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

This commit is contained in:
philip-morlier committed 2022-05-25 13:07:38 -07:00
commit 2f93e2ae10
438 files changed
+129587 -152641

No files matched your search

+3 -1
View File
@@ -3,6 +3,7 @@ package interfaces
import (
"context"
"math/big"
"encoding/json"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus"
@@ -75,5 +76,6 @@ type Backend interface {
type TracerResult interface {
vm.EVMLogger
GetResult() (interface{}, error)
GetResult() (json.RawMessage, error)
Stop(error)
}