Move initGlobals higher up

4of9 · Oct 30, 2024 · 34beeb3 · 34beeb3
1 parent a747ecc
commit 34beeb3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go
@@ -395,6 +395,16 @@ func (s *Shell) runNode(c *cli.Context) error {
 		return errors.Wrap(err, "error authenticating keystore")
 	}
 
+	err2 := app.GetKeyStore().CSA().EnsureKey(rootCtx)
+	if err2 != nil {
+		return errors.Wrap(err2, "failed to ensure CSA key")
+	}
+
+	err2 = initGlobals(cfg.Prometheus(), cfg.Tracing(), cfg.Telemetry(), lggr, keyStore.CSA())
+	if err2 != nil {
+		return errors.Wrap(err2, "failed to init globals")
+	}
+
 	legacyEVMChains := app.GetRelayers().LegacyEVMChains()
 
 	if s.Config.EVMEnabled() {
@@ -474,16 +484,6 @@ func (s *Shell) runNode(c *cli.Context) error {
 		}
 	}
 
-	err2 := app.GetKeyStore().CSA().EnsureKey(rootCtx)
-	if err2 != nil {
-		return errors.Wrap(err2, "failed to ensure CSA key")
-	}
-
-	err2 = initGlobals(cfg.Prometheus(), cfg.Tracing(), cfg.Telemetry(), lggr, keyStore.CSA())
-	if err2 != nil {
-		return errors.Wrap(err2, "failed to init globals")
-	}
-
 	if e := checkFilePermissions(lggr, s.Config.RootDir()); e != nil {
 		lggr.Warn(e)
 	}