delegator relinquish

Author: Orelsanpls

hooks/queries/proposal.ts

@@ -5,6 +5,8 @@ import {
   getAllProposals,
   getProposal,
   getProposalsByGovernance,
+  ProgramAccount,
+  Proposal,
 } from '@solana/spl-governance'
 import { fetchRealmByPubkey, useRealmQuery } from './realm'
 import { useRouter } from 'next/router'
@@ -82,18 +84,13 @@ export const useRealmProposalsQuery = () => {
       if (!enabled) throw new Error()
       console.log('query: fetching realm proposals')
 
-      const results = (
-        await Promise.all(
-          governances.map((x) =>
-            // why not just get all proposals for a realm? what was i doing here?
-            getProposalsByGovernance(connection.current, realm.owner, x.pubkey)
-          )
-        )
-      )
-        .flat()
-        // Blacklisted proposals which should not be displayed in the UI
-        // hidden legacy accounts to declutter UI
-        .filter((x) => HIDDEN_PROPOSALS.get(x.pubkey.toBase58()) === undefined)
+      const results: ProgramAccount<Proposal>[] = [];
+
+      for (const x of governances) {
+        // Get proposals synchronously
+        const proposals = await getProposalsByGovernance(connection.current, realm.owner, x.pubkey);
+        results.push(...proposals);
+      }
 
       // TODO instead of using setQueryData, prefetch queries on mouseover ?
       results.forEach((x) => {

pages/dao/[symbol]/proposal/components/MyProposalsBtn.tsx

@@ -50,9 +50,9 @@ import {
 } from '@hooks/queries/proposal'
 import queryClient from '@hooks/queries/queryClient'
 import { getFeeEstimate } from '@tools/feeEstimate'
-import { createComputeBudgetIx } from '@blockworks-foundation/mango-v4'
-import {useVotingClients} from "@hooks/useVotingClients";
-import {useNftClient} from "../../../../../VoterWeightPlugins/useNftClient";
+import { useVotingClients } from '@hooks/useVotingClients'
+import { useNftClient } from '../../../../../VoterWeightPlugins/useNftClient'
+import { useSelectedDelegatorStore } from 'stores/useSelectedDelegatorStore'
 
 const MyProposalsBn = () => {
   const [modalIsOpen, setModalIsOpen] = useState(false)
@@ -61,10 +61,16 @@ const MyProposalsBn = () => {
   const [isLoading, setIsLoading] = useState(false)
   const { governancesArray } = useGovernanceAssets()
   const { connection } = useConnection()
-  const myVoteRecords = useVoteRecordsByOwnerQuery(
-    wallet?.publicKey ?? undefined
-  ).data
 
+  const { communityDelegator } = useSelectedDelegatorStore()
+
+  const user = communityDelegator ?? wallet?.publicKey ?? undefined
+
+  const myVoteRecords = useVoteRecordsByOwnerQuery(user).data
+
+  console.log('myVoteRecords', myVoteRecords)
+
+  const realm = useRealmQuery().data?.result
   const ownVoteRecordsByProposal = useMemo(() => {
     return myVoteRecords !== undefined
       ? (Object.fromEntries(
@@ -79,14 +85,13 @@ const MyProposalsBn = () => {
   const { data: tokenOwnerRecord } = useAddressQuery_CommunityTokenOwner()
 
   const maxVoterWeight = useMaxVoteRecord()?.pubkey || undefined
-  const realm = useRealmQuery().data?.result
   const programId = realm?.owner
 
   const programVersion =
     useProgramVersion() ?? DEFAULT_GOVERNANCE_PROGRAM_VERSION
 
-  const votingClients = useVotingClients();
-  const { nftClient } = useNftClient();
+  const votingClients = useVotingClients()
+  const { nftClient } = useNftClient()
 
   const [
     proposalsWithDepositedTokens,
@@ -97,6 +102,7 @@ const MyProposalsBn = () => {
 
   const { realmInfo, isNftMode } = useRealm()
   const { data: proposals } = useRealmProposalsQuery()
+
   const myProposals = useMemo(
     () =>
       connected
@@ -115,9 +121,11 @@ const MyProposalsBn = () => {
       ownCouncilTokenRecord?.pubkey,
     ]
   )
+
   const drafts = myProposals?.filter((x) => {
     return x.account.state === ProposalState.Draft
   })
+
   const notfinalized = myProposals?.filter((x) => {
     const governance = governancesArray?.find(
       (gov) => gov.pubkey.toBase58() === x.account.governance.toBase58()
@@ -138,6 +146,7 @@ const MyProposalsBn = () => {
       now > timestamp
     )
   })
+
   const unReleased = proposals?.filter(
     (x) =>
       (x.account.state === ProposalState.Completed ||
@@ -183,14 +192,16 @@ const MyProposalsBn = () => {
           recentBlockhash,
           feePayer: wallet.publicKey!,
         })
-        transaction.add(...[createComputeBudgetIx(fee), ...chunk])
         transaction.recentBlockhash = recentBlockhash
         transaction.setSigners(
           // fee payed by the wallet owner
           wallet.publicKey!
         )
         transactions.push(transaction)
       }
+
+      console.log('transactions', transactions)
+
       const signedTXs = await wallet.signAllTransactions(transactions)
       await Promise.all(
         signedTXs.map((transaction) =>
@@ -242,10 +253,11 @@ const MyProposalsBn = () => {
         realm?.account.communityMint.toBase58()
           ? ownTokenRecord
           : ownCouncilTokenRecord
-      const role = proposal.account.governingTokenMint.toBase58() ===
+      const role =
+        proposal.account.governingTokenMint.toBase58() ===
         realm?.account.communityMint.toBase58()
-        ? 'community'
-        : 'council'
+          ? 'community'
+          : 'council'
       const governanceAuthority = wallet!.publicKey!
       const beneficiary = wallet!.publicKey!
 
@@ -254,27 +266,29 @@ const MyProposalsBn = () => {
         proposal.pubkey,
         voterTokenRecord!.pubkey
       )
-      
+
       let governingTokenMint = proposal.account.governingTokenMint
 
       try {
         await getVoteRecord(connection, voteRecordPk)
       } catch {
-        voterTokenRecord = role === "community" ?
-          ownCouncilTokenRecord :
-          ownTokenRecord
+        voterTokenRecord =
+          role === 'community' ? ownCouncilTokenRecord : ownTokenRecord
 
         voteRecordPk = await getVoteRecordAddress(
           realm!.owner,
           proposal.pubkey,
           voterTokenRecord!.pubkey
         )
 
-        governingTokenMint = role === "community" && realm?.account.config.councilMint ?
-          realm.account.config.councilMint :
-          realm?.account.communityMint!
+        governingTokenMint =
+          role === 'community' && realm?.account.config.councilMint
+            ? realm.account.config.councilMint
+            : realm?.account.communityMint!
       }
-      
+
+      console.log('THE INSTRUCTIONS', instructions)
+
       const inst = await withRelinquishVote(
         instructions,
         realm!.owner,
@@ -333,8 +347,15 @@ const MyProposalsBn = () => {
 
     setIsLoading(true)
     const instructions: TransactionInstruction[] = []
-    const { registrar } = nftClient.getRegistrarPDA(realm.pubkey, realm.account.communityMint);
-    const { voterWeightPk } = await nftClient.getVoterWeightRecordPDA(realm.pubkey, realm.account.communityMint, wallet.publicKey);
+    const { registrar } = nftClient.getRegistrarPDA(
+      realm.pubkey,
+      realm.account.communityMint
+    )
+    const { voterWeightPk } = await nftClient.getVoterWeightRecordPDA(
+      realm.pubkey,
+      realm.account.communityMint,
+      wallet.publicKey
+    )
 
     const nfts = ownNftVoteRecordsFilterd.slice(
       0,
@@ -387,7 +408,7 @@ const MyProposalsBn = () => {
   }
 
   const getNftsVoteRecord = useCallback(async () => {
-    if (!nftClient) throw new Error('no nft client');
+    if (!nftClient) throw new Error('no nft client')
     const nftVoteRecords = await nftClient.program.account.nftVoteRecord.all([
       {
         memcmp: {
@@ -473,13 +494,7 @@ const MyProposalsBn = () => {
     if (wallet?.publicKey && isNftMode && nftClient && modalIsOpen) {
       getNftsVoteRecord()
     }
-  }, [
-    nftClient,
-    getNftsVoteRecord,
-    isNftMode,
-    modalIsOpen,
-    wallet?.publicKey,
-  ])
+  }, [nftClient, getNftsVoteRecord, isNftMode, modalIsOpen, wallet?.publicKey])
 
   return (
     <>

stores/useGovernanceAssetsStore.tsx

@@ -157,12 +157,16 @@ const useGovernanceAssetsStore = create<GovernanceAssetsStore>((set, _get) => ({
     if (additionalMintAccounts) {
       possibleMintAccountPks.push(...additionalMintAccounts)
     }
+    console.log('LOAD 1')
+
     // 1 - Load token accounts behind any type of governance
     const governedTokenAccounts = await loadGovernedTokenAccounts(
       connection,
       realm,
       governancesWithNativeTreasuryAddress
     )
+    console.log('LOAD 2')
+
     // 2 - Call to fetch token prices for every token account's mints
     await tokenPriceService.fetchTokenPrices(
       governedTokenAccounts.reduce((mints, governedTokenAccount) => {
@@ -177,6 +181,8 @@ const useGovernanceAssetsStore = create<GovernanceAssetsStore>((set, _get) => ({
       }, [] as string[])
     )
     accounts.push(...governedTokenAccounts)
+
+    console.log('LOAD 3')
     const stakeAccounts = await loadStakeAccounts(
       connection,
       governedTokenAccounts.filter(
@@ -198,6 +204,7 @@ const useGovernanceAssetsStore = create<GovernanceAssetsStore>((set, _get) => ({
       s.assetAccounts = accounts.filter(filterOutHiddenAccounts)
     })
 
+    console.log('LOAD 4')
     // 3 - Load accounts related to mint
     const mintAccounts = await loadMintGovernanceAccounts(
       connection,
@@ -210,6 +217,7 @@ const useGovernanceAssetsStore = create<GovernanceAssetsStore>((set, _get) => ({
       s.assetAccounts = accounts.filter(filterOutHiddenAccounts)
     })
 
+    console.log('LOAD 5')
     // 4 - Load accounts related to program governances
     const programAccounts = await getProgramAssetAccounts(
       connection,
@@ -221,6 +229,7 @@ const useGovernanceAssetsStore = create<GovernanceAssetsStore>((set, _get) => ({
       s.assetAccounts = accounts.filter(filterOutHiddenAccounts)
     })
 
+    console.log('LOAD 6')
     // 5 - Create generic asset accounts for governance's governedAccounts that have not been handled yet
     // We do this so theses accounts may be selected
     const genericGovernances = getGenericAssetAccounts(
@@ -690,6 +699,8 @@ const getTokenAccountsInfo = async (
   }
 
   return tokenAccountsInfoJson.reduce((tokenAccountsInfo, { result }) => {
+    if (!result) return tokenAccountsInfo
+
     result.forEach(
       ({
         account: {
@@ -1046,6 +1057,8 @@ const getProgramAccountInfo = async (
     if (executableAccountInfoJson && executableAccountInfoJson.length) {
       const executableDataPks = executableAccountInfoJson.reduce(
         (executableAccountInfo, { result, id }) => {
+          if (!result) return executableAccountInfo
+
           result.forEach(({ pubkey }) => {
             const executableDataPk = new PublicKey(pubkey)
             executableAccountInfo.push({

utils/helpers.ts

@@ -75,6 +75,7 @@ export async function getFilteredProgramAccounts(
       encoding: 'base64',
     },
   ])
+
   if (resp.error) {
     throw new Error(resp.error.message)
   }

utils/tokens.tsx

@@ -68,6 +68,7 @@ export const getTokenAccountsByMint = async (
       },
     ],
   })
+
   return results.map((r) => {
     const publicKey = r.pubkey
     const data = Buffer.from(r.account.data)