changes in service to operational and assumed complete blockTracer plugin
This commit is contained in:
parent
9ac78685b3
commit
c56312cd2f
2
go.mod
2
go.mod
@ -8,7 +8,6 @@ require (
|
|||||||
github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
|
github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
|
||||||
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
|
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
|
||||||
github.com/VictoriaMetrics/fastcache v1.6.0
|
github.com/VictoriaMetrics/fastcache v1.6.0
|
||||||
github.com/aws/aws-sdk-go v1.41.4
|
|
||||||
github.com/aws/aws-sdk-go-v2 v1.2.0
|
github.com/aws/aws-sdk-go-v2 v1.2.0
|
||||||
github.com/aws/aws-sdk-go-v2/config v1.1.1
|
github.com/aws/aws-sdk-go-v2/config v1.1.1
|
||||||
github.com/aws/aws-sdk-go-v2/credentials v1.1.1
|
github.com/aws/aws-sdk-go-v2/credentials v1.1.1
|
||||||
@ -56,7 +55,6 @@ require (
|
|||||||
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
|
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
|
||||||
github.com/prometheus/tsdb v0.7.1
|
github.com/prometheus/tsdb v0.7.1
|
||||||
github.com/rjeczalik/notify v0.9.1
|
github.com/rjeczalik/notify v0.9.1
|
||||||
github.com/robertkrimen/otto v0.0.0-20211008084715-4eacda02dd21
|
|
||||||
github.com/rs/cors v1.7.0
|
github.com/rs/cors v1.7.0
|
||||||
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
|
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
|
||||||
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4
|
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4
|
||||||
|
12
go.sum
12
go.sum
@ -55,8 +55,6 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
|
|||||||
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
|
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
|
||||||
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
|
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
|
||||||
github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
|
github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
|
||||||
github.com/aws/aws-sdk-go v1.41.4 h1:5xRzZp8LfBFfowMPxmoNsxLBZOY/NTH4EeI7q2F5eWE=
|
|
||||||
github.com/aws/aws-sdk-go v1.41.4/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
|
|
||||||
github.com/aws/aws-sdk-go-v2 v1.2.0 h1:BS+UYpbsElC82gB+2E2jiCBg36i8HlubTB/dO/moQ9c=
|
github.com/aws/aws-sdk-go-v2 v1.2.0 h1:BS+UYpbsElC82gB+2E2jiCBg36i8HlubTB/dO/moQ9c=
|
||||||
github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo=
|
github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo=
|
||||||
github.com/aws/aws-sdk-go-v2/config v1.1.1 h1:ZAoq32boMzcaTW9bcUacBswAmHTbvlvDJICgHFZuECo=
|
github.com/aws/aws-sdk-go-v2/config v1.1.1 h1:ZAoq32boMzcaTW9bcUacBswAmHTbvlvDJICgHFZuECo=
|
||||||
@ -255,9 +253,7 @@ github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH
|
|||||||
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e h1:UvSe12bq+Uj2hWd8aOlwPmoZ+CITRFrdit+sDGfAg8U=
|
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e h1:UvSe12bq+Uj2hWd8aOlwPmoZ+CITRFrdit+sDGfAg8U=
|
||||||
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
|
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
|
||||||
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
||||||
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
|
|
||||||
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
|
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
|
||||||
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
|
|
||||||
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
|
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
|
||||||
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
|
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
|
||||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||||
@ -343,8 +339,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
|
|||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||||
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
|
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
|
||||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
||||||
github.com/openrelayxyz/plugeth-utils v0.0.8 h1:HpXGnWTQD0/zOmva/YLdY53HET70h/LQLSuVCJl1gdY=
|
|
||||||
github.com/openrelayxyz/plugeth-utils v0.0.8/go.mod h1:Lv47unyKJ3b/PVbVAt9Uk+RQmpdrzDOsjSCPhAMQAps=
|
|
||||||
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
||||||
github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
||||||
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
|
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
|
||||||
@ -377,8 +371,6 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
|
|||||||
github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
|
github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
|
||||||
github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
|
github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
|
||||||
github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
|
github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
|
||||||
github.com/robertkrimen/otto v0.0.0-20211008084715-4eacda02dd21 h1:uMgr5kPPCGOlEPx6lE8GPYjFkAN4ZDA9FX++QjIZn6Q=
|
|
||||||
github.com/robertkrimen/otto v0.0.0-20211008084715-4eacda02dd21/go.mod h1:/mK7FZ3mFYEn9zvNPhpngTyatyehSwte5bJZ4ehL5Xw=
|
|
||||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||||
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
|
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
|
||||||
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
|
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
|
||||||
@ -491,7 +483,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
|
|||||||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
|
||||||
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
|
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
|
||||||
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
@ -650,9 +641,6 @@ gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7
|
|||||||
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
|
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
|
||||||
gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0=
|
gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0=
|
||||||
gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
|
gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
|
||||||
gopkg.in/readline.v1 v1.0.0-20160726135117-62c6fe619375/go.mod h1:lNEQeAhU009zbRxng+XOj5ITVgY24WcbNnQopyfKoYQ=
|
|
||||||
gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
|
|
||||||
gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78=
|
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||||
gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
|
gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
|
||||||
|
@ -71,7 +71,6 @@ type Backend interface {
|
|||||||
Engine() consensus.Engine
|
Engine() consensus.Engine
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
type TracerResult interface {
|
type TracerResult interface {
|
||||||
vm.Tracer
|
vm.Tracer
|
||||||
GetResult() (interface{}, error)
|
GetResult() (interface{}, error)
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
package wrappers
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"github.com/ethereum/go-ethereum/ethdb"
|
|
||||||
"github.com/openrelayxyz/plugeth-utils/restricted"
|
|
||||||
)
|
|
||||||
|
|
||||||
type dbWrapper struct{
|
|
||||||
db ethdb.Database
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *dbWrapper) Has(key []byte) (bool, error) { return d.db.Has(key) }
|
|
||||||
func (d *dbWrapper) Get(key []byte) ([]byte, error) { return d.db.Get(key) }
|
|
||||||
func (d *dbWrapper) Put(key []byte, value []byte) error { return d.db.Put(key, value) }
|
|
||||||
func (d *dbWrapper) Delete(key []byte) error { return d.db.Delete(key) }
|
|
||||||
func (d *dbWrapper) Stat(property string) (string, error) { return d.db.Stat(property) }
|
|
||||||
func (d *dbWrapper) Compact(start []byte, limit []byte) error { return d.db.Compact(start, limit) }
|
|
||||||
func (d *dbWrapper) HasAncient(kind string, number uint64) (bool, error) { return d.db.HasAncient(kind, number) }
|
|
||||||
func (d *dbWrapper) Ancient(kind string, number uint64) ([]byte, error) { return d.db.Ancient(kind, number) }
|
|
||||||
func (d *dbWrapper) Ancients() (uint64, error) { return d.db.Ancients() }
|
|
||||||
func (d *dbWrapper) AncientSize(kind string) (uint64, error) { return d.db.AncientSize(kind) }
|
|
||||||
func (d *dbWrapper) AppendAncient(number uint64, hash, header, body, receipt, td []byte) error { return fmt.Errorf("AppendAncient is no longer supported in geth 1.10.9 and above. Use ModifyAncients instead.") }
|
|
||||||
func (d *dbWrapper) ModifyAncients(fn func(ethdb.AncientWriteOp) error) (int64, error) { return d.db.ModifyAncients(fn) }
|
|
||||||
func (d *dbWrapper) TruncateAncients(n uint64) error { return d.db.TruncateAncients(n) }
|
|
||||||
func (d *dbWrapper) Sync() error { return d.db.Sync() }
|
|
||||||
func (d *dbWrapper) Close() error { return d.db.Close() }
|
|
||||||
func (d *dbWrapper) NewIterator(prefix []byte, start []byte) restricted.Iterator { return &iterWrapper{d.db.NewIterator(prefix, start)} }
|
|
||||||
|
|
||||||
type iterWrapper struct {
|
|
||||||
iter ethdb.Iterator
|
|
||||||
}
|
|
||||||
|
|
||||||
func (it *iterWrapper) Next() bool { return it.iter.Next() }
|
|
||||||
func (it *iterWrapper) Error() error { return it.iter.Error() }
|
|
||||||
func (it *iterWrapper) Key() []byte { return it.iter.Key() }
|
|
||||||
func (it *iterWrapper) Value() []byte { return it.iter.Value() }
|
|
||||||
func (it *iterWrapper) Release() { it.iter.Release() }
|
|
@ -1,30 +1,14 @@
|
|||||||
package wrappers
|
package wrappers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"math/big"
|
"math/big"
|
||||||
"reflect"
|
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum"
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
gcore "github.com/ethereum/go-ethereum/core"
|
|
||||||
"github.com/ethereum/go-ethereum/core/state"
|
"github.com/ethereum/go-ethereum/core/state"
|
||||||
"github.com/ethereum/go-ethereum/core/types"
|
|
||||||
"github.com/ethereum/go-ethereum/core/vm"
|
"github.com/ethereum/go-ethereum/core/vm"
|
||||||
"github.com/ethereum/go-ethereum/internal/ethapi"
|
|
||||||
"github.com/ethereum/go-ethereum/event"
|
|
||||||
"github.com/ethereum/go-ethereum/log"
|
|
||||||
"github.com/ethereum/go-ethereum/node"
|
"github.com/ethereum/go-ethereum/node"
|
||||||
// "github.com/ethereum/go-ethereum/plugins/interfaces"
|
|
||||||
"github.com/ethereum/go-ethereum/rlp"
|
|
||||||
"github.com/ethereum/go-ethereum/rpc"
|
|
||||||
"github.com/openrelayxyz/plugeth-utils/core"
|
"github.com/openrelayxyz/plugeth-utils/core"
|
||||||
"github.com/openrelayxyz/plugeth-utils/restricted"
|
|
||||||
"github.com/openrelayxyz/plugeth-utils/restricted/params"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type WrappedScopeContext struct {
|
type WrappedScopeContext struct {
|
||||||
@ -222,401 +206,3 @@ func (n *Node) ResolvePath(x string) string {
|
|||||||
func (n *Node) Attach() (core.Client, error) {
|
func (n *Node) Attach() (core.Client, error) {
|
||||||
return n.n.Attach()
|
return n.n.Attach()
|
||||||
}
|
}
|
||||||
|
|
||||||
type Backend struct {
|
|
||||||
b ethapi.Backend
|
|
||||||
newTxsFeed event.Feed
|
|
||||||
newTxsOnce sync.Once
|
|
||||||
chainFeed event.Feed
|
|
||||||
chainOnce sync.Once
|
|
||||||
chainHeadFeed event.Feed
|
|
||||||
chainHeadOnce sync.Once
|
|
||||||
chainSideFeed event.Feed
|
|
||||||
chainSideOnce sync.Once
|
|
||||||
logsFeed event.Feed
|
|
||||||
logsOnce sync.Once
|
|
||||||
pendingLogsFeed event.Feed
|
|
||||||
pendingLogsOnce sync.Once
|
|
||||||
removedLogsFeed event.Feed
|
|
||||||
removedLogsOnce sync.Once
|
|
||||||
chainConfig *params.ChainConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewBackend(b ethapi.Backend) *Backend {
|
|
||||||
return &Backend{b: b}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Backend) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
|
|
||||||
return b.b.SuggestGasTipCap(ctx)
|
|
||||||
}
|
|
||||||
func (b *Backend) ChainDb() restricted.Database {
|
|
||||||
return &dbWrapper{b.b.ChainDb()}
|
|
||||||
}
|
|
||||||
func (b *Backend) ExtRPCEnabled() bool {
|
|
||||||
return b.b.ExtRPCEnabled()
|
|
||||||
}
|
|
||||||
func (b *Backend) RPCGasCap() uint64 {
|
|
||||||
return b.b.RPCGasCap()
|
|
||||||
}
|
|
||||||
func (b *Backend) RPCTxFeeCap() float64 {
|
|
||||||
return b.b.RPCTxFeeCap()
|
|
||||||
}
|
|
||||||
func (b *Backend) UnprotectedAllowed() bool {
|
|
||||||
return b.b.UnprotectedAllowed()
|
|
||||||
}
|
|
||||||
func (b *Backend) SetHead(number uint64) {
|
|
||||||
b.b.SetHead(number)
|
|
||||||
}
|
|
||||||
func (b *Backend) HeaderByNumber(ctx context.Context, number int64) ([]byte, error) {
|
|
||||||
header, err := b.b.HeaderByNumber(ctx, rpc.BlockNumber(number))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return rlp.EncodeToBytes(header)
|
|
||||||
}
|
|
||||||
func (b *Backend) HeaderByHash(ctx context.Context, hash core.Hash) ([]byte, error) {
|
|
||||||
header, err := b.b.HeaderByHash(ctx, common.Hash(hash))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return rlp.EncodeToBytes(header)
|
|
||||||
}
|
|
||||||
func (b *Backend) CurrentHeader() []byte {
|
|
||||||
ret, _ := rlp.EncodeToBytes(b.b.CurrentHeader())
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
func (b *Backend) CurrentBlock() []byte {
|
|
||||||
ret, _ := rlp.EncodeToBytes(b.b.CurrentBlock())
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
func (b *Backend) BlockByNumber(ctx context.Context, number int64) ([]byte, error) {
|
|
||||||
block, err := b.b.BlockByNumber(ctx, rpc.BlockNumber(number))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return rlp.EncodeToBytes(block)
|
|
||||||
}
|
|
||||||
func (b *Backend) BlockByHash(ctx context.Context, hash core.Hash) ([]byte, error) {
|
|
||||||
block, err := b.b.BlockByHash(ctx, common.Hash(hash))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return rlp.EncodeToBytes(block)
|
|
||||||
}
|
|
||||||
func (b *Backend) GetReceipts(ctx context.Context, hash core.Hash) ([]byte, error) {
|
|
||||||
receipts, err := b.b.GetReceipts(ctx, common.Hash(hash))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return json.Marshal(receipts)
|
|
||||||
}
|
|
||||||
func (b *Backend) GetTd(ctx context.Context, hash core.Hash) *big.Int {
|
|
||||||
return b.b.GetTd(ctx, common.Hash(hash))
|
|
||||||
}
|
|
||||||
func (b *Backend) SendTx(ctx context.Context, signedTx []byte) error {
|
|
||||||
tx := new(types.Transaction)
|
|
||||||
if err := tx.UnmarshalBinary(signedTx); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return b.b.SendTx(ctx, tx)
|
|
||||||
}
|
|
||||||
func (b *Backend) GetTransaction(ctx context.Context, txHash core.Hash) ([]byte, core.Hash, uint64, uint64, error) { // RLP Encoded transaction {
|
|
||||||
tx, blockHash, blockNumber, index, err := b.b.GetTransaction(ctx, common.Hash(txHash))
|
|
||||||
if err != nil {
|
|
||||||
return nil, core.Hash(blockHash), blockNumber, index, err
|
|
||||||
}
|
|
||||||
enc, err := tx.MarshalBinary()
|
|
||||||
return enc, core.Hash(blockHash), blockNumber, index, err
|
|
||||||
}
|
|
||||||
func (b *Backend) GetPoolTransactions() ([][]byte, error) {
|
|
||||||
txs, err := b.b.GetPoolTransactions()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
results := make([][]byte, len(txs))
|
|
||||||
for i, tx := range txs {
|
|
||||||
results[i], _ = rlp.EncodeToBytes(tx)
|
|
||||||
}
|
|
||||||
return results, nil
|
|
||||||
}
|
|
||||||
func (b *Backend) GetPoolTransaction(txHash core.Hash) []byte {
|
|
||||||
tx := b.b.GetPoolTransaction(common.Hash(txHash))
|
|
||||||
if tx == nil {
|
|
||||||
return []byte{}
|
|
||||||
}
|
|
||||||
enc, _ := rlp.EncodeToBytes(tx)
|
|
||||||
return enc
|
|
||||||
}
|
|
||||||
func (b *Backend) GetPoolNonce(ctx context.Context, addr core.Address) (uint64, error) {
|
|
||||||
return b.b.GetPoolNonce(ctx, common.Address(addr))
|
|
||||||
}
|
|
||||||
func (b *Backend) Stats() (pending int, queued int) {
|
|
||||||
return b.b.Stats()
|
|
||||||
}
|
|
||||||
func (b *Backend) TxPoolContent() (map[core.Address][][]byte, map[core.Address][][]byte) {
|
|
||||||
pending, queued := b.b.TxPoolContent()
|
|
||||||
trpending, trqueued := make(map[core.Address][][]byte), make(map[core.Address][][]byte)
|
|
||||||
for k, v := range pending {
|
|
||||||
trpending[core.Address(k)] = make([][]byte, len(v))
|
|
||||||
for i, tx := range v {
|
|
||||||
trpending[core.Address(k)][i], _ = tx.MarshalBinary()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for k, v := range queued {
|
|
||||||
trqueued[core.Address(k)] = make([][]byte, len(v))
|
|
||||||
for i, tx := range v {
|
|
||||||
trpending[core.Address(k)][i], _ = tx.MarshalBinary()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return trpending, trqueued
|
|
||||||
} // RLP encoded transactions
|
|
||||||
func (b *Backend) BloomStatus() (uint64, uint64) {
|
|
||||||
return b.b.BloomStatus()
|
|
||||||
}
|
|
||||||
func (b *Backend) GetLogs(ctx context.Context, blockHash core.Hash) ([][]byte, error) {
|
|
||||||
logs, err := b.b.GetLogs(ctx, common.Hash(blockHash))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
encLogs := make([][]byte, len(logs))
|
|
||||||
for i, log := range logs {
|
|
||||||
encLogs[i], _ = rlp.EncodeToBytes(log)
|
|
||||||
}
|
|
||||||
return encLogs, nil
|
|
||||||
} // []RLP encoded logs
|
|
||||||
|
|
||||||
type dli interface {
|
|
||||||
SyncProgress() ethereum.SyncProgress
|
|
||||||
}
|
|
||||||
|
|
||||||
type dl struct {
|
|
||||||
dl dli
|
|
||||||
}
|
|
||||||
|
|
||||||
type progress struct {
|
|
||||||
p ethereum.SyncProgress
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *progress) StartingBlock() uint64 {
|
|
||||||
return p.p.StartingBlock
|
|
||||||
}
|
|
||||||
func (p *progress) CurrentBlock() uint64 {
|
|
||||||
return p.p.CurrentBlock
|
|
||||||
}
|
|
||||||
func (p *progress) HighestBlock() uint64 {
|
|
||||||
return p.p.HighestBlock
|
|
||||||
}
|
|
||||||
func (p *progress) PulledStates() uint64 {
|
|
||||||
return p.p.PulledStates
|
|
||||||
}
|
|
||||||
func (p *progress) KnownStates() uint64 {
|
|
||||||
return p.p.KnownStates
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *dl) Progress() core.Progress {
|
|
||||||
return &progress{d.dl.SyncProgress()}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Backend) Downloader() core.Downloader {
|
|
||||||
return &dl{b.b}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Backend) SubscribeNewTxsEvent(ch chan<- core.NewTxsEvent) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.newTxsOnce.Do(func() {
|
|
||||||
bch := make(chan gcore.NewTxsEvent, 100)
|
|
||||||
sub = b.b.SubscribeNewTxsEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
txe := core.NewTxsEvent{
|
|
||||||
Txs: make([][]byte, len(item.Txs)),
|
|
||||||
}
|
|
||||||
for i, tx := range item.Txs {
|
|
||||||
txe.Txs[i], _ = tx.MarshalBinary()
|
|
||||||
}
|
|
||||||
b.newTxsFeed.Send(txe)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for NewTxs", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.newTxsFeed.Subscribe(ch)
|
|
||||||
}
|
|
||||||
func (b *Backend) SubscribeChainEvent(ch chan<- core.ChainEvent) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.chainOnce.Do(func() {
|
|
||||||
bch := make(chan gcore.ChainEvent, 100)
|
|
||||||
sub = b.b.SubscribeChainEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
ce := core.ChainEvent{
|
|
||||||
Hash: core.Hash(item.Hash),
|
|
||||||
}
|
|
||||||
ce.Block, _ = rlp.EncodeToBytes(item.Block)
|
|
||||||
ce.Logs, _ = rlp.EncodeToBytes(item.Logs)
|
|
||||||
b.chainFeed.Send(ce)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for Chain", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.chainFeed.Subscribe(ch)
|
|
||||||
}
|
|
||||||
func (b *Backend) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.chainHeadOnce.Do(func() {
|
|
||||||
bch := make(chan gcore.ChainHeadEvent, 100)
|
|
||||||
sub = b.b.SubscribeChainHeadEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
che := core.ChainHeadEvent{}
|
|
||||||
che.Block, _ = rlp.EncodeToBytes(item.Block)
|
|
||||||
b.chainHeadFeed.Send(che)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for ChainHead", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.chainHeadFeed.Subscribe(ch)
|
|
||||||
}
|
|
||||||
func (b *Backend) SubscribeChainSideEvent(ch chan<- core.ChainSideEvent) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.chainSideOnce.Do(func() {
|
|
||||||
bch := make(chan gcore.ChainSideEvent, 100)
|
|
||||||
sub = b.b.SubscribeChainSideEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
cse := core.ChainSideEvent{}
|
|
||||||
cse.Block, _ = rlp.EncodeToBytes(item.Block)
|
|
||||||
b.chainSideFeed.Send(cse)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for ChainSide", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.chainSideFeed.Subscribe(ch)
|
|
||||||
}
|
|
||||||
func (b *Backend) SubscribeLogsEvent(ch chan<- [][]byte) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.logsOnce.Do(func() {
|
|
||||||
bch := make(chan []*types.Log, 100)
|
|
||||||
sub = b.b.SubscribeLogsEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
logs := make([][]byte, len(item))
|
|
||||||
for i, log := range item {
|
|
||||||
logs[i], _ = rlp.EncodeToBytes(log)
|
|
||||||
}
|
|
||||||
b.logsFeed.Send(logs)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for Logs", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.logsFeed.Subscribe(ch)
|
|
||||||
} // []RLP encoded logs
|
|
||||||
func (b *Backend) SubscribePendingLogsEvent(ch chan<- [][]byte) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.pendingLogsOnce.Do(func() {
|
|
||||||
bch := make(chan []*types.Log, 100)
|
|
||||||
sub = b.b.SubscribePendingLogsEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
logs := make([][]byte, len(item))
|
|
||||||
for i, log := range item {
|
|
||||||
logs[i], _ = rlp.EncodeToBytes(log)
|
|
||||||
}
|
|
||||||
b.pendingLogsFeed.Send(logs)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for PendingLogs", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.pendingLogsFeed.Subscribe(ch)
|
|
||||||
} // RLP Encoded logs
|
|
||||||
func (b *Backend) SubscribeRemovedLogsEvent(ch chan<- []byte) core.Subscription {
|
|
||||||
var sub event.Subscription
|
|
||||||
b.removedLogsOnce.Do(func() {
|
|
||||||
bch := make(chan gcore.RemovedLogsEvent, 100)
|
|
||||||
sub = b.b.SubscribeRemovedLogsEvent(bch)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case item := <-bch:
|
|
||||||
logs := make([][]byte, len(item.Logs))
|
|
||||||
for i, log := range item.Logs {
|
|
||||||
logs[i], _ = rlp.EncodeToBytes(log)
|
|
||||||
}
|
|
||||||
b.removedLogsFeed.Send(item)
|
|
||||||
case err := <-sub.Err():
|
|
||||||
log.Warn("Subscription error for RemovedLogs", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
return b.removedLogsFeed.Subscribe(ch)
|
|
||||||
} // RLP encoded logs
|
|
||||||
|
|
||||||
func convertAndSet(a, b reflect.Value) (err error) {
|
|
||||||
defer func() {
|
|
||||||
if recover() != nil {
|
|
||||||
fmt.Errorf("error converting: %v", err.Error())
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
a.Set(b.Convert(a.Type()))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Backend) ChainConfig() *params.ChainConfig {
|
|
||||||
// We're using the reflect library to copy data from params.ChainConfig to
|
|
||||||
// pparams.ChainConfig, so this function shouldn't need to be touched for
|
|
||||||
// simple changes to ChainConfig (though pparams.ChainConfig may need to be
|
|
||||||
// updated). Note that this probably won't carry over consensus engine data.
|
|
||||||
if b.chainConfig != nil {
|
|
||||||
return b.chainConfig
|
|
||||||
}
|
|
||||||
b.chainConfig = ¶ms.ChainConfig{}
|
|
||||||
nval := reflect.ValueOf(b.b.ChainConfig())
|
|
||||||
ntype := nval.Elem().Type()
|
|
||||||
lval := reflect.ValueOf(b.chainConfig)
|
|
||||||
for i := 0; i < nval.Elem().NumField(); i++ {
|
|
||||||
field := ntype.Field(i)
|
|
||||||
v := nval.Elem().FieldByName(field.Name)
|
|
||||||
lv := lval.Elem().FieldByName(field.Name)
|
|
||||||
log.Info("Checking value for", "field", field.Name)
|
|
||||||
if lv.Kind() != reflect.Invalid {
|
|
||||||
// If core.ChainConfig doesn't have this field, skip it.
|
|
||||||
if v.Type() == lv.Type() && lv.CanSet() {
|
|
||||||
lv.Set(v)
|
|
||||||
} else {
|
|
||||||
convertAndSet(lv, v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return b.chainConfig
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user