Implement pdao status and signalling address commands

client/pdao.go

@@ -217,6 +217,20 @@ func (r *PDaoRequester) GetCurrentVotingDelegate() (*types.ApiResponse[api.Proto
 }
 
 // Get the pDAO status
-func (r *PDaoRequester) GetStatus() (*types.ApiResponse[api.ProtocolDAOStatusResponse], error) {
-	return client.SendGetRequest[api.ProtocolDAOStatusResponse](r, "get-status", "GetStatus", nil)
+func (r *PDaoRequester) GetStatus() (*types.ApiResponse[api.ProtocolDaoStatusResponse], error) {
+	return client.SendGetRequest[api.ProtocolDaoStatusResponse](r, "get-status", "GetStatus", nil)
+}
+
+// Set the signalling address for the node
+func (r *PDaoRequester) SetSignallingAddress(signallingAddress common.Address, signature string) (*types.ApiResponse[types.TxInfoData], error) {
+	args := map[string]string{
+		"signallingAddress": signallingAddress.Hex(),
+		"signature":         string(signature),
+	}
+	return client.SendGetRequest[types.TxInfoData](r, "set-signalling-address", "SetSignallingAddress", args)
+}
+
+// Set the signalling address for the node
+func (r *PDaoRequester) ClearSignallingAddress() (*types.ApiResponse[types.TxInfoData], error) {
+	return client.SendGetRequest[types.TxInfoData](r, "clear-signalling-address", "ClearSignallingAddress", nil)
 }

rocketpool-cli/commands/node/status.go

@@ -67,9 +67,9 @@ func getStatus(c *cli.Context) error {
 		return err
 	}
 
-	// rp.NodeStatus() will fail with an error, but we can short-circuit it here.
+	// rp.Api.Node.Status() will fail with an error, but we can short-circuit it here.
 	if !walletStatus.Address.HasAddress {
-		return errors.New("No node address is loaded.")
+		return errors.New("Node Wallet is not initialized.")
 	}
 
 	// Get node status

rocketpool-cli/commands/pdao/commands.go

@@ -154,6 +154,66 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 				},
 			},
 
+			{
+				Name:    "initialize-voting",
+				Aliases: []string{"iv"},
+				Usage:   "Unlocks a node operator's voting power (only required for node operators who registered before governance structure was in place)",
+				Action: func(c *cli.Context) error {
+					// Run
+					return initializeVoting(c)
+				},
+			},
+
+			{
+				Name:      "set-signalling-address",
+				Aliases:   []string{"ssa"},
+				Usage:     "Set the address you want to use to represent your node on Snapshot",
+				ArgsUsage: "signalling-address signature",
+				Flags: []cli.Flag{
+					cliutils.YesFlag,
+				},
+				Action: func(c *cli.Context) error {
+					// Validate args
+					utils.ValidateArgCount(c, 2)
+
+					signallingAddress, err := input.ValidateAddress("signalling-address", c.Args().Get(0))
+					if err != nil {
+						return err
+					}
+					signature := c.Args().Get(1)
+
+					// Run
+					return setSignallingAddress(c, signallingAddress, signature)
+				},
+			},
+
+			{
+				Name:    "clear-signalling-address",
+				Aliases: []string{"csa"},
+				Usage:   "Clear the node's signalling address",
+				Action: func(c *cli.Context) error {
+					// Run
+					return clearSignallingAddress(c)
+				},
+			},
+
+			{
+				Name:      "set-voting-delegate",
+				Aliases:   []string{"svd"},
+				Usage:     "Set the address you want to use when voting on Rocket Pool on-chain governance proposals, or the address you want to delegate your voting power to.",
+				ArgsUsage: "address",
+				Flags: []cli.Flag{
+					cliutils.YesFlag,
+				},
+				Action: func(c *cli.Context) error {
+					// Validate args
+					utils.ValidateArgCount(c, 1)
+					delegate := c.Args().Get(0)
+					// Run
+					return setVotingDelegate(c, delegate)
+				},
+			},
+
 			{
 				Name:    "claim-bonds",
 				Aliases: []string{"cb"},
@@ -469,33 +529,6 @@ func RegisterCommands(app *cli.App, name string, aliases []string) {
 					},
 				},
 			},
-
-			{
-				Name:    "initialize-voting",
-				Aliases: []string{"iv"},
-				Usage:   "Unlocks a node operator's voting power (only required for node operators who registered before governance structure was in place)",
-				Action: func(c *cli.Context) error {
-					// Run
-					return initializeVoting(c)
-				},
-			},
-
-			{
-				Name:      "set-voting-delegate",
-				Aliases:   []string{"svd"},
-				Usage:     "Set the address you want to use when voting on Rocket Pool on-chain governance proposals, or the address you want to delegate your voting power to.",
-				ArgsUsage: "address",
-				Flags: []cli.Flag{
-					cliutils.YesFlag,
-				},
-				Action: func(c *cli.Context) error {
-					// Validate args
-					utils.ValidateArgCount(c, 1)
-					delegate := c.Args().Get(0)
-					// Run
-					return setVotingDelegate(c, delegate)
-				},
-			},
 		},
 	})
 }

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

@@ -0,0 +1,70 @@
+package pdao
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/rocket-pool/smartnode/v2/rocketpool-cli/client"
+	"github.com/rocket-pool/smartnode/v2/rocketpool-cli/utils/tx"
+	"github.com/urfave/cli/v2"
+)
+
+func setSignallingAddress(c *cli.Context, signallingAddress common.Address, signature string) error {
+	// Get RP client
+	rp, err := client.NewClientFromCtx(c)
+	if err != nil {
+		return err
+	}
+
+	// Build the TX
+	response, err := rp.Api.PDao.SetSignallingAddress(signallingAddress, signature)
+	if err != nil {
+		return fmt.Errorf("Error setting the signalling address: %w", err)
+	}
+
+	validated, err := tx.HandleTx(c, rp, response.Data.TxInfo,
+		"Are you sure you want to set your signalling address?",
+		"setting signalling address",
+		"Setting signalling address...",
+	)
+	if err != nil {
+		return err
+	}
+	if !validated {
+		return nil
+	}
+
+	return nil
+
+}
+
+func clearSignallingAddress(c *cli.Context) error {
+
+	// Get RP client
+	rp, err := client.NewClientFromCtx(c)
+	if err != nil {
+		return err
+	}
+
+	// Build the TX
+	response, err := rp.Api.PDao.ClearSignallingAddress()
+	if err != nil {
+		return fmt.Errorf("Error clearing the signalling address: %w", err)
+	}
+
+	validated, err := tx.HandleTx(c, rp, response.Data.TxInfo,
+		"Are you sure you want to clear the current signalling address?",
+		"clearing signalling address",
+		"Clearing signalling address...",
+	)
+	if err != nil {
+		return err
+	}
+	if !validated {
+		return nil
+	}
+
+	// Log & return
+	fmt.Println("The node's signalling address has been sucessfully cleared.")
+	return nil
+}