hedge-web3 0.1.43 → 0.1.44

package/lib/utils/getLinkedListAccounts.js

@@ -21,13 +21,14 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const bs58_1 = __importDefault(require("bs58"));
 function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, loanAmount, redeem, liquidate, cachedVaults) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('Getting getLinkedListAccounts');
+        // console.log('Getting getLinkedListAccounts')
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         // Default for null is the vault itself, so set them all to this vault
         let oldSmallerPublicKey = vaultPublicKey;
         let newSmallerPublicKey = vaultPublicKey;
         let newLargerPublicKey = vaultPublicKey;
         const thisVaultData = yield program.account.vault.fetch(vaultPublicKey);
+        const accountInfo = yield program.provider.connection.getAccountInfo(vaultPublicKey);
         const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
         // Load all the vaults
         let vaults;
@@ -50,10 +51,10 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             // vaults = allVaults.map((vault) => {
             //   return new VaultAccount(vault.account, vault.publicKey)
             // })
-            vaults = yield getMiniVaults(program, vaultTypeAccount.collateralType);
+            vaults = yield getMiniVaults(program, vaultTypeAccount.vaultTypeName);
         }
-        console.log('Vault count found:', vaults.length);
-        console.log('First Vault', vaults[0]);
+        // console.log('Vault count found:', vaults.length)
+        // console.log('First Vault', vaults[0])
         // Filter out the accounts that are not open
         // TODO filter on vault status. Or we enable people to "close out" empty vaults 
         // vaults = _.filter(vaults, (vault) => {
@@ -76,6 +77,11 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (indexBefore > 0) {
             oldSmallerPublicKey = vaults[indexBefore - 1].publicKey;
         }
+        // Pretty print the list again
+        // console.log('Sorted open vaults. Index Before: ', indexBefore)
+        // console.log(vaults.map((vault) => {
+        //   return vault.toString(vaultPublicKey)
+        // }))
         // Pretty print all the vaults before the operation
         // console.log('Sorted open vaults BEFORE at index:', indexBefore)
         // let correctOrderBefore = true
@@ -89,7 +95,7 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         //   }
         // }
         // if (correctOrderBefore) {
-        //   console.log(`Verfied the on-chain order of vault type:`, vaultTypeAccount.collateralType)
+        //   console.log(`Verified the on-chain order of vault type:`, vaultTypeAccount.collateralType)
         // } else {
         //   throw new Error('On-Chian vaults not in order!')
         // }
@@ -104,7 +110,7 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             vaults[indexBefore] = thisVault;
         }
         // Now that we know it's def in the list, iterate the list and update
-        // this vault with the opeation we're going to apply
+        // this vault with the operation we're going to apply
         const newNormalizedDebt = new decimal_js_1.default(loanAmount);
         const vaultTypeCompoundedInterest = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccount.cumulativeRate.toString());
         vaults[indexBefore].updateDebtAndCollateral(vaultTypeAccount);
@@ -121,11 +127,6 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         }
         // Sort it again since we've changed one vault
         vaults = vaults.sort(sortVaults);
-        // Pretty print the list again
-        // console.log('Sorted open vaults with new debt added at index: ', indexAfter)
-        // console.log(vaults.map((vault) => {
-        //   return vault.toString(vaultPublicKey)
-        // }))
         // Search for the vaults new position
         let indexAfter = -1;
         vaults.forEach((vault, index) => {
@@ -141,8 +142,7 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         //   })
         // )
         // Print where it moved from / to
-        console.log('Index Before', indexBefore);
-        console.log('Index After', indexAfter);
+        // console.log('Index After', indexAfter)
         // Save references to the new left and right
         if (indexAfter > 0) {
             newSmallerPublicKey = vaults[indexAfter - 1].publicKey;
@@ -168,7 +168,7 @@ function sortVaults(a, b) {
     }
     return aRatio - bRatio;
 }
-function getMiniVaults(program, collateralType) {
+function getMiniVaults(program, vaultTypeName) {
     return __awaiter(this, void 0, void 0, function* () {
         const filters = [
             // Filter for Vault Accounts
@@ -179,7 +179,7 @@ function getMiniVaults(program, collateralType) {
             // Filter for Vaults with this collateral type
             {
                 memcmp: {
-                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(collateralType)),
+                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(vaultTypeName)),
                     offset: 8 + 32 + 24,
                 },
             },

package/lib/utils/sendAndConfirmWithDebug.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+function sendAndConfirmWithDebug(connection, transaction, signers) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return connection
+            .sendTransaction(transaction, signers)
+            .then((signature) => {
+            return connection
+                .confirmTransaction(signature)
+                .then((signatureContext) => {
+                return signature;
+            })
+                .catch((error) => {
+                console.log('There was an error confirming the transaction', error);
+                console.trace();
+                throw error;
+            });
+        })
+            .catch((error) => {
+            console.log('There was an error sending the transaction', error);
+            console.trace();
+            throw error;
+        });
+    });
+}
+exports.default = sendAndConfirmWithDebug;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.43",
+  "version": "0.1.44",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/Constants.ts

@@ -4,7 +4,7 @@ import {
 } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ'
+export const HEDGE_PROGRAM_ID = 'zooJaircVAoQ4e7EXRDocnsbB7UPYQ6J7bKyZEMh784'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID =

package/src/idl/vault.ts

@@ -1844,7 +1844,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -1858,6 +1858,10 @@ export type Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -2102,7 +2106,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -2186,6 +2190,14 @@ export type Vault = {
           {
             "name": "deprecated",
             "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
           }
         ]
       }
@@ -2212,7 +2224,7 @@ export type Vault = {
             "type": "u64"
           },
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -2260,6 +2272,10 @@ export type Vault = {
             "type": {
               "option": "publicKey"
             }
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -2673,8 +2689,8 @@ export type Vault = {
     },
     {
       "code": 6020,
-      "name": "RedeemingNonHighestCollateralRatioVault",
-      "msg": "Can only redeem highest collateral ratio vault in system."
+      "name": "NotRedeemingLowestCollateralRatioVault",
+      "msg": "Can only redeem lowest collateral ratio vault in system."
     },
     {
       "code": 6021,
@@ -2688,6 +2704,11 @@ export type Vault = {
     },
     {
       "code": 6023,
+      "name": "InvalidSaltLength",
+      "msg": "Salt for new vaults must be of length 8"
+    },
+    {
+      "code": 6024,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
     }
@@ -4540,7 +4561,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4554,6 +4575,10 @@ export const IDL: Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -4798,7 +4823,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4882,6 +4907,14 @@ export const IDL: Vault = {
           {
             "name": "deprecated",
             "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
           }
         ]
       }
@@ -4908,7 +4941,7 @@ export const IDL: Vault = {
             "type": "u64"
           },
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4956,6 +4989,10 @@ export const IDL: Vault = {
             "type": {
               "option": "publicKey"
             }
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -5369,8 +5406,8 @@ export const IDL: Vault = {
     },
     {
       "code": 6020,
-      "name": "RedeemingNonHighestCollateralRatioVault",
-      "msg": "Can only redeem highest collateral ratio vault in system."
+      "name": "NotRedeemingLowestCollateralRatioVault",
+      "msg": "Can only redeem lowest collateral ratio vault in system."
     },
     {
       "code": 6021,
@@ -5384,6 +5421,11 @@ export const IDL: Vault = {
     },
     {
       "code": 6023,
+      "name": "InvalidSaltLength",
+      "msg": "Salt for new vaults must be of length 8"
+    },
+    {
+      "code": 6024,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
     }

package/src/instructions/createStakingPool.ts

@@ -41,6 +41,7 @@ export async function createStakingPoolInstruction(
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
+  console.log("new createStakingPoolInstruction")
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)

package/src/instructions/depositVault.ts

@@ -20,6 +20,7 @@ import {
   getHedgeMintPublicKey,
 } from '../Constants'
 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 +36,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
   )
 
@@ -68,7 +68,7 @@ export async function depositVault(
   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,

package/src/instructions/liquidateVault.ts

@@ -31,8 +31,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 +72,7 @@ export async function liquidateVault(
     provider.connection,
     payer,
     collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
   const hedgeStakingPoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -87,7 +86,7 @@ export async function liquidateVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     0,
@@ -119,7 +118,7 @@ export async function liquidateVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      vaultAccount.collateralType,
+      vaultAccount.vaultType,
       overrideTime
     )
   )
@@ -146,13 +145,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,13 @@ import {
   getVaultTypeAccountPublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
+  HEDGE_PROGRAM_PUBLICKEY,
 } from '../Constants'
 import { Vault } from 'idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import { VaultAccount } from '../state/VaultAccount'
+
+const fs = require('fs');
 
 export async function loanVault(
   program: Program<Vault>,
@@ -36,15 +41,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 +58,10 @@ export async function loanVault(
     vaultPublicKey,
     true
   )
-
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     loanAmount,
@@ -75,7 +78,7 @@ export async function loanVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,
@@ -84,7 +87,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history]).catch(parseAnchorErrors)
   return vaultPublicKey
 }
 

package/src/instructions/redeemVault.ts

@@ -40,13 +40,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 +67,7 @@ export async function redeemVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     0,
@@ -86,7 +85,7 @@ export async function redeemVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,

package/src/instructions/refreshOraclePrice.ts

@@ -51,7 +51,7 @@ export async function refreshOraclePriceInstruction(
     .accounts({
       oracleInfoAccount: oracleInfoAccount,
       vaultTypeAccount: vaultTypeAccount,
-      oracleChainlink: chainlinkAccunts[network],
+      oracleChainlink: chainlinkAccounts[network],
       oraclePyth: pythAccounts[network],
       oracleSwitchboard: switchboardAccounts[network],
       systemProgram: SystemProgram.programId,
@@ -70,7 +70,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

@@ -39,10 +39,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 +49,7 @@ export async function repayVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     repayAmount * -1,
@@ -67,7 +66,7 @@ export async function repayVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount,
       oldSmallerPublicKey,
       newSmallerPublicKey,

package/src/instructions/withdrawVault.ts

@@ -37,7 +37,6 @@ export async function withdrawVault(
   const history = Keypair.generate()
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
   const vaultAssociatedCollateralAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
@@ -46,12 +45,12 @@ export async function withdrawVault(
     true
   )
 
-  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
   )
 
@@ -70,7 +69,7 @@ export async function withdrawVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     withdrawAmount * -1,
     0,
@@ -86,7 +85,7 @@ export async function withdrawVault(
       destinationTokenAccount.address,
       vaultPublicKey,
       vaultAssociatedCollateralAccount.address,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,