address PR comments

OffchainLabs · Aug 19, 2024 · 9e7a43a · 9e7a43a
1 parent 2fe8f08
commit 9e7a43a
Showing 1 changed file with 55 additions and 45 deletions.
diff --git a/cmd/nitro/nitro.go b/cmd/nitro/nitro.go
@@ -640,13 +640,17 @@ func mainImpl() int {
 	}
 
 	// Before starting the node, wait until the transaction that deployed rollup is finalized
-	if nodeConfig.Node.ParentChainReader.Enable && rollupAddrs.DeployedAt > 0 {
+	if nodeConfig.EnsureRollupDeployment &&
+		nodeConfig.Node.ParentChainReader.Enable &&
+		rollupAddrs.DeployedAt > 0 {
 		currentFinalized, err := l1Reader.LatestFinalizedBlockNr(ctx)
 		if err != nil && errors.Is(err, headerreader.ErrBlockNumberNotSupported) {
 			log.Info("Finality not supported by parent chain, disabling the check to verify if rollup deployment tx was finalized", "err", err)
 		} else {
 			newHeaders, unsubscribe := l1Reader.Subscribe(false)
 			retriesOnError := 10
+			sigint := make(chan os.Signal, 1)
+			signal.Notify(sigint, os.Interrupt, syscall.SIGTERM)
 			for currentFinalized < rollupAddrs.DeployedAt && retriesOnError > 0 {
 				select {
 				case <-newHeaders:
@@ -664,6 +668,9 @@ func mainImpl() int {
 				case <-ctx.Done():
 					log.Error("Context done while checking if the rollup deployment tx was finalized")
 					return 1
+				case <-sigint:
+					log.Info("shutting down because of sigint")
+					return 0
 				}
 			}
 			unsubscribe()
@@ -733,53 +740,55 @@ func mainImpl() int {
 }
 
 type NodeConfig struct {
-	Conf             genericconf.ConfConfig          `koanf:"conf" reload:"hot"`
-	Node             arbnode.Config                  `koanf:"node" reload:"hot"`
-	Execution        gethexec.Config                 `koanf:"execution" reload:"hot"`
-	Validation       valnode.Config                  `koanf:"validation" reload:"hot"`
-	ParentChain      conf.ParentChainConfig          `koanf:"parent-chain" reload:"hot"`
-	Chain            conf.L2Config                   `koanf:"chain"`
-	LogLevel         string                          `koanf:"log-level" reload:"hot"`
-	LogType          string                          `koanf:"log-type" reload:"hot"`
-	FileLogging      genericconf.FileLoggingConfig   `koanf:"file-logging" reload:"hot"`
-	Persistent       conf.PersistentConfig           `koanf:"persistent"`
-	HTTP             genericconf.HTTPConfig          `koanf:"http"`
-	WS               genericconf.WSConfig            `koanf:"ws"`
-	IPC              genericconf.IPCConfig           `koanf:"ipc"`
-	Auth             genericconf.AuthRPCConfig       `koanf:"auth"`
-	GraphQL          genericconf.GraphQLConfig       `koanf:"graphql"`
-	Metrics          bool                            `koanf:"metrics"`
-	MetricsServer    genericconf.MetricsServerConfig `koanf:"metrics-server"`
-	PProf            bool                            `koanf:"pprof"`
-	PprofCfg         genericconf.PProf               `koanf:"pprof-cfg"`
-	Init             conf.InitConfig                 `koanf:"init"`
-	Rpc              genericconf.RpcConfig           `koanf:"rpc"`
-	BlocksReExecutor blocksreexecutor.Config         `koanf:"blocks-reexecutor"`
+	Conf                   genericconf.ConfConfig          `koanf:"conf" reload:"hot"`
+	Node                   arbnode.Config                  `koanf:"node" reload:"hot"`
+	Execution              gethexec.Config                 `koanf:"execution" reload:"hot"`
+	Validation             valnode.Config                  `koanf:"validation" reload:"hot"`
+	ParentChain            conf.ParentChainConfig          `koanf:"parent-chain" reload:"hot"`
+	Chain                  conf.L2Config                   `koanf:"chain"`
+	LogLevel               string                          `koanf:"log-level" reload:"hot"`
+	LogType                string                          `koanf:"log-type" reload:"hot"`
+	FileLogging            genericconf.FileLoggingConfig   `koanf:"file-logging" reload:"hot"`
+	Persistent             conf.PersistentConfig           `koanf:"persistent"`
+	HTTP                   genericconf.HTTPConfig          `koanf:"http"`
+	WS                     genericconf.WSConfig            `koanf:"ws"`
+	IPC                    genericconf.IPCConfig           `koanf:"ipc"`
+	Auth                   genericconf.AuthRPCConfig       `koanf:"auth"`
+	GraphQL                genericconf.GraphQLConfig       `koanf:"graphql"`
+	Metrics                bool                            `koanf:"metrics"`
+	MetricsServer          genericconf.MetricsServerConfig `koanf:"metrics-server"`
+	PProf                  bool                            `koanf:"pprof"`
+	PprofCfg               genericconf.PProf               `koanf:"pprof-cfg"`
+	Init                   conf.InitConfig                 `koanf:"init"`
+	Rpc                    genericconf.RpcConfig           `koanf:"rpc"`
+	BlocksReExecutor       blocksreexecutor.Config         `koanf:"blocks-reexecutor"`
+	EnsureRollupDeployment bool                            `koanf:"ensure-rollup-deployment" reload:"hot"`
 }
 
 var NodeConfigDefault = NodeConfig{
-	Conf:             genericconf.ConfConfigDefault,
-	Node:             arbnode.ConfigDefault,
-	Execution:        gethexec.ConfigDefault,
-	Validation:       valnode.DefaultValidationConfig,
-	ParentChain:      conf.L1ConfigDefault,
-	Chain:            conf.L2ConfigDefault,
-	LogLevel:         "INFO",
-	LogType:          "plaintext",
-	FileLogging:      genericconf.DefaultFileLoggingConfig,
-	Persistent:       conf.PersistentConfigDefault,
-	HTTP:             genericconf.HTTPConfigDefault,
-	WS:               genericconf.WSConfigDefault,
-	IPC:              genericconf.IPCConfigDefault,
-	Auth:             genericconf.AuthRPCConfigDefault,
-	GraphQL:          genericconf.GraphQLConfigDefault,
-	Metrics:          false,
-	MetricsServer:    genericconf.MetricsServerConfigDefault,
-	Init:             conf.InitConfigDefault,
-	Rpc:              genericconf.DefaultRpcConfig,
-	PProf:            false,
-	PprofCfg:         genericconf.PProfDefault,
-	BlocksReExecutor: blocksreexecutor.DefaultConfig,
+	Conf:                   genericconf.ConfConfigDefault,
+	Node:                   arbnode.ConfigDefault,
+	Execution:              gethexec.ConfigDefault,
+	Validation:             valnode.DefaultValidationConfig,
+	ParentChain:            conf.L1ConfigDefault,
+	Chain:                  conf.L2ConfigDefault,
+	LogLevel:               "INFO",
+	LogType:                "plaintext",
+	FileLogging:            genericconf.DefaultFileLoggingConfig,
+	Persistent:             conf.PersistentConfigDefault,
+	HTTP:                   genericconf.HTTPConfigDefault,
+	WS:                     genericconf.WSConfigDefault,
+	IPC:                    genericconf.IPCConfigDefault,
+	Auth:                   genericconf.AuthRPCConfigDefault,
+	GraphQL:                genericconf.GraphQLConfigDefault,
+	Metrics:                false,
+	MetricsServer:          genericconf.MetricsServerConfigDefault,
+	Init:                   conf.InitConfigDefault,
+	Rpc:                    genericconf.DefaultRpcConfig,
+	PProf:                  false,
+	PprofCfg:               genericconf.PProfDefault,
+	BlocksReExecutor:       blocksreexecutor.DefaultConfig,
+	EnsureRollupDeployment: true,
 }
 
 func NodeConfigAddOptions(f *flag.FlagSet) {
@@ -806,6 +815,7 @@ func NodeConfigAddOptions(f *flag.FlagSet) {
 	conf.InitConfigAddOptions("init", f)
 	genericconf.RpcConfigAddOptions("rpc", f)
 	blocksreexecutor.ConfigAddOptions("blocks-reexecutor", f)
+	f.Bool("ensure-rollup-deployment", NodeConfigDefault.EnsureRollupDeployment, "before starting the node, wait until the transaction that deployed rollup is finalized")
 }
 
 func (c *NodeConfig) ResolveDirectoryNames() error {