@augustdigital/sdk 4.26.0-alpha.0 → 4.27.0

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

@@ -5,12 +5,101 @@ exports.vaultDeposit = vaultDeposit;
 exports.vaultRequestRedeem = vaultRequestRedeem;
 exports.vaultRedeem = vaultRedeem;
 exports.depositNative = depositNative;
+exports.rwaRedeemAsset = rwaRedeemAsset;
 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");
 const utils_1 = require("./utils");
+function safeBigInt(value) {
+    if (value === null || value === undefined)
+        return 0n;
+    const s = String(value);
+    if (s === '0x' || s === '')
+        return 0n;
+    try {
+        return BigInt(s);
+    }
+    catch {
+        return 0n;
+    }
+}
+const SAFE_WAIT_TIMEOUT_MS = 120000;
+function isNonceParsing(error) {
+    const code = error?.code;
+    const msg = String(error).toLowerCase();
+    return ((code === 'INVALID_ARGUMENT' || code === 'BAD_DATA') &&
+        msg.includes('nonce'));
+}
+async function safeWaitForTx(tx) {
+    try {
+        return await tx.wait();
+    }
+    catch (error) {
+        if (isNonceParsing(error)) {
+            const msg = error instanceof Error ? error.message : '';
+            core_1.Logger.log.warn('safeWaitForTx:fallback', msg, { hash: tx.hash });
+            const receipt = await tx.provider.waitForTransaction(tx.hash, 1, SAFE_WAIT_TIMEOUT_MS);
+            if (!receipt) {
+                throw new Error(`Transaction ${tx.hash} was not confirmed within ${SAFE_WAIT_TIMEOUT_MS / 1000}s`);
+            }
+            if (receipt.status === 0) {
+                throw new Error(`Transaction ${tx.hash} reverted on-chain`);
+            }
+            return receipt;
+        }
+        throw error;
+    }
+}
+async function safeSendTx(contractCall, provider, shouldWait) {
+    try {
+        const tx = await contractCall();
+        if (shouldWait)
+            await safeWaitForTx(tx);
+        return { tx, hash: tx.hash };
+    }
+    catch (error) {
+        if (!isNonceParsing(error))
+            throw error;
+        const errStr = String(error);
+        const hashMatch = errStr.match(/"hash"\s*:\s*"(0x[0-9a-fA-F]{64})"/);
+        if (!hashMatch?.[1])
+            throw error;
+        const txHash = hashMatch[1];
+        core_1.Logger.log.warn('safeSendTx:nonce-fallback', { txHash });
+        if (shouldWait) {
+            const signerProvider = 'provider' in provider ? provider.provider : provider;
+            const receipt = await signerProvider.waitForTransaction(txHash, 1, SAFE_WAIT_TIMEOUT_MS);
+            if (!receipt) {
+                throw new Error(`Transaction ${txHash} was not confirmed within ${SAFE_WAIT_TIMEOUT_MS / 1000}s`);
+            }
+            if (receipt.status === 0) {
+                throw new Error(`Transaction ${txHash} reverted on-chain`);
+            }
+        }
+        return { tx: null, hash: txHash };
+    }
+}
+async function tryRecoverTxHash(error, signer, wait) {
+    if (!isNonceParsing(error))
+        return null;
+    const hashMatch = String(error).match(/"hash"\s*:\s*"(0x[0-9a-fA-F]{64})"/);
+    if (!hashMatch?.[1])
+        return null;
+    const txHash = hashMatch[1];
+    if (wait) {
+        const provider = 'provider' in signer ? signer.provider : signer;
+        const receipt = await provider.waitForTransaction(txHash, 1, SAFE_WAIT_TIMEOUT_MS);
+        if (!receipt) {
+            throw new Error(`Transaction ${txHash} was not confirmed within ${SAFE_WAIT_TIMEOUT_MS / 1000}s`);
+        }
+        if (receipt.status === 0) {
+            throw new Error(`Transaction ${txHash} reverted on-chain`);
+        }
+    }
+    return txHash;
+}
 async function vaultApprove(signer, options) {
     const { wallet, target, wait, amount } = options;
     const [goodWallet, goodPool] = [
@@ -38,13 +127,11 @@ async function vaultApprove(signer, options) {
                 abi: abis_1.ABI_ERC20,
                 provider: signer,
             });
-            const approvalTx = await depositTokenContract
+            const { hash: approvalHash } = await safeSendTx(() => depositTokenContract
                 .connect(signer)
-                .approve(target, normalizedAmt.raw);
-            if (wait)
-                await approvalTx.wait();
-            core_1.Logger.log.info('approve:tx_hash', approvalTx?.hash);
-            return approvalTx?.hash;
+                .approve(target, normalizedAmt.raw), signer, wait);
+            core_1.Logger.log.info('approve:tx_hash', approvalHash);
+            return approvalHash;
         }
         catch (e) {
             core_1.Logger.log.error('approve', e, { target, amount });
@@ -138,13 +225,11 @@ async function vaultDeposit(signer, options) {
                 abi: abis_1.ABI_ERC20,
             });
             const currentAllowance = await depositTokenContract.allowance(wallet, spenderAddress);
-            if (BigInt(currentAllowance) < BigInt(normalizedAmt.raw)) {
-                const approveTx = await depositTokenContract
+            if (safeBigInt(currentAllowance) < BigInt(normalizedAmt.raw)) {
+                const { hash: approveHash } = await safeSendTx(() => depositTokenContract
                     .connect(signer)
-                    .approve(spenderAddress, normalizedAmt.raw);
-                if (wait)
-                    await approveTx.wait();
-                core_1.Logger.log.info('approve:tx_hash', approveTx?.hash);
+                    .approve(spenderAddress, normalizedAmt.raw), signer, wait);
+                core_1.Logger.log.info('approve:tx_hash', approveHash);
             }
         }
         let depositTx;
@@ -152,13 +237,11 @@ async function vaultDeposit(signer, options) {
             if (options?.isDepositWithPermit) {
                 const deadline = (0, utils_1.createDeadline)();
                 const { v, r, s } = await (0, utils_1.generatePermitSignature)(actualDepositAsset, wallet, await poolContract.getAddress(), normalizedAmt.raw, deadline, signer, tokenizedVault.chain);
-                depositTx = await poolContract
+                const { hash: permitHash } = await safeSendTx(() => poolContract
                     .connect(signer)
-                    .depositWithPermit(actualDepositAsset, normalizedAmt.raw, wallet, deadline, r, s, v);
-                if (wait)
-                    await depositTx.wait();
-                core_1.Logger.log.info('deposit:tx_hash', depositTx?.hash);
-                return depositTx?.hash;
+                    .depositWithPermit(actualDepositAsset, normalizedAmt.raw, wallet, deadline, r, s, v), signer, wait);
+                core_1.Logger.log.info('deposit:tx_hash', permitHash);
+                return permitHash;
             }
             depositTx = await poolContract
                 .connect(signer)
@@ -214,26 +297,17 @@ async function vaultDeposit(signer, options) {
                     .deposit(normalizedAmt.raw, wallet);
             }
         }
-        if (wait) {
-            try {
-                await depositTx.wait();
-            }
-            catch (waitError) {
-                if (waitError instanceof Error &&
-                    waitError.message.includes('INVALID_ARGUMENT') &&
-                    waitError.message.toLowerCase().includes('nonce') &&
-                    depositTx?.hash) {
-                    core_1.Logger.log.warn('deposit:wait_failed_but_tx_submitted', waitError.message, { hash: depositTx.hash });
-                }
-                else {
-                    throw waitError;
-                }
-            }
-        }
+        if (wait)
+            await safeWaitForTx(depositTx);
         core_1.Logger.log.info('deposit:tx_hash', depositTx?.hash);
         return depositTx?.hash;
     }
     catch (e) {
+        const recovered = await tryRecoverTxHash(e, signer, wait);
+        if (recovered) {
+            core_1.Logger.log.warn('deposit:nonce-fallback', { hash: recovered });
+            return recovered;
+        }
         core_1.Logger.log.error('deposit', e, { target, amount, depositAsset });
         throw new Error(`Deposit failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
     }
@@ -266,12 +340,12 @@ async function vaultRequestRedeem(signer, options) {
             decimals = Number(await receiptContract.decimals());
             const normalizedAmt = (0, core_1.toNormalizedBn)(amount, decimals);
             const allowance = await receiptContract.allowance(wallet, target);
-            if (BigInt(allowance) < BigInt(normalizedAmt.raw)) {
+            if (safeBigInt(allowance) < BigInt(normalizedAmt.raw)) {
                 const approveTx = await receiptContract
                     .connect(signer)
                     .approve(target, normalizedAmt.raw);
                 if (wait)
-                    await approveTx.wait();
+                    await safeWaitForTx(approveTx);
                 core_1.Logger.log.info('approve:receipt_token:tx_hash', approveTx?.hash);
             }
             poolContract = vaultContract;
@@ -315,11 +389,16 @@ async function vaultRequestRedeem(signer, options) {
                 .requestRedeem(BigInt(normalizedAmt.raw), wallet, wallet);
         }
         if (wait)
-            await requestRedeemTx.wait();
+            await safeWaitForTx(requestRedeemTx);
         core_1.Logger.log.info('requestRedeem:tx_hash', requestRedeemTx?.hash);
         return requestRedeemTx?.hash;
     }
     catch (e) {
+        const recovered = await tryRecoverTxHash(e, signer, wait);
+        if (recovered) {
+            core_1.Logger.log.warn('requestRedeem:nonce-fallback', { hash: recovered });
+            return recovered;
+        }
         core_1.Logger.log.error('requestRedeem', e, { target, amount });
         throw new Error(`Request redeem failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
     }
@@ -342,7 +421,7 @@ async function vaultRedeem(signer, options) {
             .connect(signer)
             .redeem(year, month, day, receiverIndex, wallet);
         if (wait)
-            await redeemTx.wait();
+            await safeWaitForTx(redeemTx);
         core_1.Logger.log.info('redeem:tx_hash', redeemTx?.hash);
         return redeemTx?.hash;
     }
@@ -385,14 +464,46 @@ async function depositNative(signer, options) {
             });
         }
         if (wait)
-            await depositTx.wait();
+            await safeWaitForTx(depositTx);
         core_1.Logger.log.info('depositNative:tx_hash', depositTx?.hash);
         return depositTx?.hash;
     }
     catch (e) {
-        console.log('depositNative error', e);
+        const recovered = await tryRecoverTxHash(e, signer, wait);
+        if (recovered) {
+            core_1.Logger.log.warn('depositNative:nonce-fallback', { hash: recovered });
+            return recovered;
+        }
         core_1.Logger.log.error('depositNative', e, { wrapperAddress, receiver, amount });
         throw new Error(`Deposit native failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
     }
 }
+async function rwaRedeemAsset(signer, options) {
+    const { target, wallet, asset, amount, minOut, decimals, outputDecimals, wait, } = options;
+    const goodTarget = (0, core_1.checkAddress)(target, console, 'contract');
+    const goodAsset = (0, core_1.checkAddress)(asset, console, 'contract');
+    const goodWallet = (0, core_1.checkAddress)(wallet, console, 'wallet');
+    if (!goodTarget || !goodAsset || !goodWallet)
+        return;
+    try {
+        const subaccountContract = (0, core_1.createContract)({
+            address: target,
+            provider: signer,
+            abi: abis_1.RWA_REDEEM_SUBACCOUNT,
+        });
+        if (!subaccountContract)
+            return;
+        const normalizedAmt = (0, core_1.toNormalizedBn)(amount, decimals);
+        const normalizedMinOut = (0, core_1.toNormalizedBn)(minOut, outputDecimals);
+        const tx = await subaccountContract.redeemAsset(asset, BigInt(normalizedAmt.raw), BigInt(normalizedMinOut.raw));
+        if (wait)
+            await safeWaitForTx(tx);
+        core_1.Logger.log.info('rwaRedeemAsset:tx_hash', tx?.hash);
+        return tx?.hash;
+    }
+    catch (e) {
+        core_1.Logger.log.error('rwaRedeemAsset', e, { target, asset, amount, minOut });
+        throw new Error(`RWA redeem failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
+    }
+}
 //# sourceMappingURL=write.actions.js.map

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/fetcher.d.ts

@@ -1,9 +1,112 @@
 import { IAddress, IWSMonitorHeaders } from '../../types';
-export type IVaultDebankResponse = Record<string, {
-    positions: any[];
-    tokens: any[];
-} | {
+export interface IDebankStatsObject {
+    asset_usd_value: number;
+    debt_usd_value: number;
+    net_usd_value: number;
+}
+export interface IDebankPoolObject {
+    controller: string;
+    id: string;
+    chain: string;
+    project_id: string;
+    adapter_id?: string | null;
+    time_at?: number | null;
+}
+export interface IDebankProxyDetailObject {
+    project?: Record<string, unknown> | null;
+    proxy_contract_id?: string | null;
+}
+export interface IDebankTokenObject {
+    id: string;
+    chain: string;
+    name: string;
+    symbol: string;
+    display_symbol: unknown;
+    optimized_symbol: string;
+    decimals: number;
+    protocol_id: string;
+    is_core?: boolean | null;
+    price: number;
+    time_at?: number | null;
+    logo_url?: string | null;
+    price_24h_change?: number | null;
+    credit_score?: number | null;
+    is_verified?: boolean | null;
+    is_scam?: boolean | null;
+    is_suspicious?: boolean | null;
+    is_wallet?: boolean | null;
+    amount?: number | null;
+    raw_amount?: number | null;
+}
+export interface IDebankAppTokenObject {
+    id: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+    logo_url?: string | null;
+    app_id?: string | null;
+    price: number;
+    amount?: number | null;
+    [key: string]: unknown;
+}
+export interface IDebankDetailObject {
+    supply_token_list?: IDebankTokenObject[];
+    reward_token_list?: IDebankTokenObject[];
+    borrow_token_list?: IDebankTokenObject[];
+    health_rate?: number | null;
+}
+export interface IDebankAppPortfolioDetailObject {
+    supply_token_list?: IDebankAppTokenObject[];
+    reward_token_list?: IDebankAppTokenObject[];
+    borrow_token_list?: IDebankAppTokenObject[];
+    description?: string | null;
+}
+export type IDebankPortfolioItemName = 'Yield' | 'Deposit' | 'Staked' | 'Locked' | 'Farming' | 'Leveraged Farming' | 'Lending' | 'Vesting' | 'Rewards' | 'Airdrop' | 'Liquidity Pool' | 'Options Seller' | 'Options Buyer' | 'Insurance' | 'Investment' | 'Governance' | 'Perpetuals' | 'NFT Staked' | 'NFT Liquidity Pool' | 'NFT Lending' | 'NFT Fraction' | 'NFT P2P Borrower' | 'NFT P2P Lender';
+export interface IDebankPortfolioItemObject {
+    stats: IDebankStatsObject;
+    update_at: number;
+    name: IDebankPortfolioItemName;
+    detail_types: string[];
+    detail: IDebankDetailObject;
+    proxy_detail?: IDebankProxyDetailObject | null;
+    position_index?: string | null;
+    pool: IDebankPoolObject;
+}
+export interface IDebankAppPortfolioItemObject {
+    stats: IDebankStatsObject;
+    update_at: number;
+    name: string;
+    detail_types: string[];
+    detail: IDebankAppPortfolioDetailObject;
+    proxy_detail?: IDebankProxyDetailObject | null;
+    position_index?: string | null;
+    [key: string]: unknown;
+}
+export interface IDebankUserProtocol {
+    id: string;
+    chain: string;
+    name: string;
+    logo_url?: string | null;
+    site_url: string;
+    has_supported_portfolio: boolean;
+    portfolio_item_list: IDebankPortfolioItemObject[];
+}
+export interface IDebankAppProtocol {
+    id: string;
+    name: string;
+    logo_url?: string | null;
+    site_url: string;
+    has_supported_portfolio: boolean;
+    portfolio_item_list: IDebankAppPortfolioItemObject[];
+}
+export interface IDebankAccountData {
+    positions: IDebankUserProtocol[];
+    app_positions: IDebankAppProtocol[];
+    tokens: IDebankTokenObject[];
+}
+export interface IDebankAccountDataError {
     error: string;
-}>;
+}
+export type IVaultDebankResponse = Record<string, IDebankAccountData | IDebankAccountDataError>;
 export declare function fetchVaultDebankResponse(vaultAddress: IAddress, headers?: IWSMonitorHeaders): Promise<IVaultDebankResponse | false>;
 export declare function fetchDebankResponse(address: IAddress, headers?: IWSMonitorHeaders): Promise<any>;

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

@@ -1 +1 @@
-{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src.ts/services/debank/fetcher.ts"],"names":[],"mappings":";;AAsBA,4DA0BC;AAMD,kDAqBC;AA3ED,qCAIoB;AAkBb,KAAK,UAAU,wBAAwB,CAC5C,YAAsB,EACtB,OAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EACtC,0BAAmB,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,EAC9D,EAAE,OAAO,EAAE,OAAiC,EAAE,CAC/C,CAAC;QAGF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,CAAC,KAAK,CACX,6BAA6B,EAC7B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,UAAU,CACpB,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAMM,KAAK,UAAU,mBAAmB,CACvC,OAAiB,EACjB,OAA2B;IAG3B,MAAM,cAAc,GAAG,MAAM,IAAA,yBAAkB,EAC7C,SAAS,EACT,0BAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9C,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,OAAiC,EAAE,CAC/D,CAAC;IACF,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAClC,OAAO,CAAC,KAAK,CACX,6BAA6B,EAC7B,cAAc,CAAC,MAAM,EACrB,cAAc,CAAC,UAAU,CAC1B,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACzC,MAAM,SAAS,GAAQ,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
+{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src.ts/services/debank/fetcher.ts"],"names":[],"mappings":";;AAuKA,4DA0BC;AAMD,kDAqBC;AA5ND,qCAIoB;AAmKb,KAAK,UAAU,wBAAwB,CAC5C,YAAsB,EACtB,OAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EACtC,0BAAmB,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,EAC9D,EAAE,OAAO,EAAE,OAAiC,EAAE,CAC/C,CAAC;QAGF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,CAAC,KAAK,CACX,6BAA6B,EAC7B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,UAAU,CACpB,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAMM,KAAK,UAAU,mBAAmB,CACvC,OAAiB,EACjB,OAA2B;IAG3B,MAAM,cAAc,GAAG,MAAM,IAAA,yBAAkB,EAC7C,SAAS,EACT,0BAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9C,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,OAAiC,EAAE,CAC/D,CAAC;IACF,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAClC,OAAO,CAAC,KAAK,CACX,6BAA6B,EAC7B,cAAc,CAAC,MAAM,EACrB,cAAc,CAAC,UAAU,CAC1B,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACzC,MAAM,SAAS,GAAQ,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}

package/lib/services/debank/utils.js

@@ -49,6 +49,7 @@ function parseVaultLevelDebank(debankRes, protocolExposure, tokenExposure, borro
     const tokenMap = {};
     const protocolTokenMap = {};
     const protocolExposures = debankRes?.subaccount?.positions || [];
+    const appProtocolExposures = debankRes?.subaccount?.app_positions || [];
     const tokenExposures = debankRes?.subaccount?.tokens || [];
     protocolExposures.forEach((pos) => {
         const protoReturnObj = {
@@ -103,6 +104,52 @@ function parseVaultLevelDebank(debankRes, protocolExposure, tokenExposure, borro
             });
         });
     });
+    appProtocolExposures.forEach((pos) => {
+        const protoReturnObj = {
+            id: pos?.id,
+            chain: null,
+            protocol: pos?.name,
+            logoUrl: pos?.logo_url,
+            siteUrl: pos?.site_url,
+            assetUsdValue: 0,
+            debtUsdValue: 0,
+            netUsdValue: 0,
+            label: pos?.portfolio_item_list?.[0]?.name,
+            tokenExposure: tokenMap,
+            protocolExposure: protocolTokenMap,
+            address: borrower,
+        };
+        pos?.portfolio_item_list?.forEach((item) => {
+            protoReturnObj.assetUsdValue += item?.stats?.asset_usd_value || 0;
+            protoReturnObj.debtUsdValue += item?.stats?.debt_usd_value || 0;
+            protoReturnObj.netUsdValue += item?.stats?.net_usd_value || 0;
+        });
+        const foundExistingProtocolExposure = protocolExposure.find((exp) => exp.id === pos.id);
+        if (!foundExistingProtocolExposure &&
+            (0, core_1.filterOutBySize)(protoReturnObj.netUsdValue)) {
+            protocolExposure.push(protoReturnObj);
+        }
+        else if (foundExistingProtocolExposure) {
+            foundExistingProtocolExposure.netUsdValue += protoReturnObj.netUsdValue;
+            foundExistingProtocolExposure.debtUsdValue += protoReturnObj.debtUsdValue;
+            foundExistingProtocolExposure.assetUsdValue +=
+                protoReturnObj.assetUsdValue;
+        }
+        pos?.portfolio_item_list?.forEach((item) => {
+            (item?.detail?.supply_token_list || []).forEach((sup) => {
+                addToTokenExposure(sup, tokenExposure, 'supply', pos.id, exposurePerCategory, netValue, borrower);
+                if (sup?.symbol && sup?.logo_url) {
+                    tokenMap[sup.symbol] = sup.logo_url;
+                }
+            });
+            (item?.detail?.borrow_token_list || []).forEach((bor) => {
+                addToTokenExposure(bor, tokenExposure, 'borrow', pos.id, exposurePerCategory, netValue, borrower);
+                if (bor?.symbol && bor?.logo_url) {
+                    tokenMap[bor.symbol] = bor.logo_url;
+                }
+            });
+        });
+    });
     tokenExposures?.forEach((token) => {
         if (token?.is_wallet) {
             addToTokenExposure(token, tokenExposure, 'wallet', null, exposurePerCategory, netValue, borrower);
@@ -171,7 +218,10 @@ function parseLoanLevelDebank(debankRes) {
     let positions = [];
     let exposure = [];
     try {
-        const protocolExposures = debankRes?.subaccount?.positions || [];
+        const protocolExposures = [
+            ...(debankRes?.subaccount?.positions || []),
+            ...(debankRes?.subaccount?.app_positions || []),
+        ];
         positions = protocolExposures?.map((p) => ({
             value: p.logo_url,
             label: p.name,

package/lib/services/debank/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/services/debank/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/services/debank/utils.ts"],"names":[],"mappings":";;AAoEA,sDA8LC;AAED,4CAuEC;AAED,oDAsEC;AAnZD,kDAA0D;AAe1D,SAAS,kBAAkB,CACzB,KAAU,EACV,aAAoB,EACpB,YAAqB,EACrB,QAAiB,EACjB,mBAA0C,EAC1C,QAA4B,EAC5B,QAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpE,IACE,YAAY,KAAK,QAAQ;QACvB,CAAC,CAAC,CAAC,IAAA,sBAAe,EAAC,SAAS,CAAC;QAC7B,CAAC,CAAC,CAAC,IAAA,sBAAe,EAAC,SAAS,CAAC;QAE/B,OAAO;IAET,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9B,QAAQ,CAAC,KAAK,IAAI,SAAS,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,KAAK,IAAI,SAAS,CAAC;IAC9B,CAAC;IACD,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,EAAE,MAAM,CAClC,CAAC;IACF,IACE,kBAAkB;QAClB,kBAAkB,EAAE,YAAY,KAAK,aAAa,EAClD,CAAC;QACD,kBAAkB,CAAC,MAAM,IAAI,SAAS,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAG;YACrB,EAAE,EAAE,KAAK,EAAE,EAAE;YACb,KAAK,EAAE,KAAK,EAAE,KAAK;YACnB,IAAI,EAAE,KAAK,EAAE,IAAI;YACjB,MAAM,EAAE,KAAK,EAAE,gBAAgB,IAAI,KAAK,EAAE,MAAM;YAChD,QAAQ,EAAE,KAAK,EAAE,QAAQ;YACzB,OAAO,EAAE,KAAK,EAAE,QAAQ;YACxB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,YAAY;SAC3B,CAAC;QACF,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC9B,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrD,CAAC;aAAM,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrD,CAAC;QACD,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,SAAgB,qBAAqB,CACnC,SAAc,EACd,gBAA2C,EAC3C,aAAqC,EACrC,QAAkB,EAClB,mBAAwB,EACxB,QAAa;IAGb,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,MAAM,gBAAgB,GAA6B,EAAE,CAAC;IAEtD,MAAM,iBAAiB,GAAG,SAAS,EAAE,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC;IACjE,MAAM,oBAAoB,GAAG,SAAS,EAAE,UAAU,EAAE,aAAa,IAAI,EAAE,CAAC;IACxE,MAAM,cAAc,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC;IAE3D,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAEhC,MAAM,cAAc,GAAG;YACrB,EAAE,EAAE,GAAG,EAAE,EAAE;YACX,KAAK,EAAE,GAAG,EAAE,KAAK;YACjB,QAAQ,EAAE,GAAG,EAAE,IAAI;YACnB,OAAO,EAAE,GAAG,EAAE,QAAQ;YACtB,OAAO,EAAE,GAAG,EAAE,QAAQ;YACtB,aAAa,EAAE,CAAC;YAChB,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI;YAC1C,aAAa,EAAE,QAAQ;YACvB,gBAAgB,EAAE,gBAAgB;YAClC,OAAO,EAAE,QAAQ;SAClB,CAAC;QACF,GAAG,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAEzC,cAAc,CAAC,aAAa,IAAI,IAAI,EAAE,KAAK,EAAE,eAAe,IAAI,CAAC,CAAC;YAClE,cAAc,CAAC,YAAY,IAAI,IAAI,EAAE,KAAK,EAAE,cAAc,IAAI,CAAC,CAAC;YAChE,cAAc,CAAC,WAAW,IAAI,IAAI,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,MAAM,6BAA6B,GAAG,gBAAgB,CAAC,IAAI,CACzD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,CAC3B,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,IAAA,sBAAe,EAAC,cAAc,CAAC,WAAW,CAAC,EAC3C,CAAC;YACD,gBAAgB,CAAC,IAAI,CAAC,cAAqB,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,6BAA6B,EAAE,CAAC;YACzC,6BAA6B,CAAC,WAAW,IAAI,cAAc,CAAC,WAAW,CAAC;YACxE,6BAA6B,CAAC,YAAY,IAAI,cAAc,CAAC,YAAY,CAAC;YAC1E,6BAA6B,CAAC,aAAa;gBACzC,cAAc,CAAC,aAAa,CAAC;QACjC,CAAC;QAGD,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACvC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAE5C,IAAI,GAAG,EAAE,WAAW,EAAE,CAAC;oBACrB,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;oBAC9D,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;wBACrC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACnC,CAAC;gBAED,kBAAkB,CAChB,GAAG,EACH,aAAa,EACb,QAAQ,EACR,GAAG,CAAC,EAAE,EACN,mBAAmB,EACnB,QAAQ,EACR,QAAQ,CACT,CAAC;gBAEF,IAAI,GAAG,EAAE,MAAM,IAAI,GAAG,EAAE,QAAQ,EAAE,CAAC;oBACjC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACtC,CAAC;gBACD,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;YAC5C,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAE5C,kBAAkB,CAChB,GAAG,EACH,aAAa,EACb,QAAQ,EACR,GAAG,CAAC,EAAE,EACN,mBAAmB,EACnB,QAAQ,EACR,QAAQ,CACT,CAAC;gBAEF,IAAI,GAAG,EAAE,MAAM,IAAI,GAAG,EAAE,QAAQ,EAAE,CAAC;oBACjC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACtC,CAAC;gBACD,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAIH,oBAAoB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,MAAM,cAAc,GAAG;YACrB,EAAE,EAAE,GAAG,EAAE,EAAE;YACX,KAAK,EAAE,IAAqB;YAC5B,QAAQ,EAAE,GAAG,EAAE,IAAI;YACnB,OAAO,EAAE,GAAG,EAAE,QAAQ;YACtB,OAAO,EAAE,GAAG,EAAE,QAAQ;YACtB,aAAa,EAAE,CAAC;YAChB,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,GAAG,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI;YAC1C,aAAa,EAAE,QAAQ;YACvB,gBAAgB,EAAE,gBAAgB;YAClC,OAAO,EAAE,QAAQ;SAClB,CAAC;QACF,GAAG,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzC,cAAc,CAAC,aAAa,IAAI,IAAI,EAAE,KAAK,EAAE,eAAe,IAAI,CAAC,CAAC;YAClE,cAAc,CAAC,YAAY,IAAI,IAAI,EAAE,KAAK,EAAE,cAAc,IAAI,CAAC,CAAC;YAChE,cAAc,CAAC,WAAW,IAAI,IAAI,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,MAAM,6BAA6B,GAAG,gBAAgB,CAAC,IAAI,CACzD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,CAC3B,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,IAAA,sBAAe,EAAC,cAAc,CAAC,WAAW,CAAC,EAC3C,CAAC;YACD,gBAAgB,CAAC,IAAI,CAAC,cAAqB,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,6BAA6B,EAAE,CAAC;YACzC,6BAA6B,CAAC,WAAW,IAAI,cAAc,CAAC,WAAW,CAAC;YACxE,6BAA6B,CAAC,YAAY,IAAI,cAAc,CAAC,YAAY,CAAC;YAC1E,6BAA6B,CAAC,aAAa;gBACzC,cAAc,CAAC,aAAa,CAAC;QACjC,CAAC;QAED,GAAG,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzC,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtD,kBAAkB,CAChB,GAAG,EACH,aAAa,EACb,QAAQ,EACR,GAAG,CAAC,EAAE,EACN,mBAAmB,EACnB,QAAQ,EACR,QAAQ,CACT,CAAC;gBACF,IAAI,GAAG,EAAE,MAAM,IAAI,GAAG,EAAE,QAAQ,EAAE,CAAC;oBACjC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;YACH,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtD,kBAAkB,CAChB,GAAG,EACH,aAAa,EACb,QAAQ,EACR,GAAG,CAAC,EAAE,EACN,mBAAmB,EACnB,QAAQ,EACR,QAAQ,CACT,CAAC;gBACF,IAAI,GAAG,EAAE,MAAM,IAAI,GAAG,EAAE,QAAQ,EAAE,CAAC;oBACjC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,cAAc,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAChC,IAAI,KAAK,EAAE,SAAS,EAAE,CAAC;YACrB,kBAAkB,CAChB,KAAK,EACL,aAAa,EACb,QAAQ,EACR,IAAI,EACJ,mBAAmB,EACnB,QAAQ,EACR,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAE1D,OAAO;QACL,QAAQ;QACR,gBAAgB;QAChB,iBAAiB;QACjB,cAAc;QACd,aAAa,EAAE,iBAAiB;KACjC,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAAC,cAAmB;IAClD,MAAM,kBAAkB,GAIlB,EAAE,CAAC;IACT,MAAM,kBAAkB,GAIlB,EAAE,CAAC;IACT,MAAM,eAAe,GACnB,EAAE,CAAC;IAEL,MAAM,SAAS,GAAG,cAAc,EAAE,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC;IAC9D,MAAM,MAAM,GAAG,cAAc,EAAE,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC;IAExD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,cAAc,GAAG,QAAQ,EAAE,mBAAmB,IAAI,EAAE,CAAC;QAE3D,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,IAAI,EAAE,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC;YAC3D,MAAM,YAAY,GAAG,IAAI,EAAE,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC;YAE3D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,KAAK,EAAE,MAAM,IAAI,KAAK,EAAE,OAAO,EAAE,CAAC;oBACpC,eAAe,CAAC,IAAI,CAAC;wBACnB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK;qBACnC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBACjC,IACE,KAAK,EAAE,MAAM;oBACb,CAAC,KAAK,CAAC,aAAa;oBACpB,CAAC,KAAK,CAAC,OAAO;oBACd,KAAK,EAAE,OAAO,EACd,CAAC;oBACD,kBAAkB,CAAC,IAAI,CAAC;wBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK;qBACnC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBACjC,IACE,KAAK,EAAE,MAAM;oBACb,CAAC,KAAK,CAAC,aAAa;oBACpB,CAAC,KAAK,CAAC,OAAO;oBACd,KAAK,EAAE,OAAO,EACd,CAAC;oBAGD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;wBACrB,kBAAkB,CAAC,IAAI,CAAC;4BACtB,MAAM,EAAE,KAAK,CAAC,MAAM;4BACpB,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK;yBACnC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC;AACrE,CAAC;AAED,SAAgB,oBAAoB,CAAC,SAAc;IACjD,IAAI,SAAS,GAAiB,EAAE,CAAC;IACjC,IAAI,QAAQ,GAAiB,EAAE,CAAC;IAEhC,IAAI,CAAC;QAEH,MAAM,iBAAiB,GAAG;YACxB,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC;YAC3C,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,aAAa,IAAI,EAAE,CAAC;SAChD,CAAC;QAGF,SAAS,GAAG,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,KAAK,EAAE,CAAC,CAAC,QAAQ;YACjB,KAAK,EAAE,CAAC,CAAC,IAAI;SACd,CAAC,CAAC,CAAC;QAEJ,QAAQ,GAAG,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtC,CAAC,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAChC,MAAM,KAAK,GAAG;gBACZ,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU;gBAC1B,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU;gBAC1B,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe;aAChC,CAAC;YACF,IAAI,EAAE,CAAC,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,CAAC;gBACzC,MAAM,SAAS,GAAG,EAAE,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC1D,KAAK,EAAE,CAAC,EAAE,EAAE;oBACZ,KAAK,EAAE,CAAC,EAAE,MAAM;oBAChB,GAAG,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,KAAK;iBAC1B,CAAC,CAAC,CAAC;gBACJ,OAAO,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CACH,CAAC;QAGF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,IAAI,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBAClC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACxC,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,KAAM,EAAE,CAAC;wBAC1D,QAAQ,CAAC,IAAI,CAAC;4BACZ,KAAK,EAAE,CAAC,EAAE,EAAE;4BACZ,KAAK,EAAE,CAAC,EAAE,MAAM;4BAChB,GAAG,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;yBACrD,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,QAAQ,GAAG,QAAQ,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC;QAEpC,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,EAAE,KAAK,KAAK,4CAA4C,EAAE,CAAC;oBAC9D,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBAC3C,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC3B,CAAC;gBACD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC;QAC7B,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAExB,QAAQ,GAAG,cAAc,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AACjC,CAAC"}

package/lib/types/vaults.d.ts

@@ -184,6 +184,18 @@ export interface IVault {
     cachedAt?: string | null;
     showCapFilled?: boolean | null;
     programId?: string;
+    instant_redeem_config?: {
+        subaccountAddress: IAddress;
+        outputAssetSymbol: string;
+        redeemableAssets: Array<{
+            address: IAddress;
+            symbol: string;
+            decimals: number;
+            spreadBps: number;
+        }>;
+        isPaused: boolean;
+        availableLiquidity: number;
+    } | null;
 }
 export declare enum VaultRedemptionStatus {
     AWAITING_COOLDOWN = "awaiting_cooldown",

package/lib/types/vaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../src.ts/types/vaults.ts"],"names":[],"mappings":";;;AAmPA,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,gEAAuC,CAAA;IACvC,0DAAiC,CAAA;AACnC,CAAC,EAHW,qBAAqB,qCAArB,qBAAqB,QAGhC"}
+{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../src.ts/types/vaults.ts"],"names":[],"mappings":";;;AAgQA,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,gEAAuC,CAAA;IACvC,0DAAiC,CAAA;AACnC,CAAC,EAHW,qBAAqB,qCAArB,qBAAqB,QAGhC"}

package/lib/types/webserver.d.ts

@@ -533,6 +533,18 @@ export interface ITokenizedVault {
     daily_pnl_per_share: Record<string, number>;
     latest_reported_tvl: number | null;
     cached_at?: string | null;
+    instant_redeem_config: null | {
+        subaccount_address: string;
+        output_asset_symbol: string;
+        is_paused: boolean;
+        available_liquidity: number;
+        redeemable_assets: Array<{
+            address: string;
+            symbol: string;
+            decimals: number;
+            spread_bps: number;
+        }>;
+    };
     show_cap_filled: boolean | null;
 }
 export interface IWSVaultHistoricalApy {