hedge-web3 0.1.25 → 0.1.28

package/src/instructions/liquidateVault.ts

@@ -1,9 +1,31 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUsdhAccountPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  ASSOCIATED_TOKEN_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
+  getOrCreateAssociatedTokenAccount,
+} from '@solana/spl-token'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import {
+  getHedgeMintPublicKey,
+  getLiquidationPoolStatePublicKey,
+  getLiquidationPoolUshAccountPublicKey,
+  getPoolPublicKeyForMint,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
 
-export async function liquidateVault (
+export async function liquidateVault(
   program: Program,
   provider: Provider,
   payer: Signer,
@@ -12,22 +34,80 @@ export async function liquidateVault (
 ): Promise<PublicKey> {
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(
+    vaultAccount.collateralType
+  )
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(
+    vaultTypeAccountPublicKey
+  )
   const collateralMint = vaultTypeAccountInfo.collateralMint
 
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
+  const ushMintPublickey = await getUshMintPublicKey()
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    hedgeMintPublickey
+  )
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
-  const poolStateInfo = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
+  const poolStateInfo = await program.account.liquidationPoolState.fetch(
+    liquidationPoolStatePublicKey
+  )
+
+  const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    payer.publicKey,
+    true
+  )
+  const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    hedgeStakingPoolPublicKey,
+    true
+  )
+  const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    vaultPublicKey,
+    true
+  )
+  const poolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    liquidationPoolStatePublicKey,
+    true
+  )
+  const vaultTypeAssociatedTokenAccount =
+    await getOrCreateAssociatedTokenAccount(
+      provider.connection,
+      payer,
+      collateralMint,
+      vaultTypeAccountPublicKey,
+      true
+    )
+  const hedgeStakingPoolAssociatedUshTokenAccount =
+    await getOrCreateAssociatedTokenAccount(
+      provider.connection,
+      payer,
+      ushMintPublickey,
+      hedgeStakingPoolPublicKey,
+      true
+    )
 
-  const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, payer.publicKey, true)
-  const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, hedgeStakingPoolPublicKey, true)
-  const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, vaultPublicKey, true)
-  const poolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, liquidationPoolStatePublicKey, true)
-  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, vaultTypeAccountPublicKey, true)
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, hedgeStakingPoolPublicKey, true)
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
+    await getLinkedListAccounts(
+      program,
+      provider,
+      vaultTypeAccountPublicKey,
+      vaultPublicKey,
+      0,
+      0,
+      false,
+      true
+    )
 
   const history = Keypair.generate()
   const newEra = Keypair.generate()
@@ -47,18 +127,26 @@ export async function liquidateVault (
       newEra.publicKey,
       hedgeStakingPoolPublicKey,
       feePoolAssociatedTokenAccount.address,
-      hedgeStakingPoolAssociatedUsdhTokenAccount.address,
+      hedgeStakingPoolAssociatedUshTokenAccount.address,
       collateralMint,
       vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       vaultAccount.collateralType,
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history, newEra], provider.opts)
+  await sendAndConfirmTransaction(
+    provider.connection,
+    transaction,
+    [payer, history, newEra],
+    provider.opts
+  )
   return vaultPublicKey
 }
 
-export async function liquidateVaultInstruction (
+export async function liquidateVaultInstruction(
   program: Program,
   payerPublicKey: PublicKey,
   payerAssociatedTokenAccount: PublicKey,
@@ -71,15 +159,19 @@ export async function liquidateVaultInstruction (
   newEraPublicKey: PublicKey,
   feePool: PublicKey,
   feePoolAssociatedTokenAccount: PublicKey,
-  hedgeStakingPoolAssociatedUsdhTokenAccount: PublicKey,
+  hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   collateralMint: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   collateralType: string,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
-  const liquidationPoolUsdhAccountPublickey = await getLiquidationPoolUsdhAccountPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
+  const liquidationPoolUshAccountPublickey =
+    await getLiquidationPoolUshAccountPublicKey()
   const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
 
   const payload = {
@@ -93,23 +185,28 @@ export async function liquidateVaultInstruction (
       vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
       poolState: poolState,
       poolAssociatedTokenAccount: poolAssociatedTokenAccount,
-      usdhMint: usdhMintPublickey,
+      ushMint: ushMintPublickey,
       history: historyPublicKey,
       payer: payerPublicKey,
       payerAssociatedTokenAccount: payerAssociatedTokenAccount,
       feePool: feePool,
       feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
-      feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-      liquidationPoolUsdhAccount: liquidationPoolUsdhAccountPublickey,
+      feePoolAssociatedUshTokenAccount:
+        hedgeStakingPoolAssociatedUshTokenAccount,
+      liquidationPoolUshAccount: liquidationPoolUshAccountPublickey,
       newEra: newEraPublicKey,
+      oldSmallerVaultInfo: oldSmallerPublicKey,
+      newSmallerVaultInfo: newSmallerPublicKey,
+      newLargerVaultInfo: newLargerPublicKey,
       tokenProgram: TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      rent: SYSVAR_RENT_PUBKEY
+      rent: SYSVAR_RENT_PUBKEY,
     },
-    signers: []
+    signers: [],
   }
   return program.instruction.liquidateVault(
     new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
-    payload)
+    payload
+  )
 }

package/src/instructions/loanVault.ts

@@ -1,9 +1,28 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  getOrCreateAssociatedTokenAccount,
+  TOKEN_PROGRAM_ID,
+} from '@solana/spl-token'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import {
+  findAssociatedTokenAddress,
+  getHedgeMintPublicKey,
+  getPoolPublicKeyForMint,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
 
-export async function loanVault (
+export async function loanVault(
   program: Program,
   provider: Provider,
   payer: Signer,
@@ -11,55 +30,103 @@ export async function loanVault (
   loanAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    payer.publicKey
+  )
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
-  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccount.collateralMint, vaultTypeAccountPublicKey, true)
-  const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccount.collateralMint, vaultPublicKey, true)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(
+    vaultAccount.collateralType
+  )
+  const vaultTypeAccount = await program.account.vaultType.fetch(
+    vaultTypeAccountPublicKey
+  )
+  const vaultTypeAssociatedTokenAccount =
+    await getOrCreateAssociatedTokenAccount(
+      provider.connection,
+      payer,
+      vaultTypeAccount.collateralMint,
+      vaultTypeAccountPublicKey,
+      true
+    )
+  const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    vaultTypeAccount.collateralMint,
+    vaultPublicKey,
+    true
+  )
+
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
+    await getLinkedListAccounts(
+      program,
+      provider,
+      vaultTypeAccountPublicKey,
+      vaultPublicKey,
+      0,
+      loanAmount,
+      false,
+      false
+    )
 
   const history = Keypair.generate()
   const transaction = new Transaction().add(
     await loanVaultInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
       vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       loanAmount,
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
+  await sendAndConfirmTransaction(
+    provider.connection,
+    transaction,
+    [payer, history],
+    provider.opts
+  )
   return vaultPublicKey
 }
 
-export async function loanVaultInstruction (
+export async function loanVaultInstruction(
   program: Program,
   payerPublicKey: PublicKey,
-  ownerUsdhAccount: PublicKey,
+  ownerUshAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   loanAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
-    hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    hedgeMintPublickey
   )
+  const hedgeStakingPoolAssociatedUshTokenAccount =
+    await findAssociatedTokenAddress(
+      hedgeStakingPoolPublicKey,
+      ushMintPublickey
+    )
 
   return program.instruction.loanVault(
     new BN(loanAmount),
@@ -73,13 +140,18 @@ export async function loanVaultInstruction (
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-        usdhMint: usdhMintPublickey,
+        feePoolAssociatedUshTokenAccount:
+          hedgeStakingPoolAssociatedUshTokenAccount,
+        ushMint: ushMintPublickey,
         vaultOwner: payerPublicKey,
-        ownerUsdhAccount: ownerUsdhAccount,
+        ownerUshAccount: ownerUshAccount,
+        oldSmallerVaultInfo: oldSmallerPublicKey,
+        newSmallerVaultInfo: newSmallerPublicKey,
+        newLargerVaultInfo: newLargerPublicKey,
         tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
+        systemProgram: SystemProgram.programId,
       },
-      signers: []
-    })
+      signers: [],
+    }
+  )
 }

package/src/instructions/redeemVault.ts

@@ -2,7 +2,8 @@ import { BN, Program, Provider } from '@project-serum/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 // import { TokenInstructions } from '@project-serum/serum'
 import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function redeemVault (
   program: Program,
@@ -12,10 +13,10 @@ export async function redeemVault (
   redeemAmount: number,
   transactionOverrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  // Prep the user to get USH back out at some point
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
   const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
@@ -26,18 +27,34 @@ export async function redeemVault (
 
   const payerTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey)
 
+
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
+    await getLinkedListAccounts(
+      program,
+      provider,
+      vaultTypeAccountPublicKey,
+      vaultPublicKey,
+      0,
+      0,
+      true,
+      false
+    )
+
   const history = Keypair.generate()
   const transaction = new Transaction().add(
     await redeemVaultInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       payerTokenAccount.address,
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
       vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       redeemAmount,
       transactionOverrideTime
     )
@@ -49,23 +66,26 @@ export async function redeemVault (
 export async function redeemVaultInstruction (
   program: Program,
   payerPublicKey: PublicKey,
-  payerUsdhAccount: PublicKey,
+  payerUshAccount: PublicKey,
   destinationTokenAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   redeemAmount: number,
   transactionOverrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
+  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
     hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+    ushMintPublickey
   )
   return program.instruction.redeemVault(
     new BN(redeemAmount),
@@ -79,11 +99,14 @@ export async function redeemVaultInstruction (
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-        usdhMint: usdhMintPublickey,
+        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        ushMint: ushMintPublickey,
         payer: payerPublicKey,
-        payerUsdhAccount: payerUsdhAccount,
+        payerUshAccount: payerUshAccount,
         destinationTokenAccount: destinationTokenAccount,
+        oldSmallerVaultInfo: oldSmallerPublicKey,
+        newSmallerVaultInfo: newSmallerPublicKey,
+        newLargerVaultInfo: newLargerPublicKey,
         tokenProgram: TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId
       },

package/src/instructions/repayVault.ts

@@ -1,9 +1,28 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import {
+  getOrCreateAssociatedTokenAccount,
+  TOKEN_PROGRAM_ID,
+} from '@solana/spl-token'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import {
+  findAssociatedTokenAddress,
+  getHedgeMintPublicKey,
+  getPoolPublicKeyForMint,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
 
-export async function repayVault (
+export async function repayVault(
   program: Program,
   provider: Provider,
   payer: Signer,
@@ -11,56 +30,97 @@ export async function repayVault (
   repayAmount: number,
   overrideTime?: number
 ): Promise<PublicKey> {
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
 
-  // Prep the user to get USDH back out at some point
-  const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
+  // Prep the user to get USH back out at some point
+  const payerUshAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    payer.publicKey
+  )
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
-  const vaultTypeAssociatedTokenAccount = await findAssociatedTokenAddress(vaultTypeAccountPublicKey, vaultTypeAccount.collateralMint)
-  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccount.collateralMint)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(
+    vaultAccount.collateralType
+  )
+  const vaultTypeAccount = await program.account.vaultType.fetch(
+    vaultTypeAccountPublicKey
+  )
+  const vaultTypeAssociatedTokenAccount = await findAssociatedTokenAddress(
+    vaultTypeAccountPublicKey,
+    vaultTypeAccount.collateralMint
+  )
+  const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(
+    vaultPublicKey,
+    vaultTypeAccount.collateralMint
+  )
+
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
+    await getLinkedListAccounts(
+      program,
+      provider,
+      vaultTypeAccountPublicKey,
+      vaultPublicKey,
+      0,
+      repayAmount * -1,
+      false,
+      false
+    )
 
   const history = Keypair.generate()
   const transaction = new Transaction().add(
     await repayVaultInstruction(
       program,
       payer.publicKey,
-      payerUsdhAccount.address,
+      payerUshAccount.address,
       vaultPublicKey,
       vaultAssociatedTokenAccount,
       history.publicKey,
       vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       repayAmount,
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
+  await sendAndConfirmTransaction(
+    provider.connection,
+    transaction,
+    [payer, history],
+    provider.opts
+  )
   return vaultPublicKey
 }
 
-export async function repayVaultInstruction (
+export async function repayVaultInstruction(
   program: Program,
   payerPublicKey: PublicKey,
-  ownerUsdhAccount: PublicKey,
+  ownerUshAccount: PublicKey,
   vaultPublickey: PublicKey,
   vaultAssociatedTokenAccount: PublicKey,
   historyPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   repayAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const usdhMintPublickey = await getUsdhMintPublicKey()
+  const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const hedgeStakingPoolAssociatedUsdhTokenAccount = await findAssociatedTokenAddress(
-    hedgeStakingPoolPublicKey,
-    usdhMintPublickey
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    hedgeMintPublickey
   )
+  const hedgeStakingPoolAssociatedUshTokenAccount =
+    await findAssociatedTokenAddress(
+      hedgeStakingPoolPublicKey,
+      ushMintPublickey
+    )
 
   return program.instruction.repayVault(
     new BN(repayAmount),
@@ -74,13 +134,18 @@ export async function repayVaultInstruction (
         vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
         history: historyPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUsdhTokenAccount: hedgeStakingPoolAssociatedUsdhTokenAccount,
-        usdhMint: usdhMintPublickey,
+        feePoolAssociatedUshTokenAccount:
+          hedgeStakingPoolAssociatedUshTokenAccount,
+        ushMint: ushMintPublickey,
         vaultOwner: payerPublicKey,
-        ownerUsdhAccount: ownerUsdhAccount,
+        oldSmallerVaultInfo: oldSmallerPublicKey,
+        newSmallerVaultInfo: newSmallerPublicKey,
+        newLargerVaultInfo: newLargerPublicKey,
+        ownerUshAccount: ownerUshAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
+        systemProgram: SystemProgram.programId,
       },
-      signers: []
-    })
+      signers: [],
+    }
+  )
 }

package/src/instructions/setHalted.ts

@@ -2,7 +2,7 @@ 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 { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
-import { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUsdhMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+import { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'