cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Add tracer hooks for debug_traceCall, etc.

Browse Source
This commit is contained in:
Austin Roberts 2021-06-25 13:55:31 -05:00
parent 5c55657c54
commit 97cf240fe0
2 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eth/tracers/api.go
View File

@ -40,6 +40,7 @@ import (
"github.com/ethereum/go-ethereum/internal/ethapi" "github.com/ethereum/go-ethereum/internal/ethapi"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/plugins"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
) )
@ -799,19 +800,24 @@ func (api *API) traceTx(ctx context.Context, message core.Message, txctx *txTrac
return nil, err return nil, err
} }
} }
// Constuct the JavaScript tracer to execute with // Get the tracer from the plugin loader
if tracer, err = New(*config.Tracer, txContext); err != nil { if tr, ok := plugins.GetTracer(*config.Tracer); ok {
return nil, err tracer = tr(statedb)
} } else {
// Handle timeouts and RPC cancellations // Constuct the JavaScript tracer to execute with
deadlineCtx, cancel := context.WithTimeout(ctx, timeout) if tracer, err = New(*config.Tracer, txContext); err != nil {
go func() { return nil, err
<-deadlineCtx.Done()
if deadlineCtx.Err() == context.DeadlineExceeded {
tracer.(*Tracer).Stop(errors.New("execution timeout"))
} }
}() // Handle timeouts and RPC cancellations
defer cancel() deadlineCtx, cancel := context.WithTimeout(ctx, timeout)
go func() {
<-deadlineCtx.Done()
if deadlineCtx.Err() == context.DeadlineExceeded {
tracer.(*Tracer).Stop(errors.New("execution timeout"))
}
}()
defer cancel()
}
case config == nil: case config == nil:
tracer = vm.NewStructLogger(nil) tracer = vm.NewStructLogger(nil)

35
plugins/plugin_loader.go
View File

@ -5,6 +5,8 @@ import (
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/core/state"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
"flag" "flag"
"io/ioutil" "io/ioutil"
@ -19,7 +21,7 @@ type Subcommand func(*cli.Context, []string) error
type PluginLoader struct{ type PluginLoader struct{
TracerPlugins map[string]interface{} // TODO: Set interface Tracers map[string]func(*state.StateDB)vm.Tracer
StateHooks []interface{} // TODO: Set interface StateHooks []interface{} // TODO: Set interface
ChainEventHooks []interface{} // TODO: Set interface ChainEventHooks []interface{} // TODO: Set interface
RPCPlugins []APILoader RPCPlugins []APILoader
@ -76,7 +78,7 @@ func NewPluginLoader(target string) (*PluginLoader, error) {
if err == nil { if err == nil {
subcommands, ok := sb.(map[string]func(*cli.Context, []string) error) subcommands, ok := sb.(map[string]func(*cli.Context, []string) error)
if !ok { if !ok {
log.Warn("Could not cast plugin.Subocmmands to `map[string]func(*cli.Context, []string) error`", "file", fpath) log.Warn("Could not cast plugin.Subcommands to `map[string]func(*cli.Context, []string) error`", "file", fpath)
} else { } else {
for k, v := range subcommands { for k, v := range subcommands {
if _, ok := pl.Subcommands[k]; ok { if _, ok := pl.Subcommands[k]; ok {
@ -86,6 +88,20 @@ func NewPluginLoader(target string) (*PluginLoader, error) {
} }
} }
} }
tr, err := plug.Lookup("Tracers")
if err == nil {
tracers, ok := tr.(map[string]func(*state.StateDB)vm.Tracer)
if !ok {
log.Warn("Could not cast plugin.Tracers to `map[string]vm.Tracer`", "file", fpath)
} else {
for k, v := range tracers {
if _, ok := pl.Tracers[k]; ok {
log.Warn("Tracer redeclared", "file", fpath, "tracer", k)
}
pl.Tracers[k] = v
}
}
}
} }
return pl, nil return pl, nil
} }
@ -133,8 +149,21 @@ func (pl *PluginLoader) GetAPIs(stack *node.Node, backend Backend) []rpc.API {
func GetAPIs(stack *node.Node, backend Backend) []rpc.API { func GetAPIs(stack *node.Node, backend Backend) []rpc.API {
if defaultPluginLoader == nil { if defaultPluginLoader == nil {
log.Warn("Attempting GetAPIs ,but default PluginLoader has not been initialized") log.Warn("Attempting GetAPIs, but default PluginLoader has not been initialized")
return []rpc.API{} return []rpc.API{}
} }
return defaultPluginLoader.GetAPIs(stack, backend) return defaultPluginLoader.GetAPIs(stack, backend)
} }
func (pl *PluginLoader) GetTracer(s string) (func(*state.StateDB)vm.Tracer, bool) {
tr, ok := pl.Tracers[s]
return tr, ok
}
func GetTracer(s string) (func(*state.StateDB)vm.Tracer, bool) {
if defaultPluginLoader == nil {
log.Warn("Attempting GetTracer, but default PluginLoader has not been initialized")
return nil, false
}
return defaultPluginLoader.GetTracer(s)
}