Merge feature/merge-v1.10.18-attempt-two

plugins/wrappers/wrappers.go

@@ -3,6 +3,7 @@ package wrappers
 import (
 	"math/big"
 	"time"
+	"encoding/json"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
@@ -103,9 +104,18 @@ func (w WrappedTracer) CaptureFault(pc uint64, op vm.OpCode, gas, cost uint64, s
 func (w WrappedTracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) {
 	w.r.CaptureEnd(output, gasUsed, t, err)
 }
-func (w WrappedTracer) GetResult() (interface{}, error) {
-	return w.r.Result()
+func (w WrappedTracer) GetResult() (json.RawMessage, error) {
+	data, err := w.r.Result()
+	if err != nil { return nil, err}
+	result, err := json.Marshal(data)
+	return json.RawMessage(result), err
 }
+func (w WrappedTracer) CaptureTxStart (gasLimit uint64) {}
+
+func (w WrappedTracer) CaptureTxEnd (restGas uint64) {}
+
+func (w WrappedTracer) Stop(err error) {}
+
 
 type WrappedStateDB struct {
 	s *state.StateDB