move restrictedaddr service to execution node 2

Author: mahdy-nasr

arbnode/node.go

@@ -42,7 +42,6 @@ import (
 	"github.com/offchainlabs/nitro/daprovider/data_streaming"
 	"github.com/offchainlabs/nitro/execution"
 	executionrpcclient "github.com/offchainlabs/nitro/execution/rpcclient"
-	"github.com/offchainlabs/nitro/restrictedaddr"
 	"github.com/offchainlabs/nitro/solgen/go/bridgegen"
 	"github.com/offchainlabs/nitro/solgen/go/precompilesgen"
 	"github.com/offchainlabs/nitro/staker"
@@ -84,7 +83,6 @@ type Config struct {
 	ConsensusExecutionSyncer ConsensusExecutionSyncerConfig `koanf:"consensus-execution-syncer"`
 	RPCServer                rpcserver.Config               `koanf:"rpc-server"`
 	ExecutionRPCClient       rpcclient.ClientConfig         `koanf:"execution-rpc-client" reload:"hot"`
-	RestrictedAddr           restrictedaddr.Config          `koanf:"restricted-addr" reload:"hot"`
 	// SnapSyncConfig is only used for testing purposes, these should not be configured in production.
 	SnapSyncTest SnapSyncConfig
 }
@@ -130,9 +128,6 @@ func (c *Config) Validate() error {
 	if err := c.ExecutionRPCClient.Validate(); err != nil {
 		return fmt.Errorf("error validating Client config: %w", err)
 	}
-	if err := c.RestrictedAddr.Validate(); err != nil {
-		return fmt.Errorf("error validating RestrictedAddr config: %w", err)
-	}
 	// Check that sync-interval is not more than msg-lag / 2
 	if c.ConsensusExecutionSyncer.SyncInterval > c.SyncMonitor.MsgLag/2 {
 		log.Warn("consensus-execution-syncer.sync-interval is more than half of sync-monitor.msg-lag, which may cause sync issues",
@@ -186,7 +181,6 @@ func ConfigAddOptions(prefix string, f *pflag.FlagSet, feedInputEnable bool, fee
 	ConsensusExecutionSyncerConfigAddOptions(prefix+".consensus-execution-syncer", f)
 	rpcserver.ConfigAddOptions(prefix+".rpc-server", "consensus", f)
 	rpcclient.RPCClientAddOptions(prefix+".execution-rpc-client", f, &ConfigDefault.ExecutionRPCClient)
-	restrictedaddr.ConfigAddOptions(prefix+".restricted-addr", f)
 }
 
 var ConfigDefault = Config{
@@ -220,7 +214,6 @@ var ConfigDefault = Config{
 		ArgLogLimit:               2048,
 		WebsocketMessageSizeLimit: 256 * 1024 * 1024,
 	},
-	RestrictedAddr: restrictedaddr.DefaultConfig,
 }
 
 func ConfigDefaultL1Test() *Config {
@@ -327,7 +320,6 @@ type Node struct {
 	configFetcher            ConfigFetcher
 	ctx                      context.Context
 	ConsensusExecutionSyncer *ConsensusExecutionSyncer
-	RestrictedAddrService    *restrictedaddr.Service
 }
 
 type SnapSyncConfig struct {
@@ -1097,7 +1089,6 @@ func getNodeParentChainReaderDisabled(
 	syncMonitor *SyncMonitor,
 	configFetcher ConfigFetcher,
 	blockMetadataFetcher *BlockMetadataFetcher,
-	restrictedAddrService *restrictedaddr.Service,
 ) *Node {
 	// Create ConsensusExecutionSyncer even in L2-only mode to push sync data
 	consensusExecutionSyncerConfigFetcher := func() *ConsensusExecutionSyncerConfig {
@@ -1139,7 +1130,6 @@ func getNodeParentChainReaderDisabled(
 		ctx:                      ctx,
 		blockMetadataFetcher:     blockMetadataFetcher,
 		ConsensusExecutionSyncer: consensusExecutionSyncer,
-		RestrictedAddrService:    restrictedAddrService,
 	}
 }
 
@@ -1212,16 +1202,8 @@ func createNodeImpl(
 		return nil, err
 	}
 
-	var restrictedAddrService *restrictedaddr.Service
-	if config.RestrictedAddr.Enable {
-		restrictedAddrService, err = restrictedaddr.NewService(ctx, &config.RestrictedAddr)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create restricted addr service: %w", err)
-		}
-	}
-
 	if !config.ParentChainReader.Enable {
-		return getNodeParentChainReaderDisabled(ctx, consensusDB, stack, executionClient, executionSequencer, executionRecorder, txStreamer, blobReader, broadcastServer, broadcastClients, coordinator, maintenanceRunner, syncMonitor, configFetcher, blockMetadataFetcher, restrictedAddrService), nil
+		return getNodeParentChainReaderDisabled(ctx, consensusDB, stack, executionClient, executionSequencer, executionRecorder, txStreamer, blobReader, broadcastServer, broadcastClients, coordinator, maintenanceRunner, syncMonitor, configFetcher, blockMetadataFetcher), nil
 	}
 
 	delayedBridge, sequencerInbox, err := getDelayedBridgeAndSequencerInbox(deployInfo, l1client)
@@ -1297,7 +1279,6 @@ func createNodeImpl(
 		configFetcher:            configFetcher,
 		ctx:                      ctx,
 		ConsensusExecutionSyncer: consensusExecutionSyncer,
-		RestrictedAddrService:    restrictedAddrService,
 	}, nil
 }
 
@@ -1460,13 +1441,6 @@ func (n *Node) Start(ctx context.Context) error {
 			return fmt.Errorf("error starting exec rpc client: %w", err)
 		}
 	}
-	// Initialize and start restricted address service early to ensure filtering is ready
-	if n.RestrictedAddrService != nil {
-		if err = n.RestrictedAddrService.Initialize(ctx); err != nil {
-			return fmt.Errorf("error initializing restricted addr service: %w", err)
-		}
-		n.RestrictedAddrService.Start(ctx)
-	}
 	if n.BlobReader != nil {
 		err = n.BlobReader.Initialize(ctx)
 		if err != nil {
@@ -1597,9 +1571,6 @@ func (n *Node) StopAndWait() {
 	if n.ConsensusExecutionSyncer != nil {
 		n.ConsensusExecutionSyncer.StopAndWait()
 	}
-	if n.RestrictedAddrService != nil && n.RestrictedAddrService.Started() {
-		n.RestrictedAddrService.StopAndWait()
-	}
 	if n.MaintenanceRunner != nil && n.MaintenanceRunner.Started() {
 		n.MaintenanceRunner.StopAndWait()
 	}

execution/gethexec/node.go

@@ -514,7 +514,9 @@ func (n *ExecutionNode) Start(ctxIn context.Context) error {
 	}
 	n.bulkBlockMetadataFetcher.Start(ctx)
 
-	n.RestrictedAddrService.Start(ctx)
+	if n.RestrictedAddrService != nil {
+		n.RestrictedAddrService.Start(ctx)
+	}
 	return nil
 }