hedge-web3 0.1.50 → 0.2.2

package/src/index.ts

@@ -6,6 +6,7 @@ export * from './instructions/claimStakingPoolPosition'
 export * from './instructions/depositLiquidationPool'
 export * from './instructions/closeLiquidationPoolPosition'
 export * from './instructions/claimLiquidationPoolPosition'
+export * from './instructions/closeClaimedLiquidationPoolPosition'
 export * from './instructions/createVault'
 export * from './instructions/depositVault'
 export * from './instructions/withdrawVault'

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -16,7 +16,8 @@ import {
   getLiquidationPoolStatePublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function claimLiquidationPoolPosition(
   program: Program<Vault>,
@@ -48,7 +49,7 @@ export async function claimLiquidationPoolPosition(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 

package/src/instructions/claimStakingPoolPosition.ts

@@ -17,7 +17,8 @@ import {
   getPoolPublicKeyForMint,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function claimStakingPoolPosition(
   program: Program<Vault>,
@@ -58,7 +59,7 @@ export async function claimStakingPoolPosition(
       payerAssociatedTokenAccount.address
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 

package/src/instructions/closeClaimedLiquidationPoolPosition.ts

@@ -0,0 +1,31 @@
+import { Program, Provider } from '@project-serum/anchor'
+import { PublicKey, Signer, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { parseAnchorErrors } from '../utils/Errors'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+
+export async function closeClaimedLiquidationPoolPosition(
+  program: Program<Vault>,
+  provider: Provider,
+  poolPosition: PublicKey,
+  payer: Signer
+): Promise<PublicKey> {
+  const transaction = new Transaction().add(await closeClaimedLiquidationPoolPositionInstruction(program, poolPosition, payer.publicKey))
+
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  return poolPosition
+}
+
+export async function closeClaimedLiquidationPoolPositionInstruction(
+  program: Program<Vault>,
+  poolPosition: PublicKey,
+  payer: PublicKey
+): Promise<TransactionInstruction> {
+  return program.methods
+    .closeClaimedLiquidationPool()
+    .accounts({
+      poolPosition: poolPosition,
+      payer: payer
+    })
+    .instruction()
+}

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -17,7 +17,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function closeLiquidationPoolPosition(
   program: Program<Vault>,
@@ -64,7 +65,7 @@ export async function closeLiquidationPoolPosition(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition
 }
 

package/src/instructions/createStakingPool.ts

@@ -16,7 +16,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function createStakingPool(
   program: Program<Vault>,
@@ -29,7 +30,7 @@ export async function createStakingPool(
   const transaction = new Transaction().add(
     await createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime)
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   const [poolPublickey] = await getPoolPublicKeyForMint(mintPublicKey)
   return poolPublickey
 }

package/src/instructions/createVault.ts

@@ -23,7 +23,8 @@ import {
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function createVault(
   program: Program<Vault>,
@@ -106,7 +107,7 @@ export async function createVault(
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return newVaultPublicKey
 }
 

package/src/instructions/depositLiquidationPool.ts

@@ -17,7 +17,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function depositLiquidationPool(
   program: Program<Vault>,
@@ -45,7 +46,7 @@ export async function depositLiquidationPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/depositStakingPool.ts

@@ -12,7 +12,8 @@ import {
 } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
 import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function depositStakingPool(
   program: Program<Vault>,
@@ -33,7 +34,7 @@ export async function depositStakingPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/depositVault.ts

@@ -19,7 +19,9 @@ import {
   getPoolPublicKeyForMint,
   getHedgeMintPublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
 
 export async function depositVault(
   program: Program<Vault>,
@@ -35,13 +37,12 @@ export async function depositVault(
   await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
 
@@ -64,11 +65,10 @@ export async function depositVault(
 
   const transaction = new Transaction()
   const signers = [payer, history]
-
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     depositAmount,
     0,
@@ -76,7 +76,7 @@ export async function depositVault(
     false
   )
 
-  if (vaultAccount.collateralType === 'SOL') {
+  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
     transaction.add(
       SystemProgram.createAccount({
         fromPubkey: payer.publicKey,
@@ -98,11 +98,11 @@ export async function depositVault(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
-      vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount,
+      vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString() ? wrappedSolAccount.publicKey : payerTokenAccount,
       vaultPublicKey,
       vaultAssociatedCollateralAccountPublicKey,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,
@@ -115,7 +115,7 @@ export async function depositVault(
       overrideTime
     )
   )
-  if (vaultAccount.collateralType === 'SOL') {
+  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
     transaction.add(
       TokenInstructions.closeAccount({
         source: wrappedSolAccount.publicKey,
@@ -125,7 +125,7 @@ export async function depositVault(
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers)
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers)
   return vaultPublicKey
 }
 

package/src/instructions/initHedgeFoundation.ts

@@ -19,7 +19,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function initHedgeFoundation(program: Program<Vault>, provider: Provider, payer: Signer): Promise<PublicKey> {
   const poolEra = Keypair.generate()
@@ -27,7 +28,7 @@ export async function initHedgeFoundation(program: Program<Vault>, provider: Pro
     await initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolEra]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolEra]).catch(parseAnchorErrors)
   return payer.publicKey
 }
 

package/src/instructions/initHedgeFoundationTokens.ts

@@ -19,12 +19,13 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
 
 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))
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payer.publicKey
 }
 

package/src/instructions/liquidateVault.ts

@@ -1,6 +1,7 @@
-import { BN, Program, Provider } from '@project-serum/anchor'
+import { BN, Program, Provider, translateAddress } from '@project-serum/anchor'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount } from '@solana/spl-token'
 import {
+  Connection,
   Keypair,
   PublicKey,
   sendAndConfirmTransaction,
@@ -20,7 +21,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function liquidateVault(
   program: Program<Vault>,
@@ -31,8 +33,7 @@ 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 vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const collateralMint = vaultTypeAccountInfo.collateralMint
 
   const hedgeMintPublickey = await getHedgeMintPublicKey()
@@ -73,7 +74,7 @@ export async function liquidateVault(
     provider.connection,
     payer,
     collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
   const hedgeStakingPoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -87,7 +88,7 @@ export async function liquidateVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     0,
@@ -119,11 +120,12 @@ export async function liquidateVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      vaultAccount.collateralType,
+      vaultAccount.vaultType,
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history, newEra])
+
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history, newEra])
   return vaultPublicKey
 }
 
@@ -146,13 +148,12 @@ export async function liquidateVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  collateralType: string,
+  vaultTypeAccount: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey()
-  const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
 
   return await program.methods
     .liquidateVault(

package/src/instructions/loanVault.ts

@@ -17,8 +17,12 @@ import {
   getVaultTypeAccountPublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
+  HEDGE_PROGRAM_PUBLICKEY,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import { VaultAccount } from '../state/VaultAccount'
 
 export async function loanVault(
   program: Program<Vault>,
@@ -36,15 +40,14 @@ export async function loanVault(
     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 vaultTypeAccount = await program.account.vaultType.fetch(vaultAccount.vaultType)
+
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccount.collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
   const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -54,11 +57,10 @@ export async function loanVault(
     vaultPublicKey,
     true
   )
-
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     loanAmount,
@@ -75,7 +77,7 @@ export async function loanVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,
@@ -84,7 +86,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/redeemVault.ts

@@ -19,7 +19,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function redeemVault(
   program: Program<Vault>,
@@ -40,13 +41,12 @@ export async function redeemVault(
   )
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
 
@@ -68,7 +68,7 @@ export async function redeemVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     0,
@@ -86,7 +86,7 @@ export async function redeemVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,
@@ -95,7 +95,7 @@ export async function redeemVault(
       transactionOverrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/refreshOraclePrice.ts

@@ -7,9 +7,11 @@ import {
   SystemProgram,
   Transaction,
   TransactionInstruction,
+  TransactionSignature,
 } from '@solana/web3.js'
-import { Vault } from 'idl/vault'
-import { HEDGE_PROGRAM_PUBLICKEY } from '../Constants'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+import { HEDGE_PROGRAM_PUBLICKEY, CHAINLINK_PROGRAM_ID } from '../Constants'
 
 export async function refreshOraclePrice(
   program: Program<Vault>,
@@ -19,11 +21,11 @@ export async function refreshOraclePrice(
   network: Cluster,
   overridePrice?: number,
   overrideTime?: number
-): Promise<string> {
+): Promise<TransactionSignature | void> {
   const transaction = new Transaction().add(
     await refreshOraclePriceInstruction(program, collateralType, network, overridePrice, overrideTime)
   )
-  return await sendAndConfirmTransaction(provider.connection, transaction, [payer])
+  return await sendAndConfirmWithDebug(provider.connection, transaction, [payer])
 }
 
 export async function refreshOraclePriceInstruction(
@@ -51,10 +53,11 @@ export async function refreshOraclePriceInstruction(
     .accounts({
       oracleInfoAccount: oracleInfoAccount,
       vaultTypeAccount: vaultTypeAccount,
-      oracleChainlink: chainlinkAccunts[network],
+      oracleChainlink: chainlinkAccounts[network],
       oraclePyth: pythAccounts[network],
       oracleSwitchboard: switchboardAccounts[network],
       systemProgram: SystemProgram.programId,
+      chainlinkProgram: CHAINLINK_PROGRAM_ID,
     })
     .instruction()
 }
@@ -70,7 +73,7 @@ const pythAccounts = {
   Devnet: new PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
   MainnetBeta: new PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG'),
 }
-const chainlinkAccunts = {
+const chainlinkAccounts = {
   Testing: SystemProgram.programId,
   Devnet: new PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
   MainnetBeta: SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET

package/src/instructions/repayVault.ts

@@ -18,7 +18,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function repayVault(
   program: Program<Vault>,
@@ -39,10 +40,9 @@ export async function repayVault(
   )
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const vaultTypeAssociatedTokenAccount = await findAssociatedTokenAddress(
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultTypeAccount.collateralMint
   )
   const vaultAssociatedTokenAccount = await findAssociatedTokenAddress(vaultPublicKey, vaultTypeAccount.collateralMint)
@@ -50,7 +50,7 @@ export async function repayVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     repayAmount * -1,
@@ -67,7 +67,7 @@ export async function repayVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount,
       oldSmallerPublicKey,
       newSmallerPublicKey,
@@ -76,7 +76,7 @@ export async function repayVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/instructions/setHalted.ts

@@ -22,7 +22,8 @@ import {
 } from '../Constants'
 
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function setHalted(
   program: Program<Vault>,
@@ -36,7 +37,7 @@ export async function setHalted(
     await setHaltedInstruction(program, vaultSystemStatePublicKey, payer.publicKey, halted)
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return vaultSystemStatePublicKey
 }
 

package/src/instructions/updateVaultType.ts

@@ -21,7 +21,8 @@ import {
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export interface VaultTypeConfig {
   maxDebtExtended?: BN
@@ -32,6 +33,10 @@ export interface VaultTypeConfig {
   oraclePyth?: PublicKey
   oracleSwitchboard?: PublicKey
 
+  priorityPyth?: number,
+  priorityChainlink?: number,
+  prioritySwitchboard?: number,
+
   deprecated?: boolean
 }
 
@@ -55,7 +60,7 @@ export async function updateVaultType(
     )
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer])
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer])
   return vaultSystemStatePublicKey
 }
 
@@ -75,6 +80,9 @@ export async function updateVaultTypeStatusInstruction(
     oraclePyth: vaultTypeConfig.oraclePyth ?? null,
     oracleSwitchboard: vaultTypeConfig.oracleSwitchboard ?? null,
     deprecated: vaultTypeConfig.deprecated ?? null,
+    priorityPyth: vaultTypeConfig.priorityPyth ?? null,
+    priorityChainlink: vaultTypeConfig.priorityChainlink ?? null,
+    prioritySwitchboard: vaultTypeConfig.prioritySwitchboard ?? null,
   }
 
   return await program.methods