hedge-web3 0.2.24 → 0.2.25

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(

package/src/instructions/redeemVault.ts

@@ -3,24 +3,20 @@ import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl
 // import { TokenInstructions } from '@project-serum/serum'
 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,
+  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 redeemVault(
   program: Program<Vault>,
@@ -30,7 +26,7 @@ export async function redeemVault(
   redeemAmount: number,
   transactionOverrideTime?: number
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   // Prep the user to get USH back out at some point
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
@@ -116,11 +112,12 @@ export async function redeemVaultInstruction(
   redeemAmount: BN,
   transactionOverrideTime?: 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
   )

package/src/instructions/referralClaimFees.ts

@@ -1,30 +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 { 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,
-  getUshMintPublicKey,
-  getPoolPublicKeyForMint
+  getHedgeMintPublicKey, getPoolPublicKeyForMint, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUshMintPublicKey, 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}  - Allows a referrer to claims their fees.
  * This checks the user has enough HDG in their wallet or staked and
@@ -36,30 +26,29 @@ import { Vault } from '../idl/vault'
  * - payer: Signer : who we are creating the referral account for
  * - 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
-*/
+ */
 export async function referralClaimFees(
   program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   poolPosition: PublicKey
 ): Promise<PublicKey> {
-  // setup transaction  
+  // setup transaction
   const transaction = new Transaction()
   const signers = [payer]
 
   // General variables
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
 
   // Find referrer account
   const referrer = await payer.publicKey
-  const referralAccountPublicKey = await getReferralAccountPublicKey(referrer)
-
+  const referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
 
   // Derive the user referral account public key
-  const referallStatePublicKey = await getReferralStatePublicKey()
+  const referallStatePublicKey = await getReferralStatePublicKey(program.programId)
+
+  const hedgeMintPublicKey = await getHedgeMintPublicKey(program.programId)
 
-  const hedgeMintPublicKey = await getHedgeMintPublicKey()
-  
   // Get HDG account of signer
   const payerHdgAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -68,7 +57,7 @@ export async function referralClaimFees(
     payer.publicKey
   )
 
-  const ushMintPublicKey = await getUshMintPublicKey()
+  const ushMintPublicKey = await getUshMintPublicKey(program.programId)
 
   // Get USH account of signer
   const payerUshAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -87,8 +76,8 @@ export async function referralClaimFees(
     true
   )
 
-  const [feePoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublicKey)
-  
+  const [feePoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublicKey)
+
   const feePoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -114,12 +103,10 @@ export async function referralClaimFees(
     )
   )
 
-
   await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return referralAccountPublicKey
 }
 
-
 export async function referralClaimFeesInstruction(
   program: Program<Vault>,
   payerPublicKey: PublicKey,
@@ -135,7 +122,6 @@ export async function referralClaimFeesInstruction(
   feePoolPublicKey: PublicKey,
   feePoolAssociatedUshTokenAccountPublicKey: PublicKey
 ): Promise<TransactionInstruction> {
-
   return await program.methods
     .referralClaimFees()
     .accounts({

package/src/instructions/refreshOraclePrice.ts

@@ -1,17 +1,15 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import {
   LAMPORTS_PER_SOL,
-  PublicKey,
-  sendAndConfirmTransaction,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   Transaction,
   TransactionInstruction,
-  TransactionSignature,
+  TransactionSignature
 } from '@solana/web3.js'
-import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { CHAINLINK_PROGRAM_ID } from '../Constants'
 import { Vault } from '../idl/vault'
-import { HEDGE_PROGRAM_PUBLICKEY, CHAINLINK_PROGRAM_ID } from '../Constants'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function refreshOraclePrice(
   program: Program<Vault>,
@@ -38,11 +36,11 @@ export async function refreshOraclePriceInstruction(
   const enc = new TextEncoder()
   const [oracleInfoAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralType), enc.encode('Oracle')],
-    HEDGE_PROGRAM_PUBLICKEY
+    program.programId
   )
   const [vaultTypeAccount] = await PublicKey.findProgramAddress(
     [enc.encode(collateralType), enc.encode('State')],
-    HEDGE_PROGRAM_PUBLICKEY
+    program.programId
   )
   const oracleInfo = await program.account.oracleInfoForCollateralType.fetch(oracleInfoAccount)
 

package/src/instructions/repayVault.ts

@@ -2,24 +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,
+  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 repayVault(
   program: Program<Vault>,
@@ -29,7 +25,7 @@ export async function repayVault(
   repayAmount: 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
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
@@ -42,10 +38,15 @@ export async function repayVault(
 
   const vaultTypeAccount = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const vaultTypeAssociatedTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
     vaultAccount.vaultType,
     vaultTypeAccount.collateralMint
   )
-  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccount.collateralMint)
+  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(
+    program.programId,
+    vaultPublicKey,
+    vaultTypeAccount.collateralMint
+  )
 
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
@@ -96,11 +97,12 @@ export async function repayVaultInstruction(
   repayAmount: BN,
   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
   )