Merge remote-tracking branch 'origin/main' into agrippa/delegation-re…

…work-vsr

.github/workflows/ci-main-tests.yml

@@ -15,19 +15,14 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript']
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialise CodeQL
         uses: github/codeql-action/init@v2
         with:
-          languages: ${{ matrix.language }}
+          languages: 'javascript'
 
       - name: Run CodeQL
         uses: github/codeql-action/analyze@v2
@@ -37,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Report all vulnerabilities GitHub security tab
       - name: Report on all vulnerabilities
@@ -71,12 +66,12 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         - name: Checkout repository
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
 
         - name: Setup Node
-          uses: actions/setup-node@v3
+          uses: actions/setup-node@v4
           with:
-            node-version: lts/*
+            node-version: 18
             cache: yarn
 
         - name: Cache dependencies
@@ -86,7 +81,7 @@ jobs:
             key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
         - name: Install dependencies
-          run: yarn install --frozen-lockfile
+          run: yarn ci
 
         - name: Run tests
           run: yarn test-all

VoteStakeRegistry/components/Account/LockTokensModal.tsx

@@ -208,7 +208,8 @@ const LockTokensModal = ({
   const currentMultiplier = calcMintMultiplier(
     lockupPeriodDays * SECS_PER_DAY,
     voteStakeRegistryRegistrar,
-    realm
+    realm,
+    lockupType.value !== 'constant'
   )
   const currentPercentOfMaxMultiplier =
     (100 * currentMultiplier) / maxMultiplier

VoteStakeRegistry/components/instructions/Clawback.tsx

@@ -38,6 +38,7 @@ import useVotePluginsClientStore from 'stores/useVotePluginsClientStore'
 import { AssetAccount } from '@utils/uiTypes/assets'
 import { useRealmQuery } from '@hooks/queries/realm'
 import useLegacyConnectionContext from '@hooks/useLegacyConnectionContext'
+import Input from '@components/inputs/Input'
 
 const Clawback = ({
   index,
@@ -54,13 +55,13 @@ const Clawback = ({
     governedTokenAccountsWithoutNfts,
     governancesArray,
   } = useGovernanceAssets()
-  const shouldBeGoverned = !!(index !== 0 && governance)
   const [voters, setVoters] = useState<Voter[]>([])
   const [deposits, setDeposits] = useState<DepositWithMintAccount[]>([])
   const [form, setForm] = useState<ClawbackForm>({
     governedTokenAccount: undefined,
     voter: null,
     deposit: null,
+    holdupTime: 0,
   })
   const formDeposits = form.deposit
   const schema = useMemo(
@@ -74,6 +75,7 @@ const Clawback = ({
       }),
     []
   )
+
   const realmAuthorityGov = governancesArray.find(
     (x) => x.pubkey.toBase58() === realm?.account.authority?.toBase58()
   )
@@ -119,6 +121,7 @@ const Clawback = ({
       isValid,
       governance: realmAuthorityGov,
       prerequisiteInstructions: prerequisiteInstructions,
+      customHoldUpTime: form.holdupTime,
     }
     return obj
   }, [client, form, realmAuthorityGov, realm, schema])
@@ -265,6 +268,7 @@ const Clawback = ({
           })}
       </Select>
       <GovernedAccountSelect
+        type={'token'}
         label="Clawback destination"
         governedAccounts={
           governedTokenAccountsWithoutNfts.filter(
@@ -278,9 +282,19 @@ const Clawback = ({
         }}
         value={form.governedTokenAccount}
         error={formErrors['governedTokenAccount']}
-        shouldBeGoverned={shouldBeGoverned}
         governance={governance}
       ></GovernedAccountSelect>
+      <Input
+        label="Instruction hold up time (days)"
+        type="number"
+        value={form.holdupTime}
+        onChange={(evt) =>
+          handleSetForm({
+            value: evt.target.value,
+            propertyName: 'holdupTime',
+          })
+        }
+      ></Input>
     </>
   )
 }

VoteStakeRegistry/tools/deposits.ts

@@ -2,7 +2,7 @@ import { BN, EventParser, Idl, Program } from '@coral-xyz/anchor'
 import { ProgramAccount, Realm } from '@solana/spl-governance'
 import { PublicKey, Transaction, Connection } from '@solana/web3.js'
 import { SIMULATION_WALLET } from '@tools/constants'
-import { DAYS_PER_MONTH } from '@utils/dateTools'
+import { DAYS_PER_MONTH, SECS_PER_DAY } from '@utils/dateTools'
 import { chunks } from '@utils/helpers'
 import { tryGetMint } from '@utils/tokens'
 import {
@@ -259,31 +259,33 @@ export const calcMultiplier = ({
   maxExtraLockupVoteWeightScaledFactor,
   lockupSecs,
   lockupSaturationSecs,
+  isVested = false,
 }: {
   depositScaledFactor: number
   maxExtraLockupVoteWeightScaledFactor: number
   lockupSecs: number
   lockupSaturationSecs: number
+  isVested?: boolean
 }) => {
-  //   if (isVested) {
-  //     const onMonthSecs = SECS_PER_DAY * DAYS_PER_MONTH
-  //     const n_periods_before_saturation = lockupSaturationSecs / onMonthSecs
-  //     const n_periods = lockupSecs / onMonthSecs
-  //     const n_unsaturated_periods = Math.min(
-  //       n_periods,
-  //       n_periods_before_saturation
-  //     )
-  //     const n_saturated_periods = Math.max(0, n_periods - n_unsaturated_periods)
-  //     const calc =
-  //       (depositScaledFactor +
-  //         (maxExtraLockupVoteWeightScaledFactor / n_periods) *
-  //           (n_saturated_periods +
-  //             ((n_unsaturated_periods + 1) * n_unsaturated_periods) /
-  //               2 /
-  //               n_periods_before_saturation)) /
-  //       depositScaledFactor
-  //     return depositScaledFactor !== 0 ? calc : 0
-  //   }
+  if (isVested) {
+    const onMonthSecs = SECS_PER_DAY * DAYS_PER_MONTH
+    const n_periods_before_saturation = lockupSaturationSecs / onMonthSecs
+    const n_periods = lockupSecs / onMonthSecs
+    const n_unsaturated_periods = Math.min(
+      n_periods,
+      n_periods_before_saturation
+    )
+    const n_saturated_periods = Math.max(0, n_periods - n_unsaturated_periods)
+    const calc =
+      (depositScaledFactor +
+        (maxExtraLockupVoteWeightScaledFactor / n_periods) *
+          (n_saturated_periods +
+            ((n_unsaturated_periods + 1) * n_unsaturated_periods) /
+              2 /
+              n_periods_before_saturation)) /
+      depositScaledFactor
+    return depositScaledFactor !== 0 ? calc : 0
+  }
   const calc =
     (depositScaledFactor +
       (maxExtraLockupVoteWeightScaledFactor *
@@ -318,7 +320,8 @@ export const getPeriod = (
 export const calcMintMultiplier = (
   lockupSecs: number,
   registrar: Registrar | null,
-  realm: ProgramAccount<Realm> | undefined
+  realm: ProgramAccount<Realm> | undefined,
+  isVested?: boolean
 ) => {
   const mintCfgs = registrar?.votingMints
   const mintCfg = mintCfgs?.find(
@@ -339,6 +342,7 @@ export const calcMintMultiplier = (
       maxExtraLockupVoteWeightScaledFactor: maxExtraLockupVoteWeightScaledFactorNum,
       lockupSaturationSecs: lockupSaturationSecsNum,
       lockupSecs,
+      isVested,
     })
 
     return parseFloat(calced.toFixed(2))

actions/castVote.ts

@@ -15,6 +15,7 @@ import {
   VoteType,
   withPostChatMessage,
   withCreateTokenOwnerRecord,
+  getVoteRecordAddress,
 } from '@solana/spl-governance'
 import { ProgramAccount } from '@solana/spl-governance'
 import { RpcContext } from '@solana/spl-governance'
@@ -39,6 +40,7 @@ import { findPluginName } from '@hooks/queries/governancePower'
 import { DELEGATOR_BATCH_VOTE_SUPPORT_BY_PLUGIN } from '@constants/flags'
 import { fetchTokenOwnerRecordByPubkey } from '@hooks/queries/tokenOwnerRecord'
 import { fetchProgramVersion } from '@hooks/queries/useProgramVersionQuery'
+import { fetchVoteRecordByPubkey } from '@hooks/queries/voteRecord'
 
 const getVetoTokenMint = (
   proposal: ProgramAccount<Proposal>,
@@ -259,19 +261,33 @@ export async function castVote(
     DELEGATOR_BATCH_VOTE_SUPPORT_BY_PLUGIN[
       findPluginName(votingPlugin?.client?.program.programId)
     ]
-      ? await Promise.all(
-          additionalTokenOwnerRecords.map((tokenOwnerRecordPk) =>
-            createDelegatorVote({
-              connection,
-              realmPk: realm.pubkey,
-              proposalPk: proposal.pubkey,
-              tokenOwnerRecordPk,
-              userPk: walletPubkey,
-              vote,
-              votingPlugin: votingPlugin,
+      ? (
+          await Promise.all(
+            additionalTokenOwnerRecords.map(async (tokenOwnerRecordPk) => {
+              // Skip vote if already voted
+              const voteRecordPk = await getVoteRecordAddress(
+                realm.owner,
+                proposal.pubkey,
+                tokenOwnerRecordPk
+              )
+              const voteRecord = await fetchVoteRecordByPubkey(
+                connection,
+                voteRecordPk
+              )
+              if (voteRecord.found) return undefined
+
+              return createDelegatorVote({
+                connection,
+                realmPk: realm.pubkey,
+                proposalPk: proposal.pubkey,
+                tokenOwnerRecordPk,
+                userPk: walletPubkey,
+                vote,
+                votingPlugin: votingPlugin,
+              })
             })
           )
-        )
+        ).filter((x): x is NonNullable<typeof x> => x !== undefined)
       : []
 
   const pluginPostMessageIxs: TransactionInstruction[] = []

actions/createProposal.ts

@@ -96,19 +96,20 @@ export const createProposal = async (
 
   const voteType = isMulti
     ? VoteType.MULTI_CHOICE(
-        MultiChoiceType.FullWeight,
-        1,
-        options.length,
-        options.length
-      )
+      MultiChoiceType.FullWeight,
+      1,
+      options.length,
+      options.length
+    )
     : VoteType.SINGLE_CHOICE
 
   //will run only if plugin is connected with realm
   const plugin = await client?.withUpdateVoterWeightRecord(
     instructions,
     tokenOwnerRecord.pubkey,
     'createProposal',
-    createNftTicketsIxs
+    createNftTicketsIxs,
+    governance
   )
 
   const proposalAddress = await withCreateProposal(