Merge branch 'rocket-pool:master' into master

rocket-pool · Apr 30, 2024 · 8d49a58 · 8d49a58
2 parents bac8696 + 79ab7da
commit 8d49a58
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/rocketpool-cli/pdao/get-voting-power.go b/rocketpool-cli/pdao/get-voting-power.go
@@ -12,6 +12,7 @@ import (
 const (
 	colorBlue  string = "\033[36m"
 	colorReset string = "\033[0m"
+	colorGreen string = "\033[32m"
 )
 
 func getVotePower(c *cli.Context) error {
@@ -44,7 +45,7 @@ func getVotePower(c *cli.Context) error {
 	}
 
 	// Print Results
-	fmt.Println("== Node Voting Power ==")
+	fmt.Printf("%s== Node Voting Power ==%s\n", colorGreen, colorReset)
 	if status.IsVotingInitialized {
 		fmt.Println("The node has been initialized for onchain voting.")
 

diff --git a/rocketpool/api/pdao/get-voting-power.go b/rocketpool/api/pdao/get-voting-power.go
@@ -67,10 +67,10 @@ func getVotePower(c *cli.Context) (*api.GetPDAOVotePowerResponse, error) {
 	}
 
 	// Cast to uint32
-	blockNumber32 := uint32(blockNumber)
+	response.BlockNumber = uint32(blockNumber)
 
 	// Check voting power
-	response.VotingPower, err = network.GetVotingPower(rp, nodeAccount.Address, blockNumber32, nil)
+	response.VotingPower, err = network.GetVotingPower(rp, nodeAccount.Address, response.BlockNumber, nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/shared/types/api/pdao.go b/shared/types/api/pdao.go
@@ -410,5 +410,5 @@ type GetPDAOVotePowerResponse struct {
 	VotingPower                    *big.Int       `json:"votingPower"`
 	OnchainVotingDelegate          common.Address `json:"onchainVotingDelegate"`
 	OnchainVotingDelegateFormatted string         `json:"onchainVotingDelegateFormatted"`
-	BlockNumber                    uint64         `json:"blockNumber"`
+	BlockNumber                    uint32         `json:"blockNumber"`
 }