Merge branch 'solana-labs:main' into main

sjillen · web-flow · commit 6109f49b2541 · 2021-12-22T18:21:50.000+09:00
diff --git a/components/Members/AddMember.tsx b/components/Members/AddMember.tsx
@@ -5,40 +5,28 @@ import {
 } from '@heroicons/react/outline'
 import { ViewState } from './types'
 import useMembersListStore from 'stores/useMembersListStore'
-import { PublicKey, TransactionInstruction } from '@solana/web3.js'
-import useRealm from '@hooks/useRealm'
-import Input from '@components/inputs/Input'
+import { PublicKey } from '@solana/web3.js'
+import useRealm from 'hooks/useRealm'
+import Input from 'components/inputs/Input'
 import Button, { SecondaryButton } from '@components/Button'
-import Textarea from '@components/inputs/Textarea'
+import Textarea from 'components/inputs/Textarea'
 import VoteBySwitch from 'pages/dao/[symbol]/proposal/components/VoteBySwitch'
-import {
-  getMintMinAmountAsDecimal,
-  parseMintNaturalAmountFromDecimal,
-} from '@tools/sdk/units'
-import { precision } from '@utils/formatting'
+import { getMintMinAmountAsDecimal } from '@tools/sdk/units'
+import { precision } from 'utils/formatting'
 import useWalletStore from 'stores/useWalletStore'
-import { getMintSchema } from '@utils/validations'
+import { getMintSchema } from 'utils/validations'
 import { useEffect, useState } from 'react'
-import { MintForm, UiInstruction } from '@utils/uiTypes/proposalCreationTypes'
-import { validateInstruction } from '@utils/instructionTools'
-import useGovernanceAssets from '@hooks/useGovernanceAssets'
-import {
-  ASSOCIATED_TOKEN_PROGRAM_ID,
-  Token,
-  TOKEN_PROGRAM_ID,
-} from '@solana/spl-token'
-import {
-  getInstructionDataFromBase64,
-  serializeInstructionToBase64,
-} from '@models/serialisation'
-import { getATA } from '@utils/ataTools'
-import { RpcContext } from '@models/core/api'
-import { Governance } from '@models/accounts'
-import { ParsedAccount } from '@models/core/accounts'
+import { MintForm, UiInstruction } from 'utils/uiTypes/proposalCreationTypes'
+import useGovernanceAssets from 'hooks/useGovernanceAssets'
+import { getInstructionDataFromBase64 } from 'models/serialisation'
+import { RpcContext } from 'models/core/api'
+import { Governance } from 'models/accounts'
+import { ParsedAccount } from 'models/core/accounts'
 import { useRouter } from 'next/router'
 import { createProposal } from 'actions/createProposal'
-import { notify } from '@utils/notifications'
-import useQueryContext from '@hooks/useQueryContext'
+import { notify } from 'utils/notifications'
+import useQueryContext from 'hooks/useQueryContext'
+import { getMintInstruction } from 'utils/instructionTools'
 
 interface AddMemberForm extends MintForm {
   description: string
@@ -110,57 +98,16 @@ const AddMember = () => {
       propertyName: 'amount',
     })
   }
-  //TODO common getMintInstruction
   async function getInstruction(): Promise<UiInstruction> {
-    const isValid = await validateInstruction({ schema, form, setFormErrors })
-    let serializedInstruction = ''
-    const prerequisiteInstructions: TransactionInstruction[] = []
-    if (isValid && programId && form.mintAccount?.governance?.pubkey) {
-      //this is the original owner
-      const destinationAccount = new PublicKey(form.destinationAccount)
-      const mintPK = form.mintAccount.governance.info.governedAccount
-      const mintAmount = parseMintNaturalAmountFromDecimal(
-        form.amount!,
-        form.mintAccount.mintInfo?.decimals
-      )
-      //we find true receiver address if its wallet and we need to create ATA the ata address will be the receiver
-      const { currentAddress: receiverAddress, needToCreateAta } = await getATA(
-        connection,
-        destinationAccount,
-        mintPK,
-        wallet!
-      )
-      //we push this createATA instruction to transactions to create right before creating proposal
-      //we don't want to create ata only when instruction is serialized
-      if (needToCreateAta) {
-        prerequisiteInstructions.push(
-          Token.createAssociatedTokenAccountInstruction(
-            ASSOCIATED_TOKEN_PROGRAM_ID, // always ASSOCIATED_TOKEN_PROGRAM_ID
-            TOKEN_PROGRAM_ID, // always TOKEN_PROGRAM_ID
-            mintPK, // mint
-            receiverAddress, // ata
-            destinationAccount, // owner of token account
-            wallet!.publicKey! // fee payer
-          )
-        )
-      }
-      const transferIx = Token.createMintToInstruction(
-        TOKEN_PROGRAM_ID,
-        form.mintAccount.governance.info.governedAccount,
-        receiverAddress,
-        form.mintAccount.governance!.pubkey,
-        [],
-        mintAmount
-      )
-      serializedInstruction = serializeInstructionToBase64(transferIx)
-    }
-    const obj: UiInstruction = {
-      serializedInstruction,
-      isValid,
-      governance: form.mintAccount?.governance,
-      prerequisiteInstructions: prerequisiteInstructions,
-    }
-    return obj
+    return getMintInstruction({
+      schema,
+      form,
+      programId,
+      connection,
+      wallet,
+      governedMintInfoAccount: form.mintAccount,
+      setFormErrors,
+    })
   }
   //TODO common handle propose
   const handlePropose = async () => {
diff --git a/components/Members/MembersCompactWrapper.tsx b/components/Members/MembersCompactWrapper.tsx
@@ -8,13 +8,22 @@ import MemberOverview from './MemberOverview'
 import { PlusIcon } from '@heroicons/react/outline'
 import AddMember from './AddMember'
 import useGovernanceAssets from '@hooks/useGovernanceAssets'
+import Tooltip from '@components/Tooltip'
 
 const MembersCompactWrapper = () => {
-  const { symbol, councilMint } = useRealm()
+  const {
+    symbol,
+    councilMint,
+    toManyCouncilOutstandingProposalsForUse,
+    toManyCommunityOutstandingProposalsForUser,
+  } = useRealm()
   const { members } = useMembers()
   const membersCount = members.length
   const { setCurrentCompactView, resetCompactViewState } = useMembersListStore()
-  const { canUseMintInstruction } = useGovernanceAssets()
+  const {
+    canUseMintInstruction,
+    canMintRealmCouncilToken,
+  } = useGovernanceAssets()
   const currentView = useMembersListStore((s) => s.compact.currentView)
   const totalVotesCast = members.reduce((prev, current) => {
     const councilTotalVotes = current.council?.info.totalVotesCount || 0
@@ -31,23 +40,40 @@ const MembersCompactWrapper = () => {
           <>
             <h3 className="mb-4 flex items-center">
               Members ({membersCount})
-              {councilMint && canUseMintInstruction && (
-                <div
-                  onClick={goToAddMemberView}
-                  className={`bg-bkg-2 default-transition 
+              {councilMint &&
+                canUseMintInstruction &&
+                canMintRealmCouncilToken() && (
+                  <Tooltip
+                    contentClassName="ml-auto"
+                    content={
+                      toManyCouncilOutstandingProposalsForUse &&
+                      toManyCommunityOutstandingProposalsForUser
+                        ? 'You have to many outstanding proposals'
+                        : ''
+                    }
+                  >
+                    <div
+                      onClick={goToAddMemberView}
+                      className={`bg-bkg-2 default-transition 
                 flex flex-col items-center justify-center
                 rounded-lg hover:bg-bkg-3 ml-auto 
-                hover:cursor-pointer`}
-                >
-                  <div
-                    className="bg-[rgba(255,255,255,0.06)] h-6 w-6 flex 
+                hover:cursor-pointer ${
+                  toManyCouncilOutstandingProposalsForUse &&
+                  toManyCommunityOutstandingProposalsForUser
+                    ? 'opacity-60 pointer-events-none'
+                    : ''
+                }`}
+                    >
+                      <div
+                        className="bg-[rgba(255,255,255,0.06)] h-6 w-6 flex 
                 font-bold items-center justify-center 
                 rounded-full text-fgd-3"
-                  >
-                    <PlusIcon />
-                  </div>
-                </div>
-              )}
+                      >
+                        <PlusIcon />
+                      </div>
+                    </div>
+                  </Tooltip>
+                )}
             </h3>
             <div className="bg-bkg-1 mb-3 px-4 py-2 rounded-md w-full">
               <p className="text-fgd-3 text-xs">Total votes cast</p>
diff --git a/components/TokenBalanceCard.tsx b/components/TokenBalanceCard.tsx
@@ -102,7 +102,6 @@ const TokenDeposit = ({
     proposals,
     governances,
   } = useRealm()
-
   // Do not show deposits for mints with zero supply because nobody can deposit anyway
   if (!mint || mint.supply.isZero()) {
     return null
diff --git a/components/TreasuryAccount/AccountsCompactWrapper.tsx b/components/TreasuryAccount/AccountsCompactWrapper.tsx
@@ -20,7 +20,13 @@ const AccountsCompactWrapper = () => {
   const { resetCompactViewState } = useTreasuryAccountStore()
   const connected = useWalletStore((s) => s.connected)
   const { fmtUrlWithCluster } = useQueryContext()
-  const { ownVoterWeight, symbol, realm } = useRealm()
+  const {
+    ownVoterWeight,
+    symbol,
+    realm,
+    toManyCommunityOutstandingProposalsForUser,
+    toManyCouncilOutstandingProposalsForUse,
+  } = useRealm()
   const goToNewAccountForm = () => {
     router.push(fmtUrlWithCluster(`/dao/${symbol}${NEW_TREASURY_ROUTE}`))
   }
@@ -29,7 +35,10 @@ const AccountsCompactWrapper = () => {
     ? ownVoterWeight.canCreateGovernance(realm)
     : null
   const isConnectedWithGovernanceCreationPermission =
-    connected && canCreateGovernance
+    connected &&
+    canCreateGovernance &&
+    !toManyCommunityOutstandingProposalsForUser &&
+    !toManyCouncilOutstandingProposalsForUse
   const getCurrentView = () => {
     switch (currentView) {
       case ViewState.MainView:
@@ -45,6 +54,9 @@ const AccountsCompactWrapper = () => {
                       ? 'Connect your wallet to create new account'
                       : !canCreateGovernance
                       ? "You don't have enough governance power to create a new treasury account"
+                      : toManyCommunityOutstandingProposalsForUser &&
+                        toManyCouncilOutstandingProposalsForUse
+                      ? 'You have to many outstanding proposals'
                       : ''
                   }
                 >
diff --git a/hooks/useGovernanceAssets.ts b/hooks/useGovernanceAssets.ts
@@ -31,6 +31,27 @@ export default function useGovernanceAssets() {
       )
     )
   }
+  const canMintRealmCommunityToken = () => {
+    const governances = getGovernancesByAccountType(
+      GovernanceAccountType.MintGovernance
+    )
+    return !!governances.find(
+      (x) =>
+        x.info.governedAccount.toBase58() ==
+        realm?.info.communityMint.toBase58()
+    )
+  }
+  const canMintRealmCouncilToken = () => {
+    const governances = getGovernancesByAccountType(
+      GovernanceAccountType.MintGovernance
+    )
+
+    return !!governances.find(
+      (x) =>
+        x.info.governedAccount.toBase58() ==
+        realm?.info.config.councilMint?.toBase58()
+    )
+  }
   // TODO: Check governedAccounts from all governances plus search for token accounts owned by governances
   const canUseTransferInstruction = canUseGovernanceForInstruction(
     GovernanceAccountType.TokenGovernance
@@ -176,5 +197,7 @@ export default function useGovernanceAssets() {
     getMintWithGovernances,
     canUseTransferInstruction,
     canUseMintInstruction,
+    canMintRealmCommunityToken,
+    canMintRealmCouncilToken,
   }
 }
diff --git a/hooks/useRealm.tsx b/hooks/useRealm.tsx
@@ -83,6 +83,17 @@ export default function useRealm() {
     realm.info.config.councilMint &&
     !councilMint?.supply.isZero()
 
+  //TODO take from realm config when available
+  const realmCfgMaxOutstandingProposalCount = 10
+  const toManyCommunityOutstandingProposalsForUser =
+    ownTokenRecord &&
+    ownTokenRecord?.info.outstandingProposalCount >=
+      realmCfgMaxOutstandingProposalCount
+  const toManyCouncilOutstandingProposalsForUse =
+    ownCouncilTokenRecord &&
+    ownCouncilTokenRecord?.info.outstandingProposalCount >=
+      realmCfgMaxOutstandingProposalCount
+
   return {
     realm,
     realmInfo,
@@ -103,5 +114,7 @@ export default function useRealm() {
     realmDisplayName: realmInfo?.displayName ?? realm?.info?.name,
     canChooseWhoVote,
     councilTokenOwnerRecords,
+    toManyCouncilOutstandingProposalsForUse,
+    toManyCommunityOutstandingProposalsForUser,
   }
 }
diff --git a/models/accounts.ts b/models/accounts.ts
@@ -342,13 +342,16 @@ export class TokenOwnerRecord {
 
   governanceDelegate?: PublicKey
 
+  outstandingProposalCount: number
+
   constructor(args: {
     realm: PublicKey
     governingTokenMint: PublicKey
     governingTokenOwner: PublicKey
     governingTokenDepositAmount: BN
     unrelinquishedVotesCount: number
     totalVotesCount: number
+    outstandingProposalCount: number
     reserved: Uint8Array
   }) {
     this.realm = args.realm
@@ -358,6 +361,7 @@ export class TokenOwnerRecord {
     this.unrelinquishedVotesCount = args.unrelinquishedVotesCount
     this.totalVotesCount = args.totalVotesCount
     this.reserved = args.reserved
+    this.outstandingProposalCount = args.outstandingProposalCount
   }
 }
 
diff --git a/pages/dao/[symbol]/index.tsx b/pages/dao/[symbol]/index.tsx
@@ -10,6 +10,7 @@ import RealmHeader from 'components/RealmHeader'
 import { PublicKey } from '@solana/web3.js'
 import AccountsCompactWrapper from '@components/TreasuryAccount/AccountsCompactWrapper'
 import MembersCompactWrapper from '@components/Members/MembersCompactWrapper'
+import Tooltip from '@components/Tooltip'
 
 const compareProposals = (p1: Proposal, p2: Proposal) => {
   const p1Rank = p1.getStateSortRank()
@@ -28,7 +29,13 @@ const compareProposals = (p1: Proposal, p2: Proposal) => {
 }
 
 const REALM = () => {
-  const { proposals, realmTokenAccount, ownTokenRecord } = useRealm()
+  const {
+    proposals,
+    realmTokenAccount,
+    ownTokenRecord,
+    toManyCommunityOutstandingProposalsForUser,
+    toManyCouncilOutstandingProposalsForUse,
+  } = useRealm()
   const [filters, setFilters] = useState<ProposalState[]>([])
   const [displayedProposals, setDisplayedProposals] = useState(
     Object.entries(proposals)
@@ -84,7 +91,16 @@ const REALM = () => {
             <h4 className="text-fgd-2">{`${filteredProposals.length} proposals`}</h4>
             <div className="flex items-center">
               <div className="mr-4">
-                <NewProposalBtn />
+                <Tooltip
+                  content={
+                    toManyCommunityOutstandingProposalsForUser &&
+                    toManyCouncilOutstandingProposalsForUse
+                      ? 'You have to many outstanding proposals'
+                      : ''
+                  }
+                >
+                  <NewProposalBtn />
+                </Tooltip>
               </div>
               <ProposalFilter filters={filters} setFilters={setFilters} />
             </div>
diff --git a/pages/dao/[symbol]/proposal/components/NewProposalBtn.tsx b/pages/dao/[symbol]/proposal/components/NewProposalBtn.tsx
diff --git a/pages/dao/[symbol]/proposal/components/VoteBySwitch.tsx b/pages/dao/[symbol]/proposal/components/VoteBySwitch.tsx
diff --git a/pages/dao/[symbol]/proposal/components/instructions/Mint.tsx b/pages/dao/[symbol]/proposal/components/instructions/Mint.tsx
diff --git a/utils/instructionTools.ts b/utils/instructionTools.ts
