@sonarwatch/portfolio-plugins 0.5.3 → 0.5.5

package/src/plugins/solend/obligationsFetcher.js

@@ -33,13 +33,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     markets.forEach((market) => {
         marketsByAddress.set(market.address.toString(), market);
     });
-    for (const marketInfo of markets.values()) {
+    for (const marketInfo of markets) {
         const seeds = [
             (0, helpers_1.getObligationSeed)(marketInfo.address, 0),
             (0, helpers_1.getObligationSeed)(marketInfo.address, 1),
             (0, helpers_1.getObligationSeed)(marketInfo.address, 2),
         ];
-        for (let i = 0; i < seeds.length; i++) {
+        for (let i = 0; i < seeds.length; i += 1) {
             const seed = seeds[i];
             const obligationAddress = yield web3_js_1.PublicKey.createWithSeed(new web3_js_1.PublicKey(owner), seed, constants_1.pid);
             obligationAddresses.push(obligationAddress);
@@ -102,7 +102,6 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const rewardAssets = [];
         for (let j = 0; j < market.reserves.length; j += 1) {
             const { address: reserveAddress } = market.reserves[j];
-            // const reserveInfo2 = reservesInfos[j];
             const reserveInfo = reserveByAddress.get(reserveAddress);
             if (!reserveInfo)
                 continue;
@@ -126,40 +125,46 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             // Deposit
             const deposit = depositsMap.get(reserveAddress);
             if (deposit) {
-                const suppliedAmount = deposit.depositedAmount
-                    .div(Math.pow(10, decimals))
-                    .times(reserveDepositAmount / collateralSupply)
-                    .toNumber();
-                const apy = +reserveInfo.rates.supplyInterest / 100;
-                const cSuppliedYields = [
-                    {
-                        apr: (0, portfolio_core_1.apyToApr)(apy),
-                        apy,
-                    },
-                ];
-                suppliedYields.push(cSuppliedYields);
-                suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(lMint, suppliedAmount, portfolio_core_1.NetworkId.solana, lTokenPrice));
+                if (!deposit.depositedAmount.isZero()) {
+                    const suppliedAmount = deposit.depositedAmount
+                        .div(Math.pow(10, decimals))
+                        .times(reserveDepositAmount / collateralSupply)
+                        .toNumber();
+                    const apy = +reserveInfo.rates.supplyInterest / 100;
+                    const cSuppliedYields = [
+                        {
+                            apr: (0, portfolio_core_1.apyToApr)(apy),
+                            apy,
+                        },
+                    ];
+                    suppliedYields.push(cSuppliedYields);
+                    suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(lMint, suppliedAmount, portfolio_core_1.NetworkId.solana, lTokenPrice));
+                }
             }
             // Borrow
             const borrow = borrowsMap.get(reserveAddress);
             if (borrow) {
-                const borrowedAmount = borrow.borrowedAmountWads
-                    .times(new bignumber_js_1.default(liquidity.cumulativeBorrowRateWads))
-                    .div(borrow.cumulativeBorrowRateWads)
-                    .dividedBy(new bignumber_js_1.default(Math.pow(10, (constants_1.wadsDecimal + decimals))))
-                    .toNumber();
-                const apy = +reserveInfo.rates.borrowInterest / 100;
-                const cBorrowedYields = [
-                    {
-                        apr: (0, portfolio_core_1.apyToApr)(apy),
-                        apy,
-                    },
-                ];
-                borrowedYields.push(cBorrowedYields);
-                borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(lMint, borrowedAmount, portfolio_core_1.NetworkId.solana, lTokenPrice));
+                if (!borrow.borrowedAmountWads.isZero()) {
+                    const borrowedAmount = borrow.borrowedAmountWads
+                        .times(new bignumber_js_1.default(liquidity.cumulativeBorrowRateWads))
+                        .div(borrow.cumulativeBorrowRateWads)
+                        .dividedBy(new bignumber_js_1.default(Math.pow(10, (constants_1.wadsDecimal + decimals))))
+                        .toNumber();
+                    const apy = +reserveInfo.rates.borrowInterest / 100;
+                    const cBorrowedYields = [
+                        {
+                            apr: (0, portfolio_core_1.apyToApr)(apy),
+                            apy,
+                        },
+                    ];
+                    borrowedYields.push(cBorrowedYields);
+                    borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(lMint, borrowedAmount, portfolio_core_1.NetworkId.solana, lTokenPrice));
+                }
             }
         }
         const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        if (borrowedValue === 0 && suppliedValue === 0)
+            continue;
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/solend/obligationsFetcher.js.map

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

package/src/plugins/solend/reservesJob.js

@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
-const sleep_1 = __importDefault(require("../../utils/misc/sleep"));
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const markets = yield cache.getAllItems({
         prefix: constants_1.marketsPrefix,
@@ -23,6 +23,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const reservesAddressesByMarket = markets.map((m) => m.reserves.map((r) => r.address));
     for (let i = 0; i < reservesAddressesByMarket.length; i += 1) {
         const reservesAddresses = reservesAddressesByMarket[i];
+        const poolName = markets[i].name;
         const reservesInfoRes = yield axios_1.default
             .get(`${constants_1.reserveEndpoint}${reservesAddresses.join(',')}`)
             .catch(() => {
@@ -32,12 +33,44 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             continue;
         for (let j = 0; j < reservesInfoRes.data.results.length; j += 1) {
             const reserveInfo = reservesInfoRes.data.results[j];
-            yield cache.setItem(reservesAddresses[j], Object.assign({ pubkey: reservesAddresses[j] }, reserveInfo), {
+            const reserveAddress = reservesAddresses[j];
+            yield cache.setItem(reserveAddress, Object.assign({ pubkey: reserveAddress }, reserveInfo), {
                 prefix: constants_1.reservesPrefix,
                 networkId: portfolio_core_1.NetworkId.solana,
             });
+            const { reserve } = reserveInfo;
+            const { liquidity } = reserve;
+            const decimals = liquidity.mintDecimals;
+            const tokenAddress = reserveInfo.reserve.collateral.mintPubkey;
+            const borrowApy = +reserveInfo.rates.borrowInterest / 100;
+            const depositApy = +reserveInfo.rates.supplyInterest / 100;
+            const borrowedAmount = new bignumber_js_1.default(liquidity.borrowedAmountWads)
+                .dividedBy(Math.pow(10, (constants_1.wadsDecimal + decimals)))
+                .toNumber();
+            const reserveAvailableAmount = new bignumber_js_1.default(liquidity.availableAmount)
+                .dividedBy(Math.pow(10, decimals))
+                .toNumber();
+            const depositedAmount = borrowedAmount + reserveAvailableAmount;
+            const rate = {
+                tokenAddress,
+                borrowYield: {
+                    apy: borrowApy,
+                    apr: (0, portfolio_core_1.apyToApr)(borrowApy),
+                },
+                borrowedAmount,
+                depositYield: {
+                    apy: depositApy,
+                    apr: (0, portfolio_core_1.apyToApr)(depositApy),
+                },
+                depositedAmount,
+                platformId: constants_1.platformId,
+                poolName,
+            };
+            yield cache.setItem(`${reserveAddress}-${tokenAddress}`, rate, {
+                prefix: portfolio_core_1.borrowLendRatesPrefix,
+                networkId: portfolio_core_1.NetworkId.solana,
+            });
         }
-        yield (0, sleep_1.default)(200);
     }
 });
 const job = {

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

@@ -1 +1 @@
-{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+DAAuD;AACvD,2CAKqB;AAIrB,mEAA2C;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAa;QAClD,MAAM,EAAE,yBAAa;KACtB,CAAC,CAAC;IACH,MAAM,yBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClD,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CACjC,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,yBAAyB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QAC5D,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,CAAC,CAAC,CAAC;QACvD,MAAM,eAAe,GACnB,MAAM,eAAK;aACR,GAAG,CAAC,GAAG,2BAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;aACvD,KAAK,CAAC,GAAG,EAAE;YACV,EAAE;QACJ,CAAC,CAAC,CAAC;QACP,IAAI,CAAC,eAAe;YAAE,SAAS;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/D,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC,OAAO,CACjB,iBAAiB,CAAC,CAAC,CAAC,kBAClB,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAK,WAAW,GAC9C;gBACE,MAAM,EAAN,0BAAM;gBACN,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B,CACF,CAAC;SACH;QACD,MAAM,IAAA,eAAK,EAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/reservesJob.ts"],"names":[],"mappings":"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"}

package/src/utils/solana/beets/numbers.d.ts

@@ -1,5 +1,7 @@
 import { FixedSizeBeet, SupportedTypeDefinition } from '@metaplex-foundation/beet';
 import BigNumber from 'bignumber.js';
+export declare const f32: FixedSizeBeet<BigNumber>;
+export declare const f64: FixedSizeBeet<BigNumber>;
 export declare const u64: FixedSizeBeet<BigNumber>;
 export declare const u128: FixedSizeBeet<BigNumber>;
 export declare const u256: FixedSizeBeet<BigNumber>;
@@ -8,8 +10,9 @@ export declare const i64: FixedSizeBeet<BigNumber>;
 export declare const i128: FixedSizeBeet<BigNumber>;
 export declare const i256: FixedSizeBeet<BigNumber>;
 export declare const i512: FixedSizeBeet<BigNumber>;
+export declare const i80f48: FixedSizeBeet<BigNumber>;
 export type NumbersExports = keyof typeof import('./numbers');
-export type NumbersTypeMapKey = 'u64' | 'u128' | 'u256' | 'u512' | 'i64' | 'i128' | 'i256' | 'i512';
+export type NumbersTypeMapKey = 'f32' | 'f64' | 'u64' | 'u128' | 'u256' | 'u512' | 'i64' | 'i128' | 'i256' | 'i512' | 'i80f48';
 export type NumbersTypeMap = Record<NumbersTypeMapKey, SupportedTypeDefinition & {
     beet: NumbersExports;
 }>;

package/src/utils/solana/beets/numbers.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.numbersTypeMap = exports.i512 = exports.i256 = exports.i128 = exports.i64 = exports.u512 = exports.u256 = exports.u128 = exports.u64 = void 0;
+exports.numbersTypeMap = exports.i80f48 = exports.i512 = exports.i256 = exports.i128 = exports.i64 = exports.u512 = exports.u256 = exports.u128 = exports.u64 = exports.f64 = exports.f32 = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const bn_js_1 = require("bn.js");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const helpers_1 = require("./helpers");
 function unsignedLargeBeet(byteSize, description) {
     return {
@@ -23,6 +24,31 @@ function unsignedLargeBeet(byteSize, description) {
         description,
     };
 }
+function unsignedSplittedFloatLargeBeet(integerSize, floatSize, description) {
+    const byteSize = integerSize + floatSize;
+    const bitSize = byteSize * 8;
+    return {
+        write(buf, offset, value) {
+            const bn = new bn_js_1.BN(value.toString()).toTwos(bitSize);
+            const bytesArray = bn.toArray('le', byteSize);
+            const bytesArrayBuf = Buffer.from(bytesArray);
+            bytesArrayBuf.copy(buf, offset, 0, byteSize);
+        },
+        read(buf, offset) {
+            const subarray = buf.subarray(offset, offset + byteSize);
+            const x = new bn_js_1.BN(subarray, 'le');
+            const value = new bignumber_js_1.default(x.fromTwos(bitSize).toString());
+            if (!value)
+                return new bignumber_js_1.default(0);
+            const numbers = new decimal_js_1.default(`${value.isNegative() ? '-' : ''}0b${value.abs().toString(2)}p-${floatSize * 8}`).dividedBy(Math.pow(10, 0));
+            return new bignumber_js_1.default(numbers.toString());
+        },
+        byteSize,
+        description,
+    };
+}
+exports.f32 = unsignedSplittedFloatLargeBeet(2, 2, 'f32');
+exports.f64 = unsignedSplittedFloatLargeBeet(4, 4, 'f64');
 exports.u64 = unsignedLargeBeet(8, 'u64');
 exports.u128 = unsignedLargeBeet(16, 'u128');
 exports.u256 = unsignedLargeBeet(32, 'u256');
@@ -49,9 +75,12 @@ exports.i64 = signedLargeBeet(8, 'i64');
 exports.i128 = signedLargeBeet(16, 'i128');
 exports.i256 = signedLargeBeet(32, 'i256');
 exports.i512 = signedLargeBeet(64, 'i512');
+exports.i80f48 = unsignedSplittedFloatLargeBeet(10, 6, 'i80f48');
 // prettier-ignore
 exports.numbersTypeMap = {
     // Big Number, they use, the 'BigNumber' type which is defined in this package
+    f32: { beet: 'f32', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
+    f64: { beet: 'f64', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
     u64: { beet: 'u64', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
     u128: { beet: 'u128', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
     u256: { beet: 'u256', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
@@ -60,5 +89,6 @@ exports.numbersTypeMap = {
     i128: { beet: 'i128', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
     i256: { beet: 'i256', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
     i512: { beet: 'i512', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
+    i80f48: { beet: 'i80f48', isFixable: false, sourcePack: helpers_1.BEET_SONARWATCH_PACKAGE, ts: 'BigNumber', pack: helpers_1.BEET_SONARWATCH_PACKAGE },
 };
 //# sourceMappingURL=numbers.js.map

package/src/utils/solana/beets/numbers.js.map

@@ -1 +1 @@
-{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/beets/numbers.ts"],"names":[],"mappings":";;;;;;AAIA,gEAAqC;AACrC,iCAA2B;AAC3B,uCAAoD;AAEpD,SAAS,iBAAiB,CAAC,QAAgB,EAAE,WAAmB;IAC9D,OAAO;QACL,KAAK,CAAC,GAAW,EAAE,MAAc,EAAE,KAAgB;YACjD,MAAM,EAAE,GAAG,IAAI,UAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpC,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9C,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,GAAW,EAAE,MAAc;YAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9D,OAAO,IAAI,sBAAS,CAAC,IAAI,UAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,QAAQ;QACR,WAAW;KACZ,CAAC;AACJ,CAAC;AAEY,QAAA,GAAG,GAA6B,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC5D,QAAA,IAAI,GAA6B,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC/D,QAAA,IAAI,GAA6B,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC/D,QAAA,IAAI,GAA6B,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAE5E,SAAS,eAAe,CAAC,QAAgB,EAAE,WAAmB;IAC5D,MAAM,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;IAC7B,OAAO;QACL,KAAK,CAAC,GAAW,EAAE,MAAc,EAAE,KAAgB;YACjD,MAAM,EAAE,GAAG,IAAI,UAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9C,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,GAAW,EAAE,MAAc;YAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,CAAC,GAAG,IAAI,UAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACjC,OAAO,IAAI,sBAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,QAAQ;QACR,WAAW;KACZ,CAAC;AACJ,CAAC;AAEY,QAAA,GAAG,GAA6B,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAC1D,QAAA,IAAI,GAA6B,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC7D,QAAA,IAAI,GAA6B,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC7D,QAAA,IAAI,GAA6B,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAkB1E,kBAAkB;AACL,QAAA,cAAc,GAAmB;IAC5C,8EAA8E;IAC9E,GAAG,EAAI,EAAE,IAAI,EAAE,KAAK,EAAG,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,GAAG,EAAI,EAAE,IAAI,EAAE,KAAK,EAAG,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;IAC/H,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,iCAAuB,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,iCAAuB,EAAG;CAChI,CAAA"}
+{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/beets/numbers.ts"],"names":[],"mappings":"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"}