Delegate vote fix (solana-labs#2254)

dialectlabs · Apr 22, 2024 · 01410f9 · 01410f9
1 parent 0f2c746
commit 01410f9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/actions/castVote.ts b/actions/castVote.ts
@@ -16,6 +16,7 @@ import {
   withPostChatMessage,
   withCreateTokenOwnerRecord,
   getVoteRecordAddress,
+  getTokenOwnerRecord,
 } from '@solana/spl-governance'
 import { ProgramAccount } from '@solana/spl-governance'
 import { RpcContext } from '@solana/spl-governance'
@@ -62,15 +63,15 @@ const createDelegatorVote = async ({
   realmPk,
   proposalPk,
   tokenOwnerRecordPk,
-  userPk,
+  delegatePk,
   vote,
   votingPlugin,
 }: {
   connection: Connection
   realmPk: PublicKey
   proposalPk: PublicKey
   tokenOwnerRecordPk: PublicKey
-  userPk: PublicKey
+  delegatePk: PublicKey
   vote: Vote
   votingPlugin: VotingClient | undefined
 }) => {
@@ -107,10 +108,10 @@ const createDelegatorVote = async ({
     proposal.pubkey,
     proposal.account.tokenOwnerRecord,
     tokenOwnerRecordPk,
-    userPk,
+    delegatePk,
     proposal.account.governingTokenMint,
     vote,
-    userPk,
+    delegatePk,
     pluginAddresses?.voterWeightPk,
     pluginAddresses?.maxVoterWeightRecord
   )
@@ -276,14 +277,16 @@ export async function castVote(
               )
               if (voteRecord.found) return undefined
 
+              const torOwnerPk = (await getTokenOwnerRecord(connection, tokenOwnerRecordPk)).account.governingTokenOwner
+
               return createDelegatorVote({
                 connection,
                 realmPk: realm.pubkey,
                 proposalPk: proposal.pubkey,
                 tokenOwnerRecordPk,
-                userPk: walletPubkey,
+                delegatePk: walletPubkey,
                 vote,
-                votingPlugin: votingPlugin,
+                votingPlugin: votingPlugin?.for(torOwnerPk),
               })
             })
           )

diff --git a/utils/uiTypes/VotePlugin.ts b/utils/uiTypes/VotePlugin.ts
@@ -99,6 +99,16 @@ export class VotingClient {
     }
   }
 
+  // Take this exact voting client, but set a different voter wallet - useful for combining delegate and delegator votes
+  public for(wallet: PublicKey): VotingClient {
+    return new VotingClient({
+      client: this.client,
+      realm: this.realm,
+      walletPk: wallet,
+      voterWeightPluginDetails: this.voterWeightPluginDetails,
+    })
+  }
+
   private get voterWeightPk() {
     return this.walletPk ? this.voterWeightPluginDetails.voterWeightPkForWallet(this.walletPk) : undefined
   }