@sonarwatch/portfolio-plugins 0.14.152 → 0.14.154

package/README.md

@@ -1,3 +1,3 @@
-# @sonarwatch/portfolio-plugins
-
-This library is @sonarwatch/portfolio-plugins
+# @sonarwatch/portfolio-plugins
+
+This library is @sonarwatch/portfolio-plugins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.14.152",
+  "version": "0.14.154",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "peerDependencies": {

package/src/plugins/balancer/helpers/pools.js

@@ -36,27 +36,27 @@ exports.getBalancerPoolsV2 = void 0;
 const graphql_request_1 = __importStar(require("graphql-request"));
 function getBalancerPoolsV2(url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    query pools {
-      pools(
-        first: 1000
-        orderBy: totalLiquidity
-        orderDirection: desc
-        where: { totalLiquidity_gt: "500" }
-      ) {
-        id
-        address
-        symbol
-        totalLiquidity
-        totalShares
-        tokens {
-          balance
-          decimals
-          symbol
-          address
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    query pools {
+      pools(
+        first: 1000
+        orderBy: totalLiquidity
+        orderDirection: desc
+        where: { totalLiquidity_gt: "500" }
+      ) {
+        id
+        address
+        symbol
+        totalLiquidity
+        totalShares
+        tokens {
+          balance
+          decimals
+          symbol
+          address
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/defituna/lendingPoolsJob.js

@@ -33,6 +33,8 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             dataSize: 355,
         },
     ]);
+    const tokenPriceById = yield cache.getTokenPricesAsMap(pools.map((p) => p.mint.toString()), portfolio_core_1.NetworkId.solana);
+    const items = [];
     yield cache.setItem(constants_1.lendingPoolsCacheKey, pools.map((pool) => {
         const utilization = pool.depositedFunds.isGreaterThan(0)
             ? new bignumber_js_1.default(pool.borrowedFunds)
@@ -44,12 +46,43 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             .dividedBy(Math.pow(2, 60))
             .multipliedBy((0, helpers_1.rateFactor)(utilization));
         const supplyApy = borrowApy.multipliedBy(utilization);
+        const tokenPrice = tokenPriceById.get(pool.mint.toString());
+        if (tokenPrice) {
+            const blRate = {
+                borrowedAmount: pool.borrowedFunds
+                    .dividedBy(Math.pow(10, tokenPrice.decimals))
+                    .toNumber(),
+                depositedAmount: pool.depositedFunds
+                    .dividedBy(Math.pow(10, tokenPrice.decimals))
+                    .toNumber(),
+                borrowYield: {
+                    apr: (0, portfolio_core_1.apyToApr)(borrowApy.toNumber()),
+                    apy: borrowApy.toNumber(),
+                },
+                depositYield: {
+                    apr: (0, portfolio_core_1.apyToApr)(supplyApy.toNumber()),
+                    apy: supplyApy.toNumber(),
+                },
+                utilizationRatio: utilization,
+                platformId: constants_1.platformId,
+                tokenAddress: pool.mint.toString(),
+                ref: pool.pubkey.toString(),
+            };
+            items.push({
+                key: `${pool.pubkey.toString()}-${pool.mint.toString()}`,
+                value: blRate,
+            });
+        }
         return Object.assign(Object.assign({}, pool), { supplyApy,
             borrowApy });
     }), {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,
     });
+    yield cache.setItems(items, {
+        prefix: portfolio_core_1.borrowLendRatesPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
 });
 const job = {
     id: `${constants_1.platformId}-lending-pools`,

package/src/plugins/defituna/lendingPoolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"lendingPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/lendingPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAAuD;AAGvD,2CAAgF;AAChF,+CAA8D;AAC9D,iDAAsD;AACtD,uCAAwC;AACxC,uCAAuC;AAEvC,MAAM,eAAe,GAAG,QAAQ,CAAC;AAEjC,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAwB,EAC1C,UAAU,EACV,qBAAW,EACX,2BAAe,EACf;QACE;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,aAAa;aACrB;SACF;QACD;YACE,QAAQ,EAAE,GAAG;SACd;KACF,CACF,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CACjB,gCAAoB,EACpB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,aAAa,CAAC;iBAC9B,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC;iBAC9B,QAAQ,EAAE;YACf,CAAC,CAAC,CAAC,CAAC;QACN,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,YAAY,CAAC;aAC/C,YAAY,CAAC,eAAe,CAAC;aAC7B,SAAS,CAAC,SAAA,CAAC,EAAI,EAAE,CAAA,CAAC;aAClB,YAAY,CAAC,IAAA,oBAAU,EAAC,WAAW,CAAC,CAAC,CAAC;QAEzC,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAEtD,uCACK,IAAI,KACP,SAAS;YACT,SAAS,IACT;IACJ,CAAC,CAAC,EACF;QACE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"lendingPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/lendingPoolsJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/drift/spotMarketsJob.js

@@ -65,7 +65,6 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             },
             depositedAmount,
             platformId: constants_1.platformId,
-            poolName: 'Main',
         };
         yield cache.setItem(`${spotMarketAccount.vault.toString()}-${tokenAddress}`, rate, {
             prefix: portfolio_core_1.borrowLendRatesPrefix,

package/src/plugins/drift/spotMarketsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"spotMarketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/spotMarketsJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spotMarketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/spotMarketsJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/ensofi/index.js

@@ -8,7 +8,8 @@ const constants_1 = require("./constants");
 const suiLoansJob_1 = __importDefault(require("./suiLoansJob"));
 const suiLoansFetcher_1 = __importDefault(require("./suiLoansFetcher"));
 const solanaLoansFetcher_1 = __importDefault(require("./solanaLoansFetcher"));
+const solanaLoansJob_1 = __importDefault(require("./solanaLoansJob"));
 exports.platforms = [constants_1.platform];
-exports.jobs = [suiLoansJob_1.default];
+exports.jobs = [suiLoansJob_1.default, solanaLoansJob_1.default];
 exports.fetchers = [suiLoansFetcher_1.default, solanaLoansFetcher_1.default];
 //# sourceMappingURL=index.js.map

package/src/plugins/ensofi/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ensofi/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,gEAAwC;AACxC,wEAAgD;AAChD,8EAAsD;AAEzC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,qBAAW,CAAC,CAAC;AAC5B,QAAA,QAAQ,GAAc,CAAC,yBAAe,EAAE,4BAAkB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ensofi/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,gEAAwC;AACxC,wEAAgD;AAChD,8EAAsD;AACtD,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,qBAAW,EAAE,wBAAc,CAAC,CAAC;AAC5C,QAAA,QAAQ,GAAc,CAAC,yBAAe,EAAE,4BAAkB,CAAC,CAAC"}

package/src/plugins/ensofi/solanaLoansJob.d.ts

@@ -0,0 +1,3 @@
+import { Job } from '../../Job';
+declare const job: Job;
+export default job;

package/src/plugins/ensofi/solanaLoansJob.js

@@ -0,0 +1,63 @@
+"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 });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const clients_1 = require("../../utils/clients");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const constants_1 = require("./constants");
+const structs_1 = require("./structs");
+const solana_1 = require("../../utils/solana");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const connection = (0, clients_1.getClientSolana)();
+    const lendOffers = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.lendOfferAccountStruct, constants_1.ensofiProgramId)
+        .addFilter('accountDiscriminator', [130, 140, 110, 73, 124, 199, 122, 81])
+        .addDataSizeFilter(154)
+        .run();
+    const items = [];
+    for (const lendOffer of lendOffers) {
+        if (lendOffer.status !== structs_1.LendOfferStatus.Created)
+            continue;
+        const apr = -lendOffer.interest / 10000;
+        const blRate = {
+            borrowedAmount: 0,
+            depositedAmount: lendOffer.amount.dividedBy(Math.pow(10, 6)).toNumber(),
+            borrowYield: {
+                apr,
+                apy: (0, portfolio_core_1.aprToApy)(apr),
+            },
+            depositYield: {
+                apr: 0,
+                apy: 0,
+            },
+            platformId: constants_1.platformId,
+            poolName: (0, solana_1.u8ArrayToString)(lendOffer.offerId).replace('lend_offer_', ''),
+            tokenAddress: lendOffer.lendMintToken.toString(),
+            utilizationRatio: 0,
+            duration: lendOffer.duration.times(1000).toNumber(),
+            ref: lendOffer.pubkey.toString(),
+        };
+        items.push({
+            key: `${lendOffer.pubkey.toString()}-${lendOffer.lendMintToken.toString()}`,
+            value: blRate,
+        });
+    }
+    yield cache.setItems(items, {
+        prefix: portfolio_core_1.borrowLendRatesPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+});
+const job = {
+    id: `${constants_1.platformId}-solana-loans`,
+    executor,
+    labels: ['realtime'],
+};
+exports.default = job;
+//# sourceMappingURL=solanaLoansJob.js.map

package/src/plugins/ensofi/solanaLoansJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solanaLoansJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ensofi/solanaLoansJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAKoC;AAGpC,iDAAsD;AACtD,kEAA+D;AAC/D,2CAA0D;AAC1D,uCAAoE;AACpE,+CAAqD;AAErD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,UAAU,GAAG,MAAM,qBAAS,CAAC,KAAK,CACtC,UAAU,EACV,gCAAsB,EACtB,2BAAe,CAChB;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;SACzE,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IACT,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,SAAS,CAAC,MAAM,KAAK,yBAAe,CAAC,OAAO;YAAE,SAAS;QAC3D,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxC,MAAM,MAAM,GAAmB;YAC7B,cAAc,EAAE,CAAC;YACjB,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC,QAAQ,EAAE;YAC/D,WAAW,EAAE;gBACX,GAAG;gBACH,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;aACnB;YACD,YAAY,EAAE;gBACZ,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,CAAC;aACP;YACD,UAAU,EAAV,sBAAU;YACV,QAAQ,EAAE,IAAA,wBAAe,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;YACvE,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;YAChD,gBAAgB,EAAE,CAAC;YACnB,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;YACnD,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE;SACjC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC;YACT,GAAG,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE;YAC3E,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;IACL,CAAC;IACD,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE;QAC1B,MAAM,EAAE,sCAAqB;QAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,eAAe;IAChC,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/ensofi/structs.js

@@ -23,10 +23,10 @@ var LoanOfferStatus;
 })(LoanOfferStatus || (exports.LoanOfferStatus = LoanOfferStatus = {}));
 exports.lendOfferAccountStruct = new beet_1.FixableBeetStruct([
     ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
-    ['interest', solana_1.f64],
+    ['interest', beet_1.u16],
     ['lenderFeePercent', solana_1.f64],
     ['duration', solana_1.u64],
-    ['offerId', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 30)],
+    ['offerId', (0, beet_1.array)(beet_1.u8)],
     ['lender', beet_solana_1.publicKey],
     ['lendMintToken', beet_solana_1.publicKey],
     ['amount', solana_1.u64],

package/src/plugins/ensofi/structs.js.map

@@ -1 +1 @@
-{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ensofi/structs.ts"],"names":[],"mappings":";;;AAEA,oDAMmC;AACnC,kEAA6D;AAC7D,+CAAmD;AAEnD,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,2DAAW,CAAA;IACX,+DAAa,CAAA;IACb,6DAAY,CAAA;IACZ,yDAAU,CAAA;AACZ,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACzB,2DAAW,CAAA;IACX,2EAAmB,CAAA;IACnB,uDAAS,CAAA;IACT,qEAAgB,CAAA;IAChB,mEAAe,CAAA;IACf,iEAAc,CAAA;IACd,6DAAY,CAAA;AACd,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAeY,QAAA,sBAAsB,GAAG,IAAI,wBAAiB,CACzD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,SAAE,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAwB,CACnC,CAAC;AA2BW,QAAA,sBAAsB,GAAG,IAAI,wBAAiB,CACzD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC,aAAa,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,qBAAqB,EAAE,uBAAS,CAAC;IAClC,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,uBAAuB,EAAE,IAAA,cAAO,EAAC,YAAG,CAAC,CAAC;IACvC,CAAC,QAAQ,EAAE,SAAE,CAAC;IACd,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,cAAc,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,MAAM,EAAE,SAAE,CAAC;CACb,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAwB,CACnC,CAAC"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ensofi/structs.ts"],"names":[],"mappings":";;;AAEA,oDAQmC;AACnC,kEAA6D;AAC7D,+CAAmD;AAEnD,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,2DAAW,CAAA;IACX,+DAAa,CAAA;IACb,6DAAY,CAAA;IACZ,yDAAU,CAAA;AACZ,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACzB,2DAAW,CAAA;IACX,2EAAmB,CAAA;IACnB,uDAAS,CAAA;IACT,qEAAgB,CAAA;IAChB,mEAAe,CAAA;IACf,iEAAc,CAAA;IACd,6DAAY,CAAA;AACd,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAeY,QAAA,sBAAsB,GAAG,IAAI,wBAAiB,CACzD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,UAAU,EAAE,UAAG,CAAC;IACjB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,SAAS,EAAE,IAAA,YAAK,EAAC,SAAE,CAAC,CAAC;IACtB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,SAAE,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAwB,CACnC,CAAC;AA2BW,QAAA,sBAAsB,GAAG,IAAI,wBAAiB,CACzD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC,aAAa,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,qBAAqB,EAAE,uBAAS,CAAC;IAClC,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,uBAAuB,EAAE,IAAA,cAAO,EAAC,YAAG,CAAC,CAAC;IACvC,CAAC,QAAQ,EAAE,SAAE,CAAC;IACd,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,cAAc,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,MAAM,EAAE,SAAE,CAAC;CACb,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAwB,CACnC,CAAC"}

package/src/plugins/kamino/reservesJob.js

@@ -18,14 +18,18 @@ const klend_1 = require("./structs/klend");
 const apr_1 = require("./helpers/apr");
 const common_1 = require("./helpers/common");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const client = (0, clients_1.getClientSolana)();
     const reservesAccounts = (yield Promise.all([
         (0, solana_1.getParsedProgramAccounts)(client, klend_1.reserveStruct, constants_1.klendProgramId, (0, filters_1.dataSizeFilter)(8624)),
         (0, solana_1.getParsedProgramAccounts)(client, klend_1.reserveStruct, constants_1.klendProgramId, (0, filters_1.dataSizeFilter)(8464)),
     ])).flat();
+    const items = [];
     if (reservesAccounts.length !== 0) {
         const reserveById = {};
         for (const reserve of reservesAccounts) {
+            if (reserve.lendingMarket.toString() === '11111111111111111111111111111111')
+                continue;
             const borrowApr = (0, apr_1.calculateBorrowAPR)(reserve);
             const supplyApr = (0, apr_1.calculateSupplyAPR)(reserve);
             const exchangeRate = (0, common_1.getEchangeRate)(reserve);
@@ -34,7 +38,38 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 supplyApr,
                 exchangeRate,
                 cumulativeBorrowRate });
+            const borrowedAmountRaw = reserve.liquidity.borrowedAmountSf.dividedBy(Math.pow(2, 60));
+            const depositedAmountRaw = reserve.liquidity.availableAmount.plus(borrowedAmountRaw);
+            const decimalsFactor = Math.pow(10, reserve.liquidity.mintDecimals.toNumber());
+            const rate = {
+                tokenAddress: reserve.liquidity.mintPubkey.toString(),
+                depositedAmount: depositedAmountRaw
+                    .dividedBy(decimalsFactor)
+                    .toNumber(),
+                depositYield: {
+                    apy: (0, portfolio_core_1.aprToApy)(supplyApr),
+                    apr: supplyApr,
+                },
+                borrowedAmount: borrowedAmountRaw.dividedBy(decimalsFactor).toNumber(),
+                borrowYield: {
+                    apy: (0, portfolio_core_1.aprToApy)(borrowApr),
+                    apr: borrowApr,
+                },
+                utilizationRatio: borrowedAmountRaw
+                    .dividedBy(depositedAmountRaw)
+                    .toNumber(),
+                platformId: constants_1.platformId,
+                poolName: (_a = constants_1.lendingConfigs.get(reserve.lendingMarket.toString())) === null || _a === void 0 ? void 0 : _a.name,
+            };
+            items.push({
+                key: `${reserve.pubkey.toString()}-${reserve.liquidity.mintPubkey.toString()}`,
+                value: rate,
+            });
         }
+        yield cache.setItems(items, {
+            prefix: portfolio_core_1.borrowLendRatesPrefix,
+            networkId: portfolio_core_1.NetworkId.solana,
+        });
         yield cache.setItem(constants_1.reservesKey, reserveById, {
             prefix: constants_1.platformId,
             networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/kamino/reservesJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,iDAAsD;AACtD,+CAA8D;AAC9D,wDAA4D;AAC5D,2CAAsE;AACtE,2CAAgD;AAChD,uCAAuE;AAEvE,6CAA2E;AAE3E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,gBAAgB,GAAG,CACvB,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,iCAAwB,EACtB,MAAM,EACN,qBAAa,EACb,0BAAc,EACd,IAAA,wBAAc,EAAC,IAAI,CAAC,CACrB;QACD,IAAA,iCAAwB,EACtB,MAAM,EACN,qBAAa,EACb,0BAAc,EACd,IAAA,wBAAc,EAAC,IAAI,CAAC,CACrB;KACF,CAAC,CACH,CAAC,IAAI,EAAE,CAAC;IACT,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,WAAW,GAAoC,EAAE,CAAC;QACxD,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,SAAS,GAAG,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,oBAAoB,GAAG,IAAA,gCAAuB,EAClD,OAAO,CAAC,SAAS,CAAC,uBAAuB,CAC1C,CAAC,QAAQ,EAAE,CAAC;YACb,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,mCACjC,OAAO,KACV,SAAS;gBACT,SAAS;gBACT,YAAY;gBACZ,oBAAoB,GACrB,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC,OAAO,CAAC,uBAAW,EAAE,WAAW,EAAE;YAC5C,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/reservesJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/loopscale/constants.d.ts

@@ -4,6 +4,5 @@ import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "loopscale";
 export declare const platform: Platform;
-export declare const marketsCachePrefix = "loopscale-markets";
-export declare const creditbookProgramId: PublicKey;
-export declare const lockboxProgramId: PublicKey;
+export declare const vaultsCacheKey = "vaults";
+export declare const loopscaleProgramId: PublicKey;

package/src/plugins/loopscale/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lockboxProgramId = exports.creditbookProgramId = exports.marketsCachePrefix = exports.platform = exports.platformId = void 0;
+exports.loopscaleProgramId = exports.vaultsCacheKey = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'loopscale';
 exports.platform = {
@@ -15,7 +15,6 @@ exports.platform = {
     github: 'https://github.com/bridgesplit',
     description: 'Loopscale is a new way to lend and borrow onchain with the best rates, any asset, and less risk.',
 };
-exports.marketsCachePrefix = `${exports.platformId}-markets`;
-exports.creditbookProgramId = new web3_js_1.PublicKey('abfcSQac2vK2Pa6UAJb37DzarVxF15bDTdphJzAqYYp');
-exports.lockboxProgramId = new web3_js_1.PublicKey('1oCkVqJ2uk4SuHyCuZKi8q3J6gjoe9Pux3XvHnHFVy4');
+exports.vaultsCacheKey = `vaults`;
+exports.loopscaleProgramId = new web3_js_1.PublicKey('1oopBoJG58DgkUVKkEzKgyG9dvRmpgeEm1AVjoHkF78');
 //# sourceMappingURL=constants.js.map

package/src/plugins/loopscale/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/loopscale/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EACH,+EAA+E;IACjF,OAAO,EAAE,4BAA4B;IACrC,OAAO,EAAE,6BAA6B;IACtC,qEAAqE;IACrE,aAAa,EAAE,6BAA6B;IAC5C,OAAO,EAAE,8BAA8B;IACvC,MAAM,EAAE,gCAAgC;IACxC,WAAW,EACT,kGAAkG;CACrG,CAAC;AACW,QAAA,kBAAkB,GAAG,GAAG,kBAAU,UAAU,CAAC;AAE7C,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,6CAA6C,CAC9C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/loopscale/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,WAAW;IACjB,KAAK,EACH,+EAA+E;IACjF,OAAO,EAAE,4BAA4B;IACrC,OAAO,EAAE,6BAA6B;IACtC,qEAAqE;IACrE,aAAa,EAAE,6BAA6B;IAC5C,OAAO,EAAE,8BAA8B;IACvC,MAAM,EAAE,gCAAgC;IACxC,WAAW,EACT,kGAAkG;CACrG,CAAC;AACW,QAAA,cAAc,GAAG,QAAQ,CAAC;AAE1B,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAC7C,6CAA6C,CAC9C,CAAC"}

package/src/plugins/loopscale/helpers.d.ts

@@ -1,35 +1,8 @@
+/// <reference types="node" />
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
-import { Connection, PublicKey } from '@solana/web3.js';
-import { ParsedAccount } from '../../utils/solana';
-import { EscrowAccount, Ledger, LoanVault, Order } from './structs';
-export declare const getAdminOrgs: (connection: Connection, owner: string) => Promise<PublicKey[]>;
-export declare const getEscrows: (connection: Connection, adminOrgs: PublicKey[]) => Promise<ParsedAccount<EscrowAccount>[]>;
-export declare const getLoanVaults: (connection: Connection, escrowAccounts: ParsedAccount<EscrowAccount>[]) => Promise<{
-    loansLent: ParsedAccount<LoanVault>[][];
-    loansBorrowed: ParsedAccount<LoanVault>[][];
-}>;
-export declare const getOrdersForLoans: (connection: Connection, loans: ParsedAccount<LoanVault>[]) => Promise<{
-    order: ParsedAccount<Order> | null;
-    ledgers: Ledger[];
-    orderAddress: PublicKey;
-}[]>;
-export declare const getLenderOrderValues: (orders: {
-    order: ParsedAccount<Order> | null;
-    ledgers: Ledger[];
-    orderAddress: PublicKey;
-}[]) => Balances;
-export declare const getBorrowerOrderValues: (orders: {
-    order: ParsedAccount<Order> | null;
-    ledgers: Ledger[];
-    orderAddress: PublicKey;
-}[]) => Balances;
-export declare const getBorrowerCollateralValues: (connection: Connection, orders: {
-    order: ParsedAccount<Order> | null;
-    ledgers: Ledger[];
-    orderAddress: PublicKey;
-}[]) => Promise<Balances>;
-export declare const getTokensBalance: (owner: string) => Promise<Balances>;
-export type Balances = {
-    [key: string]: number;
-};
+import { PublicKey } from '@solana/web3.js';
+import { Cache } from '../../Cache';
+export declare const getProgramAddress: (seeds: (Uint8Array | Buffer)[], programId: PublicKey) => PublicKey;
+export declare function bytesToNumberLE(bytes: Uint8Array): number;
+export declare function getMarginFiAccountBalance(account: PublicKey, cache: Cache): Promise<number>;

package/src/plugins/loopscale/helpers.js

@@ -12,151 +12,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokensBalance = exports.getBorrowerCollateralValues = exports.getBorrowerOrderValues = exports.getLenderOrderValues = exports.getOrdersForLoans = exports.getLoanVaults = exports.getEscrows = exports.getAdminOrgs = void 0;
+exports.getMarginFiAccountBalance = exports.bytesToNumberLE = exports.getProgramAddress = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const solana_1 = require("../../utils/solana");
-const constants_1 = require("./constants");
-const structs_1 = require("./structs");
-const filters_1 = require("./filters");
-const getSolanaDasEndpoint_1 = __importDefault(require("../../utils/clients/getSolanaDasEndpoint"));
-const getAssetsByOwnerDas_1 = require("../../utils/solana/das/getAssetsByOwnerDas");
-const isHeliusFungibleAsset_1 = require("../../utils/solana/das/isHeliusFungibleAsset");
-const getAdminOrgs = (connection, owner) => __awaiter(void 0, void 0, void 0, function* () {
-    const roles = yield (0, solana_1.getParsedProgramAccounts)(connection, structs_1.roleAccountStruct, constants_1.creditbookProgramId, (0, filters_1.roleFilters)(owner));
-    return roles
-        .filter((r) => r.type === 4 || r.type === 5)
-        .map((r) => r.organization);
-});
-exports.getAdminOrgs = getAdminOrgs;
-const getEscrows = (connection, adminOrgs) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield Promise.all(adminOrgs.map((organizationIdentifier) => (0, solana_1.getParsedProgramAccounts)(connection, structs_1.escrowAccountStruct, constants_1.creditbookProgramId, (0, filters_1.escrowFilters)(organizationIdentifier.toString()))))).flat();
-});
-exports.getEscrows = getEscrows;
-const getLoanVaults = (connection, escrowAccounts) => __awaiter(void 0, void 0, void 0, function* () {
-    const [loansBorrowed, loansLent] = yield Promise.all([
-        yield Promise.all(escrowAccounts.map((escrowAccount) => (0, solana_1.getParsedProgramAccounts)(connection, structs_1.loanVaultStruct, constants_1.creditbookProgramId, (0, filters_1.loanVaultBorrowedFilters)(escrowAccount.pubkey.toString())))),
-        yield Promise.all(escrowAccounts.map((escrowAccount) => (0, solana_1.getParsedProgramAccounts)(connection, structs_1.loanVaultStruct, constants_1.creditbookProgramId, (0, filters_1.loanVaultLentFilters)(escrowAccount.pubkey.toString())))),
-    ]);
-    return {
-        loansLent,
-        loansBorrowed,
-    };
-});
-exports.getLoanVaults = getLoanVaults;
-const getOrdersForLoans = (connection, loans) => __awaiter(void 0, void 0, void 0, function* () {
-    const orderAddresses = loans.map((l) => l.order);
-    const orders = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.orderStruct, orderAddresses);
-    const orderLedgerAddresses = orderAddresses.map((o) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('order_ledgers'), o.toBytes()], constants_1.creditbookProgramId)[0]);
-    const orderLedgers = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.orderLedgerStruct, orderLedgerAddresses);
-    const orderData = [];
-    for (let i = 0; i < orderAddresses.length; i++) {
-        const order = orders[i];
-        const orderLedger = orderLedgers[i];
-        if (!orderLedger)
-            continue;
-        const { ledgers } = orderLedger;
-        const orderAddress = orderAddresses[i];
-        orderData.push({ order, ledgers, orderAddress });
-    }
-    return orderData;
-});
-exports.getOrdersForLoans = getOrdersForLoans;
-const getLenderOrderValues = (orders) => {
-    const loanValues = {};
-    for (let i = 0; i < orders.length; i++) {
-        const order = orders[i];
-        if (!order.order || !order.order.principal_mint)
-            continue;
-        const principal = order.order.principal_mint.toString();
-        const totalOwed = getOrderDueAmount(order.ledgers);
-        if (!Object.keys(loanValues).includes(principal)) {
-            loanValues[principal] = totalOwed;
-        }
-        else {
-            loanValues[principal] += totalOwed;
-        }
-    }
-    return loanValues;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const getMarginFiAccounts_1 = require("../marginfi/getMarginFiAccounts");
+const helpers_1 = require("../marginfi/helpers");
+const getProgramAddress = (seeds, programId) => {
+    const [key] = web3_js_1.PublicKey.findProgramAddressSync(seeds, programId);
+    return key;
 };
-exports.getLenderOrderValues = getLenderOrderValues;
-const getBorrowerOrderValues = (orders) => {
-    const loanValues = {};
-    for (let i = 0; i < orders.length; i++) {
-        const order = orders[i];
-        if (!order.order || !order.order.principal_mint)
-            continue;
-        const principal = order.order.principal_mint.toString();
-        const totalDue = getOrderDueAmount(order.ledgers);
-        if (!Object.keys(loanValues).includes(principal)) {
-            loanValues[principal] = totalDue;
-        }
-        else {
-            loanValues[principal] += totalDue;
-        }
+exports.getProgramAddress = getProgramAddress;
+function bytesToNumberLE(bytes) {
+    let result = BigInt(0);
+    for (let i = bytes.length - 1; i >= 0; i--) {
+        // eslint-disable-next-line no-bitwise
+        result = (result << BigInt(8)) | BigInt(bytes[i]);
     }
-    return loanValues;
-};
-exports.getBorrowerOrderValues = getBorrowerOrderValues;
-function getOrderDueAmount(ledgers) {
-    return ledgers.reduce((prev, curr) => prev +
-        (curr.principal_due.toNumber() - curr.principal_repaid.toNumber()) +
-        (curr.interest_due.toNumber() - curr.interest_repaid.toNumber()), 0);
+    return Number(result);
 }
-const getBorrowerCollateralValues = (connection, orders) => __awaiter(void 0, void 0, void 0, function* () {
-    const lbNfts = orders.map((o) => { var _a; return (_a = o.order) === null || _a === void 0 ? void 0 : _a.collateral_mint; });
-    const lockboxes = yield fetchLockboxesFromNFTs(connection, lbNfts.filter((p) => p !== null));
-    const balances = yield Promise.all(lockboxes.map((lockbox) => (0, exports.getTokensBalance)(lockbox.toString())));
-    return mergeBalances(balances);
-});
-exports.getBorrowerCollateralValues = getBorrowerCollateralValues;
-const fetchLockboxesFromNFTs = (connection, nfts) => __awaiter(void 0, void 0, void 0, function* () {
-    const lbs = [];
-    for (let i = 0; i < nfts.length; i++) {
-        const lb = yield (0, solana_1.getParsedProgramAccounts)(connection, structs_1.lockboxStruct, constants_1.lockboxProgramId, (0, filters_1.lockboxFilters)(nfts[i].toString()));
-        if (lb.length > 0)
-            lbs.push(lb[0].pubkey);
-    }
-    return lbs;
-});
-const getTokensBalance = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    const dasEndpoint = (0, getSolanaDasEndpoint_1.default)();
-    const items = yield (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(dasEndpoint, owner, {
-        showNativeBalance: false,
-        showGrandTotal: false,
-        showInscription: false,
-    });
-    const escrowValues = {};
-    items.filter(isHeliusFungibleAsset_1.isHeliusFungibleAsset).forEach((asset) => {
-        var _a;
-        if (!((_a = asset.token_info) === null || _a === void 0 ? void 0 : _a.balance))
-            return;
-        if (!Object.keys(escrowValues).includes(asset.id)) {
-            escrowValues[asset.id] = asset.token_info.balance;
-        }
-        else {
-            escrowValues[asset.id] += asset.token_info.balance;
-        }
-    });
-    return escrowValues;
-});
-exports.getTokensBalance = getTokensBalance;
-const mergeBalances = (balances) => {
-    if (!balances.length)
-        return {};
-    if (balances.length === 1)
-        return balances[0];
-    const mainBalance = balances[0];
-    for (let i = 1; i < balances.length; i++) {
-        Object.keys(balances[i]).forEach((mint) => {
-            const amount = balances[i][mint];
-            if (!Object.keys(mainBalance).includes(mint)) {
-                mainBalance[mint] = amount;
-            }
-            else {
-                mainBalance[mint] += amount;
-            }
+exports.bytesToNumberLE = bytesToNumberLE;
+function getMarginFiAccountBalance(account, cache) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const marginFiAccounts = yield (0, getMarginFiAccounts_1.getMarginFiAccounts)(account.toString(), cache);
+        let accountBalance = 0;
+        marginFiAccounts.forEach((acc) => {
+            if (!acc)
+                return;
+            acc.balances.forEach((balance) => {
+                if (!balance)
+                    return;
+                const shareBalance = (0, helpers_1.wrappedI80F48toBigNumber)(balance.assetShares);
+                const { bank } = balance;
+                if (bank !== undefined) {
+                    const shareValue = (0, helpers_1.wrappedI80F48toBigNumber)({
+                        value: new bignumber_js_1.default(bank.assetShareValue.value),
+                    });
+                    const totalValue = shareBalance.multipliedBy(shareValue);
+                    accountBalance += totalValue.toNumber();
+                }
+            });
         });
-    }
-    return mainBalance;
-};
+        return accountBalance;
+    });
+}
+exports.getMarginFiAccountBalance = getMarginFiAccountBalance;
 //# sourceMappingURL=helpers.js.map