hedge-web3 0.2.33 → 0.3.2

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './Constants'
+export * from './HedgeConstants'
 export * from './HedgeDecimal'
 export * from './idl/vault'
 export * from './instructions/claimLiquidationPoolPosition'
@@ -8,8 +8,6 @@ export * from './instructions/closeLiquidationPoolPosition'
 export * from './instructions/createReferralAccount'
 export * from './instructions/createStakingPool'
 export * from './instructions/createUserReferralAccount'
-export * from './instructions/compoundCreateReferralAccount'
-export * from './instructions/compoundReferralClaimFees'
 export * from './instructions/createVault'
 export * from './instructions/depositLiquidationPool'
 export * from './instructions/depositStakingPool'
@@ -26,15 +24,6 @@ export * from './instructions/refreshOraclePrice'
 export * from './instructions/repayVault'
 export * from './instructions/setHalted'
 export * from './instructions/transferVault'
-export * from './instructions/createCompoundStakingPool'
-export * from './instructions/createCompoundStakingPoolPosition'
-export * from './instructions/depositCompoundStakingPoolPosition'
-export * from './instructions/withdrawCompoundStakingPoolPosition'
-export * from './instructions/setDelegateWallet'
-export * from './instructions/setCompoundPoolActive'
-export * from './instructions/adminWithdrawCol'
-export * from './instructions/adminWithdrawUsh'
-export * from './instructions/depositRewardsToCompoundPool'
 export * from './instructions/updateReferralAccount'
 export * from './instructions/updateReferralState'
 export * from './instructions/updateVaultType'
@@ -48,3 +37,5 @@ export * from './state/StakingPoolPosition'
 export * from './state/VaultAccount'
 export * from './state/VaultHistoryEvent'
 export * from './utils/getLinkedListAccounts'
+
+

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -10,7 +10,7 @@ import {
 import {
   findAssociatedTokenAddress, getLiquidationPoolStatePublicKey,
   getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/claimStakingPoolPosition.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -10,7 +10,7 @@ import {
 import {
   getHedgeMintPublicKey, getPoolPublicKeyForMint,
   getVaultSystemStatePublicKey, getVaultTypeAccountPublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/closeClaimedLiquidationPoolPosition.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { PublicKey, Signer, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -12,7 +12,7 @@ import {
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/createReferralAccount.ts

@@ -1,13 +1,16 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/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,
-  getReferralAccountPublicKey,
-  getReferralStatePublicKey,
-  getUserReferralAccountPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  PublicKey, Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction
+} from '@solana/web3.js'
+import {
+  getHedgeMintPublicKey, getReferralAccountPublicKey, getReferralStatePublicKey,
+  getUserReferralAccountPublicKey, getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'

package/src/instructions/createStakingPool.ts

@@ -1,12 +1,18 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { PublicKey, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import {
+  PublicKey, Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction
+} from '@solana/web3.js'
 import {
   findAssociatedTokenAddress,
   getPoolPublicKeyForMint,
   getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
@@ -37,6 +43,7 @@ export async function createStakingPoolInstruction(
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey(program.programId)
   const ushMintPublickey = await getUshMintPublicKey(program.programId)
   const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(program.programId, mintPublicKey)
+
   const poolAssociatedStakedTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, mintPublicKey)
   const poolAssociatedUshTokenAccount = await findAssociatedTokenAddress(program.programId, poolPublickey, ushMintPublickey)
   return await program.methods

package/src/instructions/createUserReferralAccount.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   PublicKey, Signer,
@@ -7,7 +7,7 @@ import {
   Transaction,
   TransactionInstruction
 } from '@solana/web3.js'
-import { getReferralAccountPublicKey, getUserReferralAccountPublicKey, getVaultSystemStatePublicKey } from '../Constants'
+import { getReferralAccountPublicKey, getUserReferralAccountPublicKey, getVaultSystemStatePublicKey } from '../HedgeConstants'
 
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'

package/src/instructions/createVault.ts

@@ -1,6 +1,10 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
-import { TokenInstructions } from '@project-serum/serum'
-import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
+import {
+  ASSOCIATED_TOKEN_PROGRAM_ID,
+  getOrCreateAssociatedTokenAccount,
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+} from '@solana/spl-token'
 import {
   Keypair,
   PublicKey,
@@ -18,12 +22,14 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
   getVaultTypeAccountPublicKey,
-} from '../Constants'
+} from '../HedgeConstants'
 
 import { v4 as uuidv4 } from 'uuid'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { createInitializeAccountInstruction } from '@solana/spl-token'
+import { createCloseAccountInstruction } from '@solana/spl-token'
 
 export async function createVault(
   program: Program<Vault>,
@@ -61,7 +67,7 @@ export async function createVault(
   const transaction = new Transaction()
   const signers = [payer, history]
 
-  const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === TokenInstructions.WRAPPED_SOL_MINT.toString()
+  const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === NATIVE_MINT.toString()
 
   const [hedgeStakingPoolPublicKey] = await getPoolPublicKeyForMint(
     program.programId,
@@ -82,14 +88,11 @@ export async function createVault(
         programId: TOKEN_PROGRAM_ID,
         space: 165,
       }),
-      TokenInstructions.initializeAccount({
-        account: wrappedSolAccount.publicKey,
-        mint: TokenInstructions.WRAPPED_SOL_MINT,
-        owner: payer.publicKey,
-      })
+      createInitializeAccountInstruction(wrappedSolAccount.publicKey, NATIVE_MINT, payer.publicKey)
     )
     signers.push(wrappedSolAccount)
   }
+
   transaction.add(
     await createVaultInstruction(
       program,
@@ -108,17 +111,11 @@ export async function createVault(
       overrideTime
     )
   )
+
   if (isWrappedSol) {
-    transaction.add(
-      TokenInstructions.closeAccount({
-        source: wrappedSolAccount.publicKey,
-        destination: payer.publicKey,
-        owner: payer.publicKey,
-      })
-    )
+    transaction.add(createCloseAccountInstruction(wrappedSolAccount.publicKey, payer.publicKey, payer.publicKey))
   }
-
-  await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
+  const result = await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return newVaultPublicKey
 }
 
@@ -137,7 +134,8 @@ export async function buildCreateVaultTransaction(
   const { blockhash, lastValidBlockHeight } = await program.provider.connection.getLatestBlockhash()
   const transaction = new Transaction({
     feePayer: payerPublicKey,
-    recentBlockhash: blockhash,
+    blockhash: blockhash,
+    lastValidBlockHeight: lastValidBlockHeight,
   })
   const signers = [history]
   const wrappedSolAccount = Keypair.generate()
@@ -152,7 +150,7 @@ export async function buildCreateVaultTransaction(
   const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   console.log('Lookup vaultTypeAccountInfo', vaultTypeAccountInfo)
 
-  const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === TokenInstructions.WRAPPED_SOL_MINT.toString()
+  const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === NATIVE_MINT.toString()
 
   const payerTokenAccount = await findAssociatedTokenAddress(
     program.programId,
@@ -187,11 +185,7 @@ export async function buildCreateVaultTransaction(
         programId: TOKEN_PROGRAM_ID,
         space: 165,
       }),
-      TokenInstructions.initializeAccount({
-        account: wrappedSolAccount.publicKey,
-        mint: TokenInstructions.WRAPPED_SOL_MINT,
-        owner: payerPublicKey,
-      })
+      createInitializeAccountInstruction(wrappedSolAccount.publicKey, NATIVE_MINT, payerPublicKey)
     )
     signers.push(wrappedSolAccount)
   }
@@ -214,14 +208,9 @@ export async function buildCreateVaultTransaction(
       overrideTime
     )
   )
+
   if (isWrappedSol) {
-    transaction.add(
-      TokenInstructions.closeAccount({
-        source: wrappedSolAccount.publicKey,
-        destination: payerPublicKey,
-        owner: payerPublicKey,
-      })
-    )
+    transaction.add(createCloseAccountInstruction(wrappedSolAccount.publicKey, payerPublicKey, payerPublicKey))
     transaction.partialSign(wrappedSolAccount)
   }
 
@@ -253,20 +242,20 @@ export async function createVaultInstruction(
     .createVault(
       salt,
       new BN(depositAmount),
-      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
+      new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override time
     )
     .accounts({
       vaultSystemState: vaultSystemStatePublicKey,
       vaultTypeAccount: vaultTypeAccount,
       vault: vaultPublicKey,
       vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-      feePool: feePool,
-      feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
+      // feePool: feePool,
+      // feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
       history: historyPublicKey,
       payer: payerPublicKey,
       payerTokenAccount: payerTokenAccountPublicKey,
       collateralMint: collateralMint,
-      ushMint: ushMintPublickey,
+      // ushMint: ushMintPublickey,
       systemProgram: SystemProgram.programId,
       tokenProgram: TOKEN_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/instructions/depositLiquidationPool.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -10,7 +10,7 @@ import {
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey, getReferralAccountPublicKey, getUserReferralAccountPublicKey, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/depositStakingPool.ts

@@ -1,4 +1,4 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -6,7 +6,7 @@ import {
   SystemProgram, Transaction,
   TransactionInstruction
 } from '@solana/web3.js'
-import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
+import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'

package/src/instructions/depositVault.ts

@@ -1,7 +1,12 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
-import { TokenInstructions } from '@project-serum/serum'
-import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
-import { getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
+import { 
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+  getOrCreateAssociatedTokenAccount,
+  createInitializeAccountInstruction,
+  createCloseAccountInstruction
+} from '@solana/spl-token'
+
 import {
   Keypair,
   PublicKey, Signer,
@@ -12,7 +17,7 @@ import {
 import {
   findAssociatedTokenAddress, getHedgeMintPublicKey, getPoolPublicKeyForMint, getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
@@ -80,7 +85,7 @@ export async function depositVault(
     false
   )
 
-  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
+  if (vaultTypeAccountInfo.collateralMint.toString() === NATIVE_MINT.toString()) {
     transaction.add(
       SystemProgram.createAccount({
         fromPubkey: payer.publicKey,
@@ -89,11 +94,11 @@ export async function depositVault(
         programId: TOKEN_PROGRAM_ID,
         space: 165,
       }),
-      TokenInstructions.initializeAccount({
-        account: wrappedSolAccount.publicKey,
-        mint: TokenInstructions.WRAPPED_SOL_MINT,
-        owner: payer.publicKey,
-      })
+      createInitializeAccountInstruction(
+        wrappedSolAccount.publicKey,
+        NATIVE_MINT,
+        payer.publicKey
+      )
     )
     signers.push(wrappedSolAccount)
   }
@@ -102,7 +107,7 @@ export async function depositVault(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
-      vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()
+      vaultTypeAccountInfo.collateralMint.toString() === NATIVE_MINT.toString()
         ? wrappedSolAccount.publicKey
         : payerTokenAccount,
       vaultPublicKey,
@@ -121,13 +126,14 @@ export async function depositVault(
       overrideTime
     )
   )
-  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
+  if (vaultTypeAccountInfo.collateralMint.toString() === NATIVE_MINT.toString()) {
     transaction.add(
-      TokenInstructions.closeAccount({
-        source: wrappedSolAccount.publicKey,
-        destination: payer.publicKey,
-        owner: payer.publicKey,
-      })
+      createCloseAccountInstruction(
+        wrappedSolAccount.publicKey,
+        payer.publicKey,
+        payer.publicKey,
+        []
+      )
     )
   }
 

package/src/instructions/initHedgeFoundation.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -15,18 +15,33 @@ import {
   getLiquidationPoolUshAccountPublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 export async function initHedgeFoundation(program: Program<Vault>, provider: Provider, payer: Signer): Promise<PublicKey> {
+  console.log('Initializing Hedge Foundation...')
   const poolEra = Keypair.generate()
-  const transaction = new Transaction().add(
+  console.log('Generated poolEra:', poolEra.publicKey.toBase58())
+  
+  const transaction = new Transaction()
+  transaction.feePayer = payer.publicKey
+  
+  transaction.add(
     await initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey)
   )
+  console.log('Created transaction with initHedgeFoundationInstruction')
+  console.log('Payer public key:', payer.publicKey.toBase58())
 
-  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolEra]).catch(parseAnchorErrors)
+  console.log('Sending transaction...')
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolEra])
+    .catch(err => {
+      console.error('Failed to initialize Hedge Foundation:', err)
+      throw parseAnchorErrors(err)
+    })
+  
+  console.log('Successfully initialized Hedge Foundation')
   return payer.publicKey
 }
 

package/src/instructions/initHedgeFoundationTokens.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
   Keypair,
@@ -11,7 +11,7 @@ import {
 import {
   findAssociatedTokenAddress,
   getHedgeMintPublicKey, getVaultSystemStatePublicKey
-} from '../Constants'
+} from '../HedgeConstants'
 import { parseAnchorErrors } from '../utils/Errors'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 

package/src/instructions/liquidateVault.ts

@@ -1,23 +1,20 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider } from '@coral-xyz/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import {
-  ComputeBudgetProgram,
   Keypair,
-  PublicKey,
-  Signer,
+  PublicKey, Signer,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Transaction,
-  TransactionInstruction,
+  TransactionInstruction
 } from '@solana/web3.js'
 import {
   getHedgeMintPublicKey,
   getLiquidationPoolStatePublicKey,
   getLiquidationPoolUshAccountPublicKey,
-  getPoolPublicKeyForMint,
-  getUshMintPublicKey,
-  getVaultSystemStatePublicKey,
-} from '../Constants'
+  getPoolPublicKeyForMint, getUshMintPublicKey,
+  getVaultSystemStatePublicKey
+} from '../HedgeConstants'
 import { Vault } from '../idl/vault'
 import { getLinkedListAccounts } from '../utils/getLinkedListAccounts'
 import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
@@ -40,11 +37,6 @@ export async function liquidateVault(
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey(program.programId)
   const poolStateInfo = await program.account.liquidationPoolState.fetch(liquidationPoolStatePublicKey)
 
-  const additionalComputationBudget = ComputeBudgetProgram.requestUnits({
-    units: 300000,
-    additionalFee: 0,
-  })
-
   const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -104,32 +96,30 @@ export async function liquidateVault(
   const newEra = Keypair.generate()
   const transaction = new Transaction()
 
-  transaction
-    .add(additionalComputationBudget)
-    .add(
-      await liquidateVaultInstruction(
-        program,
-        payer.publicKey,
-        payerAssociatedTokenAccount.address,
-        vaultPublicKey,
-        vaultAssociatedTokenAccount.address,
-        liquidationPoolStatePublicKey,
-        poolStateInfo.currentEra,
-        poolAssociatedTokenAccount.address,
-        history.publicKey,
-        newEra.publicKey,
-        hedgeStakingPoolPublicKey,
-        feePoolAssociatedTokenAccount.address,
-        hedgeStakingPoolAssociatedUshTokenAccount.address,
-        collateralMint,
-        vaultTypeAssociatedTokenAccount.address,
-        oldSmallerPublicKey,
-        newSmallerPublicKey,
-        newLargerPublicKey,
-        vaultAccount.vaultType,
-        overrideTime
-      )
+  transaction.add(
+    await liquidateVaultInstruction(
+      program,
+      payer.publicKey,
+      payerAssociatedTokenAccount.address,
+      vaultPublicKey,
+      vaultAssociatedTokenAccount.address,
+      liquidationPoolStatePublicKey,
+      poolStateInfo.currentEra,
+      poolAssociatedTokenAccount.address,
+      history.publicKey,
+      newEra.publicKey,
+      hedgeStakingPoolPublicKey,
+      feePoolAssociatedTokenAccount.address,
+      hedgeStakingPoolAssociatedUshTokenAccount.address,
+      collateralMint,
+      vaultTypeAssociatedTokenAccount.address,
+      oldSmallerPublicKey,
+      newSmallerPublicKey,
+      newLargerPublicKey,
+      vaultAccount.vaultType,
+      overrideTime
     )
+  )
 
   await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history, newEra])
   return vaultPublicKey