@augustdigital/sdk 4.2.2-alpha → 4.2.2

package/lib/modules/vaults/utils.js

@@ -1,51 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AVAX_PRICE_FEED_ADDRESS = exports.REWARD_DISTRIBUTOR_ADDRESS = void 0;
-exports.getVaultVersion = getVaultVersion;
+exports.getRewardMultiplierByTimestamp = void 0;
 exports.getVaultRewards = getVaultRewards;
 exports.getIdleAssets = getIdleAssets;
 exports.buildFormattedVault = buildFormattedVault;
 const abis_1 = require("../../abis");
 const core_1 = require("../../core");
-const constants_1 = require("./constants");
-const solana_1 = require("../../adapters/solana");
-function getVaultVersion(vault) {
-    if (solana_1.Solana.utils.isSolanaAddress(vault)) {
-        return 'sol-0';
+const helpers_vaults_1 = require("../../core/helpers.vaults");
+const getRewardMultiplierByTimestamp = (foundPool, timestamp) => {
+    const multipliers = foundPool.rewards?.multipliers;
+    if (!multipliers?.length) {
+        return 1;
     }
-    else {
-        if (constants_1.OLD_LENDING_POOLS.includes(vault)) {
-            return 'evm-0';
-        }
-        else if (constants_1.MULTI_ASSET_VAULTS.includes(vault)) {
-            return 'evm-2';
-        }
-        else {
-            return 'evm-1';
-        }
+    const multipliersByTimestamp = multipliers.reduce((acc, curr) => {
+        return {
+            ...acc,
+            [curr.timestamp]: curr.value,
+        };
+    }, {});
+    if (!multipliersByTimestamp) {
+        return 1;
     }
-}
-const REWARD_DISTRIBUTOR_ADDRESS = (chainId) => {
-    switch (chainId) {
-        case 43114:
-            return [
-                '0xAeAc5f82B140c0f7309f7E9Ec43019062A5e5BE2',
-                '0xd3e653A9f6F3d96B26Dd4487a53D151140B697C4',
-            ];
-        default:
-            return ['0x0000000000000000000000000000000000000000'];
+    if (!timestamp) {
+        const latest = Object.keys(multipliersByTimestamp)
+            .map(Number)
+            .sort((a, b) => b - a)[0];
+        return latest !== undefined ? (multipliersByTimestamp[latest] ?? 1) : 1;
     }
+    const applicableTimestamp = Object.keys(multipliersByTimestamp)
+        .map(Number)
+        .filter((ts) => ts <= timestamp)
+        .sort((a, b) => b - a)[0];
+    return applicableTimestamp !== undefined
+        ? (multipliersByTimestamp[applicableTimestamp] ?? 1)
+        : 1;
 };
-exports.REWARD_DISTRIBUTOR_ADDRESS = REWARD_DISTRIBUTOR_ADDRESS;
-const AVAX_PRICE_FEED_ADDRESS = (chainId) => {
-    switch (chainId) {
-        case 1:
-            return '0xFF3EEb22B5E3dE6e705b44749C2559d704923FD7';
-        default:
-            return '0x';
-    }
-};
-exports.AVAX_PRICE_FEED_ADDRESS = AVAX_PRICE_FEED_ADDRESS;
+exports.getRewardMultiplierByTimestamp = getRewardMultiplierByTimestamp;
 function getVaultRewards(tokenizedVault) {
     const upshiftPointRewards = tokenizedVault.rewards?.filter((r) => r.text === 'Upshift Points');
     const sortedPointsMultipliers = upshiftPointRewards?.sort((a, b) => new Date(b.start_datetime).getTime() -
@@ -66,7 +56,7 @@ function getVaultRewards(tokenizedVault) {
     return rewards;
 }
 async function getIdleAssets(provider, vaultAddress, underlying, totalAssets) {
-    const version = getVaultVersion(vaultAddress);
+    const version = (0, helpers_vaults_1.getVaultVersion)(vaultAddress);
     let idleAssets;
     switch (version) {
         case 'evm-0': {
@@ -94,6 +84,17 @@ async function getIdleAssets(provider, vaultAddress, underlying, totalAssets) {
     return idleAssets;
 }
 async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
+    const strategists = tokenizedVault.subaccounts?.length > 0
+        ? tokenizedVault.subaccounts.map((s) => ({
+            address: s.address,
+            logo: s.strategist?.strategist_logo,
+            name: s.strategist?.strategist_name,
+        }))
+        : (tokenizedVault.hardcoded_strategists || []).map((s) => ({
+            address: '0x',
+            logo: s.strategist_logo,
+            name: s.strategist_name,
+        }));
     const baseProps = {
         chainId: tokenizedVault.chain,
         maxDailyDrawdown: tokenizedVault.max_daily_drawdown || 0,
@@ -102,11 +103,6 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
         address: tokenizedVault.address,
         name: tokenizedVault.vault_name,
         logoUrl: tokenizedVault.vault_logo_url,
-        receipt: {
-            symbol: tokenizedVault.receipt_token_symbol,
-            address: tokenizedVault.address,
-            decimals: contractCalls.decimals,
-        },
         apy: {
             apy: tokenizedVault?.reported_apy?.apy * 100,
             explainer: tokenizedVault?.reported_apy?.explainer,
@@ -115,11 +111,7 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
             rewardsCompounded: tokenizedVault?.reported_apy?.rewards_compounded,
             underlyingApy: tokenizedVault?.reported_apy?.underlying_apy * 100,
         },
-        strategists: tokenizedVault.subaccounts.map((s) => ({
-            address: s.address,
-            logo: s.strategist?.strategist_logo,
-            name: s.strategist?.strategist_name,
-        })),
+        strategists: strategists,
         fees: {
             performance: tokenizedVault.weekly_performance_fee_bps,
             management: tokenizedVault.platform_fee_override.management_fee,
@@ -127,7 +119,7 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
             isPerformanceWaived: tokenizedVault.platform_fee_override.is_fee_waived,
         },
         rewards: getVaultRewards(tokenizedVault),
-        version: getVaultVersion(tokenizedVault.address),
+        version: (0, helpers_vaults_1.getVaultVersion)(tokenizedVault.address),
         description: tokenizedVault.description,
         startDatetime: String(tokenizedVault.start_datetime),
         status: tokenizedVault.status,
@@ -136,17 +128,22 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
         isVisible: tokenizedVault.is_visible,
         reserveTarget: tokenizedVault.reserve_target,
         reserveTolerance: tokenizedVault.reserve_tolerance,
-        isDepositPaused: (0, constants_1.isBadVault)(tokenizedVault.address),
+        isDepositPaused: (0, helpers_vaults_1.isBadVault)(tokenizedVault.address),
         decimals: contractCalls.decimals,
         isWithdrawalPaused: contractCalls.withdrawalsPaused,
         idleAssets: (0, core_1.toNormalizedBn)(await getIdleAssets(provider, tokenizedVault.address, contractCalls.asset, contractCalls.totalAssets), Number(contractCalls.decimals)),
     };
-    const version = getVaultVersion(tokenizedVault.address);
+    const version = (0, helpers_vaults_1.getVaultVersion)(tokenizedVault.address);
     let operator = '0x';
     let depositAssets = [];
     let totalAssets = (0, core_1.toNormalizedBn)(0);
     let totalSupply = (0, core_1.toNormalizedBn)(0);
     let maxSupply = (0, core_1.toNormalizedBn)(0);
+    let receipt = {
+        symbol: '',
+        address: '0x',
+        decimals: 0,
+    };
     switch (version) {
         case 'sol-0': {
             break;
@@ -169,7 +166,12 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
             }));
             depositAssets = [...depositAssets, ...extraAssets];
             totalSupply = contractCalls.totalSupply;
-            maxSupply = contractCalls.totalSupply;
+            ((maxSupply = (0, core_1.toNormalizedBn)(1000000000000)),
+                (receipt = {
+                    symbol: tokenizedVault.receipt_token_symbol,
+                    address: contractCalls.lpTokenAddress,
+                    decimals: contractCalls.decimals,
+                }));
             break;
         }
         default: {
@@ -184,9 +186,34 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
             totalSupply = contractCalls.totalSupply;
             maxSupply = contractCalls.maxSupply;
             operator = contractCalls.loansOperator;
+            receipt = {
+                symbol: tokenizedVault.receipt_token_symbol,
+                address: tokenizedVault.address,
+                decimals: contractCalls.decimals,
+            };
             break;
         }
     }
+    const adapterConfig = (0, core_1.getVaultAdapterConfig)(tokenizedVault.address);
+    if (adapterConfig) {
+        const allDepositTokens = (0, core_1.getVaultDepositTokens)(tokenizedVault.address, contractCalls.asset);
+        const depositAssetsWithAdapters = await Promise.all(allDepositTokens.map(async (tokenAddress) => {
+            if (depositAssets.find((a) => a.address.toLowerCase() === tokenAddress.toLowerCase())) {
+                return null;
+            }
+            const decimals = await (0, core_1.getDecimals)(provider, tokenAddress);
+            const symbol = await (0, core_1.getSymbol)(provider, tokenAddress);
+            return {
+                address: tokenAddress,
+                symbol,
+                decimals,
+            };
+        }));
+        depositAssets = [
+            ...depositAssets,
+            ...depositAssetsWithAdapters.filter((a) => a !== null),
+        ];
+    }
     return {
         ...baseProps,
         operator: operator,
@@ -194,6 +221,7 @@ async function buildFormattedVault(provider, tokenizedVault, contractCalls) {
         totalAssets: totalAssets,
         totalSupply: totalSupply,
         maxSupply: maxSupply,
+        receipt: receipt,
     };
 }
 //# sourceMappingURL=utils.js.map

package/lib/modules/vaults/utils.js.map

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

package/lib/modules/vaults/write.actions.d.ts

@@ -5,6 +5,9 @@ export type IContractWriteOptions = {
     wallet: IAddress;
     amount?: string | bigint | number;
     wait?: boolean;
+    depositAsset?: IAddress;
+    chainId?: number;
+    poolName?: string;
 };
 export declare function vaultApprove(signer: Signer | Wallet, options: IContractWriteOptions): Promise<string>;
 export declare function vaultDeposit(signer: Signer | Wallet, options: IContractWriteOptions): Promise<string>;

package/lib/modules/vaults/write.actions.js

@@ -4,9 +4,11 @@ exports.vaultApprove = vaultApprove;
 exports.vaultDeposit = vaultDeposit;
 exports.vaultRequestRedeem = vaultRequestRedeem;
 exports.vaultRedeem = vaultRedeem;
+const ethers_1 = require("ethers");
 const abis_1 = require("../../abis");
 const core_1 = require("../../core");
 const read_actions_1 = require("./read.actions");
+const adapter_helpers_1 = require("./adapter.helpers");
 async function vaultApprove(signer, options) {
     const { wallet, target, wait, amount } = options;
     const [goodWallet, goodPool] = [
@@ -51,34 +53,155 @@ async function vaultApprove(signer, options) {
     }
 }
 async function vaultDeposit(signer, options) {
-    const { wallet, target, wait, amount } = options;
+    const { wallet, target, wait, amount, depositAsset, chainId, poolName } = options;
     const [goodWallet, goodPool] = [
         (0, core_1.checkAddress)(wallet, console, 'wallet'),
         (0, core_1.checkAddress)(target, console),
     ];
     if (!goodWallet || !goodPool)
         return;
-    await vaultApprove(signer, { target, wallet, amount, wait: true });
     try {
-        const poolContract = (0, core_1.createContract)({
-            address: target,
-            provider: signer,
-            abi: abis_1.ABI_LENDING_POOLS,
-        });
-        const [decimals] = await Promise.all([
-            poolContract.decimals(),
-        ]);
-        const normalizedAmt = (0, core_1.toNormalizedBn)(amount, decimals);
-        const depositTx = await poolContract
-            .connect(signer)
-            .deposit(normalizedAmt.raw, wallet);
+        const vaultVersion = (0, core_1.getVaultVersion)(target);
+        const adapterConfig = (0, core_1.getVaultAdapterConfig)(target);
+        let poolContract;
+        let underlyingAsset;
+        let decimals;
+        let depositTokenDecimals;
+        if (vaultVersion === 'evm-2') {
+            poolContract = (0, core_1.createContract)({
+                address: target,
+                provider: signer,
+                abi: abis_1.ABI_TOKENIZED_VAULT_V2,
+            });
+            const [asset, receiptTokenAddr] = await Promise.all([
+                poolContract.asset(),
+                poolContract.lpTokenAddress(),
+            ]);
+            underlyingAsset = asset;
+            const receiptContract = (0, core_1.createContract)({
+                address: receiptTokenAddr,
+                provider: signer,
+                abi: abis_1.ABI_ERC20,
+            });
+            decimals = await receiptContract.decimals();
+        }
+        else {
+            poolContract = (0, core_1.createContract)({
+                address: target,
+                provider: signer,
+                abi: abis_1.ABI_LENDING_POOLS,
+            });
+            [underlyingAsset, decimals] = await Promise.all([
+                poolContract.asset(),
+                poolContract.decimals(),
+            ]);
+        }
+        const actualDepositAsset = depositAsset || underlyingAsset;
+        const isNativeToken = actualDepositAsset === ethers_1.ZeroAddress ||
+            actualDepositAsset === '0x0000000000000000000000000000000000000000';
+        const isAdapterDeposit = actualDepositAsset.toLowerCase() !== underlyingAsset.toLowerCase();
+        const isMultiAssetVault = vaultVersion === 'evm-2';
+        if (isAdapterDeposit && !isNativeToken) {
+            const depositTokenContract = (0, core_1.createContract)({
+                address: actualDepositAsset,
+                provider: signer,
+                abi: abis_1.ABI_ERC20,
+            });
+            depositTokenDecimals = await depositTokenContract.decimals();
+        }
+        else {
+            depositTokenDecimals = decimals;
+        }
+        const normalizedAmt = (0, core_1.toNormalizedBn)(amount, isNativeToken ? decimals : depositTokenDecimals);
+        if (!isNativeToken) {
+            let spenderAddress;
+            if (isMultiAssetVault) {
+                spenderAddress = target;
+            }
+            else if (isAdapterDeposit && adapterConfig?.wrapperAddress) {
+                spenderAddress = adapterConfig.wrapperAddress;
+            }
+            else {
+                spenderAddress = target;
+            }
+            const depositTokenContract = (0, core_1.createContract)({
+                address: actualDepositAsset,
+                provider: signer,
+                abi: abis_1.ABI_ERC20,
+            });
+            const currentAllowance = await depositTokenContract.allowance(wallet, spenderAddress);
+            if (BigInt(currentAllowance) < BigInt(normalizedAmt.raw)) {
+                const approveTx = await depositTokenContract
+                    .connect(signer)
+                    .approve(spenderAddress, normalizedAmt.raw);
+                if (wait)
+                    await approveTx.wait();
+                core_1.Logger.log.info('approve:tx_hash', approveTx?.hash);
+            }
+        }
+        let depositTx;
+        if (isMultiAssetVault) {
+            depositTx = await poolContract
+                .connect(signer)
+                .deposit(actualDepositAsset, normalizedAmt.raw, wallet);
+        }
+        else if (isAdapterDeposit && adapterConfig) {
+            if (adapterConfig.bridgeId === 2) {
+                const adapterContract = await (0, adapter_helpers_1.buildSwapAndDepositTransaction)({
+                    signer,
+                    srcToken: actualDepositAsset,
+                    srcDecimals: depositTokenDecimals,
+                    destToken: underlyingAsset,
+                    destDecimals: decimals,
+                    amount: normalizedAmt.raw.toString(),
+                    network: chainId?.toString() || '1',
+                    adapterConfig,
+                    userAddress: wallet,
+                });
+                const swapAndDepositParams = {
+                    amountIn: normalizedAmt.raw,
+                    minAmountOut: 0,
+                    srcToken: actualDepositAsset,
+                    dstToken: underlyingAsset,
+                    bridgeId: adapterConfig.bridgeId,
+                    quoteData: '0x',
+                };
+                depositTx = await adapterContract
+                    .connect(signer)
+                    .swapAndDeposit(swapAndDepositParams);
+            }
+            else {
+                const nativeDepositConfig = await (0, adapter_helpers_1.buildNativeDepositTransaction)({
+                    signer,
+                    srcToken: actualDepositAsset,
+                    amount: normalizedAmt.raw.toString(),
+                    poolName,
+                    adapterConfig,
+                    userAddress: wallet,
+                });
+                depositTx = await nativeDepositConfig.contract
+                    .connect(signer)[nativeDepositConfig.functionName](...nativeDepositConfig.args, nativeDepositConfig.value ? { value: nativeDepositConfig.value } : {});
+            }
+        }
+        else {
+            if (isNativeToken) {
+                depositTx = await poolContract
+                    .connect(signer)
+                    .deposit(normalizedAmt.raw, wallet, { value: normalizedAmt.raw });
+            }
+            else {
+                depositTx = await poolContract
+                    .connect(signer)
+                    .deposit(normalizedAmt.raw, wallet);
+            }
+        }
         if (wait)
             await depositTx.wait();
         core_1.Logger.log.info('deposit:tx_hash', depositTx?.hash);
         return depositTx?.hash;
     }
     catch (e) {
-        core_1.Logger.log.error('deposit', e, { target, amount });
+        core_1.Logger.log.error('deposit', e, { target, amount, depositAsset });
         throw new Error(`Deposit failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
     }
 }
@@ -91,18 +214,53 @@ async function vaultRequestRedeem(signer, options) {
     if (!goodWallet || !goodPool)
         return;
     try {
-        const poolContract = (0, core_1.createContract)({
-            address: target,
-            provider: signer,
-            abi: abis_1.ABI_LENDING_POOLS,
-        });
-        const [decimals] = await Promise.all([
-            poolContract.decimals(),
-        ]);
+        const vaultVersion = (0, core_1.getVaultVersion)(target);
+        let poolContract;
+        let decimals;
+        if (vaultVersion === 'evm-2') {
+            poolContract = (0, core_1.createContract)({
+                address: target,
+                provider: signer,
+                abi: abis_1.ABI_TOKENIZED_VAULT_V2,
+            });
+            const receiptTokenAddr = await poolContract.lpTokenAddress();
+            const receiptContract = (0, core_1.createContract)({
+                address: receiptTokenAddr,
+                provider: signer,
+                abi: abis_1.ABI_ERC20,
+            });
+            decimals = await receiptContract.decimals();
+            const normalizedAmt = (0, core_1.toNormalizedBn)(amount, decimals);
+            const allowance = await receiptContract.allowance(wallet, target);
+            if (BigInt(allowance) < BigInt(normalizedAmt.raw)) {
+                const approveTx = await receiptContract
+                    .connect(signer)
+                    .approve(target, normalizedAmt.raw);
+                if (wait)
+                    await approveTx.wait();
+                core_1.Logger.log.info('approve:receipt_token:tx_hash', approveTx?.hash);
+            }
+        }
+        else {
+            poolContract = (0, core_1.createContract)({
+                address: target,
+                provider: signer,
+                abi: abis_1.ABI_LENDING_POOLS,
+            });
+            decimals = await poolContract.decimals();
+        }
         const normalizedAmt = (0, core_1.toNormalizedBn)(amount, decimals);
-        const requestRedeemTx = await poolContract
-            .connect(signer)
-            .requestRedeem(normalizedAmt.raw, wallet, wallet);
+        let requestRedeemTx;
+        if (vaultVersion === 'evm-2') {
+            requestRedeemTx = await poolContract
+                .connect(signer)
+                .requestRedeem(normalizedAmt.raw, wallet);
+        }
+        else {
+            requestRedeemTx = await poolContract
+                .connect(signer)
+                .requestRedeem(normalizedAmt.raw, wallet, wallet);
+        }
         if (wait)
             await requestRedeemTx.wait();
         core_1.Logger.log.info('requestRedeem:tx_hash', requestRedeemTx?.hash);

package/lib/modules/vaults/write.actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"write.actions.js","sourceRoot":"","sources":["../../../src.ts/modules/vaults/write.actions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"write.actions.js","sourceRoot":"","sources":["../../../src.ts/modules/vaults/write.actions.ts"],"names":[],"mappings":"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"}

package/lib/services/debank/utils.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVaultLevelDebank = parseVaultLevelDebank;
 exports.getVaultExposure = getVaultExposure;
 exports.parseLoanLevelDebank = parseLoanLevelDebank;
-const core_helpers_1 = require("../../core/core.helpers");
+const helpers_core_1 = require("../../core/helpers.core");
 function addToTokenExposure(token, tokenExposure, exposureType, protocol, exposurePerCategory, netValue, borrower) {
     const usdAmount = Number(token?.price || 0) * Number(token?.amount);
     if (exposureType === 'wallet'
-        ? !(0, core_helpers_1.filterOutBySize)(usdAmount)
-        : !(0, core_helpers_1.filterOutBySize)(usdAmount))
+        ? !(0, helpers_core_1.filterOutBySize)(usdAmount)
+        : !(0, helpers_core_1.filterOutBySize)(usdAmount))
         return;
     if (exposureType === 'borrow') {
         netValue.value -= usdAmount;
@@ -72,7 +72,7 @@ function parseVaultLevelDebank(debankRes, protocolExposure, tokenExposure, borro
         });
         const foundExistingProtocolExposure = protocolExposure.find((exp) => exp.id === pos.id);
         if (!foundExistingProtocolExposure &&
-            (0, core_helpers_1.filterOutBySize)(protoReturnObj.netUsdValue)) {
+            (0, helpers_core_1.filterOutBySize)(protoReturnObj.netUsdValue)) {
             protocolExposure.push(protoReturnObj);
         }
         else if (foundExistingProtocolExposure) {

package/lib/services/subgraph/fetcher.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchSubgraph = fetchSubgraph;
 exports.fetchSubgraphWithRetry = fetchSubgraphWithRetry;
+const core_1 = require("../../core");
 async function fetchSubgraph(graphUrl, query, apiKey) {
     return fetchSubgraphWithRetry(graphUrl, query, apiKey);
 }
@@ -13,7 +14,7 @@ async function fetchSubgraphWithRetry(graphUrl, query, apiKey, maxRetries = 3, b
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
         try {
             const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), 30000);
+            const timeoutId = setTimeout(() => controller.abort(), core_1.REQUEST_TIMEOUT_MS / 3);
             try {
                 const headers = {
                     'Content-Type': 'application/json',
@@ -46,7 +47,7 @@ async function fetchSubgraphWithRetry(graphUrl, query, apiKey, maxRetries = 3, b
                     error.message.includes('ETIMEDOUT') ||
                     error.message.includes('timeout'))) {
                 const delay = baseDelay * Math.pow(2, attempt);
-                console.warn(`#fetchSubgraph::${graphUrl?.includes('/subgraphs') ? graphUrl?.split('/subgraphs/')?.[1]?.split('/')?.[0] : graphUrl}: Attempt ${attempt + 1} failed, retrying in ${delay}ms:`, error.message);
+                core_1.Logger.log.warn(`fetchSubgraph`, `${graphUrl?.includes('/subgraphs') ? graphUrl?.split('/subgraphs/')?.[1]?.split('/')?.[0] : graphUrl}: Attempt ${attempt + 1} failed, retrying in ${delay}ms`);
                 await new Promise((resolve) => setTimeout(resolve, delay));
                 continue;
             }

package/lib/services/subgraph/fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src.ts/services/subgraph/fetcher.ts"],"names":[],"mappings":";;AAAA,sCAMC;AAED,wDAqEC;AA7EM,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,KAAa,EACb,MAAe;IAEf,OAAO,sBAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACzD,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,KAAa,EACb,MAAe,EACf,aAAqB,CAAC,EACtB,YAAoB,IAAI;IAExB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,SAAgB,CAAC;IAErB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;QACvD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;YAE9D,IAAI,CAAC;gBACH,MAAM,OAAO,GAA2B;oBACtC,cAAc,EAAE,kBAAkB;iBACnC,CAAC;gBAEF,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,MAAM,EAAE,CAAC;gBAChD,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;oBACrC,MAAM,EAAE,MAAM;oBACd,OAAO;oBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,KAAK,EAAE,SAAS,KAAK,EAAE;qBACxB,CAAC;oBACF,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBAEH,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,OAAO,QAAQ,CAAC;YAClB,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACpB,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,MAAM,UAAU,CAAC;YACnB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAc,CAAC;YAG3B,IACE,OAAO,GAAG,UAAU;gBACpB,CAAC,CAAC,KAAK,YAAY,SAAS;oBAC1B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;oBACvC,KAAK,CAAC,IAAI,KAAK,YAAY;oBAC3B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACnC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EACpC,CAAC;gBACD,MAAM,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC/C,OAAO,CAAC,IAAI,CACV,mBAAmB,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,aAAa,OAAO,GAAG,CAAC,wBAAwB,KAAK,KAAK,EAC/K,KAAK,CAAC,OAAO,CACd,CAAC;gBACF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBAC3D,SAAS;YACX,CAAC;YAGD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,SAAU,CAAC;AACnB,CAAC"}
+{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src.ts/services/subgraph/fetcher.ts"],"names":[],"mappings":";;AAEA,sCAMC;AAED,wDAwEC;AAlFD,qCAAwD;AAEjD,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,KAAa,EACb,MAAe;IAEf,OAAO,sBAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACzD,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,KAAa,EACb,MAAe,EACf,aAAqB,CAAC,EACtB,YAAoB,IAAI;IAExB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,SAAgB,CAAC;IAErB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;QACvD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAC1B,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EACxB,yBAAkB,GAAG,CAAC,CACvB,CAAC;YAEF,IAAI,CAAC;gBACH,MAAM,OAAO,GAA2B;oBACtC,cAAc,EAAE,kBAAkB;iBACnC,CAAC;gBAEF,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,MAAM,EAAE,CAAC;gBAChD,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;oBACrC,MAAM,EAAE,MAAM;oBACd,OAAO;oBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,KAAK,EAAE,SAAS,KAAK,EAAE;qBACxB,CAAC;oBACF,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBAEH,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,OAAO,QAAQ,CAAC;YAClB,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACpB,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,MAAM,UAAU,CAAC;YACnB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAc,CAAC;YAG3B,IACE,OAAO,GAAG,UAAU;gBACpB,CAAC,CAAC,KAAK,YAAY,SAAS;oBAC1B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;oBACvC,KAAK,CAAC,IAAI,KAAK,YAAY;oBAC3B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACnC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EACpC,CAAC;gBACD,MAAM,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC/C,aAAM,CAAC,GAAG,CAAC,IAAI,CACb,eAAe,EACf,GAAG,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,aAAa,OAAO,GAAG,CAAC,wBAAwB,KAAK,IAAI,CAC/J,CAAC;gBACF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBAC3D,SAAS;YACX,CAAC;YAGD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,SAAU,CAAC;AACnB,CAAC"}