Merge pull request #15 from openrelayxyz/develop

Cut final v1.10.10 release
This commit is contained in:
philip-morlier 2021-10-26 13:55:14 -07:00 committed by GitHub
commit 27b3d2d74a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

2
go.mod
View File

@ -52,7 +52,7 @@ require (
github.com/naoina/go-stringutil v0.1.0 // indirect
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
github.com/olekukonko/tablewriter v0.0.5
github.com/openrelayxyz/plugeth-utils v0.0.8
github.com/openrelayxyz/plugeth-utils v0.0.9
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
github.com/prometheus/tsdb v0.7.1
github.com/rjeczalik/notify v0.9.1

View File

@ -101,10 +101,12 @@ func (w WrappedTracer) CaptureFault(env *vm.EVM, pc uint64, op vm.OpCode, gas, c
func (w WrappedTracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) {
w.r.CaptureEnd(output, gasUsed, t, err)
}
// TODO: Align these with PluGeth-utils
func (w WrappedTracer) CaptureEnter(vm.OpCode, common.Address, common.Address, []byte, uint64, *big.Int) {}
func (w WrappedTracer) CaptureExit([]byte, uint64, error) {}
func (w WrappedTracer) CaptureEnter(typ vm.OpCode, from common.Address, to common.Address, input []byte, gas uint64, value *big.Int) {
w.r.CaptureEnter(core.OpCode(typ), core.Address(from), core.Address(to), input, gas, value)
}
func (w WrappedTracer) CaptureExit(output []byte, gasUsed uint64, err error) {
w.r.CaptureExit(output, gasUsed, err)
}
func (w WrappedTracer) GetResult() (interface{}, error) {
return w.r.Result()
}