@sonarwatch/portfolio-plugins 0.14.152 → 0.14.153

package/src/plugins/loopscale/structs.js

@@ -1,96 +1,118 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lockboxStruct = exports.orderLedgerStruct = exports.ledgerStruct = exports.orderStruct = exports.escrowAccountStruct = exports.loanVaultStruct = exports.roleAccountStruct = void 0;
+exports.loanStruct = exports.collateralDataStruct = exports.strategyStruct = exports.ledgerStruct = exports.vaultStakeStruct = exports.vaultStruct = exports.podBoolStruct = exports.podU64CBPSStruct = exports.podU64Struct = exports.podU32CBPSStruct = exports.podU128Struct = exports.podDecimalStruct = exports.durationStruct = exports.podU32Struct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
-exports.roleAccountStruct = new beet_1.BeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
-    ['user', beet_solana_1.publicKey],
-    ['organization', beet_solana_1.publicKey],
-    ['type', beet_1.u32],
+exports.podU32Struct = new beet_1.BeetStruct([['array', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 4)]], (args) => args);
+exports.durationStruct = new beet_1.BeetStruct([
+    ['duration', exports.podU32Struct],
+    ['duration_type', beet_1.u8],
 ], (args) => args);
-exports.loanVaultStruct = new beet_1.BeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
-    ['order', beet_solana_1.publicKey],
-    ['lender', beet_solana_1.publicKey],
-    ['borrower', beet_solana_1.publicKey],
-    ['collateral', beet_solana_1.publicKey],
-    ['debt_note', beet_solana_1.publicKey],
-    ['credit_note', beet_solana_1.publicKey],
-    ['credit_claimed', beet_1.bool],
-    ['debt_claimed', beet_1.bool],
-    ['loan_start_time', solana_1.i64],
-    ['num_fees_outstanding', solana_1.u64],
-    ['fees_received', solana_1.u64],
+exports.podDecimalStruct = new beet_1.BeetStruct([['array', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 24)]], (args) => args);
+exports.podU128Struct = new beet_1.BeetStruct([['array', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 16)]], (args) => args);
+exports.podU32CBPSStruct = new beet_1.BeetStruct([['array', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 4)]], (args) => args);
+exports.podU64Struct = new beet_1.BeetStruct([['array', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)]], (args) => args);
+exports.podU64CBPSStruct = new beet_1.BeetStruct([['array', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)]], (args) => args);
+exports.podBoolStruct = new beet_1.BeetStruct([['value', beet_1.u8]], (args) => args);
+exports.vaultStruct = new beet_1.BeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['manager', beet_solana_1.publicKey],
+    ['nonce', beet_solana_1.publicKey],
+    ['bump', beet_1.u8],
+    ['lp_supply', exports.podU64Struct],
+    ['lp_mint', beet_solana_1.publicKey],
+    ['principal_mint', beet_solana_1.publicKey],
+    ['cumulative_principal_deposited', exports.podU64Struct],
+    ['deposits_enabled', exports.podBoolStruct],
+    ['max_early_unstake_fee', exports.podU64CBPSStruct],
 ], (args) => args);
-exports.escrowAccountStruct = new beet_1.BeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
-    ['organization_identifier', beet_solana_1.publicKey],
-    ['num_escrowed', solana_1.u64],
+exports.vaultStakeStruct = new beet_1.BeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['vault', beet_solana_1.publicKey],
     ['nonce', beet_solana_1.publicKey],
-    ['origination_cap', solana_1.u64],
-    ['cumulative_amount_originated', solana_1.u64],
-    ['external_yield_source', beet_1.u8],
+    ['bump', beet_1.u8],
+    ['user', beet_solana_1.publicKey],
+    ['amount', exports.podU64Struct],
+    ['duration', exports.durationStruct],
+    ['start_time', exports.podU64Struct],
+    ['end_time', exports.podU64Struct],
+    ['unstake_time', exports.podU64Struct],
+    ['unstake_fee_applied', exports.podU64Struct],
+], (args) => args);
+exports.ledgerStruct = new beet_1.BeetStruct([
+    ['status', beet_1.u8],
+    ['strategy', beet_solana_1.publicKey],
+    ['principal_mint', beet_solana_1.publicKey],
+    ['market_information', beet_solana_1.publicKey],
+    ['principal_due', exports.podU64Struct],
+    ['principal_repaid', exports.podU64Struct],
+    ['interest_due', exports.podU64Struct],
+    ['interest_repaid', exports.podU64Struct],
+    ['duration', exports.durationStruct],
+    ['interest_per_second', exports.podDecimalStruct],
+    ['start_time', exports.podU64Struct],
+    ['end_time', exports.podU64Struct],
+    ['apy', exports.podU64CBPSStruct],
 ], (args) => args);
-exports.orderStruct = new beet_1.BeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
+exports.strategyStruct = new beet_1.BeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
     ['version', beet_1.u8],
     ['nonce', beet_solana_1.publicKey],
-    ['maker', beet_solana_1.publicKey],
-    ['designated_taker', beet_solana_1.publicKey],
+    ['bump', beet_1.u8],
     ['principal_mint', beet_solana_1.publicKey],
-    ['principal_amount', solana_1.u64],
-    ['collateral_mint', beet_solana_1.publicKey],
-    ['collateral_amount', solana_1.u64],
-    ['maker_role', beet_1.u8],
-    ['last_updated_slot', solana_1.u64],
-    ['max_outstanding_payments', solana_1.u64],
-    ['last_payment_id', solana_1.u64],
-    ['final_payment_id', solana_1.u64],
-    ['final_payment_time_offset', solana_1.i64],
-    ['status', beet_1.u8],
-    ['default_type', beet_1.u8],
-    ['created_at', solana_1.i64],
-    ['funding_type', beet_1.u8],
-    ['allow_early_repayments', beet_1.bool],
-    ['origination_fee', solana_1.u64],
-    ['liquidation_manager', beet_solana_1.publicKey],
-    ['market_manager', beet_solana_1.publicKey],
-    ['liquidation_threshold', solana_1.u64],
-    ['refinance_enabled', beet_1.bool],
-    ['max_refinance_apy', solana_1.u64],
-    ['refinance_duration', solana_1.i64],
-    ['refinance_duration_type', beet_1.u8],
+    ['lender', beet_solana_1.publicKey],
+    ['originations_enabled', exports.podBoolStruct],
+    ['external_yield_source', beet_1.u8],
+    ['interest_per_second', exports.podDecimalStruct],
+    ['last_accrued_timestamp', exports.podU64Struct],
+    ['liquidity_buffer', exports.podU64CBPSStruct],
+    ['token_balance', exports.podU64Struct],
+    ['interest_fee', exports.podU64CBPSStruct],
+    ['principal_fee', exports.podU64CBPSStruct],
+    ['origination_fee', exports.podU64CBPSStruct],
+    ['origination_cap', exports.podU64Struct],
+    ['external_yield_amount', exports.podU64Struct],
+    ['current_deployed_amount', exports.podU64Struct],
+    ['outstanding_interest_amount', exports.podU64Struct],
+    ['fee_claimable', exports.podU64Struct],
+    ['cumulative_principal_originated', exports.podU128Struct],
+    ['cumulative_interest_accrued', exports.podU128Struct],
+    ['cumulative_loan_count', exports.podU64Struct],
+    ['active_loan_count', exports.podU64Struct],
+    ['market_information', beet_solana_1.publicKey],
+    [
+        'collateral_map',
+        (0, beet_1.uniformFixedSizeArray)((0, beet_1.uniformFixedSizeArray)(exports.podU64Struct, 5), 200),
+    ],
 ], (args) => args);
-exports.ledgerStruct = new beet_1.BeetStruct([
-    ['ledger_id', solana_1.u64],
-    ['principal_due', solana_1.u64],
-    ['principal_repaid', solana_1.u64],
-    ['interest_due', solana_1.u64],
-    ['interest_repaid', solana_1.u64],
-    ['due_time_offset', solana_1.i64],
-    ['paid_time', solana_1.i64],
-    ['payment_type', beet_1.u8],
-    ['is_filled', beet_1.bool],
-    ['grace_period', solana_1.i64],
-    ['late_payment_fee', solana_1.u64],
-    ['early_payment_fee', solana_1.u64],
-    ['payment_window', solana_1.i64],
-    ['reserve', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)],
+exports.collateralDataStruct = new beet_1.BeetStruct([
+    ['asset_mint', beet_solana_1.publicKey],
+    ['amount', exports.podU64Struct],
+    ['asset_type', beet_1.u8],
+    ['asset_identifier', beet_solana_1.publicKey],
 ], (args) => args);
-exports.orderLedgerStruct = new beet_1.FixableBeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
+exports.loanStruct = new beet_1.BeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
     ['version', beet_1.u8],
-    ['order', beet_solana_1.publicKey],
-    ['ledgers', (0, beet_1.array)(exports.ledgerStruct)],
-], (args) => args);
-exports.lockboxStruct = new beet_1.FixableBeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
-    ['nonce', beet_solana_1.publicKey],
-    ['name', (0, solana_1.blob)(24)],
-    ['initialization_time', solana_1.i64],
-    ['nft_mint', beet_solana_1.publicKey],
-    ['state', beet_1.u8],
+    ['bump', beet_1.u8],
+    ['loan_type', beet_1.u8],
+    ['borrower', beet_solana_1.publicKey],
+    ['nonce', solana_1.u64],
+    ['start_time', exports.podU64Struct],
+    ['ledgers', (0, beet_1.uniformFixedSizeArray)(exports.ledgerStruct, 5)],
+    ['collateral', (0, beet_1.uniformFixedSizeArray)(exports.collateralDataStruct, 5)],
+    [
+        'weight_matrix',
+        (0, beet_1.uniformFixedSizeArray)((0, beet_1.uniformFixedSizeArray)(exports.podU32CBPSStruct, 5), 5),
+    ],
+    [
+        'ltv_matrix',
+        (0, beet_1.uniformFixedSizeArray)((0, beet_1.uniformFixedSizeArray)(exports.podU32CBPSStruct, 5), 5),
+    ],
+    [
+        'lqt_matrix',
+        (0, beet_1.uniformFixedSizeArray)((0, beet_1.uniformFixedSizeArray)(exports.podU32CBPSStruct, 5), 5),
+    ],
 ], (args) => args);
 //# sourceMappingURL=structs.js.map

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

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

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

@@ -0,0 +1,6 @@
+export type CachedVault = {
+    pubkey: string;
+    lp_mint: string;
+    principal: string;
+    price: number;
+};

package/src/plugins/loopscale/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/loopscale/types.ts"],"names":[],"mappings":""}

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

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

package/src/plugins/loopscale/vaultsJob.js

@@ -0,0 +1,121 @@
+"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 web3_js_1 = require("@solana/web3.js");
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const clients_1 = require("../../utils/clients");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
+const constants_1 = require("./constants");
+const helpers_1 = require("./helpers");
+const solana_1 = require("../../utils/solana");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const connection = (0, clients_1.getClientSolana)();
+    const vaults = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.vaultStruct, constants_1.loopscaleProgramId)
+        .addFilter('accountDiscriminator', [211, 8, 232, 43, 2, 152, 117, 119])
+        .run();
+    if (!vaults.length)
+        throw new Error('No Vaults accounts found');
+    const strategyMap = {};
+    vaults.forEach((vault) => {
+        const seeds = [Buffer.from('strategy'), vault.pubkey.toBytes()];
+        strategyMap[vault.pubkey.toBase58()] = (0, helpers_1.getProgramAddress)(seeds, constants_1.loopscaleProgramId);
+    });
+    const strats = Object.values(strategyMap);
+    const accounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.strategyStruct, strats);
+    const now = Math.floor(Date.now() / 1000);
+    const cachedVaults = [];
+    const tokenPriceSources = [];
+    const tokenPrices = yield cache.getTokenPricesAsMap(vaults.map((v) => v.principal_mint.toString()), portfolio_core_1.NetworkId.solana);
+    for (let i = 0; i < vaults.length; i++) {
+        const vault = vaults[i];
+        const strategyAddress = strategyMap[vault.pubkey.toString()];
+        const stratPubkey = new web3_js_1.PublicKey(strategyAddress);
+        const accountIndex = strats.indexOf(strategyAddress);
+        if (accountIndex >= 0) {
+            const strat = accounts[accountIndex];
+            if (!strat)
+                continue;
+            const principalMint = strat.principal_mint;
+            const externalYieldSource = strat.external_yield_source;
+            let balance = 0;
+            if (externalYieldSource === 1) {
+                // Marginfi, add this account to loader
+                const mfiBalance = yield (0, helpers_1.getMarginFiAccountBalance)(stratPubkey, cache);
+                balance += mfiBalance; // mrgn balance
+            }
+            else {
+                const stratTAs = yield connection.getTokenAccountsByOwner(stratPubkey, {
+                    mint: principalMint,
+                });
+                stratTAs.value.forEach((accountInfo) => {
+                    const decodedAccount = solana_1.tokenAccountStruct.read(accountInfo.account.data, 0);
+                    balance += Number(decodedAccount.amount);
+                });
+            }
+            const lastAccruedTimestamp = (0, helpers_1.bytesToNumberLE)(new Uint8Array(strat.last_accrued_timestamp.array));
+            const interestPerSecond = (0, helpers_1.bytesToNumberLE)(new Uint8Array(strat.interest_per_second.array)) / 1e18;
+            const currentDeployedAmount = (0, helpers_1.bytesToNumberLE)(new Uint8Array(strat.current_deployed_amount.array));
+            const accruedDelta = now - lastAccruedTimestamp;
+            const deployedAmount = currentDeployedAmount + interestPerSecond * accruedDelta;
+            balance += deployedAmount;
+            cachedVaults.push({
+                pubkey: vault.pubkey.toString(),
+                lp_mint: vault.lp_mint.toString(),
+                principal: principalMint.toString(),
+                price: balance / (0, helpers_1.bytesToNumberLE)(new Uint8Array(vault.lp_supply.array)),
+            });
+            const principalTokenPrice = tokenPrices.get(principalMint.toString());
+            if (principalTokenPrice) {
+                const priceInPrincipal = balance / (0, helpers_1.bytesToNumberLE)(new Uint8Array(vault.lp_supply.array));
+                tokenPriceSources.push({
+                    id: vault.pubkey.toString(),
+                    weight: 1,
+                    address: vault.lp_mint.toString(),
+                    networkId: portfolio_core_1.NetworkId.solana,
+                    platformId: constants_1.platformId,
+                    decimals: principalTokenPrice.decimals,
+                    price: principalTokenPrice.price * priceInPrincipal,
+                    underlyings: [
+                        {
+                            address: principalMint.toString(),
+                            amountPerLp: priceInPrincipal,
+                            decimals: principalTokenPrice.decimals,
+                            networkId: portfolio_core_1.NetworkId.solana,
+                            price: principalTokenPrice.price,
+                        },
+                    ],
+                    label: 'LiquidityPool',
+                    timestamp: Date.now(),
+                    link: `https://app.loopscale.com/vault/AXanCP4dJHtWd7zY4X7nwxN5t5Gysfy2uG3XTxSmXdaB${vault.pubkey}`,
+                    sourceRefs: [
+                        {
+                            name: 'Vault',
+                            address: vault.pubkey.toString(),
+                        },
+                    ],
+                });
+            }
+        }
+    }
+    yield cache.setTokenPriceSources(tokenPriceSources);
+    yield cache.setItem(constants_1.vaultsCacheKey, cachedVaults, {
+        prefix: constants_1.platformId,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+});
+const job = {
+    id: `${constants_1.platformId}-vaults`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=vaultsJob.js.map

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

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

package/src/plugins/lulo/depositsFetcher.js

@@ -19,6 +19,7 @@ const helpers_1 = require("./helpers");
 const depositsFetcher_1 = __importDefault(require("../drift/depositsFetcher"));
 const lendsFetcher_1 = __importDefault(require("../kamino/lendsFetcher"));
 const collateralFetcher_1 = __importDefault(require("../mango/collateralFetcher"));
+const depositsFetcher_2 = __importDefault(require("../marginfi/depositsFetcher"));
 const constants_2 = require("../tokens/constants");
 const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
 const clients_1 = require("../../utils/clients");
@@ -26,10 +27,7 @@ const struct_1 = require("./struct");
 const structs_1 = require("../save/structs");
 const constants_3 = require("../save/constants");
 const helpers_2 = require("../save/helpers");
-const MarginfiAccount_1 = require("../marginfi/structs/MarginfiAccount");
 const solana_1 = require("../../utils/solana");
-const constants_4 = require("../marginfi/constants");
-const helpers_3 = require("../marginfi/helpers");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
@@ -44,12 +42,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         return [];
     const isSolendActivated = userAccount.solend_obligation.toString() !==
         '11111111111111111111111111111111';
-    const isMarginFiActivated = userAccount.mfi_account.toString() !== '11111111111111111111111111111111';
     const portfolioElements = [];
-    const [marginfiAccount, driftElements, kaminoElements, mangoElements, saveObligation,] = yield Promise.all([
-        isMarginFiActivated
-            ? (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, MarginfiAccount_1.marginfiAccountStruct, userAccount.mfi_account)
-            : undefined,
+    const [marginFiElements, driftElements, kaminoElements, mangoElements, saveObligation,] = yield Promise.all([
+        depositsFetcher_2.default.executor(pda, cache),
         depositsFetcher_1.default.executor(pda, cache),
         lendsFetcher_1.default.executor(pda, cache),
         collateralFetcher_1.default.executor(pda, cache),
@@ -57,7 +52,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             ? (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.obligationStruct, userAccount.solend_obligation)
             : undefined,
     ]);
-    portfolioElements.push(...[...driftElements, ...kaminoElements, ...mangoElements]);
+    portfolioElements.push(...[
+        ...marginFiElements,
+        ...driftElements,
+        ...kaminoElements,
+        ...mangoElements,
+    ]);
     if (saveObligation) {
         const mainMarketInfo = yield cache.getItem(constants_3.mainMarket, {
             prefix: constants_3.marketsPrefix,
@@ -84,26 +84,6 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             }
         }
     }
-    if (marginfiAccount) {
-        const banksInfo = yield cache.getItem(constants_4.banksKey, {
-            prefix: constants_4.platform.id,
-            networkId: portfolio_core_1.NetworkId.solana,
-        });
-        if (banksInfo) {
-            const banksInfoByAddress = new Map();
-            const tokensAddresses = new Set();
-            banksInfo.forEach((bankInfo) => {
-                if (!bankInfo)
-                    return;
-                banksInfoByAddress.set(bankInfo.pubkey.toString(), bankInfo);
-                tokensAddresses.add(bankInfo.mint.toString());
-            });
-            const tokenPriceById = yield cache.getTokenPricesAsMap(Array.from(tokensAddresses), portfolio_core_1.NetworkId.solana);
-            const element = (0, helpers_3.getElementFromAccount)(marginfiAccount, banksInfoByAddress, tokenPriceById);
-            if (element)
-                portfolioElements.push(element);
-        }
-    }
     const elements = [];
     for (const element of portfolioElements) {
         const tmpElement = element;

package/src/plugins/lulo/depositsFetcher.js.map

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

package/src/plugins/marginfi/banksJob.js

@@ -13,15 +13,19 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const Bank_1 = require("./structs/Bank");
-const filters_1 = require("./filters");
 const helpers_1 = require("./helpers");
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
 const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
 const structs_1 = require("../native-stake/solana/structs");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const banksRawData = yield (0, solana_1.getParsedProgramAccounts)(connection, Bank_1.bankStruct, constants_1.MarginfiProgram, (0, filters_1.banksFilters)());
+    const banksRawData = yield ParsedGpa_1.ParsedGpa.build(connection, Bank_1.bankStruct, constants_1.marginfiProgramId)
+        .addRawFilter(0, 'QnTef4UXSzF')
+        .addRawFilter(41, constants_1.MarginfiAccountAddress)
+        .addDataSizeFilter(Bank_1.bankStruct.byteSize)
+        .run();
     const banks = [];
     const rateItems = [];
     const sources = [];

package/src/plugins/marginfi/banksJob.js.map

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

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

@@ -2,10 +2,12 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
-import BigNumber from 'bignumber.js';
+import { MemoizedCache } from '../../utils/misc/MemoizedCache';
+import { ParsedAccount } from '../../utils/solana';
+import { BankInfo } from './types';
 export declare const platformId = "marginfi";
 export declare const platform: Platform;
-export declare const MarginfiProgram: PublicKey;
+export declare const marginfiProgramId: PublicKey;
 export declare const MarginfiAccountAddress = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 export declare const banksKey = "banks";
-export declare const solFactor: BigNumber;
+export declare const marginFiBanksMemo: MemoizedCache<ParsedAccount<BankInfo>[], Map<string, ParsedAccount<BankInfo>>>;

package/src/plugins/marginfi/constants.js

@@ -1,12 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solFactor = exports.banksKey = exports.MarginfiAccountAddress = exports.MarginfiProgram = exports.platform = exports.platformId = void 0;
+exports.marginFiBanksMemo = exports.banksKey = exports.MarginfiAccountAddress = exports.marginfiProgramId = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
+const arrayToMap_1 = require("../../utils/misc/arrayToMap");
 exports.platformId = 'marginfi';
 exports.platform = {
     id: exports.platformId,
@@ -21,8 +19,11 @@ exports.platform = {
     tokens: ['LSTxxxnJzKDFSLr4dUkPcmCf5VyryEqzPLz5j4bpxFp'],
     description: 'A liquidity layer built for finance. Access native yield, embedded risk systems, and off-chain data plug-ins.',
 };
-exports.MarginfiProgram = new web3_js_1.PublicKey('MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA');
+exports.marginfiProgramId = new web3_js_1.PublicKey('MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA');
 exports.MarginfiAccountAddress = '4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8';
 exports.banksKey = 'banks';
-exports.solFactor = new bignumber_js_1.default(Math.pow(10, portfolio_core_1.solanaNetwork.native.decimals));
+exports.marginFiBanksMemo = new MemoizedCache_1.MemoizedCache(exports.banksKey, {
+    prefix: exports.platformId,
+    networkId: portfolio_core_1.NetworkId.solana,
+}, (arr) => (0, arrayToMap_1.arrayToMap)(arr || [], 'pubkey'));
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/constants.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,+DAAqE;AACrE,gEAAqC;AAExB,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EACH,8EAA8E;IAChF,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,2BAA2B;IACpC,MAAM,EAAE,8BAA8B;IACtC,aAAa,EAAE,4BAA4B;IAC3C,OAAO,EAAE,8BAA8B;IACvC,QAAQ,EAAE,uBAAuB;IACjC,MAAM,EAAE,CAAC,6CAA6C,CAAC;IACvD,WAAW,EACT,+GAA+G;CAClH,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,sBAAsB,GACjC,8CAA8C,CAAC;AAEpC,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,+DAAiE;AACjE,kEAA+D;AAG/D,4DAAyD;AAE5C,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EACH,8EAA8E;IAChF,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,2BAA2B;IACpC,MAAM,EAAE,8BAA8B;IACtC,aAAa,EAAE,4BAA4B;IAC3C,OAAO,EAAE,8BAA8B;IACvC,QAAQ,EAAE,uBAAuB;IACjC,MAAM,EAAE,CAAC,6CAA6C,CAAC;IACvD,WAAW,EACT,+GAA+G;CAClH,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,sBAAsB,GACjC,8CAA8C,CAAC;AAEpC,QAAA,QAAQ,GAAG,OAAO,CAAC;AAEnB,QAAA,iBAAiB,GAAG,IAAI,6BAAa,CAIhD,gBAAQ,EACR;IACE,MAAM,EAAE,kBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,GAAG,IAAI,EAAE,EAAE,QAAQ,CAAC,CACzC,CAAC"}