@sonarwatch/portfolio-plugins 0.11.173 → 0.11.174

package/src/plugins/marginfi/banksJob.js

@@ -19,20 +19,37 @@ const clients_1 = require("../../utils/clients");
 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 banks = [];
+    const rateItems = [];
     for (let index = 0; index < banksRawData.length; index += 1) {
         const bank = banksRawData[index];
-        yield cache.setItem(bank.pubkey.toString(), Object.assign(Object.assign({}, bank), { dividedAssetShareValue: (0, helpers_1.wrappedI80F48toBigNumber)(bank.assetShareValue).div(Math.pow(10, bank.mintDecimals)), dividedLiabilityShareValue: (0, helpers_1.wrappedI80F48toBigNumber)(bank.liabilityShareValue).div(Math.pow(10, bank.mintDecimals)) }), {
-            prefix: constants_1.prefix,
-            networkId: portfolio_core_1.NetworkId.solana,
-        });
-        const { lendingApr, borrowingApr } = (0, helpers_1.getInterestRates)(bank);
+        const { lendingApr, borrowingApr } = (0, helpers_1.computeInterestRates)(bank);
+        banks.push(Object.assign(Object.assign({}, bank), { dividedAssetShareValue: (0, helpers_1.wrappedI80F48toBigNumber)(bank.assetShareValue)
+                .div(Math.pow(10, bank.mintDecimals))
+                .toString(), dividedLiabilityShareValue: (0, helpers_1.wrappedI80F48toBigNumber)(bank.liabilityShareValue)
+                .div(Math.pow(10, bank.mintDecimals))
+                .toString(), suppliedLtv: (0, helpers_1.wrappedI80F48toBigNumber)(bank.config.assetWeightMaint)
+                .decimalPlaces(2)
+                .toNumber(), suppliedYields: [
+                {
+                    apy: (0, portfolio_core_1.aprToApy)(lendingApr),
+                    apr: lendingApr,
+                },
+            ], borrowedWeight: (0, helpers_1.wrappedI80F48toBigNumber)(bank.config.liabilityWeightMaint)
+                .decimalPlaces(2)
+                .toNumber(), borrowedYields: [
+                {
+                    apy: -(0, portfolio_core_1.aprToApy)(borrowingApr),
+                    apr: -borrowingApr,
+                },
+            ] }));
         const depositedAmount = (0, helpers_1.wrappedI80F48toBigNumber)(bank.liabilityShareValue)
             .times((0, helpers_1.wrappedI80F48toBigNumber)(bank.totalLiabilityShares))
             .toNumber();
         const borrowedAmount = (0, helpers_1.wrappedI80F48toBigNumber)(bank.assetShareValue)
             .times((0, helpers_1.wrappedI80F48toBigNumber)(bank.totalAssetShares))
             .toNumber();
-        if (borrowedAmount <= 10 && depositedAmount <= 10)
+        if (borrowedAmount <= 1 && depositedAmount <= 1)
             continue;
         const tokenAddress = bank.mint.toString();
         const poolName = bank.config.riskTier === 0 ? 'Global Pool' : 'Isolated Pool';
@@ -51,11 +68,19 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             platformId: constants_1.platformId,
             poolName,
         };
-        yield cache.setItem(`${bank.pubkey.toString()}-${tokenAddress}`, rate, {
-            prefix: portfolio_core_1.borrowLendRatesPrefix,
-            networkId: portfolio_core_1.NetworkId.solana,
+        rateItems.push({
+            key: `${bank.pubkey.toString()}-${tokenAddress}`,
+            value: rate,
         });
     }
+    yield cache.setItem(constants_1.banksKey, banks, {
+        prefix: constants_1.platformId,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+    yield cache.setItems(rateItems, {
+        prefix: portfolio_core_1.borrowLendRatesPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
 });
 const job = {
     id: `${constants_1.platformId}-banks`,

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":";;;;;;;;;;;AAAA,+DAKoC;AACpC,2CAAkE;AAClE,yCAA4C;AAC5C,uCAAyC;AACzC,uCAAuE;AACvE,+CAA8D;AAC9D,iDAAsD;AAItD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAwB,EACjD,UAAU,EACV,iBAAU,EACV,2BAAe,EACf,IAAA,sBAAY,GAAE,CACf,CAAC;IAEF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,KAAK,CAAC,OAAO,CACjB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,kCAEjB,IAAI,KACP,sBAAsB,EAAE,IAAA,kCAAwB,EAC9C,IAAI,CAAC,eAAe,CACrB,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,IAAI,CAAC,YAAY,CAAA,CAAC,EAC9B,0BAA0B,EAAE,IAAA,kCAAwB,EAClD,IAAI,CAAC,mBAAmB,CACzB,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,IAAI,CAAC,YAAY,CAAA,CAAC,KAEhC;YACE,MAAM,EAAN,kBAAM;YACN,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CACF,CAAC;QAEF,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAA,kCAAwB,EAAC,IAAI,CAAC,mBAAmB,CAAC;aACvE,KAAK,CAAC,IAAA,kCAAwB,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aAC1D,QAAQ,EAAE,CAAC;QAEd,MAAM,cAAc,GAAG,IAAA,kCAAwB,EAAC,IAAI,CAAC,eAAe,CAAC;aAClE,KAAK,CAAC,IAAA,kCAAwB,EAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACtD,QAAQ,EAAE,CAAC;QAEd,IAAI,cAAc,IAAI,EAAE,IAAI,eAAe,IAAI,EAAE;YAAE,SAAS;QAE5D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE1C,MAAM,QAAQ,GACZ,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;QAE/D,MAAM,IAAI,GAAmB;YAC3B,YAAY;YACZ,WAAW,EAAE;gBACX,GAAG,EAAE,IAAA,yBAAQ,EAAC,YAAY,CAAC;gBAC3B,GAAG,EAAE,YAAY;aAClB;YACD,cAAc;YACd,YAAY,EAAE;gBACZ,GAAG,EAAE,IAAA,yBAAQ,EAAC,UAAU,CAAC;gBACzB,GAAG,EAAE,UAAU;aAChB;YACD,eAAe;YACf,UAAU,EAAV,sBAAU;YACV,QAAQ;SACT,CAAC;QAEF,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,EAAE,IAAI,EAAE;YACrE,MAAM,EAAE,sCAAqB;YAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"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

@@ -1,7 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 import BigNumber from 'bignumber.js';
-export declare const prefix = "marginfi-banks";
+export declare const banksKey = "banks";
 export declare const platformId = "marginfi";
 export declare const marginfiPlatform: Platform;
 export declare const MarginfiProgram: PublicKey;

package/src/plugins/marginfi/constants.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solFactor = exports.MarginfiAccountAddress = exports.MarginfiProgram = exports.marginfiPlatform = exports.platformId = exports.prefix = void 0;
+exports.solFactor = exports.MarginfiAccountAddress = exports.MarginfiProgram = exports.marginfiPlatform = exports.platformId = exports.banksKey = 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"));
-exports.prefix = 'marginfi-banks';
+exports.banksKey = 'banks';
 exports.platformId = 'marginfi';
 exports.marginfiPlatform = {
     id: exports.platformId,

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,MAAM,GAAG,gBAAgB,CAAC;AAC1B,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,2BAA2B;CACrC,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,sBAAsB,GACjC,8CAA8C,CAAC;AAEpC,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,+DAAqE;AACrE,gEAAqC;AAExB,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,2BAA2B;CACrC,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,sBAAsB,GACjC,8CAA8C,CAAC;AAEpC,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC"}

package/src/plugins/marginfi/depositsFetcher.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const MarginfiAccount_1 = require("./structs/MarginfiAccount");
 const helpers_1 = require("./helpers");
@@ -21,19 +20,16 @@ const filters_1 = require("./filters");
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
-const helpers_2 = require("../../utils/solana/pyth/helpers");
-const Bank_1 = require("./structs/Bank");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, MarginfiAccount_1.marginfiAccountStruct, constants_1.MarginfiProgram, (0, filters_1.accountsFilter)(owner));
     if (accounts.length === 0)
         return [];
-    const banksInfo = yield cache.getAllItems({
-        prefix: constants_1.prefix,
+    const banksInfo = yield cache.getItem(constants_1.banksKey, {
+        prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,
     });
-    if (banksInfo.length === 0)
+    if (!banksInfo || banksInfo.length === 0)
         return [];
     const banksInfoByAddress = new Map();
     const tokensAddresses = new Set();
@@ -43,7 +39,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         banksInfoByAddress.set(bankInfo.pubkey.toString(), bankInfo);
         tokensAddresses.add(bankInfo.mint.toString());
     });
-    const tokenPriceById = yield (0, getTokensPricesMap_1.default)(Array.from(tokensAddresses), portfolio_core_1.NetworkId.solana, cache);
+    const tokenPriceById = yield cache.getTokenPricesAsMap(Array.from(tokensAddresses), portfolio_core_1.NetworkId.solana);
     const elements = [];
     for (const account of accounts) {
         const { balances } = account.lendingAccount;
@@ -63,47 +59,22 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             const bankInfo = banksInfoByAddress.get(balance.bankPk.toString());
             if (!bankInfo)
                 continue;
-            const { lendingApr, borrowingApr } = (0, helpers_1.getInterestRates)(bankInfo);
             const tokenPrice = tokenPriceById.get(bankInfo.mint.toString());
-            let price;
-            if (!tokenPrice && bankInfo.config.oracleSetup === Bank_1.OracleSetup.PythEma) {
-                const pythOracle = new web3_js_1.PublicKey(bankInfo.config.oracleKeys[0]);
-                const pythAccount = yield client.getAccountInfo(pythOracle);
-                const pythPrice = pythAccount ? (0, helpers_2.parsePriceData)(pythAccount.data) : null;
-                if (pythPrice)
-                    price = pythPrice.price;
-            }
             if (!balance.assetShares.value.isZero()) {
-                suppliedLtvs.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.assetWeightMaint)
-                    .decimalPlaces(2)
-                    .toNumber());
-                const suppliedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(balance.assetShares)
+                suppliedLtvs.push(bankInfo.suppliedLtv);
+                const suppliedAmount = (0, helpers_1.wrappedI80F48toBigNumber)(balance.assetShares)
                     .times(bankInfo.dividedAssetShareValue)
                     .toNumber();
-                suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), suppliedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice, price));
-                const bankLendingYields = [
-                    {
-                        apr: lendingApr,
-                        apy: (0, portfolio_core_1.aprToApy)(lendingApr),
-                    },
-                ];
-                suppliedYields.push(bankLendingYields);
+                suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), suppliedAmount, portfolio_core_1.NetworkId.solana, tokenPrice));
+                suppliedYields.push(bankInfo.suppliedYields);
             }
             if (!balance.liabilityShares.value.isZero()) {
-                borrowedWeights.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.liabilityWeightMaint)
-                    .decimalPlaces(2)
-                    .toNumber());
-                const borrowedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(balance.liabilityShares)
+                borrowedWeights.push(bankInfo.borrowedWeight);
+                const borrowedAmount = (0, helpers_1.wrappedI80F48toBigNumber)(balance.liabilityShares)
                     .times(bankInfo.dividedLiabilityShareValue)
                     .toNumber();
-                borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), borrowedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice, price));
-                const bankBorrowedYields = [
-                    {
-                        apr: -borrowingApr,
-                        apy: -(0, portfolio_core_1.aprToApy)(borrowingApr),
-                    },
-                ];
-                borrowedYields.push(bankBorrowedYields);
+                borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), borrowedAmount, portfolio_core_1.NetworkId.solana, tokenPrice));
+                borrowedYields.push(bankInfo.borrowedYields);
             }
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)

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

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

package/src/plugins/marginfi/filters.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.banksFilters = exports.accountsFilter = void 0;
 const constants_1 = require("./constants");
+const Bank_1 = require("./structs/Bank");
 const accountsFilter = (owner) => [
     {
         memcmp: {
@@ -36,6 +37,9 @@ const banksFilters = () => [
             offset: 41,
         },
     },
+    {
+        dataSize: Bank_1.bankStruct.byteSize,
+    },
 ];
 exports.banksFilters = banksFilters;
 //# sourceMappingURL=filters.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/filters.ts"],"names":[],"mappings":";;;AACA,2CAAqD;AAE9C,MAAM,cAAc,GAAG,CAAC,KAAa,EAA8B,EAAE,CAAC;IAC3E;QACE,MAAM,EAAE;YACN,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,CAAC;SACV;KACF;IACD;QACE,MAAM,EAAE;YACN,KAAK,EAAE,kCAAsB;YAC7B,MAAM,EAAE,CAAC;SACV;KACF;IACD;QACE,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC;AAnBW,QAAA,cAAc,kBAmBzB;AAEK,MAAM,YAAY,GAAG,GAA+B,EAAE,CAAC;IAC5D;QACE,MAAM,EAAE;YACN,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,CAAC;SACV;KACF;IACD;QACE,MAAM,EAAE;YACN,KAAK,EAAE,kCAAsB;YAC7B,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC;AAbW,QAAA,YAAY,gBAavB"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/filters.ts"],"names":[],"mappings":";;;AACA,2CAAqD;AACrD,yCAA4C;AAErC,MAAM,cAAc,GAAG,CAAC,KAAa,EAA8B,EAAE,CAAC;IAC3E;QACE,MAAM,EAAE;YACN,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,CAAC;SACV;KACF;IACD;QACE,MAAM,EAAE;YACN,KAAK,EAAE,kCAAsB;YAC7B,MAAM,EAAE,CAAC;SACV;KACF;IACD;QACE,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC;AAnBW,QAAA,cAAc,kBAmBzB;AAEK,MAAM,YAAY,GAAG,GAA+B,EAAE,CAAC;IAC5D;QACE,MAAM,EAAE;YACN,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,CAAC;SACV;KACF;IACD;QACE,MAAM,EAAE;YACN,KAAK,EAAE,kCAAsB;YAC7B,MAAM,EAAE,EAAE;SACX;KACF;IACD;QACE,QAAQ,EAAE,iBAAU,CAAC,QAAQ;KAC9B;CACF,CAAC;AAhBW,QAAA,YAAY,gBAgBvB"}

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

@@ -3,7 +3,7 @@ import { Bank } from './structs/Bank';
 export declare function wrappedI80F48toBigNumber({ value }: {
     value: BigNumber;
 }, scaleDecimal?: number): BigNumber;
-export declare function getInterestRates(bank: Bank): {
+export declare function computeInterestRates(bank: Bank): {
     lendingApr: number;
     borrowingApr: number;
 };

package/src/plugins/marginfi/helpers.js

@@ -3,49 +3,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInterestRates = exports.wrappedI80F48toBigNumber = void 0;
+exports.computeInterestRates = exports.wrappedI80F48toBigNumber = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 function wrappedI80F48toBigNumber({ value }, scaleDecimal = 0) {
     if (!value)
         return new bignumber_js_1.default(0);
-    const newValue = new bignumber_js_1.default(value);
-    const numbers = new decimal_js_1.default(`${newValue.isNegative() ? '-' : ''}0b${newValue.abs().toString(2)}p-48`).dividedBy(Math.pow(10, scaleDecimal));
+    const numbers = new decimal_js_1.default(`${value.isNegative() ? '-' : ''}0b${value.abs().toString(2)}p-48`).dividedBy(Math.pow(10, scaleDecimal));
     return new bignumber_js_1.default(numbers.toString());
 }
 exports.wrappedI80F48toBigNumber = wrappedI80F48toBigNumber;
-// AMELIORER LE PRINCIPE DENVOYER A CHAQUE FOIS LA BANK AUX FONCTIONS
-// AMELIORER LE PRINCIPE DE UNWRAP LES I80F48 A CHAQUE FOIS
-function getInterestRates(bank) {
-    const { insuranceFeeFixedApr, insuranceIrFee, protocolFixedFeeApr, protocolIrFee, } = bank.config.interestRateConfig;
-    const rateFee = wrappedI80F48toBigNumber(insuranceFeeFixedApr).plus(wrappedI80F48toBigNumber(protocolFixedFeeApr));
-    const fixedFee = wrappedI80F48toBigNumber(insuranceIrFee).plus(wrappedI80F48toBigNumber(protocolIrFee));
-    const interestRate = interestRateCurve(bank);
-    const utilizationRate = wrappedI80F48toBigNumber(bank.liabilityShareValue)
-        .times(wrappedI80F48toBigNumber(bank.totalLiabilityShares))
-        .div(wrappedI80F48toBigNumber(bank.assetShareValue).times(wrappedI80F48toBigNumber(bank.totalAssetShares)));
-    const lendingApy = interestRate.times(utilizationRate).toNumber();
-    const borrowingApy = interestRate
-        .times(new bignumber_js_1.default(1).plus(rateFee))
-        .plus(fixedFee)
-        .toNumber();
-    return { lendingApr: lendingApy, borrowingApr: borrowingApy };
+function getTotalLiabilityQuantity(bank) {
+    return wrappedI80F48toBigNumber(bank.totalLiabilityShares).times(wrappedI80F48toBigNumber(bank.liabilityShareValue));
+}
+function getTotalAssetQuantity(bank) {
+    return wrappedI80F48toBigNumber(bank.totalAssetShares).times(wrappedI80F48toBigNumber(bank.assetShareValue));
+}
+function computeUtilizationRate(bank) {
+    const assets = getTotalAssetQuantity(bank);
+    const liabilities = getTotalLiabilityQuantity(bank);
+    if (assets.isZero())
+        return new bignumber_js_1.default(0);
+    return liabilities.div(assets);
 }
-exports.getInterestRates = getInterestRates;
-function interestRateCurve(bank) {
+function computeBaseInterestRate(bank) {
     const { optimalUtilizationRate, plateauInterestRate, maxInterestRate } = bank.config.interestRateConfig;
-    const utilizationRate = wrappedI80F48toBigNumber(bank.liabilityShareValue)
-        .times(wrappedI80F48toBigNumber(bank.totalLiabilityShares))
-        .div(wrappedI80F48toBigNumber(bank.assetShareValue).times(wrappedI80F48toBigNumber(bank.totalAssetShares)));
-    if (utilizationRate.lte(wrappedI80F48toBigNumber(optimalUtilizationRate))) {
+    const fOptimalUtilizationRate = wrappedI80F48toBigNumber(optimalUtilizationRate);
+    const fPlateauInterestRate = wrappedI80F48toBigNumber(plateauInterestRate);
+    const fMaxInterestRate = wrappedI80F48toBigNumber(maxInterestRate);
+    const utilizationRate = computeUtilizationRate(bank);
+    if (utilizationRate.lte(fOptimalUtilizationRate)) {
         return utilizationRate
-            .times(wrappedI80F48toBigNumber(plateauInterestRate))
-            .div(wrappedI80F48toBigNumber(optimalUtilizationRate));
+            .times(fPlateauInterestRate)
+            .div(fOptimalUtilizationRate);
     }
     return utilizationRate
-        .minus(wrappedI80F48toBigNumber(optimalUtilizationRate))
-        .div(new bignumber_js_1.default(1).minus(wrappedI80F48toBigNumber(optimalUtilizationRate)))
-        .times(wrappedI80F48toBigNumber(maxInterestRate).minus(wrappedI80F48toBigNumber(plateauInterestRate)))
-        .plus(wrappedI80F48toBigNumber(plateauInterestRate));
+        .minus(fOptimalUtilizationRate)
+        .div(new bignumber_js_1.default(1).minus(fOptimalUtilizationRate))
+        .times(fMaxInterestRate.minus(fPlateauInterestRate))
+        .plus(fPlateauInterestRate);
+}
+function computeInterestRates(bank) {
+    const { insuranceFeeFixedApr, insuranceIrFee, protocolFixedFeeApr, protocolIrFee, } = bank.config.interestRateConfig;
+    const fixedFee = wrappedI80F48toBigNumber(insuranceFeeFixedApr).plus(wrappedI80F48toBigNumber(protocolFixedFeeApr));
+    const rateFee = wrappedI80F48toBigNumber(insuranceIrFee).plus(wrappedI80F48toBigNumber(protocolIrFee));
+    const baseInterestRate = computeBaseInterestRate(bank);
+    const utilizationRate = computeUtilizationRate(bank);
+    const lendingRate = baseInterestRate.times(utilizationRate);
+    const borrowingRate = baseInterestRate
+        .times(new bignumber_js_1.default(1).plus(rateFee))
+        .plus(fixedFee);
+    const lendingApr = lendingRate.toNumber();
+    const borrowingApr = borrowingRate.toNumber();
+    return { lendingApr, borrowingApr };
 }
+exports.computeInterestRates = computeInterestRates;
 //# sourceMappingURL=helpers.js.map

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

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

package/src/plugins/marginfi/structs/Bank.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { FixableBeetStruct } from '@metaplex-foundation/beet';
+import { BeetStruct, bignum } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
 import { WrappedI80F48 } from './common';
@@ -25,9 +25,9 @@ export type InterestRateConfig = {
     insuranceIrFee: WrappedI80F48;
     protocolFixedFeeApr: WrappedI80F48;
     protocolIrFee: WrappedI80F48;
-    padding: BigNumber[];
+    padding: bignum[];
 };
-export declare const interestRateConfigStruct: FixableBeetStruct<InterestRateConfig, Partial<InterestRateConfig>>;
+export declare const interestRateConfigStruct: BeetStruct<InterestRateConfig, Partial<InterestRateConfig>>;
 export type BankConfig = {
     assetWeightInit: WrappedI80F48;
     assetWeightMaint: WrappedI80F48;
@@ -37,32 +37,39 @@ export type BankConfig = {
     interestRateConfig: InterestRateConfig;
     operationalState: BankOperationalState;
     oracleSetup: OracleSetup;
-    oracleKeys: PublicKey[];
-    ignore1: number[];
+    oracleKeys_1: PublicKey;
+    oracleKeys_2: PublicKey;
+    oracleKeys_3: PublicKey;
+    oracleKeys_4: PublicKey;
+    oracleKeys_5: PublicKey;
+    auto_padding_0: number[];
     borrowLimit: BigNumber;
     riskTier: RiskTier;
+    auto_padding_1: BigNumber[];
+    totalAssetValueInitLimit: BigNumber;
     padding: BigNumber[];
 };
-export declare const bankConfigStruct: FixableBeetStruct<BankConfig, Partial<BankConfig>>;
+export declare const bankConfigStruct: BeetStruct<BankConfig, Partial<BankConfig>>;
 export type Bank = {
     padding: Buffer;
     mint: PublicKey;
     mintDecimals: number;
     group: PublicKey;
-    ignore1: number[];
+    auto_padding_0: number[];
     assetShareValue: WrappedI80F48;
     liabilityShareValue: WrappedI80F48;
     liquidityVault: PublicKey;
-    blob: Buffer;
+    liquidityVaultBump: number;
+    liquidityVaultAuthorityBump: number;
     insuranceVault: PublicKey;
     insuranceVaultBump: number;
-    insuranceVaultAuthorityBump: PublicKey;
-    ignore3: PublicKey;
+    insuranceVaultAuthorityBump: number;
+    auto_padding_1: PublicKey;
     collectedInsuranceFeesOutstanding: WrappedI80F48;
     feeVault: PublicKey;
     feeVaultBump: number;
     feeVaultAuthorityBump: number;
-    ignore4: number[];
+    auto_padding_2: number[];
     collectedGroupFeesOutstanding: WrappedI80F48;
     totalLiabilityShares: WrappedI80F48;
     totalAssetShares: WrappedI80F48;
@@ -75,4 +82,4 @@ export type Bank = {
     padding0: BigNumber[];
     padding1: BigNumber[];
 };
-export declare const bankStruct: FixableBeetStruct<Bank, Partial<Bank>>;
+export declare const bankStruct: BeetStruct<Bank, Partial<Bank>>;

package/src/plugins/marginfi/structs/Bank.js

@@ -23,7 +23,7 @@ var RiskTier;
     RiskTier[RiskTier["Collateral"] = 0] = "Collateral";
     RiskTier[RiskTier["Isolated"] = 1] = "Isolated";
 })(RiskTier || (exports.RiskTier = RiskTier = {}));
-exports.interestRateConfigStruct = new beet_1.FixableBeetStruct([
+exports.interestRateConfigStruct = new beet_1.BeetStruct([
     ['optimalUtilizationRate', common_1.wrappedI80F48Struct],
     ['plateauInterestRate', common_1.wrappedI80F48Struct],
     ['maxInterestRate', common_1.wrappedI80F48Struct],
@@ -31,9 +31,9 @@ exports.interestRateConfigStruct = new beet_1.FixableBeetStruct([
     ['insuranceIrFee', common_1.wrappedI80F48Struct],
     ['protocolFixedFeeApr', common_1.wrappedI80F48Struct],
     ['protocolIrFee', common_1.wrappedI80F48Struct],
-    ['padding', (0, beet_1.uniformFixedSizeArray)(solana_1.u128, 8)],
+    ['padding', (0, beet_1.uniformFixedSizeArray)(beet_1.u32, 32)],
 ], (args) => args);
-exports.bankConfigStruct = new beet_1.FixableBeetStruct([
+exports.bankConfigStruct = new beet_1.BeetStruct([
     ['assetWeightInit', common_1.wrappedI80F48Struct],
     ['assetWeightMaint', common_1.wrappedI80F48Struct],
     ['liabilityWeightInit', common_1.wrappedI80F48Struct],
@@ -42,31 +42,38 @@ exports.bankConfigStruct = new beet_1.FixableBeetStruct([
     ['interestRateConfig', exports.interestRateConfigStruct],
     ['operationalState', beet_1.u8],
     ['oracleSetup', beet_1.u8],
-    ['oracleKeys', (0, beet_1.uniformFixedSizeArray)(beet_solana_1.publicKey, 5)],
-    ['ignore1', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 6)],
+    ['oracleKeys_1', beet_solana_1.publicKey],
+    ['oracleKeys_2', beet_solana_1.publicKey],
+    ['oracleKeys_3', beet_solana_1.publicKey],
+    ['oracleKeys_4', beet_solana_1.publicKey],
+    ['oracleKeys_5', beet_solana_1.publicKey],
+    ['auto_padding_0', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 6)],
     ['borrowLimit', solana_1.u64],
     ['riskTier', beet_1.u8],
-    ['padding', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 6)],
+    ['auto_padding_1', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 7)],
+    ['totalAssetValueInitLimit', solana_1.u64],
+    ['padding', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 5)],
 ], (args) => args);
-exports.bankStruct = new beet_1.FixableBeetStruct([
+exports.bankStruct = new beet_1.BeetStruct([
     ['padding', (0, solana_1.blob)(8)],
     ['mint', beet_solana_1.publicKey],
     ['mintDecimals', beet_1.u8],
     ['group', beet_solana_1.publicKey],
-    ['ignore1', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 7)],
+    ['auto_padding_0', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 7)],
     ['assetShareValue', common_1.wrappedI80F48Struct],
     ['liabilityShareValue', common_1.wrappedI80F48Struct],
     ['liquidityVault', beet_solana_1.publicKey],
-    ['blob', (0, solana_1.blob)(2)],
+    ['liquidityVaultBump', beet_1.u8],
+    ['liquidityVaultAuthorityBump', beet_1.u8],
     ['insuranceVault', beet_solana_1.publicKey],
     ['insuranceVaultBump', beet_1.u8],
     ['insuranceVaultAuthorityBump', beet_1.u8],
-    ['ignore3', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 4)],
+    ['auto_padding_1', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 4)],
     ['collectedInsuranceFeesOutstanding', common_1.wrappedI80F48Struct],
     ['feeVault', beet_solana_1.publicKey],
     ['feeVaultBump', beet_1.u8],
     ['feeVaultAuthorityBump', beet_1.u8],
-    ['ignore4', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 6)],
+    ['auto_padding_2', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 6)],
     ['collectedGroupFeesOutstanding', common_1.wrappedI80F48Struct],
     ['totalLiabilityShares', common_1.wrappedI80F48Struct],
     ['totalAssetShares', common_1.wrappedI80F48Struct],
@@ -74,8 +81,8 @@ exports.bankStruct = new beet_1.FixableBeetStruct([
     ['config', exports.bankConfigStruct],
     ['emissionsFlags', solana_1.u64],
     ['emissionsRate', solana_1.u64],
-    ['emissionsMint', beet_solana_1.publicKey],
     ['emissionsRemaining', common_1.wrappedI80F48Struct],
+    ['emissionsMint', beet_solana_1.publicKey],
     ['padding0', (0, beet_1.uniformFixedSizeArray)(solana_1.u128, 28)],
     ['padding1', (0, beet_1.uniformFixedSizeArray)(solana_1.u128, 32)],
 ], (args) => args);

package/src/plugins/marginfi/structs/Bank.js.map

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

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

@@ -1,6 +1,10 @@
-import BigNumber from 'bignumber.js';
+import { Yield } from '@sonarwatch/portfolio-core';
 import { Bank } from './structs/Bank';
 export type BankInfo = Bank & {
-    dividedAssetShareValue: BigNumber;
-    dividedLiabilityShareValue: BigNumber;
+    dividedAssetShareValue: string;
+    dividedLiabilityShareValue: string;
+    suppliedYields: Yield[];
+    borrowedYields: Yield[];
+    suppliedLtv: number;
+    borrowedWeight: number;
 };

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

@@ -2,6 +2,6 @@ import { PublicKey } from '@solana/web3.js';
 import { Collection, Pool } from './types';
 export declare function getPool(pool: string): Promise<Pool | undefined>;
 export declare function getCollections(): Promise<Collection[]>;
-export declare function getPoolPda(owner: PublicKey): PublicKey;
+export declare function getPoolPda(owner: string): PublicKey;
 export declare function getLoans(owner: string): Promise<import("./types").Loan[]>;
 export declare function daysBetweenDates(start: Date, end: Date): number;

package/src/plugins/rain/helpers.js

@@ -39,7 +39,7 @@ function getCollections() {
 }
 exports.getCollections = getCollections;
 function getPoolPda(owner) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('poolv2', 'utf-8'), owner.toBuffer()], constants_1.programId)[0];
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('poolv2', 'utf-8'), new web3_js_1.PublicKey(owner).toBuffer()], constants_1.programId)[0];
 }
 exports.getPoolPda = getPoolPda;
 function getLoans(owner) {

package/src/plugins/rain/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,6CAA4C;AAC5C,gEAAqC;AACrC,2CAAiD;AASjD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,SAAsB,OAAO,CAAC,IAAY;;QACxC,MAAM,WAAW,GAAuC,MAAM,eAAK;aAChE,GAAG,CAAC,GAAG,mBAAO,sBAAsB,IAAI,EAAE,CAAC;aAC3C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QACxD,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/B,CAAC;CAAA;AAND,0BAMC;AAED,SAAsB,cAAc;;QAClC,MAAM,iBAAiB,GACrB,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,mBAAO,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAC7D,OAAO,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;IAC5C,CAAC;CAAA;AALD,wCAKC;AAED,SAAgB,UAAU,CAAC,KAAgB;IACzC,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,EAClD,qBAAS,CACV,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AALD,gCAKC;AAED,SAAsB,QAAQ,CAAC,KAAa;;QAC1C,MAAM,WAAW,GAAwC,MAAM,eAAK;aACjE,GAAG,CAAC,GAAG,mBAAO,sBAAsB,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aAC/D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACnE,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;IAChC,CAAC;CAAA;AAND,4BAMC;AAED,SAAgB,gBAAgB,CAAC,KAAW,EAAE,GAAS;IACrD,OAAO,IAAI,sBAAS,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SAChC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;SACtB,SAAS,CAAC,MAAM,CAAC;SACjB,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,UAAU,CAAC;SACtC,QAAQ,EAAE,CAAC;AAChB,CAAC;AAND,4CAMC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,6CAA4C;AAC5C,gEAAqC;AACrC,2CAAiD;AASjD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,SAAsB,OAAO,CAAC,IAAY;;QACxC,MAAM,WAAW,GAAuC,MAAM,eAAK;aAChE,GAAG,CAAC,GAAG,mBAAO,sBAAsB,IAAI,EAAE,CAAC;aAC3C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QACxD,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/B,CAAC;CAAA;AAND,0BAMC;AAED,SAAsB,cAAc;;QAClC,MAAM,iBAAiB,GACrB,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,mBAAO,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAC7D,OAAO,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;IAC5C,CAAC;CAAA;AALD,wCAKC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,EACjE,qBAAS,CACV,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AALD,gCAKC;AAED,SAAsB,QAAQ,CAAC,KAAa;;QAC1C,MAAM,WAAW,GAAwC,MAAM,eAAK;aACjE,GAAG,CAAC,GAAG,mBAAO,sBAAsB,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aAC/D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACnE,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;IAChC,CAAC;CAAA;AAND,4BAMC;AAED,SAAgB,gBAAgB,CAAC,KAAW,EAAE,GAAS;IACrD,OAAO,IAAI,sBAAS,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SAChC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;SACtB,SAAS,CAAC,MAAM,CAAC;SACjB,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,UAAU,CAAC;SACtC,QAAQ,EAAE,CAAC;AAChB,CAAC;AAND,4CAMC"}