hedge-web3 0.2.24 → 0.2.25

package/src/instructions/createUserReferralAccount.ts

@@ -1,26 +1,17 @@
-import { BN, Idl, Program, Provider } from '@project-serum/anchor'
-import { TokenInstructions } from '@project-serum/serum'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
+import { BN, Program, Provider } from '@project-serum/anchor'
+import { 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 {
-  getVaultSystemStatePublicKey,
-  getReferralAccountPublicKey,
-  getUserReferralAccountPublicKey
-} from '../Constants'
+import { getReferralAccountPublicKey, getUserReferralAccountPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
-import { v4 as uuidv4 } from 'uuid'
+import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
-import { Vault } from '../idl/vault'
 
 export async function createUserReferralAccount(
   program: Program<Vault>,
@@ -29,21 +20,21 @@ export async function createUserReferralAccount(
   referrer?: PublicKey,
   overrideTime?: number
 ): Promise<PublicKey> {
-  // setup transaction  
+  // setup transaction
   const transaction = new Transaction()
   const signers = [payer]
 
   // Find referrer account
   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)
   }
 
   // Derive the user referral account public key
-  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(payer.publicKey)
+  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(program.programId, payer.publicKey)
 
   transaction.add(
     await createUserReferralAccountInstruction(
@@ -55,12 +46,10 @@ export async function createUserReferralAccount(
     )
   )
 
-
   await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return userReferralAccountPublicKey
 }
 
-
 export async function createUserReferralAccountInstruction(
   program: Program<Vault>,
   payerPublicKey: PublicKey,
@@ -68,11 +57,11 @@ export async function createUserReferralAccountInstruction(
   userReferralAccount: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   return await program.methods
     .createUserReferralAccount(
-        new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
+      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({
       signer: payerPublicKey,

package/src/instructions/createVault.ts

@@ -1,30 +1,24 @@
-import { BN, Idl, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@project-serum/anchor'
 import { TokenInstructions } from '@project-serum/serum'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, 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 {
   findAssociatedTokenAddress,
-  findVaultAddress,
-  getVaultTypeAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
+  findVaultAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey,
+  getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
 } from '../Constants'
 
 import { v4 as uuidv4 } from 'uuid'
+import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
-import { Vault } from '../idl/vault'
 
 export async function createVault(
   program: Program<Vault>,
@@ -34,20 +28,25 @@ export async function createVault(
   depositAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const salt = uuidv4().substring(0, 8)
-  const newVaultPublicKey = await findVaultAddress(salt)
+  const newVaultPublicKey = await findVaultAddress(program.programId, salt)
   const history = Keypair.generate()
 
   // Prep the user to get USH back out at some point
   await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(collateralType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(program.programId, collateralType)
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
 
-  const payerTokenAccount = await findAssociatedTokenAddress(payer.publicKey, vaultTypeAccountInfo.collateralMint)
+  const payerTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    payer.publicKey,
+    vaultTypeAccountInfo.collateralMint
+  )
   const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     newVaultPublicKey,
     vaultTypeAccountInfo.collateralMint
   )
@@ -59,8 +58,15 @@ export async function createVault(
 
   const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === TokenInstructions.WRAPPED_SOL_MINT.toString()
 
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const feePoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(hedgeStakingPoolPublicKey, ushMintPublickey)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    program.programId,
+    await getHedgeMintPublicKey(program.programId)
+  )
+  const feePoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    hedgeStakingPoolPublicKey,
+    ushMintPublickey
+  )
 
   if (isWrappedSol) {
     transaction.add(
@@ -119,9 +125,9 @@ export async function buildCreateVaultTransaction(
   overrideTime?: number
 ): Promise<[Transaction, Signer[], PublicKey]> {
   console.log('HEDGE SDK: buildCreateVaultTransaction')
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
   const salt = uuidv4().substring(0, 8)
-  const newVaultPublicKey = await findVaultAddress(salt)
+  const newVaultPublicKey = await findVaultAddress(program.programId, salt)
   const history = Keypair.generate() as Signer
   const { blockhash } = await program.provider.connection.getLatestBlockhash()
   const transaction = new Transaction({
@@ -134,7 +140,7 @@ export async function buildCreateVaultTransaction(
   console.log('Lookup getVaultTypeAccountPublicKey', collateralType)
 
   // Lookup the vault type info
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(collateralType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(program.programId, collateralType)
 
   console.log('Lookup vaultTypeAccountPublicKey', vaultTypeAccountPublicKey.toString())
 
@@ -143,14 +149,26 @@ export async function buildCreateVaultTransaction(
 
   const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === TokenInstructions.WRAPPED_SOL_MINT.toString()
 
-  const payerTokenAccount = await findAssociatedTokenAddress(payerPublicKey, vaultTypeAccountInfo.collateralMint)
+  const payerTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    payerPublicKey,
+    vaultTypeAccountInfo.collateralMint
+  )
   const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     newVaultPublicKey,
     vaultTypeAccountInfo.collateralMint
   )
 
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const feePoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(hedgeStakingPoolPublicKey, ushMintPublickey)
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    program.programId,
+    await getHedgeMintPublicKey(program.programId)
+  )
+  const feePoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    hedgeStakingPoolPublicKey,
+    ushMintPublickey
+  )
 
   console.log('about to start building transaction')
 
@@ -224,7 +242,7 @@ export async function createVaultInstruction(
   depositAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   return await program.methods
     .createVault(

package/src/instructions/depositLiquidationPool.ts

@@ -2,35 +2,28 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer,
+  SystemProgram, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   getLiquidationPoolStatePublicKey,
-  getLiquidationPoolUshAccountPublicKey,
-  getUserReferralAccountPublicKey,
-  getReferralAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
+  getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
+  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 depositLiquidationPool(
   program: Program<Vault>,
   provider: Provider,
   payer: Signer,
-  depositAmount: BN,
+  depositAmount: number,
   overrideStartTime?: number,
   referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -39,15 +32,15 @@ export async function depositLiquidationPool(
   )
 
   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)
   }
 
   // Derive the user referral account public key
-  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(payer.publicKey)
+  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(program.programId, payer.publicKey)
 
   const poolPosition = Keypair.generate()
   const transaction = new Transaction().add(
@@ -78,11 +71,11 @@ export async function depositLiquidationPoolInstruction(
   referralAccountPublicKey: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
+  const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey(program.programId)
   const liquidationPoolState = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
 
-  const poolUSHAccount = await getLiquidationPoolUshAccountPublicKey()
-  const ushMint = await getUshMintPublicKey()
+  const poolUSHAccount = await getLiquidationPoolUshAccountPublicKey(program.programId)
+  const ushMint = await getUshMintPublicKey(program.programId)
 
   return await program.methods
     .depositLiquidationPool(

package/src/instructions/depositStakingPool.ts

@@ -1,19 +1,15 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
-  SystemProgram,
-  SYSVAR_RENT_PUBKEY,
-  Transaction,
-  TransactionInstruction,
+  PublicKey, Signer,
+  SystemProgram, Transaction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import { findAssociatedTokenAddress, getPoolPublicKeyForMint, 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 depositStakingPool(
   program: Program<Vault>,
@@ -46,10 +42,18 @@ export async function depositStakingPoolInstruction(
   depositAmount: BN,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const [poolPublickey] = await getPoolPublicKeyForMint(stakedTokenMintPublicKey)
-  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, stakedTokenMintPublicKey)
-  const payersArbitraryTokenAccount = await findAssociatedTokenAddress(payerPublicKey, stakedTokenMintPublicKey)
-  const vaultSystemState = await getVaultSystemStatePublicKey()
+  const [poolPublickey] = await getPoolPublicKeyForMint(program.programId, stakedTokenMintPublicKey)
+  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    poolPublickey,
+    stakedTokenMintPublicKey
+  )
+  const payersArbitraryTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    payerPublicKey,
+    stakedTokenMintPublicKey
+  )
+  const vaultSystemState = await getVaultSystemStatePublicKey(program.programId)
 
   return await program.methods
     .depositStakingPool(

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(