hedge-web3 0.2.21 → 0.2.25

package/src/instructions/{psmEditAccount.rs → 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,27 +1,22 @@
 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,
+  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>,
@@ -29,9 +24,10 @@ export async function psmMintUsh(
   payer: Signer,
   collateralMint: PublicKey,
   collateralAmount: number,
-  overrideTime?: number
+  overrideTime?: number,
+  referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -47,20 +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(program.programId)
+  if (!referrer) {
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, vaultSystemStatePublicKey)
+  } else {
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
+  }
+
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
 
   const transaction = new Transaction().add(
     await psmMintUshInstruction(
@@ -69,6 +68,8 @@ export async function psmMintUsh(
       psmAccount,
       collateralMint,
       new BN(collateralAmount),
+      referralStatePublicKey,
+      referralAccountPublicKey,
       overrideTime
     )
   )
@@ -82,29 +83,23 @@ export async function psmMintUshInstruction(
   psmAccount: PublicKey,
   collateralMint: PublicKey,
   collateralAmount: BN,
+  referralStatePublicKey: PublicKey,
+  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(
@@ -122,6 +117,8 @@ export async function psmMintUshInstruction(
       ownerCollateralAccount: ownerCollateralAccount,
       collateralMint: collateralMint,
       ushMint: ushMintPublickey,
+      referralState: referralStatePublicKey,
+      referralAccount: referralAccountPublicKey,
       systemProgram: SystemProgram.programId,
       tokenProgram: TOKEN_PROGRAM_ID,
     })

package/src/instructions/psmRedeemUsh.ts

@@ -1,27 +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,
+  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>,
@@ -29,9 +22,10 @@ export async function psmRedeemUsh(
   payer: Signer,
   collateralMint: PublicKey,
   ushAmount: number,
-  overrideTime?: number
+  overrideTime?: number,
+  referrer?: PublicKey
 ): Promise<PublicKey> {
-  const ushMintPublickey = await getUshMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey(program.programId)
 
   const payerUshAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
@@ -47,20 +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(program.programId)
+  if (!referrer) {
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, vaultSystemStatePublicKey)
+  } else {
+    referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
+  }
+
+  const referralStatePublicKey = await getReferralStatePublicKey(program.programId)
 
   const transaction = new Transaction().add(
     await psmRedeemUshInstruction(
@@ -69,6 +66,8 @@ export async function psmRedeemUsh(
       psmAccount,
       collateralMint,
       new BN(ushAmount),
+      referralStatePublicKey,
+      referralAccountPublicKey,
       overrideTime
     )
   )
@@ -82,29 +81,23 @@ export async function psmRedeemUshInstruction(
   psmAccount: PublicKey,
   collateralMint: PublicKey,
   ushAmount: BN,
+  referralStatePublicKey: PublicKey,
+  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(
@@ -122,6 +115,8 @@ export async function psmRedeemUshInstruction(
       ownerCollateralAccount: ownerCollateralAccount,
       collateralMint: collateralMint,
       ushMint: ushMintPublickey,
+      referralState: referralStatePublicKey,
+      referralAccount: referralAccountPublicKey,
       systemProgram: SystemProgram.programId,
       tokenProgram: TOKEN_PROGRAM_ID,
     })

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

@@ -0,0 +1,145 @@
+import { Program, Provider } from '@project-serum/anchor'
+import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import {
+  PublicKey, Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction
+} from '@solana/web3.js'
+import {
+  getHedgeMintPublicKey, getPoolPublicKeyForMint, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUshMintPublicKey, getVaultSystemStatePublicKey
+} from '../Constants'
+
+import { Vault } from '../idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+
+/** @type {Function}  - Allows a referrer to claims their fees.
+ * This checks the user has enough HDG in their wallet or staked and
+ * then allows them to claim earned fees. If they meet the PSM referral threshold,
+ * they will be eligible for PSM cut.
+ * Params:
+ * - program: Program<Vault> : The program instance of Hedge Vault program
+ * - provider: Provider : Current connection
+ * - 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
+  const transaction = new Transaction()
+  const signers = [payer]
+
+  // General variables
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
+
+  // Find referrer account
+  const referrer = await payer.publicKey
+  const referralAccountPublicKey = await getReferralAccountPublicKey(program.programId, referrer)
+
+  // Derive the user referral account public key
+  const referallStatePublicKey = await getReferralStatePublicKey(program.programId)
+
+  const hedgeMintPublicKey = await getHedgeMintPublicKey(program.programId)
+
+  // Get HDG account of signer
+  const payerHdgAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    hedgeMintPublicKey,
+    payer.publicKey
+  )
+
+  const ushMintPublicKey = await getUshMintPublicKey(program.programId)
+
+  // Get USH account of signer
+  const payerUshAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublicKey,
+    payer.publicKey
+  )
+
+  // Get community_associated_hedge_token_account
+  const communityAssociatedHedgeTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    hedgeMintPublicKey,
+    vaultSystemStatePublicKey,
+    true
+  )
+
+  const [feePoolPublicKey] = await getPoolPublicKeyForMint(program.programId, hedgeMintPublicKey)
+
+  const feePoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublicKey,
+    feePoolPublicKey,
+    true
+  )
+  transaction.add(
+    await referralClaimFeesInstruction(
+      program,
+      payer.publicKey,
+      vaultSystemStatePublicKey,
+      poolPosition,
+      referralAccountPublicKey,
+      referallStatePublicKey,
+      hedgeMintPublicKey,
+      payerHdgAssociatedTokenAccount.address,
+      ushMintPublicKey,
+      payerUshAssociatedTokenAccount.address,
+      communityAssociatedHedgeTokenAccount.address,
+      feePoolPublicKey,
+      feePoolAssociatedUshTokenAccount.address
+    )
+  )
+
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
+  return referralAccountPublicKey
+}
+
+export async function referralClaimFeesInstruction(
+  program: Program<Vault>,
+  payerPublicKey: PublicKey,
+  vaultSystemStatePublicKey: PublicKey,
+  poolPositionPublicKey: PublicKey,
+  referralAccountPublicKey: PublicKey,
+  referralStatePublicKey: PublicKey,
+  hedgeMintPublicKey: PublicKey,
+  hdgAssociatedTokenAccountPublicKey: PublicKey,
+  ushMintPublicKey: PublicKey,
+  ushAssociatedTokenAccountPublicKey: PublicKey,
+  communityAssociatedHedgeTokenAccountPublicKey: PublicKey,
+  feePoolPublicKey: PublicKey,
+  feePoolAssociatedUshTokenAccountPublicKey: PublicKey
+): Promise<TransactionInstruction> {
+  return await program.methods
+    .referralClaimFees()
+    .accounts({
+      signer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
+      referralState: referralStatePublicKey,
+      referralAccount: referralAccountPublicKey,
+      poolPosition: poolPositionPublicKey,
+      hedgeMint: hedgeMintPublicKey,
+      signerHdgAta: hdgAssociatedTokenAccountPublicKey,
+      ushMint: ushMintPublicKey,
+      signerUshAta: ushAssociatedTokenAccountPublicKey,
+      communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccountPublicKey,
+      feePool: feePoolPublicKey,
+      feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccountPublicKey,
+      systemProgram: SystemProgram.programId,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      rent: SYSVAR_RENT_PUBKEY,
+    })
+    .instruction()
+}

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
   )