hedge-web3 0.2.24 → 0.2.26

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -1,27 +1,21 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   getHedgeMintPublicKey,
   getLiquidationPoolStatePublicKey,
-  getLiquidationPoolUshAccountPublicKey,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-  getReferralAccountPublicKey,
-  getUserReferralAccountPublicKey,
-  getReferralStatePublicKey
+  getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey, 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 closeLiquidationPoolPosition(
   program: Program<Vault>,
@@ -31,19 +25,19 @@ export async function closeLiquidationPoolPosition(
   overrideStartTime?: number,
   referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     ushMintPublickey,
     payer.publicKey
   )
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const referralStatePublicKey = await getReferralStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
   const liquidationPositionAccount = await program.account.liquidationPosition.fetch(poolPosition)
   const poolEra = liquidationPositionAccount.era
 
-  const hedgeMint = await getHedgeMintPublicKey()
+  const hedgeMint = await getHedgeMintPublicKey(program.programId)
   const payerAssociatedHedgeAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -60,13 +54,13 @@ export async function closeLiquidationPoolPosition(
 
   let referralAccountPublicKey = null
   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 transaction = new Transaction().add(
     await closeLiquidationPoolPositionInstruction(
@@ -100,11 +94,11 @@ export async function closeLiquidationPoolPositionInstruction(
   referralStatePublicKey: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMint = await getUshMintPublicKey()
-  const hedgeMint = await getHedgeMintPublicKey()
-  const poolUshAccount = await getLiquidationPoolUshAccountPublicKey()
-  const poolState = await getLiquidationPoolStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMint = await getUshMintPublicKey(program.programId)
+  const hedgeMint = await getHedgeMintPublicKey(program.programId)
+  const poolUshAccount = await getLiquidationPoolUshAccountPublicKey(program.programId)
+  const poolState = await getLiquidationPoolStatePublicKey(program.programId)
 
   return await program.methods
     .closeLiquidationPoolPosition(

package/src/instructions/createReferralAccount.ts

@@ -1,29 +1,20 @@
-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 { 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 {
-  getVaultSystemStatePublicKey,
-  getReferralAccountPublicKey,
-  getHedgeMintPublicKey,
-  getReferralStatePublicKey,
-  getUserReferralAccountPublicKey
+  getHedgeMintPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUserReferralAccountPublicKey, getVaultSystemStatePublicKey
 } from '../Constants'
 
+import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
-import { Vault } from '../idl/vault'
-
-
 
 /** @type {Function}  - Creates a new referral account.
  * This checks the user has enough HDG in their wallet or staked and
@@ -36,7 +27,7 @@ import { Vault } from '../idl/vault'
  * - poolPublicKey: PublicKey : a key to a pool position. If the position is closed or does not belong to the signer it will be ignored
  * - referrer: PublicKey
  * - overrideTime?: number
-*/
+ */
 export async function createReferralAccount(
   program: Program<Vault>,
   provider: Provider,
@@ -44,24 +35,23 @@ export async function createReferralAccount(
   poolPosition: PublicKey,
   overrideTime?: number
 ): Promise<PublicKey> {
-  // setup transaction  
+  // setup transaction
   const transaction = new Transaction()
   const signers = [payer]
   const referrer = payer.publicKey
 
   // Setup public keys
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   // Find referral account
-  let referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
-
+  let referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
 
   // Get the referral state PDA
-  const referallStatePublicKey = await getReferralStatePublicKey()
+  const referallStatePublicKey = await getReferralStatePublicKey(program.programId)
 
   // Get HDG mint public key
-  const hedgeMintPublicKey = await getHedgeMintPublicKey()
-  
+  const hedgeMintPublicKey = await getHedgeMintPublicKey(program.programId)
+
   // Get HDG account of signer
   const payerHdgAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -71,8 +61,8 @@ export async function createReferralAccount(
   )
 
   // Derive the user referral account public key
-  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(payer.publicKey)
-  
+  const userReferralAccountPublicKey = await getUserReferralAccountPublicKey(program.programId, payer.publicKey)
+
   transaction.add(
     await createReferralAccountInstruction(
       program,
@@ -87,12 +77,10 @@ export async function createReferralAccount(
     )
   )
 
-
   await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return referralAccountPublicKey
 }
 
-
 export async function createReferralAccountInstruction(
   program: Program<Vault>,
   payerPublicKey: PublicKey,
@@ -104,7 +92,7 @@ export async function createReferralAccountInstruction(
   userReferralAccountPublicKey: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   return await program.methods
     .createReferralAccount(

package/src/instructions/createStakingPool.ts

@@ -1,23 +1,21 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
-import { parseAnchorErrors } from '../utils/Errors'
 import {
   findAssociatedTokenAddress,
   getPoolPublicKeyForMint,
   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 createStakingPool(
   program: Program<Vault>,
@@ -31,7 +29,7 @@ export async function createStakingPool(
     await createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime)
   )
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
-  const [poolPublickey] = await getPoolPublicKeyForMint(mintPublicKey)
+  const [poolPublickey] = await getPoolPublicKeyForMint(program.programId, mintPublicKey)
   return poolPublickey
 }
 
@@ -42,12 +40,12 @@ export async function createStakingPoolInstruction(
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const ushMintPublickey = await getUshMintPublicKey()
-  const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
+  const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(program.programId, mintPublicKey)
 
-  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(poolPublickey, mintPublicKey)
-  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(poolPublickey, ushMintPublickey)
+  const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, mintPublicKey)
+  const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, ushMintPublickey)
   return await program.methods
     .createStakingPool(poolBump, new BN(hedgeTokensToBeMinted), new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)))
     .accounts({

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,10 +1,9 @@
-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,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -14,17 +13,17 @@ import {
 import {
   findAssociatedTokenAddress,
   findVaultAddress,
-  getVaultTypeAccountPublicKey,
+  getHedgeMintPublicKey,
+  getPoolPublicKeyForMint,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
-  getPoolPublicKeyForMint,
-  getHedgeMintPublicKey,
+  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 +33,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 +63,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,11 +130,11 @@ 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 { blockhash, lastValidBlockHeight } = await program.provider.connection.getLatestBlockhash()
   const transaction = new Transaction({
     feePayer: payerPublicKey,
     recentBlockhash: blockhash,
@@ -134,7 +145,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 +154,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 +247,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(