hedge-web3 0.2.8 → 0.2.9

package/declarations/state/VaultAccount.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
+import BN from 'bn.js';
 import VaultType from './VaultType';
 /**
  * A class that represents an on-chian vault.
@@ -13,9 +14,9 @@ export declare class VaultAccount {
     /** The public key of the vault owner. */
     pdaSalt: string;
     /** The deposited collateral of the vault (in SOL Lamports). */
-    deposited: number;
+    deposited: BN;
     /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
-    denormalizedDebt: number;
+    denormalizedDebt: BN;
     /** The ordered number of when this vault was created. */
     vaultNumber: number;
     /** Debt redistribution snapshot */
@@ -38,12 +39,6 @@ export declare class VaultAccount {
      * @returns true if publicKey matches the owner publicKey
      */
     isOwnedBy(publicKey: PublicKey): boolean;
-    /**
-     * Get the collateral value in SOL
-     *
-     * @returns collateral value in SOL
-     */
-    inSol(): number;
     /**
      * Get the debt value in USH
      *
@@ -56,8 +51,36 @@ export declare class VaultAccount {
      * @returns example: `1b6ca...azy71s`
      */
     toDisplayString(): string;
-    addDebt(additionalDebt: Decimal, vaultTypeAccount: VaultType): void;
-    addDeposit(depositAmount: number): void;
+    /**
+     * 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: BN, vaultTypeAccount: VaultType): void;
+    /**
+     * Repay debt on a vault
+     *
+     * @param {BN} repayAmount - Normalized debt to repay in (USH) lamports.
+     * @param {VaultType} vaultTypeAccount - Vault's vaultType
+     *
+     */
+    repayDebt(repayAmount: BN, vaultTypeAccount: VaultType): void;
+    /**
+     * Deposit Collateral
+     *
+     * @param {BN} depositAmount - Amount to deposit in (CollateralMint) lamports
+     *
+     */
+    depositCollateral(depositAmount: BN): void;
+    /**
+     * Withdraw Collateral
+     *
+     * @param {BN} withdrawAmount - Amount to withdraw in (CollateralMint) lamports
+     *
+     */
+    withdrawCollateral(withdrawAmount: BN): void;
     redeem(): void;
     liquidate(): void;
     updateDebtAndCollateral(vaultTypeAccountData: VaultType): void;

package/declarations/utils/getLinkedListAccounts.d.ts

@@ -1,5 +1,20 @@
-import { Program, Provider } from '@project-serum/anchor';
+/// <reference types="bn.js" />
+import { Program, BN } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { VaultAccount } from '../state/VaultAccount';
 import { Vault } from '../idl/vault';
-export declare function getLinkedListAccounts(program: Program<Vault>, provider: Provider, vaultTypeAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, depositAmount: number, loanAmount: number, redeem: boolean, liquidate: boolean, cachedVaults?: VaultAccount[]): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]>;
+/**
+ * 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.
+ */
+export declare function getLinkedListAccounts(program: Program<Vault>, vaultTypeAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, depositAmount: BN, withdrawAmount: BN, loanAmount: BN, repayAmount: BN, redeem: boolean, liquidate: boolean, cachedVaults?: VaultAccount[]): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]>;

package/lib/instructions/depositVault.js

@@ -38,7 +38,7 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, depositAmount, 0, false, false);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(depositAmount), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), false, false);
         if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,

package/lib/instructions/liquidateVault.js

@@ -35,7 +35,7 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         const poolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, liquidationPoolStatePublicKey, true);
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, vaultAccount.vaultType, true);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, hedgeStakingPoolPublicKey, true);
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, 0, false, true);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), false, true);
         const history = web3_js_1.Keypair.generate();
         const newEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();

package/lib/instructions/loanVault.js

@@ -27,7 +27,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultAccount.vaultType, true);
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccount.collateralMint, vaultPublicKey, true);
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, loanAmount, false, false);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(loanAmount), new anchor_1.BN(0), false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);

package/lib/instructions/redeemVault.js

@@ -30,7 +30,7 @@ function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, tra
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, true);
         const vaultAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultPublicKey, true);
         const payerTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, 0, true, false);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), true, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield redeemVaultInstruction(program, payer.publicKey, payerUshAccount.address, payerTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(redeemAmount), transactionOverrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);

package/lib/instructions/refreshOraclePrice.js

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

package/lib/instructions/repayVault.js

@@ -28,7 +28,7 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultAccount.vaultType);
         const vaultTypeAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultAccount.vaultType, vaultTypeAccount.collateralMint);
         const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultPublicKey, vaultTypeAccount.collateralMint);
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, repayAmount * -1, false, false);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(Math.abs(repayAmount)), false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield repayVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(repayAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);

package/lib/instructions/withdrawVault.js

@@ -34,7 +34,7 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         const destinationTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, withdrawAmount * -1, 0, false, false);
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(0), new anchor_1.BN(Math.abs(withdrawAmount)), new anchor_1.BN(0), new anchor_1.BN(0), false, false);
         const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(withdrawAmount), overrideTime));
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;

package/lib/state/VaultAccount.js

@@ -27,12 +27,16 @@ 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;
+        /** 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 */
@@ -44,8 +48,8 @@ class VaultAccount {
         this.publicKey = publicKey;
         this.vaultOwner = vault.vaultOwner;
         this.pdaSalt = vault.pdaSalt;
-        this.deposited = (_a = vault.deposited) === null || _a === void 0 ? void 0 : _a.toNumber();
-        this.denormalizedDebt = (_b = vault.denormalizedDebt) === null || _b === void 0 ? void 0 : _b.toNumber();
+        this.deposited = vault.deposited;
+        this.denormalizedDebt = vault.denormalizedDebt;
         if (vault.vaultNumber) {
             this.vaultNumber = vault.vaultNumber.toNumber();
         }
@@ -71,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
@@ -97,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);
     }
-    addDeposit(depositAmount) {
-        this.deposited += depositAmount;
+    /**
+     * 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);
+    }
+    /**
+     * 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;
     }
@@ -135,8 +174,8 @@ 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) {

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) {
+    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* () {

package/package.json

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

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
   )

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
   )

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
   )

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
   )

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
   )

package/src/state/VaultAccount.ts

@@ -20,10 +20,10 @@ export class VaultAccount {
   pdaSalt: string
 
   /** The deposited collateral of the vault (in SOL Lamports). */
-  deposited: number
+  deposited = new BN(0)
 
   /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */
-  denormalizedDebt: number
+  denormalizedDebt = new BN(0)
 
   /** The ordered number of when this vault was created. */
   vaultNumber = 0
@@ -50,8 +50,10 @@ export class VaultAccount {
     this.publicKey = publicKey
     this.vaultOwner = vault.vaultOwner
     this.pdaSalt = vault.pdaSalt
-    this.deposited = vault.deposited?.toNumber()
-    this.denormalizedDebt = vault.denormalizedDebt?.toNumber()
+    
+    this.deposited = vault.deposited
+    this.denormalizedDebt = vault.denormalizedDebt
+
     if (vault.vaultNumber) {
       this.vaultNumber = vault.vaultNumber.toNumber()
     }
@@ -80,14 +82,15 @@ export class VaultAccount {
     return publicKey && publicKey.toString() === this.vaultOwner.toString()
   }
 
-  /**
-   * Get the collateral value in SOL
-   *
-   * @returns collateral value in SOL
-   */
-  public inSol(): number {
-    return this.deposited / 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
@@ -95,7 +98,7 @@ export class VaultAccount {
    * @returns debt value in USH
    */
   public inUsd(): number {
-    return this.denormalizedDebt / LAMPORTS_PER_SOL
+    return new Decimal(this.denormalizedDebt.toString()).div(LAMPORTS_PER_SOL).toNumber()
   }
 
   /**
@@ -109,42 +112,82 @@ export class VaultAccount {
       .substring(this.publicKey.toString().length - 6)}`
   }
 
-  public addDebt(additionalDebt: Decimal, vaultTypeAccount: VaultType) {
-    let loanFee = new Decimal(0)
-    if (additionalDebt.isPositive()){
-      loanFee = vaultTypeAccount.loanInitFee.mul(additionalDebt)
-    }
+  /**
+   * Add additional debt to the vault.
+   *
+   * @param {BN} additionalDebt - Additional normalized debt to add in (USH) lamports.
+   * @param {VaultType} vaultTypeAccount - Vault's vaultType
+   *
+   */
+  public addDebt(additionalDebt: BN, vaultTypeAccount: VaultType) {
+    const additionalDebtAsDecimal = new Decimal(additionalDebt.toString())
+    // Calculate the fee on the loan
+    const loanFee = vaultTypeAccount.loanInitFee.mul(additionalDebtAsDecimal)
 
-    const totalNormalizedLoan = additionalDebt.add(loanFee)
-    const denormalizedNewDebt = totalNormalizedLoan.div(new Decimal(vaultTypeAccount.cumulativeRate.toString()))
-    this.denormalizedDebt = denormalizedNewDebt.add(new Decimal(this.denormalizedDebt)).floor().toNumber()
+    // TODO: There's a chance this needs to be .Floor()
+    const totalNormalizedLoan = additionalDebtAsDecimal.add(loanFee)
+
+    const denormalizedNewDebt = new BN(totalNormalizedLoan.div(vaultTypeAccount.cumulativeRate).floor().toString())
+    this.denormalizedDebt = this.denormalizedDebt.add(denormalizedNewDebt)
   }
 
-  public addDeposit(depositAmount: number) {
-    this.deposited += depositAmount
+  /**
+   * Repay debt on a vault
+   *
+   * @param {BN} repayAmount - Normalized debt to repay in (USH) lamports.
+   * @param {VaultType} vaultTypeAccount - Vault's vaultType
+   *
+   */
+  public repayDebt(repayAmount: BN, vaultTypeAccount: VaultType) {
+    const denormalizedRepayment = new Decimal(repayAmount.toString()).div(vaultTypeAccount.cumulativeRate).floor()
+
+    this.denormalizedDebt = this.denormalizedDebt.sub(new BN(denormalizedRepayment.toString()))
+  }
+
+  /**
+   * Deposit Collateral
+   *
+   * @param {BN} depositAmount - Amount to deposit in (CollateralMint) lamports
+   *
+   */
+  public depositCollateral(depositAmount: BN) {
+    this.deposited = this.deposited.add(depositAmount)
+  }
+  /**
+   * Withdraw Collateral
+   *
+   * @param {BN} withdrawAmount - Amount to withdraw in (CollateralMint) lamports
+   *
+   */
+  public withdrawCollateral(withdrawAmount: BN) {
+    this.deposited = this.deposited.sub(withdrawAmount)
   }
 
   public redeem() {
     // TODO - Calculate actual redeem amount and adust correctly
-    this.denormalizedDebt = 0
+    this.denormalizedDebt = new BN(0)
     this.vaultStatus = 'initialized'
   }
   public liquidate() {
     // TODO - Calculate actual liquidate amount and adust correctly
-    this.denormalizedDebt = 0
+    this.denormalizedDebt = new BN(0)
     this.vaultStatus = 'liquidated'
   }
 
   public updateDebtAndCollateral(vaultTypeAccountData: VaultType) {
-
-    this.denormalizedDebt = vaultTypeAccountData.debtRedistributionProduct
+    this.denormalizedDebt = new BN(
+      vaultTypeAccountData.debtRedistributionProduct
       .div(this.debtProductSnapshotBytes)
-      .mul(new Decimal(this.denormalizedDebt))
-      .toNumber()
+      .mul(new Decimal(this.denormalizedDebt.toString()))
+      .floor()
+      .toString()
+    )
 
     const extraCollateralDeposited =
-      this.denormalizedDebt * vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
-    this.deposited += extraCollateralDeposited
+      new Decimal(this.denormalizedDebt.toString()).mul(
+        vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
+      ).floor()
+    this.deposited = this.deposited.add(new BN(extraCollateralDeposited.toString()))
 
     this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator
     this.debtProductSnapshotBytes = vaultTypeAccountData.debtRedistributionProduct
@@ -156,8 +199,8 @@ export class VaultAccount {
       arrow = ' <----!!'
     }
     let collateralRatio = 'Infinite'
-    if (this.denormalizedDebt > 0) {
-      collateralRatio = new Decimal(this.deposited).div(new Decimal(this.denormalizedDebt)).toString()
+    if (this.denormalizedDebt.gt(new BN(0))) {
+      collateralRatio = new Decimal(this.deposited.toString()).div(new Decimal(this.denormalizedDebt.toString())).toString()
     }
 
     let nextVault = 'None'
@@ -165,9 +208,9 @@ export class VaultAccount {
       nextVault = this.nextVaultToRedeem.toString().substring(0, 6)
     }
 
-    return `${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

package/src/utils/getLinkedListAccounts.ts

@@ -1,4 +1,4 @@
-import { Program, Provider } from '@project-serum/anchor'
+import { Program, Provider, BN } from '@project-serum/anchor'
 import { PublicKey, Signer } from '@solana/web3.js'
 import _ from 'underscore'
 import { getVaultSystemStatePublicKey, getVaultTypeOracleAccountPublicKey, HEDGE_PROGRAM_PUBLICKEY } from '../Constants'
@@ -12,13 +12,28 @@ import * as borsh from '@project-serum/borsh'
 import base58 from 'bs58'
 import VaultType from '../state/VaultType'
 
+/**
+ * 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.
+ */
 export async function getLinkedListAccounts(
   program: Program<Vault>,
-  provider: Provider,
   vaultTypeAccountPublicKey: PublicKey,
   vaultPublicKey: PublicKey,
-  depositAmount: number,
-  loanAmount: number,
+  depositAmount: BN,
+  withdrawAmount: BN,
+  loanAmount: BN,
+  repayAmount: BN,
   redeem: boolean,
   liquidate: boolean,
   cachedVaults?: VaultAccount[]
@@ -58,7 +73,7 @@ export async function getLinkedListAccounts(
 
   // Remove any vaults with no debt or collateral
   vaults = _.filter(vaults, (vault) => {
-    return vault.denormalizedDebt > 0 && vault.deposited > 0
+    return vault.denormalizedDebt.gt(new BN(0)) && vault.deposited.gt(new BN(0))
   })
 
   // Sort them
@@ -117,10 +132,13 @@ export async function getLinkedListAccounts(
 
   // 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(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()
@@ -129,7 +147,7 @@ export async function getLinkedListAccounts(
     vaults[indexBefore].redeem()
   }
 
-  if (vaults[indexBefore].denormalizedDebt === 0) {
+  if (vaults[indexBefore].denormalizedDebt.isZero()) {
     vaults.splice(indexBefore, 1)
   }
 
@@ -180,12 +198,12 @@ export async function 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: VaultAccount, b: VaultAccount) {
-  const aRatio = a.deposited / a.denormalizedDebt
-  const bRatio = b.deposited / b.denormalizedDebt
-  if (aRatio === bRatio) {
+  const aRatio = new Decimal(a.deposited.toString()).div(new Decimal(a.denormalizedDebt.toString()))
+  const bRatio = new Decimal(b.deposited.toString()).div(new Decimal(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
 }
 
 async function getMiniVaults(program: Program<Vault>, vaultTypePublicKey: PublicKey) {