hedge-web3 0.1.27 → 0.1.31

package/src/instructions/depositVault.ts

@@ -1,11 +1,28 @@
 import { BN, Program, Provider } from '@project-serum/anchor'
 import { TokenInstructions } from '@project-serum/serum'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-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 { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
+import {
+  findAssociatedTokenAddress,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint,
+  getHedgeMintPublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
 export async function depositVault(
-  program: Program,
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
@@ -20,10 +37,19 @@ export async function depositVault(
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
   const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
-  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultTypeAccountPublicKey, true)
+  const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    vaultTypeAccountInfo.collateralMint,
+    vaultTypeAccountPublicKey,
+    true
+  )
 
   const payerTokenAccount = await findAssociatedTokenAddress(payer.publicKey, vaultTypeAccountInfo.collateralMint)
-  const vaultAssociatedCollateralAccountPublicKey = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccountInfo.collateralMint)
+  const vaultAssociatedCollateralAccountPublicKey = await findAssociatedTokenAddress(
+    vaultPublicKey,
+    vaultTypeAccountInfo.collateralMint
+  )
 
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -39,6 +65,17 @@ export async function depositVault(
   const transaction = new Transaction()
   const signers = [payer, history]
 
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
+    program,
+    provider,
+    vaultTypeAccountPublicKey,
+    vaultPublicKey,
+    depositAmount,
+    0,
+    false,
+    false
+  )
+
   if (vaultAccount.collateralType === 'SOL') {
     transaction.add(
       SystemProgram.createAccount({
@@ -46,12 +83,12 @@ export async function depositVault(
         lamports: depositAmount + 2.04e6,
         newAccountPubkey: wrappedSolAccount.publicKey,
         programId: TOKEN_PROGRAM_ID,
-        space: 165
+        space: 165,
       }),
       TokenInstructions.initializeAccount({
         account: wrappedSolAccount.publicKey,
         mint: TokenInstructions.WRAPPED_SOL_MINT,
-        owner: payer.publicKey
+        owner: payer.publicKey,
       })
     )
     signers.push(wrappedSolAccount)
@@ -71,6 +108,9 @@ export async function depositVault(
       hedgeStakingPoolAssociatedUshTokenAccount,
       vaultTypeAccountInfo.collateralMint,
       ushMintPublickey,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
       depositAmount,
       overrideTime
     )
@@ -80,17 +120,17 @@ export async function depositVault(
       TokenInstructions.closeAccount({
         source: wrappedSolAccount.publicKey,
         destination: payer.publicKey,
-        owner: payer.publicKey
+        owner: payer.publicKey,
       })
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers, provider.opts)
+  await sendAndConfirmTransaction(provider.connection, transaction, signers)
   return vaultPublicKey
 }
 
 export async function depositVaultInstruction(
-  program: Program,
+  program: Program<Vault>,
   vaultSystemStatePublicKey: PublicKey,
   vaultOwner: PublicKey,
   vaultOwnerTokenAccount: PublicKey,
@@ -103,29 +143,35 @@ export async function depositVaultInstruction(
   hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   collateralMint: PublicKey,
   ushMintPublickey: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   depositAmount: number,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
-  return program.instruction.depositVault(
-    new BN(depositAmount),
-    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
-    {
-      accounts: {
-        vaultSystemState: vaultSystemStatePublicKey,
-        vaultTypeAccount: vaultTypeAccountPublicKey,
-        vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-        collateralTokenMint: collateralMint,
-        vault: vaultPublicKey,
-        vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-        feePool: hedgeStakingPoolPublicKey,
-        feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-        history: historyPublicKey,
-        vaultOwner: vaultOwner,
-        vaultOwnerTokenAccount: vaultOwnerTokenAccount,
-        ushMint: ushMintPublickey,
-        systemProgram: SystemProgram.programId,
-        tokenProgram: TOKEN_PROGRAM_ID
-      },
-      signers: []
+  return await program.methods
+    .depositVault(
+      new BN(depositAmount),
+      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
+    )
+    .accounts({
+      vaultSystemState: vaultSystemStatePublicKey,
+      vaultTypeAccount: vaultTypeAccountPublicKey,
+      vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+      collateralTokenMint: collateralMint,
+      vault: vaultPublicKey,
+      vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+      feePool: hedgeStakingPoolPublicKey,
+      feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+      history: historyPublicKey,
+      vaultOwner: vaultOwner,
+      vaultOwnerTokenAccount: vaultOwnerTokenAccount,
+      ushMint: ushMintPublickey,
+      oldSmallerVaultInfo: oldSmallerPublicKey,
+      newSmallerVaultInfo: newSmallerPublicKey,
+      newLargerVaultInfo: newLargerPublicKey,
+      systemProgram: SystemProgram.programId,
+      tokenProgram: TOKEN_PROGRAM_ID,
     })
+    .instruction()
 }

package/src/instructions/initHedgeFoundation.ts

@@ -1,64 +1,63 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
-
-export async function initHedgeFoundation(
-  program: Program,
-  provider: Provider,
-  payer: Signer
-): Promise<PublicKey> {
+import {
+  findAssociatedTokenAddress,
+  getHedgeMintPublicKey,
+  getLiquidationPoolStatePublicKey,
+  getLiquidationPoolUshAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
+import { Vault } from 'idl/vault'
 
+export async function initHedgeFoundation(program: Program<Vault>, provider: Provider, payer: Signer): Promise<PublicKey> {
   const poolEra = Keypair.generate()
   const transaction = new Transaction().add(
-    await initHedgeFoundationInstruction(
-      program,
-      poolEra.publicKey,
-      payer.publicKey,
-    )
+    await initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolEra], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolEra]).catch(parseAnchorErrors)
   return payer.publicKey
 }
 
-export async function initHedgeFoundationInstruction (
-  program: Program,
+export async function initHedgeFoundationInstruction(
+  program: Program<Vault>,
   poolEraPublicKey: PublicKey,
-  payerPublicKey: PublicKey,
+  payerPublicKey: PublicKey
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const poolStatePublickey = await getLiquidationPoolStatePublicKey()
   const poolUshTokenAccount = await getLiquidationPoolUshAccountPublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const founderHedgeTokenAccount = await findAssociatedTokenAddress(
-    payerPublicKey,
-    hedgeMintPublickey
-  )
-  const communityHedgeTokenAccount = await findAssociatedTokenAddress(
-    vaultSystemStatePublicKey,
-    hedgeMintPublickey
-  )
+  const founderHedgeTokenAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
+  const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
 
-  return program.instruction.initHedgeFoundation(
-    {
-      accounts: {
-        vaultSystemState: vaultSystemStatePublicKey,
-        poolState: poolStatePublickey,
-        poolEra: poolEraPublicKey,
-        poolUshAccount: poolUshTokenAccount,
-        founder: payerPublicKey,
-        ushMint: ushMintPublickey,
-        hedgeMint: hedgeMintPublickey,
-        founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
-        communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-        rent: SYSVAR_RENT_PUBKEY,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
-      },
-      signers: []
+  return await program.methods
+    .initHedgeFoundation()
+    .accounts({
+      vaultSystemState: vaultSystemStatePublicKey,
+      poolState: poolStatePublickey,
+      poolEra: poolEraPublicKey,
+      poolUshAccount: poolUshTokenAccount,
+      founder: payerPublicKey,
+      ushMint: ushMintPublickey,
+      hedgeMint: hedgeMintPublickey,
+      rent: SYSVAR_RENT_PUBKEY,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
     })
+    .instruction()
 }

package/src/instructions/initHedgeFoundationTokens.ts

@@ -1,55 +1,54 @@
 import { Program, Provider } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { Keypair, PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
-import { findAssociatedTokenAddress, getHedgeMintPublicKey, getLiquidationPoolStatePublicKey, getLiquidationPoolUshAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
-
-export async function initHedgeFoundationTokens(
-  program: Program,
-  provider: Provider,
-  payer: Signer
-): Promise<PublicKey> {
+import {
+  findAssociatedTokenAddress,
+  getHedgeMintPublicKey,
+  getLiquidationPoolStatePublicKey,
+  getLiquidationPoolUshAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+} from '../Constants'
 
+export async function initHedgeFoundationTokens(program: Program, provider: Provider, payer: Signer): Promise<PublicKey> {
   const poolEra = Keypair.generate()
-  const transaction = new Transaction().add(
-    await initHedgeFoundationTokensInstruction(
-      program,
-      payer.publicKey,
-    )
-  )
+  const transaction = new Transaction().add(await initHedgeFoundationTokensInstruction(program, payer.publicKey))
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payer.publicKey
 }
 
-export async function initHedgeFoundationTokensInstruction (
+export async function initHedgeFoundationTokensInstruction(
   program: Program,
-  payerPublicKey: PublicKey,
+  payerPublicKey: PublicKey
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const hedgeMintPublickey = await getHedgeMintPublicKey()
-  const founderHedgeTokenAccount = await findAssociatedTokenAddress(
-    payerPublicKey,
-    hedgeMintPublickey
-  )
-  const communityHedgeTokenAccount = await findAssociatedTokenAddress(
-    vaultSystemStatePublicKey,
-    hedgeMintPublickey
-  )
+  const founderHedgeTokenAccount = await findAssociatedTokenAddress(payerPublicKey, hedgeMintPublickey)
+  const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
 
-  return program.instruction.initHedgeFoundationTokens(
-    {
-      accounts: {
-        vaultSystemState: vaultSystemStatePublicKey,
-        founder: payerPublicKey,
-        hedgeMint: hedgeMintPublickey,
-        founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
-        communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-        rent: SYSVAR_RENT_PUBKEY,
-        tokenProgram: TOKEN_PROGRAM_ID,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: SystemProgram.programId
-      },
-      signers: []
+  return await program.methods
+    .initHedgeFoundationTokens()
+    .accounts({
+      vaultSystemState: vaultSystemStatePublicKey,
+      founder: payerPublicKey,
+      hedgeMint: hedgeMintPublickey,
+      founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
+      communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
+      rent: SYSVAR_RENT_PUBKEY,
+      tokenProgram: TOKEN_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
     })
+    .instruction()
 }

package/src/instructions/liquidateVault.ts

@@ -1,10 +1,29 @@
 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, getLiquidationPoolUshAccountPublicKey, getPoolPublicKeyForMint, getVaultTypeAccountPublicKey, getUshMintPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+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'
+import { Vault } from 'idl/vault'
 
-export async function liquidateVault (
-  program: Program,
+export async function liquidateVault(
+  program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   vaultPublicKey: PublicKey,
@@ -22,12 +41,59 @@ export async function liquidateVault (
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
   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 hedgeStakingPoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    ushMintPublickey,
+    hedgeStakingPoolPublicKey,
+    true
+  )
+
+  const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
+    program,
+    provider,
+    vaultTypeAccountPublicKey,
+    vaultPublicKey,
+    0,
+    0,
+    false,
+    true
+  )
 
   const history = Keypair.generate()
   const newEra = Keypair.generate()
@@ -50,16 +116,19 @@ export async function liquidateVault (
       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])
   return vaultPublicKey
 }
 
-export async function liquidateVaultInstruction (
-  program: Program,
+export async function liquidateVaultInstruction(
+  program: Program<Vault>,
   payerPublicKey: PublicKey,
   payerAssociatedTokenAccount: PublicKey,
   vaultPublickey: PublicKey,
@@ -74,6 +143,9 @@ export async function liquidateVaultInstruction (
   hedgeStakingPoolAssociatedUshTokenAccount: PublicKey,
   collateralMint: PublicKey,
   vaultTypeAssociatedTokenAccount: PublicKey,
+  oldSmallerPublicKey: PublicKey,
+  newSmallerPublicKey: PublicKey,
+  newLargerPublicKey: PublicKey,
   collateralType: string,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
@@ -82,8 +154,11 @@ export async function liquidateVaultInstruction (
   const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey()
   const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
 
-  const payload = {
-    accounts: {
+  return program.methods
+    .liquidateVault(
+      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
+    )
+    .accounts({
       vaultSystemState: vaultSystemStatePublicKey,
       vaultTypeAccount: vaultTypeAccount,
       vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
@@ -102,14 +177,13 @@ export async function liquidateVaultInstruction (
       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
-    },
-    signers: []
-  }
-  return program.instruction.liquidateVault(
-    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
-    payload)
+      rent: SYSVAR_RENT_PUBKEY,
+    })
+    .instruction()
 }