Implement pdao status and signalling address commands

rocketpool-cli/commands/pdao/signalling-address.go

@@ -24,7 +24,7 @@ func setSignallingAddress(c *cli.Context, signallingAddress common.Address, sign
 
 	validated, err := tx.HandleTx(c, rp, response.Data.TxInfo,
 		"Are you sure you want to set your signalling address?",
-		"setting signalling",
+		"setting signalling address",
 		"Setting signalling address...",
 	)
 	if err != nil {

rocketpool-cli/commands/pdao/status.go

@@ -12,13 +12,15 @@ import (
 	"github.com/rocket-pool/rocketpool-go/v2/types"
 	"github.com/rocket-pool/smartnode/v2/rocketpool-cli/client"
 	"github.com/rocket-pool/smartnode/v2/rocketpool-cli/utils"
+	"github.com/rocket-pool/smartnode/v2/rocketpool-cli/utils/terminal"
 	"github.com/rocket-pool/smartnode/v2/shared/types/api"
 )
 
 const (
-	colorBlue             string = "\033[36m"
-	colorReset            string = "\033[0m"
-	colorGreen            string = "\033[32m"
+	colorBlue  string = terminal.ColorBlue
+	colorReset string = terminal.ColorReset
+	colorGreen string = terminal.ColorGreen
+
 	signallingAddressLink string = "https://docs.rocketpool.net/guides/houston/participate#setting-your-snapshot-signalling-address"
 )
 
@@ -49,88 +51,66 @@ func getStatus(c *cli.Context) error {
 	}
 	claimableBonds := claimableBondsResponse.Data.ClaimableBonds
 
-	// Test Strings
-	fmt.Printf("Resp %v\n", response)
-	fmt.Printf("block number: %d\n", response.Data.BlockNumber)
-	fmt.Printf("Voting initialized: %t\n", response.Data.IsVotingInitialized)
-	fmt.Printf("Node Registered: %t\n", response.Data.IsNodeRegistered)
-	fmt.Printf("Voting power %d\n", response.Data.VotingPower)
-	fmt.Printf("Delegated voting power %d\n", response.Data.TotalDelegatedVp)
-	fmt.Printf("On chain delegate formatted: %s\n", response.Data.OnchainVotingDelegateFormatted)
-	fmt.Printf("Account Address formatted: %s\n", response.Data.AccountAddressFormatted)
-	fmt.Printf("Signalling Address formatted %s\n", response.Data.SignallingAddressFormatted)
-	fmt.Printf("Is RPL locking allowed %t\n", response.Data.IsRPLLockingAllowed)
-
 	// Signalling Status
 	fmt.Printf("%s=== Signalling on Snapshot ===%s\n", colorGreen, colorReset)
 	blankAddress := common.Address{}
 	if response.Data.SignallingAddress == blankAddress {
-		fmt.Printf("The node does not currently have a snapshot signalling address set.\nTo learn more about snapshot signalling, please visit %s.\n", signallingAddressLink)
+		fmt.Println("The node does not currently have a snapshot signalling address set.")
+		fmt.Printf("To learn more about snapshot signalling, please visit %s.\n", signallingAddressLink)
 	} else {
 		fmt.Printf("The node has a signalling address of %s%s%s which can represent it when voting on Rocket Pool Snapshot governance proposals.\n", colorBlue, response.Data.SignallingAddressFormatted, colorReset)
 	}
-
 	if response.Data.SnapshotResponse.Error != "" {
 		fmt.Printf("Unable to fetch latest voting information from snapshot.org: %s\n", response.Data.SnapshotResponse.Error)
 	} else {
 		voteCount := response.Data.SnapshotResponse.VoteCount()
 		if len(response.Data.SnapshotResponse.ActiveSnapshotProposals) == 0 {
-			fmt.Printf("Rocket Pool has no Snapshot governance proposals being voted on.")
-			fmt.Println()
+			fmt.Println("Rocket Pool has no Snapshot governance proposals being voted on.")
 		} else {
 			fmt.Printf("Rocket Pool has %d Snapshot governance proposal(s) being voted on. You have voted on %d of those. See details using 'rocketpool network dao-proposals'.\n", len(response.Data.SnapshotResponse.ActiveSnapshotProposals), voteCount)
 		}
-		fmt.Println()
 	}
+	fmt.Println()
 
 	// Onchain Voting Status
 	fmt.Printf("%s=== Onchain Voting ===%s\n", colorGreen, colorReset)
 	if response.Data.IsVotingInitialized {
-		fmt.Printf("The node %s%s%s has been initialized for onchain voting.", colorBlue, response.Data.AccountAddressFormatted, colorReset)
-		fmt.Println()
+		fmt.Printf("The node %s%s%s has been initialized for onchain voting.\n", colorBlue, response.Data.AccountAddressFormatted, colorReset)
 	} else {
-		fmt.Printf("The node %s%s%s has NOT been initialized for onchain voting. You need to run `rocketpool pdao initialize-voting` to participate in onchain votes.", colorBlue, response.Data.AccountAddressFormatted, colorReset)
-		fmt.Println()
+		fmt.Printf("The node %s%s%s has NOT been initialized for onchain voting. You need to run `rocketpool pdao initialize-voting` to participate in onchain votes.\n", colorBlue, response.Data.AccountAddressFormatted, colorReset)
 	}
-
 	if response.Data.OnchainVotingDelegate == blankAddress {
 		fmt.Println("The node doesn't have a delegate, which means it can vote directly on onchain proposals after it initializes voting.")
 	} else if response.Data.OnchainVotingDelegate == response.Data.AccountAddress {
 		fmt.Println("The node doesn't have a delegate, which means it can vote directly on onchain proposals. You can have another node represent you by running `rocketpool p svd <address>`.")
 	} else {
-		fmt.Printf("The node has a voting delegate of %s%s%s which can represent it when voting on Rocket Pool onchain governance proposals.", colorBlue, response.Data.OnchainVotingDelegateFormatted, colorReset)
-		fmt.Println()
+		fmt.Printf("The node has a voting delegate of %s%s%s which can represent it when voting on Rocket Pool onchain governance proposals.\n", colorBlue, response.Data.OnchainVotingDelegateFormatted, colorReset)
 	}
 	fmt.Printf("The node's local voting power: %.10f\n", eth.WeiToEth(response.Data.VotingPower))
 	if response.Data.IsNodeRegistered {
-		fmt.Printf("Total voting power delegated to the node: %.10f", eth.WeiToEth(response.Data.TotalDelegatedVp))
-		fmt.Println()
+		fmt.Printf("Total voting power delegated to the node: %.10f\n", eth.WeiToEth(response.Data.TotalDelegatedVp))
 	} else {
-		fmt.Print("The node must register using 'rocketpool node register' to be eligible to receive delegated voting power")
-		fmt.Println()
+		fmt.Println("The node must register using 'rocketpool node register' to be eligible to receive delegated voting power")
 	}
 	fmt.Printf("Network total initialized voting power: %.10f\n", eth.WeiToEth(response.Data.SumVotingPower))
-	fmt.Println("")
+	fmt.Println()
 
 	// Claimable Bonds Status:
-	fmt.Printf("%s=== Claimable RPL Bonds ===%s", colorGreen, colorReset)
-	fmt.Println()
+	fmt.Printf("%s=== Claimable RPL Bonds ===%s\n", colorGreen, colorReset)
 	if response.Data.IsRPLLockingAllowed {
 		fmt.Println("The node is allowed to lock RPL to create governance proposals/challenges.")
 		if response.Data.NodeRPLLocked.Cmp(big.NewInt(0)) != 0 {
-			fmt.Printf("The node currently has %.6f RPL locked.",
-				utilsMath.RoundDown(eth.WeiToEth(response.Data.NodeRPLLocked), 6))
-			fmt.Println()
+			fmt.Printf("The node currently has %.6f RPL locked.\n", utilsMath.RoundDown(eth.WeiToEth(response.Data.NodeRPLLocked), 6))
 		}
 	} else {
-		fmt.Print("The node is NOT allowed to lock RPL to create governance proposals/challenges. Use 'rocketpool node allow-rpl-locking, to allow RPL locking.\n")
+		fmt.Println("The node is NOT allowed to lock RPL to create governance proposals/challenges. Use 'rocketpool node allow-rpl-locking, to allow RPL locking.")
 	}
 	if len(claimableBonds) == 0 {
-		fmt.Println("You do not have any unlockable bonds or claimable rewards.")
+		fmt.Println("The node does not have any unlockable bonds or claimable rewards.")
 	} else {
 		fmt.Println("The node has unlockable bonds or claimable rewards available. Use 'rocketpool pdao claim-bonds' to view and claim.")
 	}
-	fmt.Println("")
+	fmt.Println()
 
 	// Check if PDAO proposal checking duty is enabled
 	fmt.Printf("%s=== PDAO Proposal Checking Duty ===%s\n", colorGreen, colorReset)
@@ -140,7 +120,7 @@ func getStatus(c *cli.Context) error {
 	} else {
 		fmt.Println("The node does not have PDAO proposal checking duties enabled (See https://docs.rocketpool.net/guides/houston/pdao#challenge-process to learn more about this duty).")
 	}
-	fmt.Println("")
+	fmt.Println()
 
 	// Claimable Bonds Status:
 	fmt.Printf("%s=== Pending, Active and Succeeded Proposals ===%s\n", colorGreen, colorReset)
@@ -175,12 +155,12 @@ func getStatus(c *cli.Context) error {
 		// Print message for Succeeded Proposals
 		if stateName == "Succeeded" {
 			succeededExists = true
-			fmt.Printf("%sThe following proposal(s) have succeeded and are waiting to be executed. Use `rocketpool pdao proposals execute` to execute.%s\n\n", colorBlue, colorReset)
+			fmt.Printf("%sThe following proposal(s) have succeeded and are waiting to be executed. Use `rocketpool pdao proposals execute` to execute.%s\n", colorBlue, colorReset)
 		}
 
 		// Proposal state count
 		fmt.Printf("%d %s proposal(s):\n", len(proposals), stateName)
-		fmt.Println("")
+		fmt.Println()
 
 		// Proposals
 		for _, proposal := range proposals {