review feedback

cmd/zetaclientd/start.go

@@ -83,6 +83,20 @@ func Start(_ *cobra.Command, _ []string) error {
 		return errors.Wrap(err, "unable to resolve observer pub key bech32")
 	}
 
+	isObserver, err := isObserverNode(ctx, zetacoreClient)
+	switch {
+	case err != nil:
+		return errors.Wrap(err, "unable to check if observer node")
+	case !isObserver:
+		logger.Std.Warn().Msg("This node is not an observer node. Exit 0")
+		return nil
+	}
+
+	shutdownListener := maintenance.NewShutdownListener(zetacoreClient, logger.Std)
+	if err := shutdownListener.RunPreStartCheck(ctx); err != nil {
+		return errors.Wrap(err, "pre start check failed")
+	}
+
 	tssSetupProps := zetatss.SetupProps{
 		Config:              cfg,
 		Zetacore:            zetacoreClient,
@@ -94,13 +108,11 @@ func Start(_ *cobra.Command, _ []string) error {
 		Telemetry:           telemetry,
 	}
 
-	isObserver, err := isObserverNode(ctx, zetacoreClient)
-	switch {
-	case err != nil:
-		return errors.Wrap(err, "unable to check if observer node")
-	case !isObserver:
-		logger.Std.Warn().Msg("This node is not an observer node. Exit 0")
-		return nil
+	// This will start p2p communication so it should only happen after
+	// preflight checks have completed
+	tss, err := zetatss.Setup(ctx, tssSetupProps, logger.Std)
+	if err != nil {
+		return errors.Wrap(err, "unable to setup TSS service")
 	}
 
 	// Starts various background TSS listeners.
@@ -110,23 +122,11 @@ func Start(_ *cobra.Command, _ []string) error {
 		graceful.ShutdownNow()
 	})
 
-	shutdownListener := maintenance.NewShutdownListener(zetacoreClient, logger.Std)
-	err = shutdownListener.RunPreStartCheck(ctx)
-	if err != nil {
-		return errors.Wrap(err, "pre start check failed")
-	}
 	shutdownListener.Listen(ctx, func() {
 		logger.Std.Info().Msg("Shutdown listener received an action to shutdown zetaclientd.")
 		graceful.ShutdownNow()
 	})
 
-	// This will start p2p communication so it should only happen after
-	// preflight checks have completed
-	tss, err := zetatss.Setup(ctx, tssSetupProps, logger.Std)
-	if err != nil {
-		return errors.Wrap(err, "unable to setup TSS service")
-	}
-
 	// CreateSignerMap: This creates a map of all signers for each chain.
 	// Each signer is responsible for signing transactions for a particular chain
 	signerMap, err := orchestrator.CreateSignerMap(ctx, tss, logger)

docs/openapi/openapi.swagger.yaml

@@ -58119,7 +58119,8 @@ definitions:
         type: string
         description: |-
           Minimum version of zetaclient that is allowed to run. This must be either
-          a valid semver string (v23.0.1) or empty.
+          a valid semver string (v23.0.1) or empty. If empty, all versions are
+          allowed.
     description: Flags for the top-level operation of zetaclient.
   observerPendingNonces:
     type: object

proto/zetachain/zetacore/observer/operational.proto

@@ -18,6 +18,7 @@ message OperationalFlags {
       [ (gogoproto.stdduration) = true ];
 
   // Minimum version of zetaclient that is allowed to run. This must be either
-  // a valid semver string (v23.0.1) or empty.
+  // a valid semver string (v23.0.1) or empty. If empty, all versions are
+  // allowed.
   string minimum_version = 3;
 }

typescript/zetachain/zetacore/observer/operational_pb.d.ts

@@ -30,7 +30,8 @@ export declare class OperationalFlags extends Message<OperationalFlags> {
 
   /**
    * Minimum version of zetaclient that is allowed to run. This must be either
-   * a valid semver string (v23.0.1) or empty.
+   * a valid semver string (v23.0.1) or empty. If empty, all versions are
+   * allowed.
    *
    * @generated from field: string minimum_version = 3;
    */

x/observer/types/operational_test.go

@@ -58,6 +58,13 @@ func TestOperationalFlags_Validate(t *testing.T) {
 				MinimumVersion: "v1.1.1",
 			},
 		},
+		{
+			name: "minimum version invalid",
+			of: types.OperationalFlags{
+				MinimumVersion: "asdf",
+			},
+			errContains: types.ErrOperationalFlagsInvalidMinimumVersion.Error(),
+		},
 		{
 			name: "all flags valid",
 			of: types.OperationalFlags{

zetaclient/maintenance/shutdown_listener.go

@@ -26,7 +26,8 @@ type ShutdownListener struct {
 	logger zerolog.Logger
 
 	lastRestartHeightMissed int64
-	getVersion              func() string
+	// get the current version of zetaclient
+	getVersion func() string
 }
 
 // NewShutdownListener creates a new ShutdownListener.
@@ -46,10 +47,7 @@ func (o *ShutdownListener) RunPreStartCheck(ctx context.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "unable to get initial operational flags")
 	}
-	if err := o.checkMinimumVersion(operationalFlags); err != nil {
-		return err
-	}
-	return nil
+	return o.checkMinimumVersion(operationalFlags)
 }
 
 func (o *ShutdownListener) Listen(ctx context.Context, action func()) {
@@ -100,7 +98,7 @@ func (o *ShutdownListener) getOperationalFlagsWithRetry(ctx context.Context) (ob
 // handleNewFlags processes the flags and returns true if a shutdown should be signaled
 func (o *ShutdownListener) handleNewFlags(ctx context.Context, f observertypes.OperationalFlags) bool {
 	if err := o.checkMinimumVersion(f); err != nil {
-		o.logger.Error().Err(err).Msg("minimum version check")
+		o.logger.Error().Err(err).Any("operational_flags", f).Msg("minimum version check")
 		return true
 	}
 	if f.RestartHeight < 1 {

zetaclient/maintenance/shutdown_listener_test.go

@@ -106,7 +106,7 @@ func TestShutdownListener(t *testing.T) {
 		client := mocks.NewZetacoreClient(t)
 
 		listener := NewShutdownListener(client, logger)
-		listener.getVersion = func() string {
+		listener.getNodeVersion = func() string {
 			return "1.1.2"
 		}
 
@@ -134,7 +134,7 @@ func TestShutdownListener(t *testing.T) {
 		client := mocks.NewZetacoreClient(t)
 
 		listener := NewShutdownListener(client, logger)
-		listener.getVersion = func() string {
+		listener.getNodeVersion = func() string {
 			return "1.1.1"
 		}