hedge-web3 0.2.24 → 0.2.26

package/src/instructions/depositVault.ts

@@ -1,27 +1,21 @@
 import { BN, Program, Provider } from '@project-serum/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'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import {
-  findAssociatedTokenAddress,
-  getVaultTypeAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
+  findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
-import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function depositVault(
   program: Program<Vault>,
@@ -31,7 +25,7 @@ export async function depositVault(
   depositAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   // Prep the user to get USH back out at some point
   await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
@@ -46,19 +40,28 @@ export async function depositVault(
     true
   )
 
-  const payerTokenAccount = await findAssociatedTokenAddress(payer.publicKey, vaultTypeAccountInfo.collateralMint)
+  const payerTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    payer.publicKey,
+    vaultTypeAccountInfo.collateralMint
+  )
   const vaultAssociatedCollateralAccountPublicKey = await findAssociatedTokenAddress(
+    program.programId,
     vaultPublicKey,
     vaultTypeAccountInfo.collateralMint
   )
 
   const history = Keypair.generate()
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   const wrappedSolAccount = Keypair.generate()
 
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    program.programId,
+    await getHedgeMintPublicKey(program.programId)
+  )
   const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     hedgeStakingPoolPublicKey,
     ushMintPublickey
   )
@@ -99,7 +102,9 @@ export async function depositVault(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
-      vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString() ? wrappedSolAccount.publicKey : payerTokenAccount,
+      vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()
+        ? wrappedSolAccount.publicKey
+        : payerTokenAccount,
       vaultPublicKey,
       vaultAssociatedCollateralAccountPublicKey,
       history.publicKey,

package/src/instructions/initHedgeFoundation.ts

@@ -2,25 +2,23 @@ import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey,
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey,
   getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function initHedgeFoundation(program: Program<Vault>, provider: Provider, payer: Signer): Promise<PublicKey> {
   const poolEra = Keypair.generate()
@@ -37,13 +35,17 @@ export async function initHedgeFoundationInstruction(
   poolEraPublicKey: PublicKey,
   payerPublicKey: PublicKey
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const poolStatePublickey = await getLiquidationPoolStatePublicKey()
-  const poolUshTokenAccount = await getLiquidationPoolUshAccountPublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const founderHedgeTokenAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
-  const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const poolStatePublickey = await getLiquidationPoolStatePublicKey(program.programId)
+  const poolUshTokenAccount = await getLiquidationPoolUshAccountPublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId)
+  const founderHedgeTokenAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, hedgeMintPublickey)
+  const communityHedgeTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    vaultSystemStatePublicKey,
+    hedgeMintPublickey
+  )
 
   return await program.methods
     .initHedgeFoundation()

package/src/instructions/initHedgeFoundationTokens.ts

@@ -2,23 +2,17 @@ import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   findAssociatedTokenAddress,
-  getHedgeMintPublicKey,
-  getLiquidationPoolStatePublicKey,
-  getLiquidationPoolUshAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
+  getHedgeMintPublicKey, getVaultSystemStatePublicKey
 } from '../Constants'
+import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function initHedgeFoundationTokens(program: Program, provider: Provider, payer: Signer): Promise<PublicKey> {
@@ -33,10 +27,14 @@ export async function initHedgeFoundationTokensInstruction(
   program: Program,
   payerPublicKey: PublicKey
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const founderHedgeTokenAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
-  const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId)
+  const founderHedgeTokenAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, hedgeMintPublickey)
+  const communityHedgeTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    vaultSystemStatePublicKey,
+    hedgeMintPublickey
+  )
 
   return await program.methods
     .initHedgeFoundationTokens()

package/src/instructions/liquidateVault.ts

@@ -1,28 +1,23 @@
-import { BN, Program, Provider, translateAddress } from '@project-serum/anchor'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
+import { BN, Program, Provider } from '@project-serum/anchor'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  Connection,
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import {
   getHedgeMintPublicKey,
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey,
-  getPoolPublicKeyForMint,
-  getVaultTypeAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function liquidateVault(
   program: Program<Vault>,
@@ -36,10 +31,10 @@ export async function liquidateVault(
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const collateralMint = vaultTypeAccountInfo.collateralMint
 
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublickey)
+  const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey(program.programId)
   const poolStateInfo = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
 
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -152,9 +147,9 @@ export async function liquidateVaultInstruction(
   vaultTypeAccount: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey(program.programId)
 
   return await program.methods
     .liquidateVault(

package/src/instructions/loanVault.ts

@@ -2,30 +2,20 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey,
-  getPoolPublicKeyForMint,
-  getVaultTypeAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  HEDGE_PROGRAM_PUBLICKEY,
-  getReferralStatePublicKey,
-  getReferralAccountPublicKey,
-  getUserReferralAccountPublicKey,
+  getPoolPublicKeyForMint, getReferralAccountPublicKey, getReferralStatePublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
-import { parseAnchorErrors } from '../utils/Errors'
-import { VaultAccount } from '../state/VaultAccount'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function loanVault(
   program: Program<Vault>,
@@ -34,9 +24,9 @@ export async function loanVault(
   vaultPublicKey: PublicKey,
   loanAmount: number,
   overrideTime?: number,
-  referrer?: PublicKey,
+  referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -74,11 +64,11 @@ export async function loanVault(
   )
 
   let referralAccountPublicKey = null
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
   if (typeof referrer === 'undefined') {
-    referralAccountPublicKey = await getReferralAccountPublicKey(vaultSystemStatePublicKey)  
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, vaultSystemStatePublicKey)
   } else {
-    referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
   }
 
   const history = Keypair.generate()
@@ -120,16 +110,17 @@ export async function loanVaultInstruction(
   referralAccountPublicKey: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublickey)
   const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     hedgeStakingPoolPublicKey,
     ushMintPublickey
   )
-  const referralStatePublicKey = await getReferralStatePublicKey()
-  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(payerPublicKey)
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
+  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(program.programId, payerPublicKey)
 
   return await program.methods
     .loanVault(

package/src/instructions/psmEditAccount.ts

@@ -1,27 +1,19 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import {
-  findAssociatedTokenAddress,
   getHedgeMintPublicKey,
   getPoolPublicKeyForMint,
   getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  HEDGE_PROGRAM_PUBLICKEY,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
-import { parseAnchorErrors } from '../utils/Errors'
-import { VaultAccount } from '../state/VaultAccount'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export enum psmStatus {
     PsmEnabled,
@@ -41,7 +33,7 @@ export async function psmEditAccount(
   minSwap: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId, )
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -61,7 +53,7 @@ export async function psmEditAccount(
   const enc = new TextEncoder()
   const [psmAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
-    HEDGE_PROGRAM_PUBLICKEY
+    program.programId
   )
 
   const psmAccountAta = await getOrCreateAssociatedTokenAccount(
@@ -100,9 +92,9 @@ export async function psmEditAccountInstruction(
   minSwap: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId, )
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId, )
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublickey)
 
 
   return await program.methods

package/src/instructions/psmMintUsh.ts

@@ -1,15 +1,11 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey,
@@ -17,13 +13,10 @@ import {
   getReferralAccountPublicKey,
   getReferralStatePublicKey,
   getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  HEDGE_PROGRAM_PUBLICKEY,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
-import { parseAnchorErrors } from '../utils/Errors'
-import { VaultAccount } from '../state/VaultAccount'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function psmMintUsh(
   program: Program<Vault>,
@@ -34,7 +27,7 @@ export async function psmMintUsh(
   overrideTime?: number,
   referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -50,30 +43,23 @@ export async function psmMintUsh(
     payer.publicKey
   )
 
-
   const enc = new TextEncoder()
   const [psmAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
-    HEDGE_PROGRAM_PUBLICKEY
+    program.programId
   )
 
-  const psmAccountAta = await getOrCreateAssociatedTokenAccount(
-    provider.connection,
-    payer,
-    collateralMint,
-    psmAccount,
-    true
-  )
+  const psmAccountAta = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, psmAccount, true)
 
   let referralAccountPublicKey
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
   if (!referrer) {
-    referralAccountPublicKey = await getReferralAccountPublicKey(vaultSystemStatePublicKey)  
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, vaultSystemStatePublicKey)
   } else {
-    referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
   }
 
-  const referralStatePublicKey = await getReferralStatePublicKey()
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
 
   const transaction = new Transaction().add(
     await psmMintUshInstruction(
@@ -101,27 +87,19 @@ export async function psmMintUshInstruction(
   referralAccountPublicKey: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublickey)
   const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     hedgeStakingPoolPublicKey,
     ushMintPublickey
   )
-  const psmAccountAta = await findAssociatedTokenAddress(
-    psmAccount,
-    collateralMint
-  )
-  const ownerCollateralAccount = await findAssociatedTokenAddress(
-    payerPublicKey,
-    collateralMint
-  )
+  const psmAccountAta = await findAssociatedTokenAddress(program.programId, psmAccount, collateralMint)
+  const ownerCollateralAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, collateralMint)
 
-  const ownerUshAccount = await findAssociatedTokenAddress(
-    payerPublicKey,
-    ushMintPublickey
-  ) 
+  const ownerUshAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, ushMintPublickey)
 
   return await program.methods
     .psmMintUsh(

package/src/instructions/psmRedeemUsh.ts

@@ -1,29 +1,20 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey,
-  getPoolPublicKeyForMint,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  HEDGE_PROGRAM_PUBLICKEY,
-  getReferralAccountPublicKey,
-  getReferralStatePublicKey
+  getPoolPublicKeyForMint, getReferralAccountPublicKey,
+  getReferralStatePublicKey, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
 } from '../Constants'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 import { Vault } from '../idl/vault'
-import { parseAnchorErrors } from '../utils/Errors'
-import { VaultAccount } from '../state/VaultAccount'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function psmRedeemUsh(
   program: Program<Vault>,
@@ -34,7 +25,7 @@ export async function psmRedeemUsh(
   overrideTime?: number,
   referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -50,30 +41,23 @@ export async function psmRedeemUsh(
     payer.publicKey
   )
 
-
   const enc = new TextEncoder()
   const [psmAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralMint.toString().slice(0, 12)), enc.encode('PSM')],
-    HEDGE_PROGRAM_PUBLICKEY
+    program.programId
   )
 
-  const psmAccountAta = await getOrCreateAssociatedTokenAccount(
-    provider.connection,
-    payer,
-    collateralMint,
-    psmAccount,
-    true
-  )
+  const psmAccountAta = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, psmAccount, true)
 
   let referralAccountPublicKey
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
   if (!referrer) {
-    referralAccountPublicKey = await getReferralAccountPublicKey(vaultSystemStatePublicKey)  
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, vaultSystemStatePublicKey)
   } else {
-    referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
   }
 
-  const referralStatePublicKey = await getReferralStatePublicKey()
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
 
   const transaction = new Transaction().add(
     await psmRedeemUshInstruction(
@@ -101,27 +85,19 @@ export async function psmRedeemUshInstruction(
   referralAccountPublicKey: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const hedgeMintPublickey = await getHedgeMintPublicKey(program.programId)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublickey)
   const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     hedgeStakingPoolPublicKey,
     ushMintPublickey
   )
-  const psmAccountAta = await findAssociatedTokenAddress(
-    psmAccount,
-    collateralMint
-  )
-  const ownerCollateralAccount = await findAssociatedTokenAddress(
-    payerPublicKey,
-    collateralMint
-  )
+  const psmAccountAta = await findAssociatedTokenAddress(program.programId, psmAccount, collateralMint)
+  const ownerCollateralAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, collateralMint)
 
-  const ownerUshAccount = await findAssociatedTokenAddress(
-    payerPublicKey,
-    ushMintPublickey
-  ) 
+  const ownerUshAccount = await findAssociatedTokenAddress(program.programId, payerPublicKey, ushMintPublickey)
 
   return await program.methods
     .psmRedeemUsh(