ethclient moved to node.Node

cmd/geth/config.go

@@ -192,12 +192,7 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 		cfg.Eth.OverrideVerkle = &v
 	}
 
-	// [rollup-geth]
-	// TODO: think about if there is better solution for this (eg. rollup config file)
-	if !ctx.IsSet(utils.L1NodeRPCEndpointFlag.Name) {
-		log.Crit("L1 node RPC endpoint URL not set", "flag", utils.L1NodeRPCEndpointFlag.Name)
-	}
-	backend, eth := utils.RegisterEthService(stack, &cfg.Eth, ctx.String(utils.L1NodeRPCEndpointFlag.Name))
+	backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
 
 	// Create gauge with geth system and build information
 	if eth != nil { // The 'eth' backend may be nil in light mode
@@ -255,6 +250,10 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 			utils.Fatalf("failed to register catalyst service: %v", err)
 		}
 	}
+
+	//[rollup-geth]
+	activateL1RPCEndpoint(ctx, stack)
+
 	return stack
 }
 

cmd/geth/config_rollup.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"github.com/ethereum/go-ethereum/cmd/utils"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/node"
+	"github.com/urfave/cli/v2"
+)
+
+// TODO: when we have clearer picture of how do we want rollup "features" (EIPs/RIPs) to be activated
+// make this "rule" activated (ie. if not "rule activated" then L1 client can simply be nil)
+func activateL1RPCEndpoint(ctx *cli.Context, stack *node.Node) {
+	if !ctx.IsSet(utils.L1NodeRPCEndpointFlag.Name) {
+		log.Error("L1 node RPC endpoint URL not set", "flag", utils.L1NodeRPCEndpointFlag.Name)
+		return
+	}
+
+	l1RPCEndpoint := ctx.String(utils.L1NodeRPCEndpointFlag.Name)
+	stack.RegisterEthClient(l1RPCEndpoint)
+}

cmd/utils/flags.go

@@ -1925,8 +1925,8 @@ func SetDNSDiscoveryDefaults(cfg *ethconfig.Config, genesis common.Hash) {
 
 // RegisterEthService adds an Ethereum client to the stack.
 // The second return value is the full node instance.
-func RegisterEthService(stack *node.Node, cfg *ethconfig.Config, l1RPCClientEndpoint string) (*eth.EthAPIBackend, *eth.Ethereum) {
-	backend, err := eth.New(stack, cfg, l1RPCClientEndpoint)
+func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (*eth.EthAPIBackend, *eth.Ethereum) {
+	backend, err := eth.New(stack, cfg)
 	if err != nil {
 		Fatalf("Failed to register the Ethereum service: %v", err)
 	}

eth/backend.go

@@ -100,7 +100,7 @@ type Ethereum struct {
 
 // New creates a new Ethereum object (including the initialisation of the common Ethereum object),
 // whose lifecycle will be managed by the provided node.
-func New(stack *node.Node, config *ethconfig.Config, l1RPCEndpoint string) (*Ethereum, error) {
+func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	// Ensure configuration values are compatible and sane
 	if !config.SyncMode.IsValid() {
 		return nil, fmt.Errorf("invalid sync mode %d", config.SyncMode)
@@ -217,7 +217,7 @@ func New(stack *node.Node, config *ethconfig.Config, l1RPCEndpoint string) (*Eth
 	}
 
 	// [rollup-geth]
-	activateL1RPCEndpoint(l1RPCEndpoint, &vmConfig)
+	vmConfig.L1RpcClient = stack.EthClient()
 
 	eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, config.Genesis, &overrides, eth.engine, vmConfig, &config.TransactionHistory)
 	if err != nil {

node/node.go

@@ -33,6 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethdb/memorydb"
 	"github.com/ethereum/go-ethereum/event"
@@ -67,6 +68,8 @@ type Node struct {
 	inprocHandler *rpc.Server // In-process RPC request handler to process the API requests
 
 	databases map[*closeTrackingDB]struct{} // All open databases
+
+	ethClient *ethclient.Client
 }
 
 const (
@@ -708,6 +711,12 @@ func (n *Node) EventMux() *event.TypeMux {
 	return n.eventmux
 }
 
+// [rollup-geth]
+// EthClient returns instance of ETH RPC client
+func (n *Node) EthClient() *ethclient.Client {
+	return n.ethClient
+}
+
 // OpenDatabase opens an existing database with the given name (or creates one if no
 // previous can be found) from within the node's instance directory. If the node is
 // ephemeral, a memory database is returned.

node/node_rollup.go

@@ -0,0 +1,17 @@
+package node
+
+import (
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+func (n *Node) RegisterEthClient(endpoint string) {
+	ethClient, err := ethclient.Dial(endpoint)
+	if err != nil {
+		log.Error("Unable to connect to ETH RPC endpoint at", "URL", ethClient, "error", err)
+		return
+	}
+
+	n.ethClient = ethClient
+	log.Info("Initialized ETH RPC client", "endpoint", ethClient)
+}