Feature/release loader and council (#643)

* release loader

* hide multi vote for nfts

* vote with council alone when plugin is on

* fix council

* release nfts addon

Strategies/components/MangoDepositComponent.tsx

@@ -220,7 +220,7 @@ const MangoDepositComponent = ({
         },
         realm!,
         governedTokenAccount!,
-        ownTokenRecord.pubkey,
+        ownTokenRecord,
         defaultProposalMint!,
         governedTokenAccount!.governance!.account!.proposalCount,
         prerequisiteInstructions,

Strategies/types/types.ts

@@ -1,5 +1,10 @@
 import { MangoAccount } from '@blockworks-foundation/mango-client'
-import { ProgramAccount, Realm, RpcContext } from '@solana/spl-governance'
+import {
+  ProgramAccount,
+  Realm,
+  RpcContext,
+  TokenOwnerRecord,
+} from '@solana/spl-governance'
 import { PublicKey, TransactionInstruction } from '@solana/web3.js'
 import { VotingClient } from '@utils/uiTypes/VotePlugin'
 import { AssetAccount } from '@utils/uiTypes/assets'
@@ -31,7 +36,7 @@ export type HandleCreateProposalWithStrategy = (
   form: MNGODepositForm,
   realm: ProgramAccount<Realm>,
   treasuaryAccount: AssetAccount,
-  tokenOwnerRecord: PublicKey,
+  tokenOwnerRecord: ProgramAccount<TokenOwnerRecord>,
   governingTokenMint: PublicKey,
   proposalIndex: number,
   prerequisiteInstructions: TransactionInstruction[],

actions/castVote.ts

@@ -1,15 +1,11 @@
-import {
-  Keypair,
-  PublicKey,
-  Transaction,
-  TransactionInstruction,
-} from '@solana/web3.js'
+import { Keypair, Transaction, TransactionInstruction } from '@solana/web3.js'
 import {
   ChatMessageBody,
   getGovernanceProgramVersion,
   GOVERNANCE_CHAT_PROGRAM_ID,
   Proposal,
   Realm,
+  TokenOwnerRecord,
   withPostChatMessage,
   YesNoVote,
 } from '@solana/spl-governance'
@@ -29,7 +25,7 @@ export async function castVote(
   { connection, wallet, programId, walletPubkey }: RpcContext,
   realm: ProgramAccount<Realm>,
   proposal: ProgramAccount<Proposal>,
-  tokeOwnerRecord: PublicKey,
+  tokeOwnerRecord: ProgramAccount<TokenOwnerRecord>,
   yesNoVote: YesNoVote,
   message?: ChatMessageBody | undefined,
   votingPlugin?: VotingClient
@@ -49,7 +45,8 @@ export async function castVote(
   //will run only if any plugin is connected with realm
   const plugin = await votingPlugin?.withCastPluginVote(
     instructions,
-    proposal.pubkey
+    proposal,
+    tokeOwnerRecord
   )
   await withCastVote(
     instructions,
@@ -59,7 +56,7 @@ export async function castVote(
     proposal.account.governance,
     proposal.pubkey,
     proposal.account.tokenOwnerRecord,
-    tokeOwnerRecord,
+    tokeOwnerRecord.pubkey,
     governanceAuthority,
     proposal.account.governingTokenMint,
     Vote.fromYesNoVote(yesNoVote),
@@ -71,6 +68,7 @@ export async function castVote(
   if (message) {
     const plugin = await votingPlugin?.withUpdateVoterWeightRecord(
       instructions,
+      tokeOwnerRecord,
       'commentProposal'
     )
     await withPostChatMessage(
@@ -81,7 +79,7 @@ export async function castVote(
       realm.pubkey,
       proposal.account.governance,
       proposal.pubkey,
-      tokeOwnerRecord,
+      tokeOwnerRecord.pubkey,
       governanceAuthority,
       payer,
       undefined,

actions/chat/postMessage.ts

@@ -8,6 +8,7 @@ import {
   GOVERNANCE_CHAT_PROGRAM_ID,
   Proposal,
   Realm,
+  TokenOwnerRecord,
 } from '@solana/spl-governance'
 import { ChatMessageBody } from '@solana/spl-governance'
 import { withPostChatMessage } from '@solana/spl-governance'
@@ -20,7 +21,7 @@ export async function postChatMessage(
   { connection, wallet, programId, walletPubkey }: RpcContext,
   realm: ProgramAccount<Realm>,
   proposal: ProgramAccount<Proposal>,
-  tokeOwnerRecord: PublicKey,
+  tokeOwnerRecord: ProgramAccount<TokenOwnerRecord>,
   body: ChatMessageBody,
   replyTo?: PublicKey,
   client?: VotingClient
@@ -30,10 +31,10 @@ export async function postChatMessage(
 
   const governanceAuthority = walletPubkey
   const payer = walletPubkey
-
   //will run only if plugin is connected with realm
   const plugin = await client?.withUpdateVoterWeightRecord(
     instructions,
+    tokeOwnerRecord,
     'commentProposal'
   )
 
@@ -45,7 +46,7 @@ export async function postChatMessage(
     realm.pubkey,
     proposal.account.governance,
     proposal.pubkey,
-    tokeOwnerRecord,
+    tokeOwnerRecord.pubkey,
     governanceAuthority,
     payer,
     replyTo,

actions/createProposal.ts

@@ -12,6 +12,7 @@ import {
   Governance,
   ProgramAccount,
   Realm,
+  TokenOwnerRecord,
   VoteType,
   withCreateProposal,
 } from '@solana/spl-governance'
@@ -61,7 +62,7 @@ export const createProposal = async (
   { connection, wallet, programId, walletPubkey }: RpcContext,
   realm: ProgramAccount<Realm>,
   governance: PublicKey,
-  tokenOwnerRecord: PublicKey,
+  tokenOwnerRecord: ProgramAccount<TokenOwnerRecord>,
   name: string,
   descriptionLink: string,
   governingTokenMint: PublicKey,
@@ -99,6 +100,7 @@ export const createProposal = async (
   //will run only if plugin is connected with realm
   const plugin = await client?.withUpdateVoterWeightRecord(
     instructions,
+    tokenOwnerRecord,
     'createProposal'
   )
 
@@ -108,7 +110,7 @@ export const createProposal = async (
     programVersion,
     realm.pubkey!,
     governance,
-    tokenOwnerRecord,
+    tokenOwnerRecord.pubkey,
     name,
     descriptionLink,
     governingTokenMint,
@@ -126,7 +128,7 @@ export const createProposal = async (
     programId,
     programVersion,
     proposalAddress,
-    tokenOwnerRecord,
+    tokenOwnerRecord.pubkey,
     governanceAuthority,
     signatory,
     payer
@@ -157,7 +159,7 @@ export const createProposal = async (
         programVersion,
         governance,
         proposalAddress,
-        tokenOwnerRecord,
+        tokenOwnerRecord.pubkey,
         governanceAuthority,
         index,
         0,

actions/createTreasuryAccount.ts

@@ -10,6 +10,7 @@ import {
   GovernanceConfig,
   ProgramAccount,
   Realm,
+  TokenOwnerRecord,
   withCreateGovernance,
   withCreateNativeTreasury,
 } from '@solana/spl-governance'
@@ -25,7 +26,7 @@ export const createTreasuryAccount = async (
   realm: ProgramAccount<Realm>,
   mint: PublicKey | null,
   config: GovernanceConfig,
-  tokenOwnerRecord: PublicKey,
+  tokenOwnerRecord: ProgramAccount<TokenOwnerRecord>,
   client?: VotingClient
 ): Promise<PublicKey> => {
   const instructions: TransactionInstruction[] = []
@@ -41,6 +42,7 @@ export const createTreasuryAccount = async (
   //will run only if plugin is connected with realm
   const plugin = await client?.withUpdateVoterWeightRecord(
     instructions,
+    tokenOwnerRecord,
     'createGovernance'
   )
 
@@ -66,7 +68,7 @@ export const createTreasuryAccount = async (
         config,
         true,
         walletPubkey,
-        tokenOwnerRecord,
+        tokenOwnerRecord.pubkey,
         walletPubkey,
         governanceAuthority,
         plugin?.voterWeightPk
@@ -78,7 +80,7 @@ export const createTreasuryAccount = async (
         realm.pubkey,
         undefined,
         config,
-        tokenOwnerRecord,
+        tokenOwnerRecord.pubkey,
         walletPubkey,
         governanceAuthority,
         plugin?.voterWeightPk

actions/registerProgramGovernance.ts

@@ -9,6 +9,7 @@ import {
   GovernanceType,
   ProgramAccount,
   Realm,
+  TokenOwnerRecord,
 } from '@solana/spl-governance'
 import { GovernanceConfig } from '@solana/spl-governance'
 import { withCreateProgramGovernance } from '@solana/spl-governance'
@@ -23,7 +24,7 @@ export const registerProgramGovernance = async (
   governedAccount: PublicKey,
   config: GovernanceConfig,
   transferAuthority: boolean,
-  tokenOwnerRecord: PublicKey,
+  tokenOwnerRecord: ProgramAccount<TokenOwnerRecord>,
   client?: VotingClient
 ): Promise<PublicKey> => {
   const instructions: TransactionInstruction[] = []
@@ -41,6 +42,7 @@ export const registerProgramGovernance = async (
   //will run only if plugin is connected with realm
   const plugin = await client?.withUpdateVoterWeightRecord(
     instructions,
+    tokenOwnerRecord,
     'createGovernance'
   )
 
@@ -55,7 +57,7 @@ export const registerProgramGovernance = async (
         config,
         transferAuthority!,
         walletPubkey,
-        tokenOwnerRecord,
+        tokenOwnerRecord.pubkey,
         walletPubkey,
         governanceAuthority,
         plugin?.voterWeightPk

components/AssetsList/NewProgramForm.tsx

@@ -114,7 +114,7 @@ const NewProgramForm = () => {
           new PublicKey(form.programId),
           governanceConfig,
           form.transferAuthority,
-          tokenOwnerRecord!.pubkey,
+          tokenOwnerRecord!,
           client
         )
         setIsLoading(false)

components/TreasuryAccount/NewTreasuryAccountForm.tsx

@@ -158,7 +158,7 @@ const NewAccountForm = () => {
           realm,
           treasuryType?.value === SOL ? null : new PublicKey(form.mintAddress),
           governanceConfig,
-          tokenOwnerRecord!.pubkey,
+          tokenOwnerRecord!,
           client
         )
         setIsLoading(false)

components/VoteCommentModal.tsx

@@ -68,7 +68,7 @@ const VoteCommentModal: FunctionComponent<VoteCommentModalProps> = ({
         rpcContext,
         realm!,
         proposal!,
-        voterTokenRecord.pubkey,
+        voterTokenRecord,
         vote,
         msg,
         client

components/VotePanel.tsx

@@ -24,6 +24,7 @@ const VotePanel = () => {
   const client = useVotePluginsClientStore(
     (s) => s.state.currentRealmVotingClient
   )
+  const [isLoading, setIsLoading] = useState(false)
   const router = useRouter()
   const { pk } = router.query
   const {
@@ -89,6 +90,7 @@ const VotePanel = () => {
       connection.endpoint
     )
     try {
+      setIsLoading(true)
       const instructions: TransactionInstruction[] = []
 
       if (
@@ -124,6 +126,7 @@ const VotePanel = () => {
     } catch (ex) {
       console.error("Can't relinquish vote", ex)
     }
+    setIsLoading(false)
   }
 
   const handleShowVoteModal = (vote: YesNoVote) => {
@@ -187,10 +190,11 @@ const VotePanel = () => {
           <div className="items-center justify-center flex w-full gap-5">
             {isVoteCast && connected ? (
               <SecondaryButton
+                isLoading={isLoading}
                 small
                 tooltipMessage={withdrawTooltipContent}
                 onClick={() => submitRelinquishVote()}
-                disabled={!isWithdrawEnabled}
+                disabled={!isWithdrawEnabled || isLoading}
               >
                 {isVoting ? 'Withdraw' : 'Release Tokens'}
               </SecondaryButton>

components/chat/DiscussionForm.tsx

@@ -31,6 +31,10 @@ const DiscussionForm = () => {
   const { proposal } = useWalletStore((s) => s.selectedProposal)
   const { fetchChatMessages } = useWalletStore((s) => s.actions)
   const { tokenType } = useWalletStore((s) => s.selectedProposal)
+  const commenterVoterTokenRecord =
+    tokenType === GoverningTokenType.Community
+      ? ownTokenRecord
+      : ownCouncilTokenRecord
 
   const submitComment = async () => {
     setSubmitting(true)
@@ -53,7 +57,7 @@ const DiscussionForm = () => {
         rpcContext,
         realm!,
         proposal!,
-        ownVoterWeight.getTokenRecord(),
+        commenterVoterTokenRecord!,
         msg,
         undefined,
         client
@@ -73,11 +77,6 @@ const DiscussionForm = () => {
   const postEnabled =
     proposal && connected && ownVoterWeight.hasAnyWeight() && comment
 
-  const commenterVoterTokenRecord =
-    tokenType === GoverningTokenType.Community
-      ? ownTokenRecord
-      : ownCouncilTokenRecord
-
   const tooltipContent = !connected
     ? 'Connect your wallet to send a comment'
     : !ownVoterWeight.hasAnyWeight()

hooks/useCreateProposal.ts

@@ -67,7 +67,7 @@ export default function useCreateProposal() {
       rpcContext,
       realm!,
       selectedGovernance.pubkey,
-      ownTokenRecord!.pubkey,
+      ownTokenRecord!,
       title,
       description,
       proposalMint,

hooks/useRealm.tsx

@@ -114,15 +114,18 @@ export default function useRealm() {
       realmCfgMaxOutstandingProposalCount
 
   const currentPluginPk = config?.account?.communityVoterWeightAddin
-
+  //based on realm config it will provide proper tokenBalanceCardComponent
+  const isLockTokensMode =
+    currentPluginPk && vsrPluginsPks.includes(currentPluginPk?.toBase58())
+  const isNftMode =
+    currentPluginPk && nftPluginsPks.includes(currentPluginPk?.toBase58())
   const ownVoterWeight = getVoterWeight(
     currentPluginPk,
     ownTokenRecord,
     votingPower,
     nftVotingPower,
     ownCouncilTokenRecord
   )
-
   return {
     realm,
     realmInfo,
@@ -143,6 +146,9 @@ export default function useRealm() {
     toManyCouncilOutstandingProposalsForUse,
     toManyCommunityOutstandingProposalsForUser,
     config,
+    currentPluginPk,
+    isLockTokensMode,
+    isNftMode,
   }
 }