hedge-web3 0.2.31 → 0.3.0

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './Constants'
+export * from './HedgeConstants'
 export * from './HedgeDecimal'
 export * from './idl/vault'
 export * from './instructions/claimLiquidationPoolPosition'
@@ -24,15 +24,6 @@ export * from './instructions/refreshOraclePrice'
 export * from './instructions/repayVault'
 export * from './instructions/setHalted'
 export * from './instructions/transferVault'
-export * from './instructions/createCompoundStakingPool'
-export * from './instructions/createCompoundStakingPoolPosition'
-export * from './instructions/depositCompoundStakingPoolPosition'
-export * from './instructions/withdrawCompoundStakingPoolPosition'
-export * from './instructions/setDelegateWallet'
-export * from './instructions/setCompoundPoolActive'
-export * from './instructions/adminWithdrawCol'
-export * from './instructions/adminWithdrawUsh'
-export * from './instructions/depositRewardsToCompoundPool'
 export * from './instructions/updateReferralAccount'
 export * from './instructions/updateReferralState'
 export * from './instructions/updateVaultType'
@@ -46,3 +37,5 @@ export * from './state/StakingPoolPosition'
 export * from './state/VaultAccount'
 export * from './state/VaultHistoryEvent'
 export * from './utils/getLinkedListAccounts'
+
+

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -10,7 +10,7 @@ import {
 import {
   findAssociatedTokenAddress, getLiquidationPoolStatePublicKey,
   getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/claimStakingPoolPosition.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -10,7 +10,7 @@ import {
 import {
   getHedgeMintPublicKey, getPoolPublicKeyForMint,
   getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/closeClaimedLiquidationPoolPosition.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { PublicKey, Signer, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -12,7 +12,7 @@ import {
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/createReferralAccount.ts

@@ -1,14 +1,16 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import {
-  getCompoundPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
-  getReferralAccountPublicKey,
-  getReferralStatePublicKey,
-  getUserReferralAccountPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  PublicKey, Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction
+} from '@solana/web3.js'
+import {
+  getHedgeMintPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUserReferralAccountPublicKey, getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
@@ -31,7 +33,6 @@ export async function createReferralAccount(
   provider: Provider,
   payer: Signer,
   poolPosition: PublicKey,
-  stakedTokenMintPublicKey: PublicKey,
   overrideTime?: number
 ): Promise<PublicKey> {
   // setup transaction
@@ -67,7 +68,6 @@ export async function createReferralAccount(
       program,
       payer.publicKey,
       poolPosition,
-      stakedTokenMintPublicKey,
       referralAccountPublicKey,
       referallStatePublicKey,
       hedgeMintPublicKey,
@@ -85,7 +85,6 @@ export async function createReferralAccountInstruction(
   program: Program<Vault>,
   payerPublicKey: PublicKey,
   poolPositionPublicKey: PublicKey,
-  stakedTokenMintPublicKey: PublicKey,
   referralAccountPublicKey: PublicKey,
   referralStatePublicKey: PublicKey,
   hedgeMintPublicKey: PublicKey,
@@ -94,7 +93,6 @@ export async function createReferralAccountInstruction(
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
-  const [poolPublickey] = await getCompoundPoolPublicKeyForMint(program.programId, stakedTokenMintPublicKey)
 
   return await program.methods
     .createReferralAccount(
@@ -107,8 +105,6 @@ export async function createReferralAccountInstruction(
       referralAccount: referralAccountPublicKey,
       userReferralAccount: userReferralAccountPublicKey,
       poolPosition: poolPositionPublicKey,
-      pool: poolPublickey,
-      stakedTokenMint: stakedTokenMintPublicKey,
       hedgeMint: hedgeMintPublicKey,
       hdgAta: hdgAssociatedTokenAccountPublicKey,
       systemProgram: SystemProgram.programId,

package/src/instructions/createStakingPool.ts

@@ -1,12 +1,18 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  PublicKey, Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction
+} from '@solana/web3.js'
 import {
   findAssociatedTokenAddress,
   getPoolPublicKeyForMint,
   getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
@@ -37,6 +43,7 @@ export async function createStakingPoolInstruction(
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
   const ushMintPublickey = await getUshMintPublicKey(program.programId)
   const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(program.programId, mintPublicKey)
+
   const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, mintPublicKey)
   const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, ushMintPublickey)
   return await program.methods

package/src/instructions/createUserReferralAccount.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -7,7 +7,7 @@ import {
   Transaction,
   TransactionInstruction
 } from '@solana/web3.js'
-import { getReferralAccountPublicKey, getUserReferralAccountPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { getReferralAccountPublicKey, getUserReferralAccountPublicKey, getVaultSystemStatePublicKey } from '../HedgeConstants'
 
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'

package/src/instructions/createVault.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { TokenInstructions } from '@project-serum/serum'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
@@ -18,7 +18,7 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
   getVaultTypeAccountPublicKey,
-} from '../Constants'
+} from '../HedgeConstants'
 
 import { v4 as uuidv4 } from 'uuid'
 import { Vault } from '../idl/vault'

package/src/instructions/depositLiquidationPool.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -10,7 +10,7 @@ import {
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/depositStakingPool.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -6,7 +6,7 @@ import {
   SystemProgram, Transaction,
   TransactionInstruction
 } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/depositVault.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { TokenInstructions } from '@project-serum/serum'
 import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
@@ -12,7 +12,7 @@ import {
 import {
   findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/initHedgeFoundation.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -15,7 +15,7 @@ import {
   getLiquidationPoolUshAccountPublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/initHedgeFoundationTokens.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -11,7 +11,7 @@ import {
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey, getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 

package/src/instructions/liquidateVault.ts

@@ -1,23 +1,20 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  ComputeBudgetProgram,
   Keypair,
-  PublicKey,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
   getHedgeMintPublicKey,
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey,
-  getPoolPublicKeyForMint,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  getPoolPublicKeyForMint, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
@@ -40,11 +37,6 @@ export async function liquidateVault(
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey(program.programId)
   const poolStateInfo = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
 
-  const additionalComputationBudget = ComputeBudgetProgram.requestUnits({
-    units: 300000,
-    additionalFee: 0,
-  })
-
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -104,32 +96,30 @@ export async function liquidateVault(
   const newEra = Keypair.generate()
   const transaction = new Transaction()
 
-  transaction
-    .add(additionalComputationBudget)
-    .add(
-      await liquidateVaultInstruction(
-        program,
-        payer.publicKey,
-        payerAssociatedTokenAccount.address,
-        vaultPublicKey,
-        vaultAssociatedTokenAccount.address,
-        liquidationPoolStatePublicKey,
-        poolStateInfo.currentEra,
-        poolAssociatedTokenAccount.address,
-        history.publicKey,
-        newEra.publicKey,
-        hedgeStakingPoolPublicKey,
-        feePoolAssociatedTokenAccount.address,
-        hedgeStakingPoolAssociatedUshTokenAccount.address,
-        collateralMint,
-        vaultTypeAssociatedTokenAccount.address,
-        oldSmallerPublicKey,
-        newSmallerPublicKey,
-        newLargerPublicKey,
-        vaultAccount.vaultType,
-        overrideTime
-      )
+  transaction.add(
+    await liquidateVaultInstruction(
+      program,
+      payer.publicKey,
+      payerAssociatedTokenAccount.address,
+      vaultPublicKey,
+      vaultAssociatedTokenAccount.address,
+      liquidationPoolStatePublicKey,
+      poolStateInfo.currentEra,
+      poolAssociatedTokenAccount.address,
+      history.publicKey,
+      newEra.publicKey,
+      hedgeStakingPoolPublicKey,
+      feePoolAssociatedTokenAccount.address,
+      hedgeStakingPoolAssociatedUshTokenAccount.address,
+      collateralMint,
+      vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
+      vaultAccount.vaultType,
+      overrideTime
     )
+  )
 
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history, newEra])
   return vaultPublicKey

package/src/instructions/loanVault.ts

@@ -1,24 +1,18 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  ComputeBudgetProgram,
   Keypair,
-  PublicKey,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey,
-  getPoolPublicKeyForMint,
-  getReferralAccountPublicKey,
-  getReferralStatePublicKey,
-  getUserReferralAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  getPoolPublicKeyForMint, getReferralAccountPublicKey, getReferralStatePublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
@@ -32,11 +26,6 @@ export async function loanVault(
   overrideTime?: number,
   referrer?: PublicKey
 ): Promise<PublicKey> {
-  const additionalComputationBudget = ComputeBudgetProgram.requestUnits({
-    units: 300000,
-    additionalFee: 0,
-  })
-
   const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
@@ -83,26 +72,24 @@ export async function loanVault(
   }
 
   const history = Keypair.generate()
-  const transaction = new Transaction()
-    .add(additionalComputationBudget)
-    .add(
-      await loanVaultInstruction(
-        program,
-        payer.publicKey,
-        payerUshAccount.address,
-        vaultPublicKey,
-        vaultAssociatedTokenAccount.address,
-        history.publicKey,
-        vaultAccount.vaultType,
-        vaultTypeAssociatedTokenAccount.address,
-        oldSmallerPublicKey,
-        newSmallerPublicKey,
-        newLargerPublicKey,
-        new BN(loanAmount),
-        referralAccountPublicKey,
-        overrideTime
-      )
+  const transaction = new Transaction().add(
+    await loanVaultInstruction(
+      program,
+      payer.publicKey,
+      payerUshAccount.address,
+      vaultPublicKey,
+      vaultAssociatedTokenAccount.address,
+      history.publicKey,
+      vaultAccount.vaultType,
+      vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
+      new BN(loanAmount),
+      referralAccountPublicKey,
+      overrideTime
     )
+  )
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }

package/src/instructions/psmEditAccount.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -11,7 +11,7 @@ import {
   getPoolPublicKeyForMint,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
@@ -51,7 +51,7 @@ export async function psmEditAccount(
 
 
   const enc = new TextEncoder()
-  const [psmAccount] = await PublicKey.findProgramAddress(
+  const [psmAccount] = await PublicKey.findProgramAddressSync(
     [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
     program.programId
   )

package/src/instructions/psmMintUsh.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -14,7 +14,7 @@ import {
   getReferralStatePublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
@@ -44,7 +44,7 @@ export async function psmMintUsh(
   )
 
   const enc = new TextEncoder()
-  const [psmAccount] = await PublicKey.findProgramAddress(
+  const [psmAccount] = await PublicKey.findProgramAddressSync(
     [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
     program.programId
   )

package/src/instructions/psmRedeemUsh.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -12,7 +12,7 @@ import {
   getPoolPublicKeyForMint, getReferralAccountPublicKey,
   getReferralStatePublicKey, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
@@ -42,7 +42,7 @@ export async function psmRedeemUsh(
   )
 
   const enc = new TextEncoder()
-  const [psmAccount] = await PublicKey.findProgramAddress(
+  const [psmAccount] = await PublicKey.findProgramAddressSync(
     [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
     program.programId
   )

package/src/instructions/redeemVault.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 // import { TokenInstructions } from '@project-serum/serum'
 import {
@@ -13,7 +13,7 @@ import {
   getHedgeMintPublicKey,
   getPoolPublicKeyForMint, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/referralClaimFees.ts

@@ -1,15 +1,16 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
 import {
-  getCompoundPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
-  getPoolPublicKeyForMint,
-  getReferralAccountPublicKey,
-  getReferralStatePublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  PublicKey, Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction
+} from '@solana/web3.js'
+import {
+  getHedgeMintPublicKey, getPoolPublicKeyForMint, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUshMintPublicKey, getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
@@ -30,8 +31,7 @@ export async function referralClaimFees(
   program: Program<Vault>,
   provider: Provider,
   payer: Signer,
-  poolPosition: PublicKey,
-  stakedTokenMintPublicKey: PublicKey
+  poolPosition: PublicKey
 ): Promise<PublicKey> {
   // setup transaction
   const transaction = new Transaction()
@@ -91,7 +91,6 @@ export async function referralClaimFees(
       payer.publicKey,
       vaultSystemStatePublicKey,
       poolPosition,
-      stakedTokenMintPublicKey,
       referralAccountPublicKey,
       referallStatePublicKey,
       hedgeMintPublicKey,
@@ -113,7 +112,6 @@ export async function referralClaimFeesInstruction(
   payerPublicKey: PublicKey,
   vaultSystemStatePublicKey: PublicKey,
   poolPositionPublicKey: PublicKey,
-  stakedTokenMintPublicKey: PublicKey,
   referralAccountPublicKey: PublicKey,
   referralStatePublicKey: PublicKey,
   hedgeMintPublicKey: PublicKey,
@@ -124,8 +122,6 @@ export async function referralClaimFeesInstruction(
   feePoolPublicKey: PublicKey,
   feePoolAssociatedUshTokenAccountPublicKey: PublicKey
 ): Promise<TransactionInstruction> {
-  const [poolPublickey] = await getCompoundPoolPublicKeyForMint(program.programId, stakedTokenMintPublicKey)
-
   return await program.methods
     .referralClaimFees()
     .accounts({
@@ -139,8 +135,6 @@ export async function referralClaimFeesInstruction(
       ushMint: ushMintPublicKey,
       signerUshAta: ushAssociatedTokenAccountPublicKey,
       communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccountPublicKey,
-      pool: poolPublickey,
-      stakedTokenMint: stakedTokenMintPublicKey,
       feePool: feePoolPublicKey,
       feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccountPublicKey,
       systemProgram: SystemProgram.programId,