Merge pull request #740 from rocket-pool/delegate-vote-direction

Show delegate vote direction in pDAO proposal details and voting.

Author: 0xfornax

rocketpool-cli/pdao/proposals.go

@@ -116,6 +116,12 @@ func getProposal(c *cli.Context, id uint64) error {
 		return err
 	}
 
+	// Get the voting delegate info
+	votingDelegateInfo, err := rp.GetCurrentVotingDelegate()
+	if err != nil {
+		return err
+	}
+
 	// Find the proposal
 	var proposal *api.PDAOProposalWithNodeVoteDirection
 
@@ -170,14 +176,23 @@ func getProposal(c *cli.Context, id uint64) error {
 	vetoQuorum := utilsMath.RoundUp(eth.WeiToEth(proposal.VetoQuorum), 2)
 	fmt.Printf("Voting power for:       %.2f / %.2f (%.2f%%)\n", votingPowerFor, votingPowerRequired, votingPowerFor/votingPowerRequired*100)
 	fmt.Printf("Voting power against:   %.2f\n", utilsMath.RoundDown(eth.WeiToEth(proposal.VotingPowerAgainst), 2))
-	fmt.Printf("   Against with veto:   %.2f / %2.f (%.2f%%)\n", votingPowerToVeto, vetoQuorum, votingPowerToVeto/vetoQuorum*100)
+	fmt.Printf("Against with veto:      %.2f / %2.f (%.2f%%)\n", votingPowerToVeto, vetoQuorum, votingPowerToVeto/vetoQuorum*100)
 	fmt.Printf("Voting power abstained: %.2f\n", utilsMath.RoundDown(eth.WeiToEth(proposal.VotingPowerAbstained), 2))
 	if proposal.NodeVoteDirection != types.VoteDirection_NoVote {
 		fmt.Printf("Node has voted:         %s\n", types.VoteDirections[proposal.NodeVoteDirection])
 	} else {
 		fmt.Printf("Node has voted:         no\n")
 	}
 
+	if votingDelegateInfo.VotingDelegate != votingDelegateInfo.AccountAddress && proposal.DelegateVoteDirection != types.VoteDirection_NoVote {
+		fmt.Printf("Delegate has voted:     %s\n", types.VoteDirections[proposal.DelegateVoteDirection])
+	} else if votingDelegateInfo.VotingDelegate != votingDelegateInfo.AccountAddress {
+		fmt.Printf("Delegate has voted:     no\n")
+	}
+	if votingDelegateInfo.VotingDelegate != votingDelegateInfo.AccountAddress {
+		fmt.Printf("Current Delegate:       %s", votingDelegateInfo.VotingDelegate.Hex())
+	}
+
 	return nil
 }
 

rocketpool-cli/pdao/vote-proposal.go

@@ -38,6 +38,12 @@ func voteOnProposal(c *cli.Context) error {
 		}
 	}
 
+	// Get the voting delegate
+	votingDelegateInfo, err := rp.GetCurrentVotingDelegate()
+	if err != nil {
+		return err
+	}
+
 	// Check for votable proposals
 	if len(votableProposals) == 0 {
 		fmt.Println("No proposals can be voted on.")
@@ -96,6 +102,12 @@ func voteOnProposal(c *cli.Context) error {
 
 	}
 
+	// Check if delegate has voted
+	if selectedProposal.DelegateVoteDirection != types.VoteDirection_NoVote && votingDelegateInfo.VotingDelegate != votingDelegateInfo.AccountAddress {
+		fmt.Printf("Your Delegate: %s has voted: %s\n", votingDelegateInfo.VotingDelegate.Hex(), types.VoteDirections[selectedProposal.DelegateVoteDirection])
+		fmt.Println()
+	}
+
 	// Get support status
 	var voteDirection types.VoteDirection
 	var voteDirectionLabel string

rocketpool/api/pdao/proposals.go

@@ -3,6 +3,7 @@ package pdao
 import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/rocket-pool/rocketpool-go/dao/protocol"
+	"github.com/rocket-pool/rocketpool-go/network"
 	"github.com/rocket-pool/rocketpool-go/rocketpool"
 	"github.com/rocket-pool/smartnode/shared/services"
 	"github.com/rocket-pool/smartnode/shared/types/api"
@@ -60,6 +61,11 @@ func getProposals(c *cli.Context) (*api.PDAOProposalsResponse, error) {
 }
 
 func getProposalsWithNodeVoteDirection(rp *rocketpool.RocketPool, nodeAddress common.Address, props []protocol.ProtocolDaoProposalDetails) ([]api.PDAOProposalWithNodeVoteDirection, error) {
+	delegateAddress, err := network.GetCurrentVotingDelegate(rp, nodeAddress, nil)
+	if err != nil {
+		return nil, err
+	}
+
 	// Load node votes in batches
 	proposalCount := uint64(len(props))
 	details := make([]api.PDAOProposalWithNodeVoteDirection, proposalCount)
@@ -79,8 +85,10 @@ func getProposalsWithNodeVoteDirection(rp *rocketpool.RocketPool, nodeAddress co
 				prop := props[pi]
 				details[pi].ProtocolDaoProposalDetails = prop
 				voteDir, err := protocol.GetAddressVoteDirection(rp, prop.ID, nodeAddress, nil)
+				delegateVoteDir, err := protocol.GetAddressVoteDirection(rp, prop.ID, delegateAddress, nil)
 				if err == nil {
 					details[pi].NodeVoteDirection = voteDir
+					details[pi].DelegateVoteDirection = delegateVoteDir
 				}
 				return err
 			})
@@ -120,6 +128,12 @@ func getProposal(c *cli.Context, id uint64) (*api.PDAOProposalResponse, error) {
 		return nil, err
 	}
 
+	// Get the voting delegate address
+	delegateAddress, err := network.GetCurrentVotingDelegate(rp, nodeAccount.Address, nil)
+	if err != nil {
+		return nil, err
+	}
+
 	// Get proposal
 	proposal, err := protocol.GetProposalDetails(rp, id, nil)
 	if err != nil {
@@ -132,10 +146,17 @@ func getProposal(c *cli.Context, id uint64) (*api.PDAOProposalResponse, error) {
 		return nil, err
 	}
 
+	// Get the delegate vote direction
+	delegateVoteDir, err := protocol.GetAddressVoteDirection(rp, id, delegateAddress, nil)
+	if err != nil {
+		return nil, err
+	}
+
 	// Make the augmented proposal
 	augmentedProp := api.PDAOProposalWithNodeVoteDirection{
 		ProtocolDaoProposalDetails: proposal,
 		NodeVoteDirection:          voteDir,
+		DelegateVoteDirection:      delegateVoteDir,
 	}
 	response.Proposal = augmentedProp
 

shared/types/api/pdao.go

@@ -12,7 +12,8 @@ import (
 
 type PDAOProposalWithNodeVoteDirection struct {
 	protocol.ProtocolDaoProposalDetails
-	NodeVoteDirection types.VoteDirection `json:"nodeVoteDirection"`
+	NodeVoteDirection     types.VoteDirection `json:"nodeVoteDirection"`
+	DelegateVoteDirection types.VoteDirection `json:"delegateVoteDirection"`
 }
 
 type PDAOProposalsResponse struct {