From 56ed6c4aa8481d72aab7493827c8a4773ef28c04 Mon Sep 17 00:00:00 2001 From: Jakub Pajek Date: Wed, 31 Aug 2022 15:13:48 +0900 Subject: [PATCH 1/2] mobile: register filter APIs --- mobile/geth.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mobile/geth.go b/mobile/geth.go index 204e29c8be042..384024784e3d0 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,6 +24,7 @@ import ( "fmt" "path/filepath" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/eth/ethconfig" @@ -200,6 +201,8 @@ func NewNode(datadir string, config *NodeConfig) (stack *Node, _ error) { rawStack.Close() return nil, fmt.Errorf("ethereum init: %v", err) } + // Configure log filter RPC API. + utils.RegisterFilterAPI(rawStack, lesBackend.ApiBackend, ðConf) // If netstats reporting is requested, do it if config.EthereumNetStats != "" { if err := ethstats.New(rawStack, lesBackend.ApiBackend, lesBackend.Engine(), config.EthereumNetStats); err != nil { From 8f6ccfc0310037695ed3054f03eb75112bb04299 Mon Sep 17 00:00:00 2001 From: Jakub Pajek Date: Thu, 1 Sep 2022 10:55:03 +0900 Subject: [PATCH 2/2] mobile: rewrote without using cmd/utils --- mobile/geth.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mobile/geth.go b/mobile/geth.go index 384024784e3d0..7dee93b77ca51 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,10 +24,10 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/ethstats" "github.com/ethereum/go-ethereum/internal/debug" @@ -36,6 +36,7 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/params" + "github.com/ethereum/go-ethereum/rpc" ) // NodeConfig represents the collection of configuration values to fine tune the Geth @@ -201,8 +202,14 @@ func NewNode(datadir string, config *NodeConfig) (stack *Node, _ error) { rawStack.Close() return nil, fmt.Errorf("ethereum init: %v", err) } - // Configure log filter RPC API. - utils.RegisterFilterAPI(rawStack, lesBackend.ApiBackend, ðConf) + // Register log filter RPC API. + filterSystem := filters.NewFilterSystem(lesBackend.ApiBackend, filters.Config{ + LogCacheSize: ethConf.FilterLogCacheSize, + }) + rawStack.RegisterAPIs([]rpc.API{{ + Namespace: "eth", + Service: filters.NewFilterAPI(filterSystem, true), + }}) // If netstats reporting is requested, do it if config.EthereumNetStats != "" { if err := ethstats.New(rawStack, lesBackend.ApiBackend, lesBackend.Engine(), config.EthereumNetStats); err != nil {