@gearbox-protocol/sdk 3.0.0-next.23 → 3.0.0-next.231

package/lib/pathfinder/pathfinder.js

@@ -2,151 +2,172 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathFinder = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const ethers_1 = require("ethers");
+const viem_1 = require("viem");
 const types_1 = require("../types");
 const pathOptions_1 = require("./pathOptions");
-const MAX_GAS_PER_ROUTE = 200e6;
-const GAS_PER_BLOCK = 400e6;
+const MAX_GAS_PER_ROUTE = 200000000n;
+const GAS_PER_BLOCK = 400000000n;
 class PathFinder {
     pathFinder;
     network;
-    static connectors = [
-        "USDC",
-        "WETH",
-        "DAI",
-        "FRAX",
-    ];
     _connectors;
-    constructor(address, provider, network = "Mainnet", connectors = PathFinder.connectors) {
-        this.pathFinder = types_1.IRouter__factory.connect(address, provider);
+    constructor(address, provider, network = "Mainnet") {
+        this.pathFinder = (0, viem_1.getContract)({
+            address,
+            abi: types_1.iRouterV3Abi,
+            client: provider,
+        });
         this.network = network;
-        this._connectors = connectors
-            .map(c => sdk_gov_1.tokenDataByNetwork[this.network][c]?.toLowerCase())
-            .filter(t => !!t);
+        this._connectors = (0, sdk_gov_1.getConnectors)(network);
     }
-    async findAllSwaps(creditAccount, swapOperation, tokenIn, tokenOut, amount, slippage) {
+    async findAllSwaps({ creditAccount, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);
         const swapTask = {
             swapOperation: swapOperation,
             creditAccount: creditAccount.addr,
-            tokenIn: sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn,
-            tokenOut: sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] ||
-                tokenOut,
+            tokenIn,
+            tokenOut,
             connectors,
-            amount: ethers_1.BigNumber.from(amount),
-            slippage: ethers_1.BigNumber.from(slippage),
-            externalSlippage: false,
+            amount,
+            leftoverAmount,
         };
-        const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, {
-            gasLimit: GAS_PER_BLOCK,
+        const { result: results } = await this.pathFinder.simulate.findAllSwaps([swapTask, BigInt(slippage)], {
+            gas: GAS_PER_BLOCK,
         });
         const unique = {};
         results.forEach(r => {
-            const key = `${r.amount.toHexString()}${r.calls
+            const key = `${r.minAmount.toString()}${r.calls
                 .map(c => `${c.target.toLowerCase()}${c.callData}`)
                 .join("-")}`;
             unique[key] = {
-                amount: (0, sdk_gov_1.toBigInt)(r.amount),
+                amount: r.amount,
+                minAmount: r.minAmount,
                 calls: r.calls,
             };
         });
         return Object.values(unique);
     }
-    async findOneTokenPath(creditAccount, tokenIn, tokenOut, amount, slippage) {
-        const tokenInAddr = sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn;
+    async findOneTokenPath({ creditAccount, tokenIn, tokenOut, amount, slippage, }) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);
-        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenInAddr, amount, sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, connectors, slippage, {
-            gasLimit: GAS_PER_BLOCK,
+        const { result } = await this.pathFinder.simulate.findOneTokenPath([
+            tokenIn,
+            amount,
+            tokenOut,
+            creditAccount.addr,
+            connectors,
+            BigInt(slippage),
+        ], {
+            gas: GAS_PER_BLOCK,
         });
         return {
-            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            amount: result.amount,
+            minAmount: result.minAmount,
             calls: result.calls,
         };
     }
     /**
-     * @dev Finds the best path for opening credit account and converting all NORMAL tokens and LP token in the way to TARGET
-     * @param cm CreditManagerData which represents credit manager you want to use to open credit account
+     * @dev Finds the best path for opening Credit Account and converting all NORMAL tokens and LP token in the way to TARGET
+     * @param cm CreditManagerData which represents credit manager you want to use to open Credit Account
      * @param expectedBalances Expected balances which would be on account accounting also debt. For example,
-     *    if you open an USDC credit account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
+     *    if you open an USDC Credit Account, borrow 50_000 USDC and provide 10 WETH and 10_USDC as collateral
      *    from your own funds, expectedBalances should be: { "USDC": 60_000 * (10**6), "<address of WETH>": WAD.mul(10) }
      *
      * @param target Address of symbol of desired token
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @returns PathFinderOpenStrategyResult which
      */
-    async findOpenStrategyPath(cm, expectedBalances, target, slippage) {
-        const targetAddr = sdk_gov_1.tokenDataByNetwork[this.network][target] || target;
-        const expectedBalancesAddr = Object.entries(expectedBalances).reduce((acc, [token, balance]) => {
-            const tokenAddr = sdk_gov_1.tokenDataByNetwork[this.network][token] || token;
-            acc[tokenAddr.toLowerCase()] = balance;
-            return acc;
-        }, {});
-        const balances = cm.collateralTokens.map(token => ({
+    async findOpenStrategyPath({ creditManager: cm, expectedBalances, leftoverBalances, target: targetUntyped, slippage, }) {
+        const target = targetUntyped;
+        const input = cm.collateralTokens.map(token => ({
+            token,
+            balance: expectedBalances[token]?.balance || 0n,
+        }));
+        const leftover = cm.collateralTokens.map(token => ({
             token,
-            balance: expectedBalancesAddr[token] || 0,
+            balance: leftoverBalances[token]?.balance || 1n,
         }));
         const connectors = this.getAvailableConnectors(cm.supportedTokens);
-        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, connectors, slippage, {
-            gasLimit: GAS_PER_BLOCK,
+        const { result: [outBalances, result], } = await this.pathFinder.simulate.findOpenStrategyPath([cm.address, input, leftover, target, connectors, BigInt(slippage)], {
+            gas: GAS_PER_BLOCK,
         });
-        const balancesAfter = result[0].reduce((acc, b) => {
-            acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
+        const balancesAfter = outBalances.reduce((acc, b) => {
+            acc[b.token.toLowerCase()] = b.balance;
             return acc;
         }, {});
         return {
-            balances: balancesAfter,
-            calls: result[1].calls,
+            balances: {
+                ...balancesAfter,
+                [target]: (expectedBalances[target]?.balance || 0n) + result.amount,
+            },
+            minBalances: {
+                ...balancesAfter,
+                [target]: (expectedBalances[target]?.balance || 0n) + result.minAmount,
+            },
+            calls: result.calls,
+            minAmount: result.minAmount,
+            amount: result.amount,
         };
     }
     /**
      * @dev Finds the path to swap / withdraw all assets from CreditAccount into underlying asset
-     *   Can bu used for closing credit account and for liquidations as well.
+     *   Can bu used for closing Credit Account and for liquidations as well.
      * @param creditAccount CreditAccountData object used for close path computation
      * @param slippage Slippage in PERCENTAGE_FORMAT (100% = 10_000) per operation
      * @return The best option in PathFinderCloseResult format, which
      *          - underlyingBalance - total balance of underlying token
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
-    async findBestClosePath(creditAccount, slippage, noConcurency = false) {
-        const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
-        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+    async findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, network, }) {
+        const loopsPerTx = GAS_PER_BLOCK / MAX_GAS_PER_ROUTE;
+        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, Number(loopsPerTx), network);
+        const expected = cm.collateralTokens.map(token => {
+            // When we pass expected balances explicitly, we need to mimic router behaviour by filtering out leftover tokens
+            // for example, we can have stETH balance of 2, because 1 transforms to 2 because of rebasing
+            // https://github.com/Gearbox-protocol/router-v3/blob/c230a3aa568bb432e50463cfddc877fec8940cf5/contracts/RouterV3.sol#L222
+            const actual = expectedBalances[token]?.balance || 0n;
+            return {
+                token,
+                balance: actual > 10n ? actual : 0n,
+            };
+        });
+        const leftover = cm.collateralTokens.map(token => ({
+            token,
+            balance: leftoverBalances[token]?.balance || 1n,
+        }));
         const connectors = this.getAvailableConnectors(creditAccount.balances);
-        let results = [];
-        if (noConcurency) {
-            for (const po of pathOptions) {
-                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
-                    gasLimit: GAS_PER_BLOCK,
-                }));
-            }
-        }
-        else {
-            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
-                gasLimit: GAS_PER_BLOCK,
-            }));
-            results = await Promise.all(requests);
-        }
-        const bestResult = results.reduce((best, [pathFinderResult, gasPriceRAY]) => PathFinder.compare(best, {
-            calls: pathFinderResult.calls,
-            amount: (0, sdk_gov_1.toBigInt)(pathFinderResult.amount),
-            gasUsage: (0, sdk_gov_1.toBigInt)(pathFinderResult.gasUsage),
-        }, (0, sdk_gov_1.toBigInt)(gasPriceRAY)), {
+        const results = await Promise.all(pathOptions.map(po => this.pathFinder.simulate.findBestClosePath([
+            creditAccount.addr,
+            expected,
+            leftover,
+            connectors,
+            BigInt(slippage),
+            po,
+            loopsPerTx,
+            false,
+        ], {
+            gas: GAS_PER_BLOCK,
+        })));
+        const bestResult = results.reduce((best, pathFinderResult) => PathFinder.compare(best, {
+            calls: pathFinderResult.result.calls,
+            amount: pathFinderResult.result.amount,
+            minAmount: pathFinderResult.result.minAmount,
+        }), {
             amount: 0n,
-            gasUsage: 0n,
+            minAmount: 0n,
             calls: [],
         });
         return {
-            underlyingBalance: bestResult.amount +
-                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()]
-                    .balance,
-            calls: bestResult.calls,
+            ...bestResult,
+            underlyingBalance: bestResult.minAmount +
+                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()].balance,
         };
     }
-    static compare(r1, r2, gasPriceRAY) {
-        const comparator = ({ amount, gasUsage }, gasPrice) => amount - (gasUsage * gasPrice) / sdk_gov_1.RAY;
-        return comparator(r1, gasPriceRAY) > comparator(r2, gasPriceRAY) ? r1 : r2;
+    static compare(r1, r2) {
+        return r1.amount > r2.amount ? r1 : r2;
     }
     getAvailableConnectors(availableList) {
-        return PathFinder.getAvailableConnectors(availableList, this._connectors);
+        const connectors = PathFinder.getAvailableConnectors(availableList, this._connectors);
+        return connectors;
     }
     static getAvailableConnectors(availableList, connectors) {
         return connectors.filter(t => availableList[t] !== undefined);

package/lib/pathfinder/pathfinder.spec.js

@@ -2,38 +2,51 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const chai_1 = require("chai");
-const ethers_1 = require("ethers");
+const viem_1 = require("viem");
 const pathfinder_1 = require("./pathfinder");
 describe("PathFinder test", () => {
     it("compare works correctly", () => {
         const r1 = {
-            amount: 2000n,
-            gasUsage: 1000n,
+            minAmount: 2000n,
+            amount: 20000n,
             calls: [],
         };
         const r2 = {
-            amount: 3000n,
-            gasUsage: 2000n,
+            minAmount: 3000n,
+            amount: 30000n,
             calls: [],
         };
-        let result = pathfinder_1.PathFinder.compare(r1, r2, sdk_gov_1.RAY);
+        let result = pathfinder_1.PathFinder.compare(r1, r2);
         (0, chai_1.expect)(result).to.be.eql(r2);
-        result = pathfinder_1.PathFinder.compare(r1, r2, sdk_gov_1.RAY * 2n);
-        (0, chai_1.expect)(result).to.be.eql(r1);
     });
     it("has all expected connectors", () => {
-        const pf = new pathfinder_1.PathFinder("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const pf = new pathfinder_1.PathFinder("", (0, viem_1.createPublicClient)({ transport: (0, viem_1.http)("https://mainnet.infura.io/v3/") }), "Mainnet");
         const allowedTokens = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase()]: true,
         };
         (0, chai_1.expect)(pf.getAvailableConnectors(allowedTokens)).to.be.deep.equal([
-            sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase(),
             sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
             sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase(),
             sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase(),
+        ]);
+    });
+    it("has all expected connectors, when gew are disabled", () => {
+        const pf = new pathfinder_1.PathFinder("", (0, viem_1.createPublicClient)({ transport: (0, viem_1.http)("https://mainnet.infura.io/v3/") }), "Mainnet");
+        const allowedTokens = {
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase()]: true,
+        };
+        (0, chai_1.expect)(pf.getAvailableConnectors(allowedTokens)).to.be.deep.equal([
+            sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            sdk_gov_1.tokenDataByNetwork.Mainnet.rETH.toLowerCase(),
         ]);
     });
 });

package/lib/pathfinder/utils.d.ts

@@ -0,0 +1,34 @@
+import { Address, PublicClient } from "viem";
+import { MultiCall } from "./core";
+export interface FeeInfo {
+    type: KnownFeeTypes;
+    value: bigint;
+}
+type KnownFeeTypes = "curve" | "lido" | "uniswap_v2" | "uniswap_v3" | "balancer";
+export declare const BALANCER_VAULT_ABI: readonly [{
+    readonly inputs: readonly [];
+    readonly name: "getSwapFeePercentage";
+    readonly outputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}];
+export interface FindPathFeesProps {
+    calls: Array<MultiCall>;
+    provider: PublicClient;
+    contractsByAdapter: Record<Address, Address>;
+}
+export declare class PathFinderUtils {
+    static findPathFees({ calls, provider, contractsByAdapter, }: FindPathFeesProps): Promise<FeeInfo[]>;
+    private static getUniswapV2Fee;
+    private static getUniswapV3Fee;
+    private static getCurveFeeCall;
+    private static getCurveFee;
+    private static getBalancerFeeCall;
+    private static getBalancerFee;
+    private static getLidoFee;
+}
+export {};

package/lib/pathfinder/utils.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PathFinderUtils = exports.BALANCER_VAULT_ABI = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const balancerV2VaultParser_1 = require("../parsers/balancerV2VaultParser");
+const curveAdapterParser_1 = require("../parsers/curveAdapterParser");
+const lidoAdapterParser_1 = require("../parsers/lidoAdapterParser");
+const txParser_1 = require("../parsers/txParser");
+const uniV2AdapterParser_1 = require("../parsers/uniV2AdapterParser");
+const uniV3AdapterParser_1 = require("../parsers/uniV3AdapterParser");
+const types_1 = require("../types");
+const balancerVault_1 = require("./balancerVault");
+const CURVE_FEE_DECIMALS = 100000000n;
+const BALANCER_FEE_DECIMALS = 10000000000000000n;
+exports.BALANCER_VAULT_ABI = [
+    {
+        inputs: [],
+        name: "getSwapFeePercentage",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
+class PathFinderUtils {
+    static async findPathFees({ calls, provider, contractsByAdapter, }) {
+        const pathObjects = txParser_1.TxParser.parseToObjectMultiCall(calls);
+        const { simpleFees, curve, balancer } = pathObjects.reduce((acc, pathSegment) => {
+            if (!pathSegment)
+                return acc;
+            const { callObject, parser } = pathSegment;
+            switch (true) {
+                case parser instanceof uniV2AdapterParser_1.UniswapV2AdapterParser: {
+                    const f = this.getUniswapV2Fee(callObject);
+                    if (f)
+                        acc.simpleFees.push(f);
+                    break;
+                }
+                case parser instanceof uniV3AdapterParser_1.UniswapV3AdapterParser: {
+                    const f = this.getUniswapV3Fee(callObject);
+                    if (f)
+                        acc.simpleFees.push(f);
+                    break;
+                }
+                case parser instanceof lidoAdapterParser_1.LidoAdapterParser: {
+                    const f = this.getLidoFee();
+                    if (f)
+                        acc.simpleFees.push(f);
+                    break;
+                }
+                case parser instanceof curveAdapterParser_1.CurveAdapterParser: {
+                    const call = this.getCurveFeeCall(callObject, contractsByAdapter);
+                    if (call)
+                        acc.curve.push(call);
+                    break;
+                }
+                case parser instanceof balancerV2VaultParser_1.BalancerV2VaultParser: {
+                    const call = this.getBalancerFeeCall(callObject);
+                    if (call)
+                        acc.balancer.push(call);
+                    break;
+                }
+            }
+            return acc;
+        }, {
+            simpleFees: [],
+            curve: [],
+            balancer: [],
+        });
+        const response = (await provider.multicall({
+            allowFailure: true,
+            multicallAddress: sdk_gov_1.MULTICALL_ADDRESS,
+            contracts: [...curve, ...balancer],
+        }));
+        const curveEnds = curve.length;
+        const curveResponse = response.slice(0, curveEnds);
+        const balancerEnds = balancer.length;
+        const balancerResponse = response.slice(curveEnds, balancerEnds);
+        const curveFees = curveResponse.map(r => this.getCurveFee(r));
+        const balancerFees = balancerResponse.map(r => this.getBalancerFee(r));
+        const fees = [...simpleFees, ...curveFees, ...balancerFees];
+        return fees;
+    }
+    static getUniswapV2Fee(callObject) {
+        const { functionName } = callObject;
+        switch (functionName) {
+            case "swapExactTokensForTokens":
+            case "swapTokensForExactTokens":
+            case "swapDiffTokensForTokens": {
+                // 0.3%
+                return {
+                    type: "uniswap_v2",
+                    value: 3000n,
+                };
+            }
+            default:
+                return null;
+        }
+    }
+    static getUniswapV3Fee(callObject) {
+        const { functionName, args } = callObject;
+        switch (functionName) {
+            case "exactInputSingle":
+            case "exactDiffInputSingle":
+            case "exactOutputSingle": {
+                const [first] = args;
+                const { fee = 0 } = first || {};
+                return {
+                    type: "uniswap_v3",
+                    value: (0, sdk_gov_1.toBigInt)(fee),
+                };
+            }
+            default:
+                return null;
+        }
+    }
+    static getCurveFeeCall(callObject, contractsByAdapter) {
+        const { functionName } = callObject;
+        switch (functionName) {
+            case "exchange":
+            case "exchange_underlying":
+            case "exchange_diff":
+            case "exchange_diff_underlying": {
+                const adapter = (callObject.address || "").toLowerCase();
+                const contract = contractsByAdapter[adapter];
+                return contract
+                    ? {
+                        address: contract,
+                        abi: types_1.iCurvePoolAbi,
+                        functionName: "fee",
+                        args: [],
+                    }
+                    : null;
+            }
+            default:
+                return null;
+        }
+    }
+    static getCurveFee({ result }) {
+        const feeOriginal = result || 0n;
+        return {
+            type: "curve",
+            value: (feeOriginal * sdk_gov_1.PERCENTAGE_FACTOR) / CURVE_FEE_DECIMALS,
+        };
+    }
+    static getBalancerFeeCall(callObject) {
+        const { functionName } = callObject;
+        switch (functionName) {
+            case "swapDiff":
+            case "swap": {
+                const [first] = callObject.args;
+                const { poolId = "" } = first || {};
+                const { address } = (0, balancerVault_1.splitPoolId)(poolId);
+                return address
+                    ? {
+                        address: address,
+                        abi: exports.BALANCER_VAULT_ABI,
+                        functionName: "getSwapFeePercentage",
+                        args: [],
+                    }
+                    : null;
+            }
+            default:
+                return null;
+        }
+    }
+    static getBalancerFee({ result }) {
+        const feeOriginal = result || 0n;
+        return {
+            type: "balancer",
+            value: (feeOriginal * sdk_gov_1.PERCENTAGE_FACTOR) / BALANCER_FEE_DECIMALS,
+        };
+    }
+    static getLidoFee() {
+        return {
+            type: "lido",
+            value: 0n,
+        };
+    }
+}
+exports.PathFinderUtils = PathFinderUtils;

package/lib/payload/bot.d.ts

@@ -0,0 +1,13 @@
+import { Address } from "viem";
+export type BotBaseType = "liquidationProtection";
+export type LiquidationBotType = "deleverageBotPegged" | "deleverageBotLV" | "deleverageBotHV";
+export type BotDetailedType = LiquidationBotType;
+export interface BotDataPayload {
+    baseType: BotBaseType;
+    detailedType: BotDetailedType;
+    address: Address;
+    minHealthFactor: number;
+    maxHealthFactor: number;
+    premiumScaleFactor: number;
+    feeScaleFactor: number;
+}

package/lib/payload/creditAccount.d.ts

@@ -1,6 +1,48 @@
-import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
-import { CreditAccountDataStructOutput, ScheduledWithdrawalStructOutput, TokenBalanceStructOutput } from "../types/IDataCompressorV3_00";
-import { BigintifyProps, PartialKeys } from "../utils/types";
-export type CaTokenBalance = BigintifyProps<ExcludeArrayProps<TokenBalanceStructOutput>>;
-export type ScheduledWithdrawal = BigintifyProps<ExcludeArrayProps<ScheduledWithdrawalStructOutput>>;
-export type CreditAccountDataPayload = PartialKeys<ExcludeArrayProps<CreditAccountDataStructOutput>, "accruedInterest" | "accruedFees" | "healthFactor" | "totalValue">;
+import { Address } from "viem";
+export interface CaTokenBalance {
+    token: Address;
+    balance: bigint;
+    isForbidden: boolean;
+    isEnabled: boolean;
+    isQuoted: boolean;
+    quota: bigint;
+    quotaRate: bigint;
+    quotaCumulativeIndexLU: bigint;
+}
+export interface CreditAccountDataPayload {
+    isSuccessful: boolean;
+    priceFeedsNeeded: readonly Address[];
+    addr: Address;
+    borrower: Address;
+    creditManager: Address;
+    cmName: string;
+    creditFacade: Address;
+    underlying: Address;
+    debt: bigint;
+    cumulativeIndexLastUpdate: bigint;
+    cumulativeQuotaInterest: bigint;
+    accruedInterest: bigint;
+    accruedFees: bigint;
+    totalDebtUSD: bigint;
+    totalValue: bigint;
+    totalValueUSD: bigint;
+    twvUSD: bigint;
+    enabledTokensMask: bigint;
+    healthFactor: bigint;
+    baseBorrowRate: bigint;
+    aggregatedBorrowRate: bigint;
+    balances: readonly {
+        token: Address;
+        balance: bigint;
+        isForbidden: boolean;
+        isEnabled: boolean;
+        isQuoted: boolean;
+        quota: bigint;
+        quotaRate: number;
+        quotaCumulativeIndexLU: bigint;
+    }[];
+    since: bigint;
+    cfVersion: bigint;
+    expirationDate: number;
+    activeBots: readonly Address[];
+}