hedge-web3 0.1.42 → 0.1.45

package/lib/state/VaultAccount.js

@@ -33,11 +33,11 @@ const borsh = __importStar(require("@project-serum/borsh"));
 class VaultAccount {
     constructor(vault, publicKey) {
         var _a, _b, _c;
-        /** Debt redistribution snapshop */
+        /** Debt redistribution snapshot */
         this.debtProductSnapshotBytes = new decimal_js_1.default(0);
-        /** Collateral redistribution snapshop' */
+        /** Collateral redistribution snapshot' */
         this.collateralAccumulatorSnapshotBytes = new decimal_js_1.default(0);
-        /** Current State of the vautl ("Open", "Closed", "Liquidated") */
+        /** Current State of the vault ("Open", "Closed", "Liquidated") */
         this.vaultStatus = '';
         this.publicKey = publicKey;
         this.vaultOwner = vault.vaultOwner;
@@ -51,11 +51,12 @@ class VaultAccount {
         if (vault.collateralAccumulatorSnapshotBytes) {
             this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.collateralAccumulatorSnapshotBytes.toString());
         }
-        this.collateralType = vault.collateralType;
+        this.vaultTypeName = vault.vaultTypeName;
         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
@@ -110,9 +111,9 @@ class VaultAccount {
         this.denormalizedDebt = 0;
         this.vaultStatus = 'liquidated';
     }
-    updateDebtAndCollateral(vaultTypeAccuntData) {
-        const debtProductCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccuntData.debtRedistributionProduct);
-        const collateralAccumulatorCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccuntData.collateralRedistributionAccumulator);
+    updateDebtAndCollateral(vaultTypeAccountData) {
+        const debtProductCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccountData.debtRedistributionProduct);
+        const collateralAccumulatorCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccountData.collateralRedistributionAccumulator);
         this.denormalizedDebt = debtProductCurrent
             .div(this.debtProductSnapshotBytes)
             .mul(new decimal_js_1.default(this.denormalizedDebt))
@@ -135,7 +136,7 @@ class VaultAccount {
         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} NextVault: ${nextVault} ${arrow} `;
+        return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
     }
     /**
      * Creates a VaultAccount from a slice of data

package/lib/state/VaultType.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const HedgeDecimal_1 = require("../HedgeDecimal");
+class VaultType {
+    constructor(config, publicKey) {
+        var _a;
+        this.publicKey = publicKey;
+        this.name = config.collateralType;
+        this.loanInitFee = (0, HedgeDecimal_1.DecimalFromU128)(config.loanInitFee);
+        this.minCollateralRatio = (0, HedgeDecimal_1.DecimalFromU128)(config.minCollateralRatio);
+        this.interestRatePerSecond = (0, HedgeDecimal_1.DecimalFromU128)(config.interestRatePerSecond);
+        this.minDebtPerVault = (0, HedgeDecimal_1.DecimalFromU128)(config.minDebtPerVault);
+        this.maxDebtExtended = (0, HedgeDecimal_1.DecimalFromU128)(config.maxDebtExtended);
+        this.canBeRedeemed = config.canBeRedeemed;
+        this.collateralMint = config.collateralMint;
+        this.firstVaultToRedeem = config.firstVaultToRedeem;
+        this.recentPrice = (0, HedgeDecimal_1.DecimalFromU128)((_a = config.recentPrice) === null || _a === void 0 ? void 0 : _a.toString());
+        this.priceLastUpdatedTimestamp = new decimal_js_1.default(config.priceLastUpdatedTimestamp.toString());
+        this.collateralHeld = new decimal_js_1.default(config.collateralHeld.toString());
+        this.denormalizedDebtExtended = new decimal_js_1.default(config.denormalizedDebtExtended.toString());
+        this.debtRedistributionProduct = (0, HedgeDecimal_1.DecimalFromU128)(config.debtRedistributionProduct.toString());
+        this.collateralRedistributionAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(config.collateralRedistributionAccumulator.toString());
+        this.cumulativeRate = (0, HedgeDecimal_1.DecimalFromU128)(config.cumulativeRate.toString());
+        this.cumulativeRateLastUpdated = new decimal_js_1.default(config.cumulativeRateLastUpdated.toString());
+        this.collateralIndex = config.collateralIndex.toNumber();
+    }
+}
+exports.default = VaultType;

package/lib/utils/Sender.js

@@ -0,0 +1,32 @@
+"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 });
+exports.sendAndConfirmWithDebug = void 0;
+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);
+            });
+        })
+            .catch((error) => {
+            console.log('There was an error sending the transaction', error);
+        });
+    });
+}
+exports.sendAndConfirmWithDebug = sendAndConfirmWithDebug;

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.42",
+  "version": "0.1.45",
   "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

@@ -1649,6 +1649,58 @@ 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": [
@@ -1844,7 +1896,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -1858,6 +1910,10 @@ export type Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -1968,7 +2024,7 @@ export type Vault = {
             "type": {
               "array": [
                 "u8",
-                12
+                16
               ]
             }
           },
@@ -2102,7 +2158,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -2186,6 +2242,14 @@ export type Vault = {
           {
             "name": "deprecated",
             "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
           }
         ]
       }
@@ -2212,7 +2276,7 @@ export type Vault = {
             "type": "u64"
           },
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -2260,6 +2324,10 @@ export type Vault = {
             "type": {
               "option": "publicKey"
             }
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -2673,8 +2741,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 +2756,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!"
     }
@@ -4345,6 +4418,58 @@ 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": [
@@ -4540,7 +4665,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4554,6 +4679,10 @@ export const IDL: Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -4664,7 +4793,7 @@ export const IDL: Vault = {
             "type": {
               "array": [
                 "u8",
-                12
+                16
               ]
             }
           },
@@ -4798,7 +4927,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4882,6 +5011,14 @@ export const IDL: Vault = {
           {
             "name": "deprecated",
             "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
           }
         ]
       }
@@ -4908,7 +5045,7 @@ export const IDL: Vault = {
             "type": "u64"
           },
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4956,6 +5093,10 @@ export const IDL: Vault = {
             "type": {
               "option": "publicKey"
             }
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -5369,8 +5510,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 +5525,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,