hedge-web3 0.1.46 → 0.1.50

package/lib/state/VaultAccount.js

@@ -32,7 +32,11 @@ const borsh = __importStar(require("@project-serum/borsh"));
  */
 class VaultAccount {
     constructor(vault, publicKey) {
-        var _a, _b, _c;
+        var _a;
+        /** The deposited collateral of the vault (in SOL Lamports). */
+        this.deposited = new decimal_js_1.default(0);
+        /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
+        this.denormalizedDebt = new decimal_js_1.default(0);
         /** Debt redistribution snapshot */
         this.debtProductSnapshotBytes = new decimal_js_1.default(0);
         /** Collateral redistribution snapshot' */
@@ -43,20 +47,23 @@ class VaultAccount {
         this.vaultOwner = vault.vaultOwner;
         this.vaultNumber = (_a = vault.vaultNumber) === null || _a === void 0 ? void 0 : _a.toNumber();
         this.pdaSalt = vault.pdaSalt;
-        this.deposited = (_b = vault.deposited) === null || _b === void 0 ? void 0 : _b.toNumber();
-        this.denormalizedDebt = (_c = vault.denormalizedDebt) === null || _c === void 0 ? void 0 : _c.toNumber();
+        if (vault.deposited) {
+            this.deposited = new decimal_js_1.default(vault.deposited.toString());
+        }
+        if (vault.denormalizedDebt) {
+            this.denormalizedDebt = new decimal_js_1.default(vault.denormalizedDebt.toString());
+        }
         if (vault.debtProductSnapshotBytes) {
             this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
         }
         if (vault.collateralAccumulatorSnapshotBytes) {
             this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.collateralAccumulatorSnapshotBytes.toString());
         }
-        this.vaultTypeName = vault.vaultTypeName;
+        this.collateralType = vault.collateralType;
         this.nextVaultToRedeem = vault.nextVaultToRedeem;
         if (vault.vaultStatus) {
             this.vaultStatus = Object.keys(vault.vaultStatus)[0];
         }
-        this.vaultType = vault.vaultType;
     }
     /**
      * Check if some `PublicKey` is the owner
@@ -73,7 +80,7 @@ class VaultAccount {
      * @returns collateral value in SOL
      */
     inSol() {
-        return this.deposited / web3_js_1.LAMPORTS_PER_SOL;
+        return this.deposited.div(web3_js_1.LAMPORTS_PER_SOL).toNumber();
     }
     /**
      * Get the debt value in USH
@@ -81,7 +88,7 @@ class VaultAccount {
      * @returns debt value in USH
      */
     inUsd() {
-        return this.denormalizedDebt / web3_js_1.LAMPORTS_PER_SOL;
+        return this.denormalizedDebt.div(web3_js_1.LAMPORTS_PER_SOL).toNumber();
     }
     /**
      * Pretty print the vault publickey for easy display
@@ -95,31 +102,30 @@ class VaultAccount {
     }
     addDebt(newNormalizedDebt, vaultTypeCompoundedInterest) {
         const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest);
-        this.denormalizedDebt = denormalizedNewDebt.add(new decimal_js_1.default(this.denormalizedDebt)).floor().toNumber();
+        this.denormalizedDebt = denormalizedNewDebt.add(new decimal_js_1.default(this.denormalizedDebt)).floor();
         // this.denormalizedDebt = parseFloat(this.denormalizedDebt.toFixed(0))
     }
     addDeposit(depositAmount) {
-        this.deposited += depositAmount;
+        this.deposited = this.deposited.add(depositAmount);
     }
     redeem() {
         // TODO - Calculate actual redeem amount and adust correctly
-        this.denormalizedDebt = 0;
+        this.denormalizedDebt = new decimal_js_1.default(0);
         this.vaultStatus = 'initialized';
     }
     liquidate() {
         // TODO - Calculate actual liquidate amount and adust correctly
-        this.denormalizedDebt = 0;
+        this.denormalizedDebt = new decimal_js_1.default(0);
         this.vaultStatus = 'liquidated';
     }
-    updateDebtAndCollateral(vaultTypeAccountData) {
-        const debtProductCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccountData.debtRedistributionProduct);
-        const collateralAccumulatorCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccountData.collateralRedistributionAccumulator);
+    updateDebtAndCollateral(vaultTypeAccuntData) {
+        const debtProductCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccuntData.debtRedistributionProduct);
+        const collateralAccumulatorCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccuntData.collateralRedistributionAccumulator);
         this.denormalizedDebt = debtProductCurrent
             .div(this.debtProductSnapshotBytes)
-            .mul(new decimal_js_1.default(this.denormalizedDebt))
-            .toNumber();
-        const extraCollateralDeposited = this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber();
-        this.deposited += extraCollateralDeposited;
+            .mul(new decimal_js_1.default(this.denormalizedDebt));
+        const extraCollateralDeposited = this.denormalizedDebt.mul(collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes));
+        this.deposited = this.deposited.add(extraCollateralDeposited);
         this.collateralAccumulatorSnapshotBytes = collateralAccumulatorCurrent;
         this.debtProductSnapshotBytes = debtProductCurrent;
     }
@@ -129,14 +135,14 @@ class VaultAccount {
             arrow = ' <----!!';
         }
         let collateralRatio = 'Infinite';
-        if (this.denormalizedDebt > 0) {
+        if (this.denormalizedDebt.greaterThan(0)) {
             collateralRatio = new decimal_js_1.default(this.deposited).div(new decimal_js_1.default(this.denormalizedDebt)).toString();
         }
         let nextVault = 'None';
         if (this.nextVaultToRedeem) {
             nextVault = this.nextVaultToRedeem.toString().substring(0, 6);
         }
-        return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
+        return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `;
     }
     /**
      * Creates a VaultAccount from a slice of data

package/lib/utils/getLinkedListAccounts.js

@@ -21,14 +21,13 @@ 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;
@@ -51,10 +50,10 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             // vaults = allVaults.map((vault) => {
             //   return new VaultAccount(vault.account, vault.publicKey)
             // })
-            vaults = yield getMiniVaults(program, vaultTypeAccount.vaultTypeName);
+            vaults = yield getMiniVaults(program, vaultTypeAccount.collateralType);
         }
-        // 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) => {
@@ -62,7 +61,7 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         // })
         // Remove any vaults with no debt or collateral
         vaults = underscore_1.default.filter(vaults, (vault) => {
-            return vault.denormalizedDebt > 0 && vault.deposited > 0;
+            return vault.denormalizedDebt.greaterThan(0) && vault.deposited.greaterThan(0);
         });
         // Sort them
         vaults.sort(sortVaults);
@@ -77,11 +76,6 @@ 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
@@ -122,11 +116,16 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (redeem) {
             vaults[indexBefore].redeem();
         }
-        if (vaults[indexBefore].denormalizedDebt === 0) {
+        if (vaults[indexBefore].denormalizedDebt.isZero()) {
             vaults.splice(indexBefore, 1);
         }
         // 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) => {
@@ -142,7 +141,8 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         //   })
         // )
         // Print where it moved from / to
-        // console.log('Index After', indexAfter)
+        console.log('Index Before', indexBefore);
+        console.log('Index After', indexAfter);
         // Save references to the new left and right
         if (indexAfter > 0) {
             newSmallerPublicKey = vaults[indexAfter - 1].publicKey;
@@ -161,14 +161,17 @@ exports.getLinkedListAccounts = getLinkedListAccounts;
 // Sort function we can use to sort the vaults
 // Sorted by collateral ratio. If two are the same, newer vault first
 function sortVaults(a, b) {
-    const aRatio = a.deposited / a.denormalizedDebt;
-    const bRatio = b.deposited / b.denormalizedDebt;
-    if (aRatio === bRatio) {
+    const aRatio = a.deposited.floor().div(a.denormalizedDebt.floor());
+    const bRatio = b.deposited.floor().div(b.denormalizedDebt.floor());
+    if (aRatio.equals(bRatio)) {
         return b.vaultNumber - a.vaultNumber;
     }
-    return aRatio - bRatio;
+    if (aRatio.greaterThan(bRatio)) {
+        return 1;
+    }
+    return -1;
 }
-function getMiniVaults(program, vaultTypeName) {
+function getMiniVaults(program, collateralType) {
     return __awaiter(this, void 0, void 0, function* () {
         const filters = [
             // Filter for Vault Accounts
@@ -179,7 +182,7 @@ function getMiniVaults(program, vaultTypeName) {
             // Filter for Vaults with this collateral type
             {
                 memcmp: {
-                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(vaultTypeName)),
+                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(collateralType)),
                     offset: 8 + 32 + 24,
                 },
             },

package/package.json

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

package/src/idl/vault.ts

@@ -1649,58 +1649,6 @@ export type Vault = {
           }
         }
       ]
-    },
-    {
-      "name": "adminMigrateVault",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "vaultSystemState",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "vaultAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "vaultTypeAccount",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "adminMigrateOracle",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "vaultSystemState",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "oracleInfoAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "vaultTypeAccount",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
     }
   ],
   "accounts": [
@@ -1896,7 +1844,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultTypeName",
+            "name": "collateralType",
             "type": "string"
           },
           {
@@ -1910,10 +1858,6 @@ export type Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
-          },
-          {
-            "name": "vaultType",
-            "type": "publicKey"
           }
         ]
       }
@@ -2158,7 +2102,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultTypeName",
+            "name": "collateralType",
             "type": "string"
           },
           {
@@ -2242,14 +2186,6 @@ export type Vault = {
           {
             "name": "deprecated",
             "type": "bool"
-          },
-          {
-            "name": "totalFeesAccumulatedUsh",
-            "type": "u128"
-          },
-          {
-            "name": "totalFeesAccumulatedCollateral",
-            "type": "u128"
           }
         ]
       }
@@ -2276,7 +2212,7 @@ export type Vault = {
             "type": "u64"
           },
           {
-            "name": "vaultTypeName",
+            "name": "collateralType",
             "type": "string"
           },
           {
@@ -2324,10 +2260,6 @@ export type Vault = {
             "type": {
               "option": "publicKey"
             }
-          },
-          {
-            "name": "vaultType",
-            "type": "publicKey"
           }
         ]
       }
@@ -2741,8 +2673,8 @@ export type Vault = {
     },
     {
       "code": 6020,
-      "name": "NotRedeemingLowestCollateralRatioVault",
-      "msg": "Can only redeem lowest collateral ratio vault in system."
+      "name": "RedeemingNonHighestCollateralRatioVault",
+      "msg": "Can only redeem highest collateral ratio vault in system."
     },
     {
       "code": 6021,
@@ -2756,11 +2688,6 @@ 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!"
     }
@@ -4418,58 +4345,6 @@ export const IDL: Vault = {
           }
         }
       ]
-    },
-    {
-      "name": "adminMigrateVault",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "vaultSystemState",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "vaultAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "vaultTypeAccount",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "adminMigrateOracle",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "vaultSystemState",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "oracleInfoAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "vaultTypeAccount",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
     }
   ],
   "accounts": [
@@ -4665,7 +4540,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultTypeName",
+            "name": "collateralType",
             "type": "string"
           },
           {
@@ -4679,10 +4554,6 @@ export const IDL: Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
-          },
-          {
-            "name": "vaultType",
-            "type": "publicKey"
           }
         ]
       }
@@ -4927,7 +4798,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultTypeName",
+            "name": "collateralType",
             "type": "string"
           },
           {
@@ -5011,14 +4882,6 @@ export const IDL: Vault = {
           {
             "name": "deprecated",
             "type": "bool"
-          },
-          {
-            "name": "totalFeesAccumulatedUsh",
-            "type": "u128"
-          },
-          {
-            "name": "totalFeesAccumulatedCollateral",
-            "type": "u128"
           }
         ]
       }
@@ -5045,7 +4908,7 @@ export const IDL: Vault = {
             "type": "u64"
           },
           {
-            "name": "vaultTypeName",
+            "name": "collateralType",
             "type": "string"
           },
           {
@@ -5093,10 +4956,6 @@ export const IDL: Vault = {
             "type": {
               "option": "publicKey"
             }
-          },
-          {
-            "name": "vaultType",
-            "type": "publicKey"
           }
         ]
       }
@@ -5510,8 +5369,8 @@ export const IDL: Vault = {
     },
     {
       "code": 6020,
-      "name": "NotRedeemingLowestCollateralRatioVault",
-      "msg": "Can only redeem lowest collateral ratio vault in system."
+      "name": "RedeemingNonHighestCollateralRatioVault",
+      "msg": "Can only redeem highest collateral ratio vault in system."
     },
     {
       "code": 6021,
@@ -5525,11 +5384,6 @@ 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,7 +41,6 @@ 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,7 +20,6 @@ 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>,
@@ -36,12 +35,13 @@ export async function depositVault(
   await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     true
   )
 
@@ -68,7 +68,7 @@ export async function depositVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultPublicKey,
     depositAmount,
     0,
@@ -76,7 +76,7 @@ export async function depositVault(
     false
   )
 
-  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
+  if (vaultAccount.collateralType === 'SOL') {
     transaction.add(
       SystemProgram.createAccount({
         fromPubkey: payer.publicKey,
@@ -98,11 +98,11 @@ export async function depositVault(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
-      vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString() ? wrappedSolAccount.publicKey : payerTokenAccount,
+      vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount,
       vaultPublicKey,
       vaultAssociatedCollateralAccountPublicKey,
       history.publicKey,
-      vaultAccount.vaultType,
+      vaultTypeAccountPublicKey,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,
@@ -115,7 +115,7 @@ export async function depositVault(
       overrideTime
     )
   )
-  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
+  if (vaultAccount.collateralType === 'SOL') {
     transaction.add(
       TokenInstructions.closeAccount({
         source: wrappedSolAccount.publicKey,

package/src/instructions/liquidateVault.ts

@@ -31,7 +31,8 @@ export async function liquidateVault(
 ): Promise<PublicKey> {
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
+  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const collateralMint = vaultTypeAccountInfo.collateralMint
 
   const hedgeMintPublickey = await getHedgeMintPublicKey()
@@ -72,7 +73,7 @@ export async function liquidateVault(
     provider.connection,
     payer,
     collateralMint,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     true
   )
   const hedgeStakingPoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -86,7 +87,7 @@ export async function liquidateVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultAccount.vaultType,
+    vaultTypeAccountPublicKey,
     vaultPublicKey,
     0,
     0,
@@ -118,7 +119,7 @@ export async function liquidateVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      vaultAccount.vaultType,
+      vaultAccount.collateralType,
       overrideTime
     )
   )
@@ -145,12 +146,13 @@ export async function liquidateVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  vaultTypeAccount: PublicKey,
+  collateralType: string,
   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(