@gearbox-protocol/sdk 3.0.0-next.56 → 3.0.0-next.58

package/lib/core/creditManager.d.ts

@@ -51,6 +51,7 @@ export declare class CreditManagerData {
     encodeRevertIfReceivedLessThanV2(assets: Array<Asset>): MultiCall;
     encodeRevertIfReceivedLessThanV3(assets: Array<Asset>): MultiCall;
     encodeUpdateQuotaV3(token: string, quotaChange: bigint, minQuota: bigint): MultiCall;
+    encodeWithdrawCollateralV3(token: string, amount: bigint, to: string): MultiCall;
     static withdrawAllAndUnwrap_Convex(address: string, claim: boolean): MultiCall;
 }
 export declare class ChartsCreditManagerData {

package/lib/core/creditManager.js

@@ -200,6 +200,12 @@ class CreditManagerData {
             callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("updateQuota", [token, quotaChange, minQuota]),
         };
     }
+    encodeWithdrawCollateralV3(token, amount, to) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("withdrawCollateral", [token, amount, to]),
+        };
+    }
     static withdrawAllAndUnwrap_Convex(address, claim) {
         return {
             target: address,

package/lib/core/trade.js

@@ -47,7 +47,11 @@ class Trade {
             const callInfo = Trade.getCallInfo(calls, creditManager.address, currentContracts);
             const trade = new Trade({
                 tradePath,
-                adapter: callInfo[0],
+                adapter: callInfo[0] || {
+                    name: "unknown",
+                    contractAddress: calls[0]?.target || "",
+                    creditManager: creditManager.address,
+                },
                 swapOperation,
                 sourceAmount: amount,
                 minExpectedAmount: tradePath.minAmount,
@@ -64,8 +68,9 @@ class Trade {
     static getCallInfo(calls, creditManager, currentContracts) {
         const callAdapters = calls.reduce((acc, call) => {
             const contractSymbol = this.getContractSymbol(call.target.toLowerCase());
-            if (!(0, sdk_gov_1.isSupportedContract)(contractSymbol))
+            if (!(0, sdk_gov_1.isSupportedContract)(contractSymbol)) {
                 return acc;
+            }
             const { name } = sdk_gov_1.contractParams[contractSymbol];
             const contractAddress = currentContracts[contractSymbol];
             acc.push({

package/lib/core/transactions.d.ts

@@ -2,7 +2,7 @@ import { SupportedContract } from "@gearbox-protocol/sdk-gov";
 import { Asset } from "./assets";
 import { EVMTx, EVMTxProps } from "./eventOrTx";
 export interface TxSerialized {
-    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxDecreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT" | "TxClaimGearRewards" | "TxEnableTokens" | "TxUpdateQuota" | "TxGaugeStake" | "TxGaugeUnstake" | "TxGaugeClaim" | "TxGaugeVote";
+    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxDecreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT" | "TxClaimGearRewards" | "TxEnableTokens" | "TxUpdateQuota" | "TxGaugeStake" | "TxGaugeUnstake" | "TxGaugeClaim" | "TxGaugeVote" | "TxWithdrawCollateral";
     content: string;
 }
 export declare class TxSerializer {
@@ -237,4 +237,19 @@ export declare class TxGaugeVote extends EVMTx {
     toString(): string;
     serialize(): TxSerialized;
 }
+interface WithdrawCollateralProps extends EVMTxProps {
+    amount: bigint;
+    token: string;
+    to: string;
+    creditManager: string;
+}
+export declare class TxWithdrawCollateral extends EVMTx {
+    readonly amount: bigint;
+    readonly token: string;
+    readonly to: string;
+    readonly creditManager: string;
+    constructor(opts: WithdrawCollateralProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
 export {};

package/lib/core/transactions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TxGaugeVote = exports.TxGaugeClaim = exports.TxGaugeUnstake = exports.TxGaugeStake = exports.TxUpdateQuota = exports.TxEnableTokens = exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxClaimGearRewards = exports.TxClaimNFT = exports.TxClaimReward = exports.TxOpenMultitokenAccount = exports.TxOpenAccount = exports.TxDecreaseBorrowAmount = exports.TxIncreaseBorrowAmount = exports.TxAddCollateral = exports.TXSwap = exports.TxRemoveLiquidity = exports.TxAddLiquidity = exports.TxSerializer = void 0;
+exports.TxWithdrawCollateral = exports.TxGaugeVote = exports.TxGaugeClaim = exports.TxGaugeUnstake = exports.TxGaugeStake = exports.TxUpdateQuota = exports.TxEnableTokens = exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxClaimGearRewards = exports.TxClaimNFT = exports.TxClaimReward = exports.TxOpenMultitokenAccount = exports.TxOpenAccount = exports.TxDecreaseBorrowAmount = exports.TxIncreaseBorrowAmount = exports.TxAddCollateral = exports.TXSwap = exports.TxRemoveLiquidity = exports.TxAddLiquidity = exports.TxSerializer = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const contractsRegister_1 = require("../contracts/contractsRegister");
 const math_1 = require("../utils/math");
@@ -53,6 +53,8 @@ class TxSerializer {
                     return new TxGaugeClaim(params);
                 case "TxGaugeVote":
                     return new TxGaugeVote(params);
+                case "TxWithdrawCollateral":
+                    return new TxWithdrawCollateral(params);
                 default:
                     throw new Error(`Unknown transaction for parsing: ${e.type}`);
             }
@@ -501,3 +503,27 @@ class TxGaugeVote extends eventOrTx_1.EVMTx {
     }
 }
 exports.TxGaugeVote = TxGaugeVote;
+class TxWithdrawCollateral extends eventOrTx_1.EVMTx {
+    amount;
+    token;
+    to;
+    creditManager;
+    constructor(opts) {
+        super(opts);
+        this.amount = opts.amount;
+        this.token = opts.token;
+        this.to = opts.to;
+        this.creditManager = opts.creditManager;
+    }
+    toString() {
+        const [symbol, decimals] = (0, sdk_gov_1.extractTokenData)(this.token);
+        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: withdrawn ${(0, sdk_gov_1.formatBN)(this.amount, decimals || 18)} ${symbol}`;
+    }
+    serialize() {
+        return {
+            type: "TxWithdrawCollateral",
+            content: JSON.stringify(this),
+        };
+    }
+}
+exports.TxWithdrawCollateral = TxWithdrawCollateral;

package/lib/parsers/creditFacadeParser.js

@@ -48,6 +48,10 @@ class CreditFacadeParser extends abstractParser_1.AbstractParser {
                     .join(", ");
                 return `${functionName}(${balancesStr})`;
             }
+            case "withdrawCollateral": {
+                const [token, amount, to] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(token: ${this.tokenSymbol(token)}, withdraw: ${this.formatAmount(amount)}, to: ${this.formatAmount(to)})`;
+            }
             default:
                 return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;
         }

package/lib/pathfinder/pathfinder.d.ts

@@ -1,5 +1,6 @@
 import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
 import { providers, Signer } from "ethers";
+import { Asset } from "../core/assets";
 import { CreditAccountData } from "../core/creditAccount";
 import { CreditManagerData } from "../core/creditManager";
 import { IRouter } from "../types";
@@ -23,15 +24,15 @@ interface FindOneTokenPathProps {
 interface FindBestClosePathProps {
     creditAccount: CreditAccountData;
     creditManager: CreditManagerData;
-    expectedBalances: Record<string, bigint>;
-    leftoverBalances: Record<string, bigint>;
+    expectedBalances: Record<string, Asset>;
+    leftoverBalances: Record<string, Asset>;
     slippage: number;
     noConcurrency?: boolean;
 }
 interface FindOpenStrategyPathProps {
     creditManager: CreditManagerData;
-    expectedBalances: Record<string, bigint>;
-    leftoverBalances: Record<string, bigint>;
+    expectedBalances: Record<string, Asset>;
+    leftoverBalances: Record<string, Asset>;
     target: string;
     slippage: number;
 }

package/lib/pathfinder/pathfinder.js

@@ -77,11 +77,11 @@ class PathFinder {
     async findOpenStrategyPath({ creditManager: cm, expectedBalances, leftoverBalances, target, slippage, }) {
         const expected = cm.collateralTokens.map(token => ({
             token,
-            balance: expectedBalances[token] || 0,
+            balance: expectedBalances[token]?.balance || 0n,
         }));
         const leftover = cm.collateralTokens.map(token => ({
             token,
-            balance: leftoverBalances[token] || 1,
+            balance: leftoverBalances[token]?.balance || 1n,
         }));
         const connectors = this.getAvailableConnectors(cm.supportedTokens);
         const [outBalances, result] = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, expected, leftover, target, connectors, slippage, {
@@ -114,11 +114,11 @@ class PathFinder {
         const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
         const expected = cm.collateralTokens.map(token => ({
             token,
-            balance: expectedBalances[token] || 0,
+            balance: expectedBalances[token]?.balance || 0n,
         }));
         const leftover = cm.collateralTokens.map(token => ({
             token,
-            balance: leftoverBalances[token] || 1,
+            balance: leftoverBalances[token]?.balance || 1n,
         }));
         const connectors = this.getAvailableConnectors(creditAccount.balances);
         let results = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.56",
+  "version": "3.0.0-next.58",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",