hedge-web3 0.2.3 → 0.2.9

package/lib/state/VaultAccount.js

@@ -27,12 +27,18 @@ const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const HedgeDecimal_1 = require("../HedgeDecimal");
 const borsh = __importStar(require("@project-serum/borsh"));
+const bn_js_1 = __importDefault(require("bn.js"));
 /**
  * A class that represents an on-chian vault.
  */
 class VaultAccount {
     constructor(vault, publicKey) {
-        var _a, _b, _c;
+        /** The deposited collateral of the vault (in SOL Lamports). */
+        this.deposited = new bn_js_1.default(0);
+        /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
+        this.denormalizedDebt = new bn_js_1.default(0);
+        /** The ordered number of when this vault was created. */
+        this.vaultNumber = 0;
         /** Debt redistribution snapshot */
         this.debtProductSnapshotBytes = new decimal_js_1.default(0);
         /** Collateral redistribution snapshot' */
@@ -41,10 +47,12 @@ class VaultAccount {
         this.vaultStatus = '';
         this.publicKey = publicKey;
         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();
+        this.deposited = vault.deposited;
+        this.denormalizedDebt = vault.denormalizedDebt;
+        if (vault.vaultNumber) {
+            this.vaultNumber = vault.vaultNumber.toNumber();
+        }
         if (vault.debtProductSnapshotBytes) {
             this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
         }
@@ -67,21 +75,22 @@ class VaultAccount {
     isOwnedBy(publicKey) {
         return publicKey && publicKey.toString() === this.vaultOwner.toString();
     }
-    /**
-     * Get the collateral value in SOL
-     *
-     * @returns collateral value in SOL
-     */
-    inSol() {
-        return this.deposited / web3_js_1.LAMPORTS_PER_SOL;
-    }
+    // /**
+    //  * Get the collateral value in SOL
+    //  *
+    //  * @returns collateral value in SOL
+    //  */
+    // public inSol(): number {
+    // This should not be LAMPORTS_PER_SOL. Should be collateral units like Ray
+    //   return new Decimal(this.deposited.toString()).div(LAMPORTS_PER_SOL).toNumber()
+    // }
     /**
      * Get the debt value in USH
      *
      * @returns debt value in USH
      */
     inUsd() {
-        return this.denormalizedDebt / web3_js_1.LAMPORTS_PER_SOL;
+        return new decimal_js_1.default(this.denormalizedDebt.toString()).div(web3_js_1.LAMPORTS_PER_SOL).toNumber();
     }
     /**
      * Pretty print the vault publickey for easy display
@@ -93,35 +102,69 @@ class VaultAccount {
             .toString()
             .substring(this.publicKey.toString().length - 6)}`;
     }
+    /**
+     * Add additional debt to the vault.
+     *
+     * @param {BN} additionalDebt - Additional normalized debt to add in (USH) lamports.
+     * @param {VaultType} vaultTypeAccount - Vault's vaultType
+     *
+     */
     addDebt(additionalDebt, vaultTypeAccount) {
-        let loanFee = new decimal_js_1.default(0);
-        if (additionalDebt.isPositive()) {
-            loanFee = vaultTypeAccount.loanInitFee.mul(additionalDebt);
-        }
-        const totalNormalizedLoan = additionalDebt.add(loanFee);
-        const denormalizedNewDebt = totalNormalizedLoan.div(new decimal_js_1.default(vaultTypeAccount.cumulativeRate.toString()));
-        this.denormalizedDebt = denormalizedNewDebt.add(new decimal_js_1.default(this.denormalizedDebt)).floor().toNumber();
+        const additionalDebtAsDecimal = new decimal_js_1.default(additionalDebt.toString());
+        // Calculate the fee on the loan
+        const loanFee = vaultTypeAccount.loanInitFee.mul(additionalDebtAsDecimal);
+        // TODO: There's a chance this needs to be .Floor()
+        const totalNormalizedLoan = additionalDebtAsDecimal.add(loanFee);
+        const denormalizedNewDebt = new bn_js_1.default(totalNormalizedLoan.div(vaultTypeAccount.cumulativeRate).floor().toString());
+        this.denormalizedDebt = this.denormalizedDebt.add(denormalizedNewDebt);
+    }
+    /**
+     * Repay debt on a vault
+     *
+     * @param {BN} repayAmount - Normalized debt to repay in (USH) lamports.
+     * @param {VaultType} vaultTypeAccount - Vault's vaultType
+     *
+     */
+    repayDebt(repayAmount, vaultTypeAccount) {
+        const denormalizedRepayment = new decimal_js_1.default(repayAmount.toString()).div(vaultTypeAccount.cumulativeRate).floor();
+        this.denormalizedDebt = this.denormalizedDebt.sub(new bn_js_1.default(denormalizedRepayment.toString()));
+    }
+    /**
+     * Deposit Collateral
+     *
+     * @param {BN} depositAmount - Amount to deposit in (CollateralMint) lamports
+     *
+     */
+    depositCollateral(depositAmount) {
+        this.deposited = this.deposited.add(depositAmount);
     }
-    addDeposit(depositAmount) {
-        this.deposited += depositAmount;
+    /**
+     * Withdraw Collateral
+     *
+     * @param {BN} withdrawAmount - Amount to withdraw in (CollateralMint) lamports
+     *
+     */
+    withdrawCollateral(withdrawAmount) {
+        this.deposited = this.deposited.sub(withdrawAmount);
     }
     redeem() {
         // TODO - Calculate actual redeem amount and adust correctly
-        this.denormalizedDebt = 0;
+        this.denormalizedDebt = new bn_js_1.default(0);
         this.vaultStatus = 'initialized';
     }
     liquidate() {
         // TODO - Calculate actual liquidate amount and adust correctly
-        this.denormalizedDebt = 0;
+        this.denormalizedDebt = new bn_js_1.default(0);
         this.vaultStatus = 'liquidated';
     }
     updateDebtAndCollateral(vaultTypeAccountData) {
-        this.denormalizedDebt = vaultTypeAccountData.debtRedistributionProduct
+        this.denormalizedDebt = new bn_js_1.default(vaultTypeAccountData.debtRedistributionProduct
             .div(this.debtProductSnapshotBytes)
-            .mul(new decimal_js_1.default(this.denormalizedDebt))
-            .toNumber();
-        const extraCollateralDeposited = this.denormalizedDebt * vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber();
-        this.deposited += extraCollateralDeposited;
+            .mul(new decimal_js_1.default(this.denormalizedDebt.toString()))
+            .floor()
+            .toString());
+        const extraCollateralDeposited = new decimal_js_1.default(this.denormalizedDebt.toString()).mul(vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()).floor();
+        this.deposited = this.deposited.add(new bn_js_1.default(extraCollateralDeposited.toString()));
         this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator;
         this.debtProductSnapshotBytes = vaultTypeAccountData.debtRedistributionProduct;
     }
@@ -131,14 +174,14 @@ class VaultAccount {
             arrow = ' <----!!';
         }
         let collateralRatio = 'Infinite';
-        if (this.denormalizedDebt > 0) {
-            collateralRatio = new decimal_js_1.default(this.deposited).div(new decimal_js_1.default(this.denormalizedDebt)).toString();
+        if (this.denormalizedDebt.gt(new bn_js_1.default(0))) {
+            collateralRatio = new decimal_js_1.default(this.deposited.toString()).div(new decimal_js_1.default(this.denormalizedDebt.toString())).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 `${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
     }
     /**
      * Creates a VaultAccount from a slice of data
@@ -153,7 +196,7 @@ class VaultAccount {
      * @returns a new VaultAccount
      */
     static FromMiniSlice(data, pubkey) {
-        const props = [borsh.u64('vaultNumber'), borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
+        const props = [borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
         const miniVaultLayout = borsh.struct(props, 'minVaultLayout');
         const decodedData = miniVaultLayout.decode(data);
         return new VaultAccount(decodedData, pubkey);

package/lib/utils/getLinkedListAccounts.js

@@ -13,13 +13,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
+const anchor_1 = require("@project-serum/anchor");
 const underscore_1 = __importDefault(require("underscore"));
 const Constants_1 = require("../Constants");
 const VaultAccount_1 = require("../state/VaultAccount");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const bs58_1 = __importDefault(require("bs58"));
 const VaultType_1 = __importDefault(require("../state/VaultType"));
-function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, loanAmount, redeem, liquidate, cachedVaults) {
+/**
+ * Get the accounts the left and right for re-inserting in the linked list
+ *
+ * @param {Program<Vault>} program - Anchor program <Vault ILD>
+ * @param {PublicKey} vaultTypeAccountPublicKey - Vault Type Account PublicKey
+ * @param {PublicKey} vaultPublicKey - Vault Account PublicKey
+ * @param {BN} depositAmount - Amount that will be deposited into vault with instruction
+ * @param {BN} withdrawAmount - Amount that will be withdrawn from vault with instruction
+ * @param {BN} loanAmount - Amount that will be deposited into vault with transaction (sans fees)
+ * @param {BN} repayAmount - Amount that will be repaid into vault with transaction
+ * @param {boolean} redeem - True if vault is going to be redeemed fully
+ * @param {boolean} liquidate - True if vault is going to be liquidated fully
+ * @param {VaultAccount[]} cachedVaults - Optional list of cached vaults. Saves a request to the on-chain data.
+ */
+function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, withdrawAmount, loanAmount, repayAmount, redeem, liquidate, cachedVaults) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultTypeRaw = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const vaultType = new VaultType_1.default(vaultTypeRaw, vaultTypeAccountPublicKey);
@@ -50,7 +65,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.gt(new anchor_1.BN(0)) && vault.deposited.gt(new anchor_1.BN(0));
         });
         // Sort them
         vaults.sort(sortVaults);
@@ -101,17 +116,18 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         }
         // Now that we know it's def in the list, iterate the list and update
         // this vault with the operation we're going to apply
-        const newNormalizedDebt = new decimal_js_1.default(loanAmount);
         vaults[indexBefore].updateDebtAndCollateral(vaultType);
-        vaults[indexBefore].addDebt(newNormalizedDebt, vaultType);
-        vaults[indexBefore].addDeposit(depositAmount);
+        vaults[indexBefore].addDebt(loanAmount, vaultType);
+        vaults[indexBefore].repayDebt(repayAmount, vaultType);
+        vaults[indexBefore].depositCollateral(depositAmount);
+        vaults[indexBefore].withdrawCollateral(withdrawAmount);
         if (liquidate) {
             vaults[indexBefore].liquidate();
         }
         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
@@ -154,12 +170,12 @@ 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) {
-        return b.vaultNumber - a.vaultNumber;
+    const aRatio = new decimal_js_1.default(a.deposited.toString()).div(new decimal_js_1.default(a.denormalizedDebt.toString()));
+    const bRatio = new decimal_js_1.default(b.deposited.toString()).div(new decimal_js_1.default(b.denormalizedDebt.toString()));
+    if (aRatio.equals(bRatio)) {
+        return a.publicKey.toString() > b.publicKey.toString() ? 1 : -1;
     }
-    return aRatio - bRatio;
+    return aRatio.greaterThan(bRatio) ? 1 : -1;
 }
 function getMiniVaults(program, vaultTypePublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -189,8 +205,8 @@ function getMiniVaults(program, vaultTypePublicKey) {
             // Slice the data only to grab the 3 u64's of size 8 bytes each
             dataSlice: {
                 // See programs/hedge-vault/src/account_data/vault.rs for struct layout
-                offset: 8 + 32,
-                length: 24,
+                offset: 8 + 32 + 8,
+                length: 16,
             },
         });
         return allAccounts.map((vaultData) => {

package/package.json

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

package/src/instructions/createVault.ts

@@ -93,7 +93,7 @@ export async function createVault(
       vaultTypeAccountInfo.collateralMint,
       history.publicKey,
       ushMintPublickey,
-      depositAmount,
+      new BN(depositAmount),
       overrideTime
     )
   )
@@ -187,7 +187,7 @@ export async function buildCreateVaultTransaction(
       vaultTypeAccountInfo.collateralMint,
       history.publicKey,
       ushMintPublickey,
-      depositAmount,
+      new BN(depositAmount),
       overrideTime
     )
   )
@@ -221,7 +221,7 @@ export async function createVaultInstruction(
   collateralMint: PublicKey,
   historyPublicKey: PublicKey,
   ushMintPublickey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()

package/src/instructions/depositLiquidationPool.ts

@@ -24,7 +24,7 @@ export async function depositLiquidationPool(
   program: Program<Vault>,
   provider: Provider,
   payer: Signer,
-  depositAmount: number,
+  depositAmount: BN,
   overrideStartTime?: number
 ): Promise<PublicKey> {
   const ushMintPublickey = await getUshMintPublicKey()
@@ -42,7 +42,7 @@ export async function depositLiquidationPool(
       payer.publicKey,
       payerUshAccount.address,
       poolPosition.publicKey,
-      depositAmount,
+      new BN(depositAmount),
       overrideStartTime
     )
   )
@@ -55,7 +55,7 @@ export async function depositLiquidationPoolInstruction(
   payerPublicKey: PublicKey,
   payerUshAccount: PublicKey,
   poolPositionPublicKey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
   const liquidationPoolStatePublicKey = await getLiquidationPoolStatePublicKey()
@@ -68,7 +68,7 @@ export async function depositLiquidationPoolInstruction(
 
   return await program.methods
     .depositLiquidationPool(
-      new BN(depositAmount),
+      depositAmount,
       new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)) // override current time
     )
     .accounts({

package/src/instructions/depositStakingPool.ts

@@ -30,7 +30,7 @@ export async function depositStakingPool(
       payer.publicKey,
       poolPosition.publicKey,
       mintPublicKey,
-      depositAmount,
+      new BN(depositAmount),
       overrideStartTime
     )
   )
@@ -43,7 +43,7 @@ export async function depositStakingPoolInstruction(
   payerPublicKey: PublicKey,
   poolPositionPublicKey: PublicKey,
   stakedTokenMintPublicKey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
   const [poolPublickey] = await getPoolPublicKeyForMint(stakedTokenMintPublicKey)
@@ -53,7 +53,7 @@ export async function depositStakingPoolInstruction(
 
   return await program.methods
     .depositStakingPool(
-      new BN(depositAmount),
+      depositAmount,
       new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)) // override current time
     )
     .accounts({

package/src/instructions/depositVault.ts

@@ -67,11 +67,12 @@ export async function depositVault(
   const signers = [payer, history]
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
-    provider,
     vaultAccount.vaultType,
     vaultPublicKey,
-    depositAmount,
-    0,
+    new BN(depositAmount),
+    new BN(0),
+    new BN(0),
+    new BN(0),
     false,
     false
   )
@@ -111,7 +112,7 @@ export async function depositVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      depositAmount,
+      new BN(depositAmount),
       overrideTime
     )
   )
@@ -146,12 +147,12 @@ export async function depositVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  depositAmount: number,
+  depositAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   return await program.methods
     .depositVault(
-      new BN(depositAmount),
+      depositAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

package/src/instructions/liquidateVault.ts

@@ -87,11 +87,12 @@ export async function liquidateVault(
 
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
-    provider,
     vaultAccount.vaultType,
     vaultPublicKey,
-    0,
-    0,
+    new BN(0),
+    new BN(0),
+    new BN(0),
+    new BN(0),
     false,
     true
   )

package/src/instructions/loanVault.ts

@@ -59,11 +59,12 @@ export async function loanVault(
   )
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
-    provider,
     vaultAccount.vaultType,
     vaultPublicKey,
-    0,
-    loanAmount,
+    new BN(0),
+    new BN(0),
+    new BN(loanAmount),
+    new BN(0),
     false,
     false
   )
@@ -82,7 +83,7 @@ export async function loanVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      loanAmount,
+      new BN(loanAmount),
       overrideTime
     )
   )
@@ -102,7 +103,7 @@ export async function loanVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  loanAmount: number,
+  loanAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -116,7 +117,7 @@ export async function loanVaultInstruction(
 
   return await program.methods
     .loanVault(
-      new BN(loanAmount),
+      loanAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

package/src/instructions/redeemVault.ts

@@ -67,11 +67,12 @@ export async function redeemVault(
 
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
-    provider,
     vaultAccount.vaultType,
     vaultPublicKey,
-    0,
-    0,
+    new BN(0),
+    new BN(0),
+    new BN(0),
+    new BN(0),
     true,
     false
   )
@@ -91,7 +92,7 @@ export async function redeemVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      redeemAmount,
+      new BN(redeemAmount),
       transactionOverrideTime
     )
   )
@@ -112,7 +113,7 @@ export async function redeemVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  redeemAmount: number,
+  redeemAmount: BN,
   transactionOverrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -125,7 +126,7 @@ export async function redeemVaultInstruction(
   )
   return await program.methods
     .redeemVault(
-      new BN(redeemAmount),
+      redeemAmount,
       new BN(transactionOverrideTime ?? Date.now() / 1000) // override start time
     )
     .accounts({

package/src/instructions/refreshOraclePrice.ts

@@ -75,12 +75,12 @@ const pythAccounts = {
 }
 const chainlinkAccounts = {
   Testing: SystemProgram.programId,
-  Devnet: new PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
+  Devnet: new PublicKey('HgTtcbcmp5BeThax5AU8vg4VwK79qAvAKKFMs8txMLW6'),
   MainnetBeta: SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET
 }
 const switchboardAccounts = {
   Testing: SystemProgram.programId,
   // Devnet: new PublicKey('GvDMxPzN1sCj7L26YDK2HnMRXEQmQ2aemov8YBtPS7vR'),
-  Devnet: new PublicKey('DpoK8Zz69APV9ntjuY9C4LZCxANYMV56M2cbXEdkjxME'),
+  Devnet: new PublicKey('GvDMxPzN1sCj7L26YDK2HnMRXEQmQ2aemov8YBtPS7vR'),
   MainnetBeta: SystemProgram.programId, // Switchboard V2 NOT ON MAINNET YET
 }

package/src/instructions/repayVault.ts

@@ -49,11 +49,12 @@ export async function repayVault(
 
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
-    provider,
     vaultAccount.vaultType,
     vaultPublicKey,
-    0,
-    repayAmount * -1,
+    new BN(0),
+    new BN(0),
+    new BN(0),
+    new BN(Math.abs(repayAmount)),
     false,
     false
   )
@@ -72,7 +73,7 @@ export async function repayVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      repayAmount,
+      new BN(repayAmount),
       overrideTime
     )
   )
@@ -92,7 +93,7 @@ export async function repayVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  repayAmount: number,
+  repayAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
@@ -106,7 +107,7 @@ export async function repayVaultInstruction(
 
   return await program.methods
     .repayVault(
-      new BN(repayAmount),
+      repayAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({

package/src/instructions/withdrawVault.ts

@@ -69,11 +69,12 @@ export async function withdrawVault(
 
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
-    provider,
     vaultAccount.vaultType,
     vaultPublicKey,
-    withdrawAmount * -1,
-    0,
+    new BN(0),
+    new BN(Math.abs(withdrawAmount)),
+    new BN(0),
+    new BN(0),
     false,
     false
   )
@@ -95,7 +96,7 @@ export async function withdrawVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      withdrawAmount,
+      new BN(withdrawAmount),
       overrideTime
     )
   )
@@ -119,12 +120,12 @@ export async function withdrawVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  withdrawAmount: number,
+  withdrawAmount: BN,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   return await program.methods
     .withdrawVault(
-      new BN(withdrawAmount),
+      withdrawAmount,
       new BN(overrideTime ?? Math.floor(Date.now() / 1000)) // override override time
     )
     .accounts({