QB-1574: update to TM calls, refactor ws

app/ante/eth.go

@@ -17,6 +17,41 @@ import (
  evmtypes "github.com/stratosnet/stratos-chain/x/evm/types"
 )
 
+// EthTxPayloadVerificationDecorator validates base tx payload and check some limitations
+type EthTxPayloadVerificationDecorator struct {
+}
+
+func NewEthTxPayloadVerificationDecorator() EthTxPayloadVerificationDecorator {
+ return EthTxPayloadVerificationDecorator{}
+}
+
+// AnteHandle validates msgs count, some signature protection and applied limitations
+func (tpvd EthTxPayloadVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
+ if len(tx.GetMsgs()) > 1 {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "evm transactions only operates with 1 msg")
+ }
+
+ for _, msg := range tx.GetMsgs() {
+ msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
+ if !ok {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid message type %T, expected %T", msg, (*evmtypes.MsgEthereumTx)(nil))
+ }
+
+ ethTx := msgEthTx.AsTransaction()
+ // EIP-155 only allowed
+ if !ethTx.Protected() {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrNotSupported, "legacy pre-eip-155 transactions not supported")
+ }
+
+ // forbid EIP-2930 update with access list
+ if len(ethTx.AccessList()) > 0 {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrNotSupported, "eip-2930 transactions not supported")
+ }
+ }
+
+ return next(ctx, tx, simulate)
+}
+
 // EthSigVerificationDecorator validates an ethereum signatures
 type EthSigVerificationDecorator struct {
  evmKeeper EVMKeeper

app/ante/handler_options.go

@@ -48,6 +48,7 @@ func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
  NewEthSetUpContextDecorator(options.EvmKeeper), // outermost AnteDecorator. SetUpContext must be called first
  NewEthMempoolFeeDecorator(options.EvmKeeper), // Check eth effective gas price against minimal-gas-prices
  NewEthValidateBasicDecorator(options.EvmKeeper),
+ // NewEthTxPayloadVerificationDecorator(),
  NewEthSigVerificationDecorator(options.EvmKeeper),
  NewEthAccountVerificationDecorator(options.AccountKeeper, options.EvmKeeper),
  NewEthGasConsumeDecorator(options.EvmKeeper, options.MaxTxGasWanted),

app/app.go

@@ -192,6 +192,10 @@ var (
  }
 )
 
+type EVMLKeeperApp interface {
+ GetEVMKeeper() *evmkeeper.Keeper
+}
+
 type NewApp struct {
  *baseapp.BaseApp
 
@@ -751,6 +755,10 @@ func (app *NewApp) GetPotKeeper() potkeeper.Keeper {
  return app.potKeeper
 }
 
+func (app *NewApp) GetEVMKeeper() *evmkeeper.Keeper {
+ return app.evmKeeper
+}
+
 // RegisterSwaggerAPI registers swagger route with API Server
 func RegisterSwaggerAPI(_ client.Context, rtr *mux.Router) {
  statikFS, err := fs.New()

go.mod

@@ -13,14 +13,12 @@ require (
  github.com/gogo/protobuf v1.3.3
  github.com/golang/protobuf v1.5.2
  github.com/gorilla/mux v1.8.0
- github.com/gorilla/websocket v1.5.0
  github.com/grpc-ecosystem/grpc-gateway v1.16.0
  github.com/improbable-eng/grpc-web v0.15.0
  github.com/ipfs/go-cid v0.1.0
  github.com/pkg/errors v0.9.1
  github.com/rakyll/statik v0.1.7
  github.com/regen-network/cosmos-proto v0.3.1
- github.com/rs/cors v1.8.2
  github.com/spf13/cast v1.5.0
  github.com/spf13/cobra v1.6.0
  github.com/spf13/pflag v1.0.5
@@ -58,6 +56,7 @@ require (
  github.com/cosmos/gorocksdb v1.2.0 // indirect
  github.com/cosmos/iavl v0.19.4 // indirect
  github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
  github.com/creachadair/taskgroup v0.3.2 // indirect
  github.com/danieljoos/wincred v1.1.2 // indirect
  github.com/deckarep/golang-set v1.8.0 // indirect
@@ -70,6 +69,7 @@ require (
  github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
  github.com/edsrzf/mmap-go v1.0.0 // indirect
  github.com/felixge/httpsnoop v1.0.1 // indirect
+ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
  github.com/go-kit/kit v0.12.0 // indirect
@@ -80,15 +80,18 @@ require (
  github.com/go-stack/stack v1.8.0 // indirect
  github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
  github.com/gogo/gateway v1.1.0 // indirect
+ github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
  github.com/golang/snappy v0.0.4 // indirect
  github.com/google/btree v1.0.0 // indirect
  github.com/google/orderedcode v0.0.1 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/gorilla/handlers v1.5.1 // indirect
+ github.com/gorilla/websocket v1.5.0 // indirect
  github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
  github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
  github.com/gtank/merlin v0.1.1 // indirect
  github.com/gtank/ristretto255 v0.1.2 // indirect
+ github.com/hashicorp/go-bexpr v0.1.10 // indirect
  github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
  github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
@@ -114,6 +117,7 @@ require (
  github.com/minio/highwayhash v1.0.2 // indirect
  github.com/minio/sha256-simd v1.0.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/mitchellh/pointerstructure v1.2.0 // indirect
  github.com/mr-tron/base58 v1.2.0 // indirect
  github.com/mtibben/percent v0.2.1 // indirect
  github.com/multiformats/go-base32 v0.0.3 // indirect
@@ -134,7 +138,9 @@ require (
  github.com/prometheus/tsdb v0.7.1 // indirect
  github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
  github.com/rjeczalik/notify v0.9.1 // indirect
+ github.com/rs/cors v1.8.2 // indirect
  github.com/rs/zerolog v1.27.0 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/sasha-s/go-deadlock v0.3.1 // indirect
  github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
  github.com/spf13/afero v1.9.2 // indirect
@@ -146,6 +152,8 @@ require (
  github.com/tidwall/btree v1.5.0 // indirect
  github.com/tklauser/go-sysconf v0.3.5 // indirect
  github.com/tklauser/numcpus v0.2.2 // indirect
+ github.com/urfave/cli/v2 v2.10.2 // indirect
+ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
  github.com/zondax/hid v0.9.1 // indirect
  github.com/zondax/ledger-go v0.14.1 // indirect
  go.etcd.io/bbolt v1.3.6 // indirect

go.sum

@@ -188,7 +188,6 @@ github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ
 github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8=
 github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA=
 github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI=
-github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
@@ -256,6 +255,7 @@ github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8S
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
+github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
@@ -315,6 +315,7 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0=
 github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic=
 github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog=
+github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -427,6 +428,7 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
+github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -582,9 +584,11 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
+github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -750,7 +754,6 @@ github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubr
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
 github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -858,15 +861,16 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
+github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
 github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI=
 github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

rpc/apis.go

@@ -5,13 +5,14 @@ package rpc
 import (
  "fmt"
 
- rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
+ "github.com/tendermint/tendermint/node"
 
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/server"
 
  "github.com/ethereum/go-ethereum/rpc"
 
+ sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/stratosnet/stratos-chain/rpc/backend"
  "github.com/stratosnet/stratos-chain/rpc/namespaces/ethereum/debug"
  "github.com/stratosnet/stratos-chain/rpc/namespaces/ethereum/eth"
@@ -22,6 +23,8 @@ import (
  "github.com/stratosnet/stratos-chain/rpc/namespaces/ethereum/txpool"
  "github.com/stratosnet/stratos-chain/rpc/namespaces/ethereum/web3"
  "github.com/stratosnet/stratos-chain/rpc/types"
+
+ evmkeeper "github.com/stratosnet/stratos-chain/x/evm/keeper"
 )
 
 // RPC namespaces and API version
@@ -44,16 +47,16 @@ const (
 )
 
 // APICreator creates the JSON-RPC API implementations.
-type APICreator = func(*server.Context, client.Context, *rpcclient.WSClient) []rpc.API
+type APICreator = func(*server.Context, *node.Node, *evmkeeper.Keeper, sdk.Context, client.Context) []rpc.API
 
 // apiCreators defines the JSON-RPC API namespaces.
 var apiCreators map[string]APICreator
 
 func init() {
  apiCreators = map[string]APICreator{
- EthNamespace: func(ctx *server.Context, clientCtx client.Context, tmWSClient *rpcclient.WSClient) []rpc.API {
+ EthNamespace: func(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context) []rpc.API {
  nonceLock := new(types.AddrLocker)
- evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+ evmBackend := backend.NewBackend(ctx, tmNode, evmKeeper, sdkCtx, ctx.Logger, clientCtx)
  return []rpc.API{
  {
  Namespace: EthNamespace,
@@ -64,12 +67,12 @@ func init() {
  {
  Namespace: EthNamespace,
  Version: apiVersion,
- Service: filters.NewPublicAPI(ctx.Logger, clientCtx, tmWSClient, evmBackend),
+ Service: filters.NewPublicAPI(ctx.Logger, clientCtx, tmNode.EventBus(), evmBackend),
  Public: true,
  },
  }
  },
- Web3Namespace: func(*server.Context, client.Context, *rpcclient.WSClient) []rpc.API {
+ Web3Namespace: func(*server.Context, *node.Node, *evmkeeper.Keeper, sdk.Context, client.Context) []rpc.API {
  return []rpc.API{
  {
  Namespace: Web3Namespace,
@@ -79,18 +82,19 @@ func init() {
  },
  }
  },
- NetNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
+ NetNamespace: func(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context) []rpc.API {
+ evmBackend := backend.NewBackend(ctx, tmNode, evmKeeper, sdkCtx, ctx.Logger, clientCtx)
  return []rpc.API{
  {
  Namespace: NetNamespace,
  Version: apiVersion,
- Service: net.NewPublicAPI(clientCtx),
+ Service: net.NewPublicAPI(evmBackend),
  Public: true,
  },
  }
  },
- PersonalNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
- evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+ PersonalNamespace: func(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context) []rpc.API {
+ evmBackend := backend.NewBackend(ctx, tmNode, evmKeeper, sdkCtx, ctx.Logger, clientCtx)
  return []rpc.API{
  {
  Namespace: PersonalNamespace,
@@ -100,18 +104,19 @@ func init() {
  },
  }
  },
- TxPoolNamespace: func(ctx *server.Context, _ client.Context, _ *rpcclient.WSClient) []rpc.API {
+ TxPoolNamespace: func(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context) []rpc.API {
+ evmBackend := backend.NewBackend(ctx, tmNode, evmKeeper, sdkCtx, ctx.Logger, clientCtx)
  return []rpc.API{
  {
  Namespace: TxPoolNamespace,
  Version: apiVersion,
- Service: txpool.NewPublicAPI(ctx.Logger),
+ Service: txpool.NewPublicAPI(ctx.Logger, clientCtx, evmBackend),
  Public: true,
  },
  }
  },
- DebugNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
- evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+ DebugNamespace: func(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context) []rpc.API {
+ evmBackend := backend.NewBackend(ctx, tmNode, evmKeeper, sdkCtx, ctx.Logger, clientCtx)
  return []rpc.API{
  {
  Namespace: DebugNamespace,
@@ -121,8 +126,8 @@ func init() {
  },
  }
  },
- MinerNamespace: func(ctx *server.Context, clientCtx client.Context, _ *rpcclient.WSClient) []rpc.API {
- evmBackend := backend.NewBackend(ctx, ctx.Logger, clientCtx)
+ MinerNamespace: func(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context) []rpc.API {
+ evmBackend := backend.NewBackend(ctx, tmNode, evmKeeper, sdkCtx, ctx.Logger, clientCtx)
  return []rpc.API{
  {
  Namespace: MinerNamespace,
@@ -136,12 +141,12 @@ func init() {
 }
 
 // GetRPCAPIs returns the list of all APIs
-func GetRPCAPIs(ctx *server.Context, clientCtx client.Context, tmWSClient *rpcclient.WSClient, selectedAPIs []string) []rpc.API {
+func GetRPCAPIs(ctx *server.Context, tmNode *node.Node, evmKeeper *evmkeeper.Keeper, sdkCtx sdk.Context, clientCtx client.Context, selectedAPIs []string) []rpc.API {
  var apis []rpc.API
 
  for _, ns := range selectedAPIs {
  if creator, ok := apiCreators[ns]; ok {
- apis = append(apis, creator(ctx, clientCtx, tmWSClient)...)
+ apis = append(apis, creator(ctx, tmNode, evmKeeper, sdkCtx, clientCtx)...)
  } else {
  ctx.Logger.Error("invalid namespace value", "namespace", ns)
  }