eth/tracers: remove revertReasonTracer, add revert reason to callTracer (#25508)

* eth/tracers: add revertReason to callTracer

* update callframe gen json

* add revertal to calltrace test

Author: s1na

eth/tracers/internal/tracetest/calltrace_test.go

@@ -104,16 +104,17 @@ type callContext struct {
 
 // callTrace is the result of a callTracer run.
 type callTrace struct {
-	Type    string          `json:"type"`
-	From    common.Address  `json:"from"`
-	To      common.Address  `json:"to"`
-	Input   hexutil.Bytes   `json:"input"`
-	Output  hexutil.Bytes   `json:"output"`
-	Gas     *hexutil.Uint64 `json:"gas,omitempty"`
-	GasUsed *hexutil.Uint64 `json:"gasUsed,omitempty"`
-	Value   *hexutil.Big    `json:"value,omitempty"`
-	Error   string          `json:"error,omitempty"`
-	Calls   []callTrace     `json:"calls,omitempty"`
+	Type     string          `json:"type"`
+	From     common.Address  `json:"from"`
+	To       common.Address  `json:"to"`
+	Input    hexutil.Bytes   `json:"input"`
+	Output   hexutil.Bytes   `json:"output"`
+	Gas      *hexutil.Uint64 `json:"gas,omitempty"`
+	GasUsed  *hexutil.Uint64 `json:"gasUsed,omitempty"`
+	Value    *hexutil.Big    `json:"value,omitempty"`
+	Error    string          `json:"error,omitempty"`
+	Revertal string          `json:"revertReason,omitempty"`
+	Calls    []callTrace     `json:"calls,omitempty"`
 }
 
 // callTracerTest defines a single test to check the call tracer against.

eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json

@@ -59,6 +59,7 @@
     "to": "0xf58833cf0c791881b494eb79d461e08a1f043f52",
     "type": "CALL",
     "value": "0x0",
-    "output": "0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001e53656c662d64656c65676174696f6e20697320646973616c6c6f7765642e0000"
+    "output": "0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001e53656c662d64656c65676174696f6e20697320646973616c6c6f7765642e0000",
+    "revertReason": "Self-delegation is disallowed."
   }
 }

eth/tracers/native/call.go

@@ -23,6 +23,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/vm"
@@ -36,15 +37,16 @@ func init() {
 }
 
 type callFrame struct {
-	Type    vm.OpCode      `json:"-"`
-	From    common.Address `json:"from"`
-	Gas     uint64         `json:"gas"`
-	GasUsed uint64         `json:"gasUsed"`
-	To      common.Address `json:"to,omitempty" rlp:"optional"`
-	Input   []byte         `json:"input" rlp:"optional"`
-	Output  []byte         `json:"output,omitempty" rlp:"optional"`
-	Error   string         `json:"error,omitempty" rlp:"optional"`
-	Calls   []callFrame    `json:"calls,omitempty" rlp:"optional"`
+	Type     vm.OpCode      `json:"-"`
+	From     common.Address `json:"from"`
+	Gas      uint64         `json:"gas"`
+	GasUsed  uint64         `json:"gasUsed"`
+	To       common.Address `json:"to,omitempty" rlp:"optional"`
+	Input    []byte         `json:"input" rlp:"optional"`
+	Output   []byte         `json:"output,omitempty" rlp:"optional"`
+	Error    string         `json:"error,omitempty" rlp:"optional"`
+	Revertal string         `json:"revertReason,omitempty"`
+	Calls    []callFrame    `json:"calls,omitempty" rlp:"optional"`
 	// Placed at end on purpose. The RLP will be decoded to 0 instead of
 	// nil if there are non-empty elements after in the struct.
 	Value *big.Int `json:"value,omitempty" rlp:"optional"`
@@ -109,13 +111,20 @@ func (t *callTracer) CaptureStart(env *vm.EVM, from common.Address, to common.Ad
 func (t *callTracer) CaptureEnd(output []byte, gasUsed uint64, _ time.Duration, err error) {
 	t.callstack[0].GasUsed = gasUsed
 	output = common.CopyBytes(output)
-	if err != nil {
-		t.callstack[0].Error = err.Error()
-		if err.Error() == "execution reverted" && len(output) > 0 {
-			t.callstack[0].Output = output
-		}
-	} else {
+	if err == nil {
 		t.callstack[0].Output = output
+		return
+	}
+	t.callstack[0].Error = err.Error()
+	if !errors.Is(err, vm.ErrExecutionReverted) || len(output) == 0 {
+		return
+	}
+	t.callstack[0].Output = output
+	if len(output) < 4 {
+		return
+	}
+	if unpacked, err := abi.UnpackRevert(output); err == nil {
+		t.callstack[0].Revertal = unpacked
 	}
 }