hedge-web3 0.1.50 → 0.2.2

package/lib/utils/getLinkedListAccounts.js

@@ -15,19 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const underscore_1 = __importDefault(require("underscore"));
 const Constants_1 = require("../Constants");
-const HedgeDecimal_1 = require("../HedgeDecimal");
 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) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('Getting getLinkedListAccounts');
-        const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeRaw = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultType = new VaultType_1.default(vaultTypeRaw, vaultTypeAccountPublicKey);
+        const DEBUG = false;
         // 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 =  await program.provider.connection.getAccountInfo(vaultPublicKey)
         const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
         // Load all the vaults
         let vaults;
@@ -35,33 +37,20 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             vaults = cachedVaults;
         }
         else {
-            // let allVaults = cachedVaults
-            //   ? cachedVaults
-            //   : (await program.account.vault
-            //       .all([
-            //         {
-            //           memcmp: { bytes: vaultTypeAccount.collateralType, offset: 8 + 32 + 8 },
-            //         },
-            //       ])
-            //       .catch((error) => {
-            //         console.log('error', error)
-            //       })) || []
-            // // Load them into our account objects
-            // vaults = allVaults.map((vault) => {
-            //   return new VaultAccount(vault.account, vault.publicKey)
-            // })
-            vaults = yield getMiniVaults(program, vaultTypeAccount.collateralType);
+            vaults = yield getMiniVaults(program, vaultTypeAccountPublicKey);
+        }
+        if (DEBUG) {
+            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 
+        // TODO filter on vault status. Or we enable people to "close out" empty vaults
         // vaults = _.filter(vaults, (vault) => {
         //   return vault.vaultStatus === 'open'
         // })
         // Remove any vaults with no debt or collateral
         vaults = underscore_1.default.filter(vaults, (vault) => {
-            return vault.denormalizedDebt.greaterThan(0) && vault.deposited.greaterThan(0);
+            return vault.denormalizedDebt > 0 && vault.deposited > 0;
         });
         // Sort them
         vaults.sort(sortVaults);
@@ -76,6 +65,13 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (indexBefore > 0) {
             oldSmallerPublicKey = vaults[indexBefore - 1].publicKey;
         }
+        if (DEBUG) {
+            // 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
@@ -106,9 +102,8 @@ 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);
-        const vaultTypeCompoundedInterest = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccount.cumulativeRate.toString());
-        vaults[indexBefore].updateDebtAndCollateral(vaultTypeAccount);
-        vaults[indexBefore].addDebt(newNormalizedDebt, vaultTypeCompoundedInterest);
+        vaults[indexBefore].updateDebtAndCollateral(vaultType);
+        vaults[indexBefore].addDebt(newNormalizedDebt, vaultType);
         vaults[indexBefore].addDeposit(depositAmount);
         if (liquidate) {
             vaults[indexBefore].liquidate();
@@ -116,16 +111,11 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (redeem) {
             vaults[indexBefore].redeem();
         }
-        if (vaults[indexBefore].denormalizedDebt.isZero()) {
+        if (vaults[indexBefore].denormalizedDebt === 0) {
             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) => {
@@ -133,16 +123,17 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
                 indexAfter = index;
             }
         });
-        // New list with vault
-        // console.log('New list with vault now at index:', indexAfter)
-        // console.log(
-        //   vaults.map((vault) => {
-        //     return vault.toString(vaultPublicKey)
-        //   })
-        // )
-        // Print where it moved from / to
-        console.log('Index Before', indexBefore);
-        console.log('Index After', indexAfter);
+        if (DEBUG) {
+            // New list with vault
+            console.log('New list with vault now at index:', indexAfter);
+            console.log(vaults.map((vault) => {
+                return vault.toString(vaultPublicKey);
+            }));
+        }
+        if (DEBUG) {
+            // Print where it moved from / to
+            console.log('Index After', indexAfter);
+        }
         // Save references to the new left and right
         if (indexAfter > 0) {
             newSmallerPublicKey = vaults[indexAfter - 1].publicKey;
@@ -150,10 +141,12 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (indexAfter < vaults.length - 1 && indexAfter >= 0) {
             newLargerPublicKey = vaults[indexAfter + 1].publicKey;
         }
-        // Print out the new left/right
-        // console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
-        // console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
-        // console.log('newLargerPublicKey', newLargerPublicKey.toString())
+        if (DEBUG) {
+            // Print out the new left/right
+            console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString());
+            console.log('newSmallerPublicKey', newSmallerPublicKey.toString());
+            console.log('newLargerPublicKey', newLargerPublicKey.toString());
+        }
         return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults];
     });
 }
@@ -161,17 +154,14 @@ 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.floor().div(a.denormalizedDebt.floor());
-    const bRatio = b.deposited.floor().div(b.denormalizedDebt.floor());
-    if (aRatio.equals(bRatio)) {
+    const aRatio = a.deposited / a.denormalizedDebt;
+    const bRatio = b.deposited / b.denormalizedDebt;
+    if (aRatio === bRatio) {
         return b.vaultNumber - a.vaultNumber;
     }
-    if (aRatio.greaterThan(bRatio)) {
-        return 1;
-    }
-    return -1;
+    return aRatio - bRatio;
 }
-function getMiniVaults(program, collateralType) {
+function getMiniVaults(program, vaultTypePublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const filters = [
             // Filter for Vault Accounts
@@ -179,13 +169,20 @@ function getMiniVaults(program, collateralType) {
                 // @ts-ignore
                 memcmp: program.account.vault.coder.accounts.memcmp(program.account.vault._idlAccount.name),
             },
-            // Filter for Vaults with this collateral type
+            // Filter for Vaults that are open
             {
                 memcmp: {
-                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(collateralType)),
+                    bytes: bs58_1.default.encode(Buffer.from([1])),
                     offset: 8 + 32 + 24,
                 },
             },
+            // Filter for Vaults with this collateral type
+            {
+                memcmp: {
+                    bytes: vaultTypePublicKey.toString(),
+                    offset: 8 + 32 + 24 + 1,
+                },
+            },
         ];
         const allAccounts = yield program.provider.connection.getProgramAccounts(Constants_1.HEDGE_PROGRAM_PUBLICKEY, {
             filters: filters,
@@ -196,7 +193,7 @@ function getMiniVaults(program, collateralType) {
                 length: 24,
             },
         });
-        return allAccounts.map(vaultData => {
+        return allAccounts.map((vaultData) => {
             return VaultAccount_1.VaultAccount.FromMiniSlice(vaultData.account.data, vaultData.pubkey);
         });
     });

package/package.json

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

package/src/Constants.ts

@@ -4,12 +4,13 @@ import {
 } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ'
+export const HEDGE_PROGRAM_ID = 'HedgeEohwU6RqokrvPU4Hb6XKPub8NuKbnPmY7FoMMtN'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID =
   'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
 export const CHAINLINK_SOL_USD_PUBLICKEY = new PublicKey(CHAINLINK_SOL_USD_ID)
+export const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
 
 const enc = new TextEncoder()