Gateway compose [WIP]

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "cSpell.words": ["Addin", "blockworks", "lamports", "solana", "VERCEL"]
+  "cSpell.words": ["Addin", "blockworks", "lamports", "solana", "VERCEL"],
+  "editor.formatOnSave": true
 }

GatewayPlugin/sdk/accounts.tsx

@@ -1,76 +1,36 @@
 import { PublicKey } from '@solana/web3.js'
-import { ProgramAccount, Realm } from '@solana/spl-governance'
+import {
+  getTokenOwnerRecordAddress,
+  ProgramAccount,
+  Realm,
+} from '@solana/spl-governance'
 import { GatewayClient } from '@solana/governance-program-library/dist'
+import { getRegistrarPDA, getVoterWeightRecord } from '@utils/plugin/accounts'
 
-// TODO merge this with NFTVotePlugin as it is essentially identical
-export const getGatewayRegistrarPDA = async (
-  realmPk: PublicKey,
-  mint: PublicKey,
-  clientProgramId: PublicKey
-) => {
-  const [registrar, registrarBump] = await PublicKey.findProgramAddress(
-    [Buffer.from('registrar'), realmPk.toBuffer(), mint.toBuffer()],
-    clientProgramId
-  )
-  return {
-    registrar,
-    registrarBump,
-  }
-}
-
-export const getGatewayMaxVoterWeightRecord = async (
-  realmPk: PublicKey,
-  mint: PublicKey,
-  clientProgramId: PublicKey
-) => {
-  const [
-    maxVoterWeightRecord,
-    maxVoterWeightRecordBump,
-  ] = await PublicKey.findProgramAddress(
-    [
-      Buffer.from('max-voter-weight-record'),
-      realmPk.toBuffer(),
-      mint.toBuffer(),
-    ],
-    clientProgramId
+export const getGatekeeperNetwork = async (
+  client: GatewayClient,
+  realm: ProgramAccount<Realm>
+): Promise<PublicKey> => {
+  // Get the registrar for the realm
+  const { registrar } = await getRegistrarPDA(
+    realm.pubkey,
+    realm.account.communityMint,
+    client.program.programId
   )
-  return {
-    maxVoterWeightRecord,
-    maxVoterWeightRecordBump,
-  }
-}
-
-export const getGatewayVoterWeightRecord = async (
-  realmPk: PublicKey,
-  mint: PublicKey,
-  walletPk: PublicKey,
-  clientProgramId: PublicKey
-) => {
-  const [
-    voterWeightPk,
-    voterWeightRecordBump,
-  ] = await PublicKey.findProgramAddress(
-    [
-      Buffer.from('voter-weight-record'),
-      realmPk.toBuffer(),
-      mint.toBuffer(),
-      walletPk.toBuffer(),
-    ],
-    clientProgramId
+  const registrarObject = await client.program.account.registrar.fetch(
+    registrar
   )
 
-  return {
-    voterWeightPk,
-    voterWeightRecordBump,
-  }
+  // Find the gatekeeper network from the registrar
+  return registrarObject.gatekeeperNetwork
 }
 
-export const getGatekeeperNetwork = async (
+export const getPredecessorProgramId = async (
   client: GatewayClient,
   realm: ProgramAccount<Realm>
-): Promise<PublicKey> => {
+): Promise<PublicKey | null> => {
   // Get the registrar for the realm
-  const { registrar } = await getGatewayRegistrarPDA(
+  const { registrar } = await getRegistrarPDA(
     realm.pubkey,
     realm.account.communityMint,
     client.program.programId
@@ -80,40 +40,77 @@ export const getGatekeeperNetwork = async (
   )
 
   // Find the gatekeeper network from the registrar
-  return registrarObject.gatekeeperNetwork
+  return registrarObject.previousVoterWeightPluginProgramId
+}
+
+export const getPreviousVotingWeightRecord = async (
+  client: GatewayClient,
+  realm: ProgramAccount<Realm>,
+  walletPk: PublicKey
+): Promise<PublicKey> => {
+  // TODO cache this to avoid lookup every time someone votes
+  const predecessorProgramId = await getPredecessorProgramId(client, realm)
+
+  if (predecessorProgramId) {
+    // this gateway plugin registrar has a predecessor plugin - get its voting weight record
+    const { voterWeightPk } = await getVoterWeightRecord(
+      realm.pubkey,
+      realm.account.communityMint,
+      walletPk,
+      predecessorProgramId
+    )
+    return voterWeightPk
+  }
+
+  // this gateway plugin registrar has no predecessor plugin.
+  // The previous voting weight record is the token owner record
+  return getTokenOwnerRecordAddress(
+    realm.owner,
+    realm.pubkey,
+    realm.account.communityMint,
+    walletPk
+  )
 }
 
 export const getVoteInstruction = async (
   client: GatewayClient,
   gatewayToken: PublicKey,
   realm: ProgramAccount<Realm>,
-  walletPk: PublicKey,
-  proposalPk: PublicKey
+  walletPk: PublicKey
 ) => {
   // Throw if the user has no gateway token (TODO handle this later)
   if (!gatewayToken) throw new Error(`Unable to vote: No Gateway Token found`)
 
   // get the user's voter weight account address
-  const { voterWeightPk } = await getGatewayVoterWeightRecord(
+  const { voterWeightPk } = await getVoterWeightRecord(
     realm.pubkey,
     realm.account.communityMint,
     walletPk,
     client.program.programId
   )
 
   // Get the registrar for the realm
-  const { registrar } = await getGatewayRegistrarPDA(
+  const { registrar } = await getRegistrarPDA(
     realm.pubkey,
     realm.account.communityMint,
     client.program.programId
   )
 
-  // call updateVoterWeightRecord on the plugin
+  // the previous voting weight record in the chain of plugins,
+  // or the token owner record if this is the first plugin in the chain
+  const inputVoterWeight = await getPreviousVotingWeightRecord(
+    client,
+    realm,
+    walletPk
+  )
+
+  // call updateVotingWeightRecord on the plugin
   return client.program.methods
-    .updateVoterWeightRecord({ castVote: {} }, proposalPk)
+    .updateVoterWeightRecord()
     .accounts({
       registrar,
       voterWeightRecord: voterWeightPk,
+      inputVoterWeight,
       gatewayToken,
     })
     .instruction()

Strategies/components/DepositModal.tsx

@@ -4,6 +4,7 @@ import SolendModalContent from './SolendModalContent'
 import MangoDeposit from './MangoDepositComponent'
 import BigNumber from 'bignumber.js'
 import { SolendStrategy } from 'Strategies/types/types'
+import EverlendModalContent from './EverlendModalContent'
 
 const DepositModal = ({
   onClose,
@@ -49,6 +50,14 @@ const DepositModal = ({
           createProposalFcn={createProposalFcn}
         ></MangoDeposit>
       ) : null}
+      {protocolName === 'Everlend' ? (
+        <EverlendModalContent
+          proposedInvestment={proposedInvestment}
+          governedTokenAccount={governedTokenAccount}
+          handledMint={handledMint}
+          createProposalFcn={createProposalFcn}
+        />
+      ) : null}
     </Modal>
   )
 }

Strategies/components/EverlendModalContent.tsx

@@ -0,0 +1,85 @@
+import ButtonGroup from '@components/ButtonGroup'
+import { useEffect, useState } from 'react'
+import { TreasuryStrategy } from 'Strategies/types/types'
+import { CreateEverlendProposal } from 'Strategies/protocols/everlend/tools'
+import { AssetAccount } from '@utils/uiTypes/assets'
+import EverlendDeposit from './everlend/EverlendDeposit'
+import EverlendWithdraw from './everlend/EverlendWithdraw'
+import { findAssociatedTokenAccount } from '@everlend/common'
+import { PublicKey } from '@solana/web3.js'
+import useWalletStore from 'stores/useWalletStore'
+
+enum Tabs {
+  DEPOSIT = 'Deposit',
+  WITHDRAW = 'Withdraw',
+}
+
+interface IProps {
+  proposedInvestment: TreasuryStrategy & { poolMint: string }
+  handledMint: string
+  createProposalFcn: CreateEverlendProposal
+  governedTokenAccount: AssetAccount
+}
+
+const EverlendModalContent = ({
+  proposedInvestment,
+  handledMint,
+  createProposalFcn,
+  governedTokenAccount,
+}: IProps) => {
+  const [selectedTab, setSelectedTab] = useState(Tabs.DEPOSIT)
+  const [depositedAmount, setDepositedAmount] = useState(0)
+  const tabs = Object.values(Tabs)
+  const connection = useWalletStore((s) => s.connection)
+
+  const isSol = governedTokenAccount.isSol
+  const owner = isSol
+    ? governedTokenAccount!.pubkey
+    : governedTokenAccount!.extensions!.token!.account.owner
+
+  useEffect(() => {
+    const loadMaxAmount = async () => {
+      const tokenMintATA = await findAssociatedTokenAccount(
+        owner,
+        new PublicKey(proposedInvestment.poolMint)
+      )
+      const tokenMintATABalance = await connection.current.getTokenAccountBalance(
+        tokenMintATA
+      )
+      setDepositedAmount(Number(tokenMintATABalance.value.uiAmount))
+    }
+    loadMaxAmount()
+  }, [proposedInvestment, handledMint])
+
+  return (
+    <div>
+      <div className="pb-4">
+        <ButtonGroup
+          activeValue={selectedTab}
+          onChange={(tab) => setSelectedTab(tab)}
+          values={tabs}
+        />
+      </div>
+      {selectedTab === Tabs.DEPOSIT && (
+        <EverlendDeposit
+          proposedInvestment={proposedInvestment}
+          createProposalFcn={createProposalFcn}
+          governedTokenAccount={governedTokenAccount}
+          handledMint={handledMint}
+          depositedAmount={depositedAmount}
+        />
+      )}
+      {selectedTab === Tabs.WITHDRAW && (
+        <EverlendWithdraw
+          proposedInvestment={proposedInvestment}
+          createProposalFcn={createProposalFcn}
+          governedTokenAccount={governedTokenAccount}
+          handledMint={handledMint}
+          depositedAmount={depositedAmount}
+        />
+      )}
+    </div>
+  )
+}
+
+export default EverlendModalContent

Strategies/components/MangoDepositComponent.tsx

@@ -11,7 +11,6 @@ import useGovernanceAssets from '@hooks/useGovernanceAssets'
 import useQueryContext from '@hooks/useQueryContext'
 import useRealm from '@hooks/useRealm'
 import { getProgramVersionForRealm } from '@models/registry/api'
-import { BN } from '@project-serum/anchor'
 import {
   getNativeTreasuryAddress,
   RpcContext,
@@ -90,9 +89,7 @@ const MangoDepositComponent = ({
   const wallet = useWalletStore((s) => s.current)
   const tokenInfo = tokenService.getTokenInfo(handledMint)
   const { canUseTransferInstruction } = useGovernanceAssets()
-  const treasuryAmount = governedTokenAccount.extensions?.token
-    ? governedTokenAccount.extensions.token.account.amount
-    : new BN(0)
+  const treasuryAmount = governedTokenAccount.extensions.amount!
   const mintInfo = governedTokenAccount.extensions?.mint?.account
   const [form, setForm] = useState({
     title: '',