bug fixes

mohammeds1992 · mohammeds1992 · commit 347cd81582f8 · 2026-01-24T02:40:31.000+05:30
diff --git a/cmd/push-validator/cmd_increase_stake.go b/cmd/push-validator/cmd_increase_stake.go
@@ -142,7 +142,18 @@ func handleIncreaseStake(d *Deps) error {
 	// Determine delegation amount
 	delegationAmount := ""
 	if !d.Prompter.IsInteractive() {
-		// In non-interactive mode, use max delegatable amount
+		// In non-interactive mode, require --yes to auto-delegate max amount
+		if !flagYes {
+			if flagOutput == "json" {
+				getPrinter().JSON(map[string]any{"ok": false, "error": "non-interactive mode requires --yes to confirm delegation"})
+			} else {
+				fmt.Println(p.Colors.Error(p.Colors.Emoji("❌") + " Non-interactive mode requires --yes flag to confirm delegation"))
+				fmt.Println()
+				fmt.Printf("  This would delegate %s PC. Run with --yes to confirm.\n", fmt.Sprintf("%.6f", maxDelegatePC))
+				fmt.Println()
+			}
+			return fmt.Errorf("non-interactive mode requires --yes to confirm delegation")
+		}
 		delegationAmount = maxDelegatable.String()
 	} else {
 		// Prompt for delegation amount
diff --git a/cmd/push-validator/cmd_increase_stake_test.go b/cmd/push-validator/cmd_increase_stake_test.go
@@ -205,16 +205,19 @@ func TestHandleIncreaseStake_NonInteractive_Success(t *testing.T) {
 	origNonInteractive := flagNonInteractive
 	origNoColor := flagNoColor
 	origNoEmoji := flagNoEmoji
+	origYes := flagYes
 	defer func() {
 		flagOutput = origOutput
 		flagNonInteractive = origNonInteractive
 		flagNoColor = origNoColor
 		flagNoEmoji = origNoEmoji
+		flagYes = origYes
 	}()
 	flagOutput = "json"
 	flagNonInteractive = true
 	flagNoColor = true
 	flagNoEmoji = true
+	flagYes = true
 
 	runner := newMockRunner()
 	binPath := findPchaind()
@@ -250,16 +253,19 @@ func TestHandleIncreaseStake_NonInteractive_DelegationFails(t *testing.T) {
 	origNonInteractive := flagNonInteractive
 	origNoColor := flagNoColor
 	origNoEmoji := flagNoEmoji
+	origYes := flagYes
 	defer func() {
 		flagOutput = origOutput
 		flagNonInteractive = origNonInteractive
 		flagNoColor = origNoColor
 		flagNoEmoji = origNoEmoji
+		flagYes = origYes
 	}()
 	flagOutput = "json"
 	flagNonInteractive = true
 	flagNoColor = true
 	flagNoEmoji = true
+	flagYes = true
 
 	runner := newMockRunner()
 	binPath := findPchaind()
@@ -297,16 +303,19 @@ func TestHandleIncreaseStake_NonInteractive_TextSuccess(t *testing.T) {
 	origNonInteractive := flagNonInteractive
 	origNoColor := flagNoColor
 	origNoEmoji := flagNoEmoji
+	origYes := flagYes
 	defer func() {
 		flagOutput = origOutput
 		flagNonInteractive = origNonInteractive
 		flagNoColor = origNoColor
 		flagNoEmoji = origNoEmoji
+		flagYes = origYes
 	}()
 	flagOutput = "text"
 	flagNonInteractive = true
 	flagNoColor = true
 	flagNoEmoji = true
+	flagYes = true
 
 	runner := newMockRunner()
 	binPath := findPchaind()
@@ -341,16 +350,19 @@ func TestHandleIncreaseStake_NonInteractive_KeyDerivationFallback(t *testing.T)
 	origNonInteractive := flagNonInteractive
 	origNoColor := flagNoColor
 	origNoEmoji := flagNoEmoji
+	origYes := flagYes
 	defer func() {
 		flagOutput = origOutput
 		flagNonInteractive = origNonInteractive
 		flagNoColor = origNoColor
 		flagNoEmoji = origNoEmoji
+		flagYes = origYes
 	}()
 	flagOutput = "json"
 	flagNonInteractive = true
 	flagNoColor = true
 	flagNoEmoji = true
+	flagYes = true
 
 	runner := newMockRunner()
 	binPath := findPchaind()
@@ -617,16 +629,19 @@ func TestHandleIncreaseStake_NonInteractive_DelegationFails_Text(t *testing.T) {
 	origNonInteractive := flagNonInteractive
 	origNoColor := flagNoColor
 	origNoEmoji := flagNoEmoji
+	origYes := flagYes
 	defer func() {
 		flagOutput = origOutput
 		flagNonInteractive = origNonInteractive
 		flagNoColor = origNoColor
 		flagNoEmoji = origNoEmoji
+		flagYes = origYes
 	}()
 	flagOutput = "text"
 	flagNonInteractive = true
 	flagNoColor = true
 	flagNoEmoji = true
+	flagYes = true
 
 	runner := newMockRunner()
 	binPath := findPchaind()
diff --git a/cmd/push-validator/cmd_register.go b/cmd/push-validator/cmd_register.go
@@ -242,6 +242,10 @@ var flagRegisterCheckOnly bool
 // handleRegisterValidator is the main entry point for registration.
 // It prompts interactively for moniker and key name if not set via env vars.
 func handleRegisterValidator(d *Deps) error {
+	if err := checkNodeRunning(d.Sup); err != nil {
+		return err
+	}
+
 	cfg := d.Cfg
 	// Get defaults from env or use hardcoded fallbacks
 	defaultMoniker := getenvDefault("MONIKER", "push-validator")
diff --git a/cmd/push-validator/cmd_restake.go b/cmd/push-validator/cmd_restake.go
@@ -21,6 +21,10 @@ import (
 // - submit delegation transaction
 // - display results
 func handleRestakeRewardsAll(d *Deps) error {
+	if err := checkNodeRunning(d.Sup); err != nil {
+		return err
+	}
+
 	p := getPrinter()
 	cfg := d.Cfg
 
diff --git a/cmd/push-validator/cmd_start.go b/cmd/push-validator/cmd_start.go
@@ -293,9 +293,6 @@ func handlePostStartFlow(cfg config.Config, p *ui.Printer) bool {
 	// Show status checking message
 	fmt.Println(p.Colors.Info("▸ Checking Validator Status"))
 
-	// Give the node a moment to fully initialize RPC after sync check
-	time.Sleep(2 * time.Second)
-
 	valResult := checkValidatorRegistration(v, 2)
 
 	if valResult.Error != nil {
@@ -378,6 +375,8 @@ func (prodDashboardRunner) Run(cfg config.Config) error {
 		NoEmoji:         flagNoEmoji,
 		CLIVersion:      Version,
 		Debug:           false,
+		Supervisor:      newSupervisor(cfg.HomeDir),
+		BinPath:         findPchaind(),
 	}
 	return runDashboardInteractive(opts)
 }
diff --git a/cmd/push-validator/cmd_status.go b/cmd/push-validator/cmd_status.go
@@ -206,6 +206,22 @@ func computeStatus(d *Deps) statusResult {
         }
     }
 
+    // If validator info wasn't fetched (node stopped / RPC down), try via remote RPC
+    if !res.IsValidator && res.ValidatorMoniker == "" {
+        valCtx, valCancel := context.WithTimeout(context.Background(), 3*time.Second)
+        myVal, _ := d.Fetcher.GetMyValidator(valCtx, cfg)
+        valCancel()
+        res.IsValidator = myVal.IsValidator
+        if myVal.IsValidator {
+            res.ValidatorMoniker = myVal.Moniker
+            res.VotingPower = myVal.VotingPower
+            res.VotingPct = myVal.VotingPct
+            res.Commission = myVal.Commission
+            res.ValidatorStatus = myVal.Status
+            res.IsJailed = myVal.Jailed
+        }
+    }
+
     // Fetch binary version (best-effort)
     res.BinaryVer = getBinaryVersion(cfg)
 
@@ -263,7 +279,7 @@ func printStatusText(result statusResult) {
     }
 
     syncIcon := c.StatusIcon("offline")
-    syncVal := "N/A"
+    syncVal := "Stopped"
     if result.RPCListening {
         if result.CatchingUp {
             syncIcon = c.StatusIcon("syncing")
diff --git a/cmd/push-validator/cmd_sync.go b/cmd/push-validator/cmd_sync.go
@@ -98,6 +98,9 @@ func init() {
 				syncRemote = cfg.RemoteRPCURL()
 			}
 			sup := newSupervisor(cfg.HomeDir)
+			if err := checkNodeRunning(sup); err != nil {
+				return err
+			}
 			return runSyncCore(cmd.Context(), prodSyncRunner{}, syncCoreOpts{
 				rpc:          syncRPC,
 				remote:       syncRemote,
diff --git a/cmd/push-validator/cmd_unjail.go b/cmd/push-validator/cmd_unjail.go
@@ -18,6 +18,10 @@ import (
 // - submit unjail transaction
 // - display results
 func handleUnjail(d *Deps) error {
+	if err := checkNodeRunning(d.Sup); err != nil {
+		return err
+	}
+
 	p := getPrinter()
 	cfg := d.Cfg
 
diff --git a/cmd/push-validator/cmd_withdraw_rewards.go b/cmd/push-validator/cmd_withdraw_rewards.go
@@ -19,6 +19,10 @@ import (
 // - submit withdraw transaction
 // - display results
 func handleWithdrawRewards(d *Deps) error {
+	if err := checkNodeRunning(d.Sup); err != nil {
+		return err
+	}
+
 	p := getPrinter()
 	cfg := d.Cfg
 
diff --git a/cmd/push-validator/helpers.go b/cmd/push-validator/helpers.go
@@ -21,6 +21,32 @@ func newSupervisor(homeDir string) process.Supervisor {
 	return process.NewCosmovisor(homeDir)
 }
 
+// silentErr wraps an error that has already been displayed to the user.
+// Execute() checks for this type and skips re-printing.
+type silentErr struct{ error }
+
+func (e silentErr) Unwrap() error { return e.error }
+
+// checkNodeRunning verifies the node is running and prints a user-friendly
+// error if not. Returns a silentErr so the message is not repeated.
+func checkNodeRunning(sup process.Supervisor) error {
+	if sup.IsRunning() {
+		return nil
+	}
+	if flagOutput == "json" {
+		getPrinter().JSON(map[string]any{"ok": false, "error": "node is not running"})
+	} else {
+		p := getPrinter()
+		fmt.Println()
+		fmt.Println(p.Colors.Error(p.Colors.Emoji("⚠️") + " Node is not running"))
+		fmt.Println()
+		fmt.Println(p.Colors.Info("Start the node with:"))
+		fmt.Println(p.Colors.Apply(p.Colors.Theme.Command, "  push-validator start"))
+		fmt.Println()
+	}
+	return silentErr{fmt.Errorf("node is not running")}
+}
+
 // findPchaind returns the path to the pchaind binary, resolving
 // either --bin flag, PCHAIND or PCHAIN_BIN environment variables, checking the
 // cosmovisor genesis directory, or falling back to PATH lookup.
diff --git a/cmd/push-validator/root_cobra.go b/cmd/push-validator/root_cobra.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"sync"
@@ -32,9 +33,11 @@ var (
 )
 
 var rootCmd = &cobra.Command{
-	Use:   "push-validator",
-	Short: "Push Validator",
-	Long:  "Manage a Push Chain validator node: init, start, status, sync, and admin tasks.",
+	Use:           "push-validator",
+	Short:         "Push Validator",
+	Long:          "Manage a Push Chain validator node: init, start, status, sync, and admin tasks.",
+	SilenceUsage:  true,
+	SilenceErrors: true,
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		// Initialize global UI config from flags after parsing but before command execution
 		ui.InitGlobal(ui.Config{
@@ -319,7 +322,10 @@ func init() {
 
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		var se silentErr
+		if !errors.As(err, &se) {
+			fmt.Fprintln(os.Stderr, err)
+		}
 		os.Exit(exitcodes.CodeForError(err))
 	}
 }
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -26,19 +26,6 @@ func TestKeyringBackendEnvOverride(t *testing.T) {
 	}
 }
 
-func TestWarnIfTestKeyring(t *testing.T) {
-	// Reset the warnedOnce flag by creating a new config
-	cfg := Config{KeyringBackend: "test"}
-
-	// This should trigger the warning (but we can't easily capture stderr in this test)
-	// Just verify it doesn't panic
-	cfg.WarnIfTestKeyring()
-
-	// Verify no warning for other backends
-	cfg2 := Config{KeyringBackend: "os"}
-	cfg2.WarnIfTestKeyring() // Should not print anything
-}
-
 func TestDefaults_AllFields(t *testing.T) {
 	// Clear env var if set
 	os.Unsetenv("PUSH_KEYRING_BACKEND")
@@ -139,14 +126,3 @@ func TestRemoteRPCURL(t *testing.T) {
 	}
 }
 
-func TestWarnIfTestKeyring_NonTestBackend(t *testing.T) {
-	backends := []string{"os", "file", "kwallet", "pass", ""}
-
-	for _, backend := range backends {
-		t.Run("backend_"+backend, func(t *testing.T) {
-			cfg := Config{KeyringBackend: backend}
-			// Should not panic and should not print warning
-			cfg.WarnIfTestKeyring()
-		})
-	}
-}
diff --git a/internal/dashboard/chain_status.go b/internal/dashboard/chain_status.go
@@ -109,11 +109,13 @@ func (c *ChainStatus) renderContent(w int) string {
 
 	// Check if node is running and RPC is available
 	if !c.data.NodeInfo.Running || !c.data.Metrics.Node.RPCListening {
-		lines = append(lines, fmt.Sprintf("%s Unknown", c.icons.Err))
-		if remoteHeight > 0 {
-			lines = append(lines, fmt.Sprintf("%s/%s", ui.FormatNumber(localHeight), ui.FormatNumber(remoteHeight)))
+		if !c.data.NodeInfo.Running {
+			lines = append(lines, fmt.Sprintf("%s Stopped", c.icons.Err))
 		} else {
-			lines = append(lines, fmt.Sprintf("Height: %s", ui.FormatNumber(localHeight)))
+			lines = append(lines, fmt.Sprintf("%s RPC unavailable", c.icons.Err))
+		}
+		if remoteHeight > 0 {
+			lines = append(lines, fmt.Sprintf("Network height: %s", ui.FormatNumber(remoteHeight)))
 		}
 	} else {
 		// Always show sync-monitor-style progress bar
diff --git a/internal/dashboard/dashboard.go b/internal/dashboard/dashboard.go
@@ -687,13 +687,8 @@ func (m *Dashboard) fetchData(ctx context.Context) (DashboardData, error) {
 
 // getCachedVersion fetches version with caching (5min TTL + PID-based invalidation)
 func (m *Dashboard) getCachedVersion(ctx context.Context, running bool, currentPID int) string {
-	// Don't call pchaind version when node is stopped
-	if !running {
-		return "—"
-	}
-
 	// Invalidate cache if PID changed (process restarted)
-	if currentPID != m.cachedVersionPID {
+	if running && currentPID != m.cachedVersionPID {
 		m.cachedVersion = ""
 		m.cachedVersionPID = currentPID
 		m.cachedVersionAt = time.Time{} // Force immediate fetch
diff --git a/internal/dashboard/dashboard_test.go b/internal/dashboard/dashboard_test.go
@@ -467,12 +467,12 @@ func TestRenderStaticStoppedNode(t *testing.T) {
 	}
 }
 
-// Test getCachedVersion when node is stopped
+// Test getCachedVersion when node is stopped - should still attempt version fetch
 func TestGetCachedVersionStopped(t *testing.T) {
 	opts := Options{
 		Config: config.Config{
-			HomeDir:   "/tmp/test",
-			RPCLocal:  "http://localhost:26657",
+			HomeDir:  "/tmp/test",
+			RPCLocal: "http://localhost:26657",
 		},
 		RefreshInterval: 1 * time.Second,
 		CLIVersion:      "1.0.0",
@@ -482,10 +482,12 @@ func TestGetCachedVersionStopped(t *testing.T) {
 	dashboard := New(opts)
 	ctx := context.Background()
 
+	// Even when stopped, version fetch is attempted (binary exists on disk)
 	version := dashboard.getCachedVersion(ctx, false, 0)
 
-	if version != "—" {
-		t.Errorf("Version for stopped node should be '—', got %q", version)
+	// Without a valid BinPath, falls back to "pchaind" which won't be in PATH during tests
+	if version != "pchaind not found" {
+		t.Errorf("Version for stopped node without BinPath should be 'pchaind not found', got %q", version)
 	}
 }
 
diff --git a/internal/dashboard/log_viewer.go b/internal/dashboard/log_viewer.go
diff --git a/internal/dashboard/validator_info.go b/internal/dashboard/validator_info.go
diff --git a/internal/ui/logtui_v2.go b/internal/ui/logtui_v2.go
