hedge-web3 0.1.27 → 0.1.28

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, getUshMintPublicKey, 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,
@@ -13,13 +32,47 @@ export async function loanVault (
 ): Promise<PublicKey> {
   const ushMintPublickey = await getUshMintPublicKey()
 
-  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, 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(
@@ -32,15 +85,23 @@ export async function loanVault (
       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,
   ownerUshAccount: PublicKey,
@@ -49,17 +110,23 @@ export async function loanVaultInstruction (
   historyPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   loanAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
-    hedgeStakingPoolPublicKey,
-    ushMintPublickey
+  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,
-        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        feePoolAssociatedUshTokenAccount:
+          hedgeStakingPoolAssociatedUshTokenAccount,
         ushMint: ushMintPublickey,
         vaultOwner: payerPublicKey,
         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,6 +2,7 @@ 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 { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import { findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
 
 export async function redeemVault (
@@ -26,6 +27,19 @@ 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(
@@ -38,6 +52,9 @@ export async function redeemVault (
       history.publicKey,
       vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       redeemAmount,
       transactionOverrideTime
     )
@@ -56,6 +73,9 @@ export async function redeemVaultInstruction (
   historyPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   redeemAmount: number,
   transactionOverrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -84,6 +104,9 @@ export async function redeemVaultInstruction (
         payer: payerPublicKey,
         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, getUshMintPublicKey, 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,
@@ -14,13 +33,40 @@ export async function repayVault (
   const ushMintPublickey = await getUshMintPublicKey()
 
   // Prep the user to get USH back out at some point
-  const payerUshAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, 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 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(
@@ -33,15 +79,23 @@ export async function repayVault (
       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,
   ownerUshAccount: PublicKey,
@@ -50,17 +104,23 @@ export async function repayVaultInstruction (
   historyPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   repayAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(hedgeMintPublickey)
-  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
-    hedgeStakingPoolPublicKey,
-    ushMintPublickey
+  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,
-        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        feePoolAssociatedUshTokenAccount:
+          hedgeStakingPoolAssociatedUshTokenAccount,
         ushMint: ushMintPublickey,
         vaultOwner: payerPublicKey,
+        oldSmallerVaultInfo: oldSmallerPublicKey,
+        newSmallerVaultInfo: newSmallerPublicKey,
+        newLargerVaultInfo: newLargerPublicKey,
         ownerUshAccount: ownerUshAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
+        systemProgram: SystemProgram.programId,
       },
-      signers: []
-    })
+      signers: [],
+    }
+  )
 }

package/src/instructions/setVaultTypeStatus.ts

@@ -0,0 +1,50 @@
+import { BN, Program, Provider } from '@project-serum/anchor'
+import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { findAssociatedTokenAddress, findVaultAddress, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+
+import { v4 as uuidv4 } from 'uuid'
+import { parseAnchorErrors } from '../utils/Errors'
+
+export async function setVaultTypeStatus (
+  program: Program,
+  provider: Provider,
+  payer: Signer,
+  vaultTypeAccount: PublicKey,
+  deprecated: boolean
+): Promise<PublicKey> {
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+
+
+  const transaction = new Transaction().add(
+    await setVaultTypeStatusInstruction(
+      program,
+      vaultSystemStatePublicKey,
+      payer.publicKey,
+      vaultTypeAccount,
+      deprecated,
+    )
+  )
+
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider?.opts).catch(parseAnchorErrors)
+  return vaultSystemStatePublicKey
+}
+
+export async function setVaultTypeStatusInstruction(
+  program: Program,
+  vaultSystemStatePublicKey: PublicKey,
+  payerPublicKey: PublicKey,
+  vaultTypeAccount: PublicKey,
+  deprecated: boolean
+): Promise<TransactionInstruction> {
+  const ix = program.instruction.setVaultTypeStatus(
+    deprecated,
+    {
+      accounts: {
+        payer: payerPublicKey,
+        vaultSystemState: vaultSystemStatePublicKey,
+        vaultType: vaultTypeAccount,
+      },
+      signers: []
+    })
+  return ix
+}

package/src/instructions/withdrawVault.ts

@@ -1,10 +1,29 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+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, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey, getPoolPublicKeyForMint, getHedgeMintPublicKey } from '../Constants'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import {
+  findAssociatedTokenAddress,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint,
+  getHedgeMintPublicKey,
+} from '../Constants'
+import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 
-export async function withdrawVault (
+export async function withdrawVault(
   program: Program,
   provider: Provider,
   payer: Signer,
@@ -15,23 +34,66 @@ export async function withdrawVault (
   const ushMintPublickey = await getUshMintPublicKey()
 
   // Prep the user to get USH back out at some point
-  await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
+  await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    payer.publicKey
+  )
 
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccount = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultAssociatedCollateralAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, TokenInstructions.WRAPPED_SOL_MINT, vaultPublicKey, true)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(
+    vaultAccount.collateralType
+  )
+  const vaultAssociatedCollateralAccount =
+    await getOrCreateAssociatedTokenAccount(
+      provider.connection,
+      payer,
+      TokenInstructions.WRAPPED_SOL_MINT,
+      vaultPublicKey,
+      true
+    )
 
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccount)
-  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccount, true)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(
+    vaultTypeAccountPublicKey
+  )
+  const vaultTypeAssociatedTokenAccount =
+    await getOrCreateAssociatedTokenAccount(
+      provider.connection,
+      payer,
+      vaultTypeAccountInfo.collateralMint,
+      vaultTypeAccountPublicKey,
+      true
+    )
 
-  const destinationTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey)
-  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(await getHedgeMintPublicKey())
-  const hedgeStakingPoolAssociatedUshTokenAccount = await findAssociatedTokenAddress(
-    hedgeStakingPoolPublicKey,
-    ushMintPublickey
+  const destinationTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    vaultTypeAccountInfo.collateralMint,
+    payer.publicKey
   )
+  const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
+    await getHedgeMintPublicKey()
+  )
+  const hedgeStakingPoolAssociatedUshTokenAccount =
+    await findAssociatedTokenAddress(
+      hedgeStakingPoolPublicKey,
+      ushMintPublickey
+    )
+
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] =
+    await getLinkedListAccounts(
+      program,
+      provider,
+      vaultTypeAccountPublicKey,
+      vaultPublicKey,
+      withdrawAmount * -1,
+      0,
+      false,
+      false
+    )
 
   const transaction = new Transaction().add(
     await withdrawVaultInstruction(
@@ -41,21 +103,29 @@ export async function withdrawVault (
       destinationTokenAccount.address,
       vaultPublicKey,
       vaultAssociatedCollateralAccount.address,
-      vaultTypeAccount,
+      vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,
       ushMintPublickey,
       history.publicKey,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       withdrawAmount,
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history], provider.opts)
+  await sendAndConfirmTransaction(
+    provider.connection,
+    transaction,
+    [payer, history],
+    provider.opts
+  )
   return vaultPublicKey
 }
 
-export async function withdrawVaultInstruction (
+export async function withdrawVaultInstruction(
   program: Program,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
@@ -68,6 +138,9 @@ export async function withdrawVaultInstruction (
   hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   ushMint: PublicKey,
   historyPublicKey: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   withdrawAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -82,14 +155,19 @@ export async function withdrawVaultInstruction (
         vault: vaultPublickey,
         vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
         feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+        feePoolAssociatedUshTokenAccount:
+          hedgeStakingPoolAssociatedUshTokenAccount,
         ushMint: ushMint,
         history: historyPublicKey,
         vaultOwner: payerPublicKey,
         destinationTokenAccount: destinationTokenAccount,
+        oldSmallerVaultInfo: oldSmallerPublicKey,
+        newSmallerVaultInfo: newSmallerPublicKey,
+        newLargerVaultInfo: newLargerPublicKey,
         tokenProgram: TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
+        systemProgram: SystemProgram.programId,
       },
-      signers: []
-    })
+      signers: [],
+    }
+  )
 }