@gearbox-protocol/sdk 3.0.0-next.19 → 3.0.0-next.191

package/lib/core/trade.js

@@ -7,50 +7,58 @@ const core_1 = require("../pathfinder/core");
 class Trade {
     helper;
     tradePath;
-    swapType;
+    swapOperation;
     sourceAmount;
-    expectedAmount;
+    minExpectedAmount;
+    averageExpectedAmount;
     rate;
-    tokenFrom;
-    tokenTo;
+    tokenIn;
+    tokenOut;
     operationName;
     constructor(props) {
         this.helper = props.adapter;
         this.tradePath = props.tradePath;
-        this.swapType = props.swapType;
+        this.swapOperation = props.swapOperation;
         this.sourceAmount = props.sourceAmount;
-        this.expectedAmount = props.expectedAmount;
-        this.rate = (sdk_gov_1.WAD * props.expectedAmount) / props.sourceAmount;
-        this.tokenFrom = props.tokenFrom;
-        this.tokenTo = props.tokenTo;
+        this.minExpectedAmount = props.minExpectedAmount;
+        this.averageExpectedAmount = props.averageExpectedAmount;
+        this.rate = (sdk_gov_1.WAD * props.minExpectedAmount) / props.sourceAmount;
+        this.tokenIn = props.tokenIn;
+        this.tokenOut = props.tokenOut;
         this.operationName = props.swapName;
     }
     getName() {
         return this.helper.name;
     }
     toString() {
-        const symbolFrom = sdk_gov_1.tokenSymbolByAddress[this.tokenFrom.toLowerCase()];
-        const symbolTo = sdk_gov_1.tokenSymbolByAddress[this.tokenTo.toLowerCase()];
+        const symbolFrom = sdk_gov_1.tokenSymbolByAddress[this.tokenIn.toLowerCase()];
+        const symbolTo = sdk_gov_1.tokenSymbolByAddress[this.tokenOut.toLowerCase()];
         if (!symbolFrom)
-            throw new Error(`Unknown token: ${this.tokenFrom}`);
+            throw new Error(`Unknown token: ${this.tokenIn}`);
         if (!symbolTo)
-            throw new Error(`Unknown token: ${this.tokenTo}`);
+            throw new Error(`Unknown token: ${this.tokenOut}`);
         const decimalsFrom = sdk_gov_1.decimals[symbolFrom];
         const decimalsTo = sdk_gov_1.decimals[symbolTo];
-        return `${this.operationName} ${(0, sdk_gov_1.formatBN)(this.sourceAmount, decimalsFrom)} ${symbolFrom} ⇒ ${(0, sdk_gov_1.formatBN)(this.expectedAmount, decimalsTo)} ${symbolTo} on ${this.helper.name}`;
+        return `${this.operationName} ${(0, sdk_gov_1.formatBN)(this.sourceAmount, decimalsFrom)} ${symbolFrom} ⇒ ${(0, sdk_gov_1.formatBN)(this.minExpectedAmount, decimalsTo)} ${symbolTo} on ${this.helper.name}`;
     }
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }) {
+    static getTrades({ tokenIn, tokenOut, amount, results, creditManager, swapOperation, swapName, }) {
         const trades = results.reduce((acc, tradePath) => {
             const { calls } = tradePath;
-            const callInfo = Trade.getCallInfo(calls, creditManager.address, currentContracts);
+            const callInfo = Trade.getCallInfo(calls, creditManager.address, creditManager.name);
             const trade = new Trade({
                 tradePath,
-                adapter: callInfo[0],
-                swapType,
+                adapter: callInfo[0] || {
+                    name: "unknown",
+                    contractAddress: calls[0]?.target || "",
+                    creditManager: creditManager.address,
+                    creditManagerName: creditManager.name,
+                },
+                swapOperation,
                 sourceAmount: amount,
-                expectedAmount: tradePath.amount,
-                tokenFrom: from,
-                tokenTo: to,
+                minExpectedAmount: tradePath.minAmount,
+                averageExpectedAmount: tradePath.amount,
+                tokenIn,
+                tokenOut,
                 swapName,
             });
             acc.push(trade);
@@ -58,17 +66,17 @@ class Trade {
         }, []);
         return trades;
     }
-    static getCallInfo(calls, creditManager, currentContracts) {
+    static getCallInfo(calls, creditManager, creditManagerName) {
         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({
                 name,
-                contractAddress,
                 creditManager,
+                creditManagerName,
             });
             return acc;
         }, []);
@@ -86,13 +94,13 @@ class Trade {
     static sortTrades(trades, swapStrategy) {
         if (trades.length === 0)
             return [];
-        const { swapType } = trades[0];
+        const { swapOperation } = trades[0];
         const sorted = [...trades].sort((a, b) => {
             const aSelected = a.getName().toLowerCase().search(swapStrategy.toLowerCase()) >= 0;
             const bSelected = b.getName().toLowerCase().search(swapStrategy.toLowerCase()) >= 0;
             if ((aSelected && bSelected) || (!aSelected && !bSelected)) {
-                const sign = a.expectedAmount > b.expectedAmount ? -1 : 1;
-                return swapType === core_1.SwapOperation.EXACT_INPUT ? sign : -sign;
+                const sign = a.minExpectedAmount > b.minExpectedAmount ? -1 : 1;
+                return swapOperation === core_1.SwapOperation.EXACT_INPUT ? sign : -sign;
             }
             return aSelected ? -1 : 1;
         });

package/lib/core/transactions.d.ts

@@ -1,8 +1,16 @@
 import { SupportedContract } from "@gearbox-protocol/sdk-gov";
 import { Asset } from "./assets";
 import { EVMTx, EVMTxProps } from "./eventOrTx";
+interface CMEvent {
+    readonly creditManager: string;
+    readonly creditManagerName?: string;
+}
+interface PoolEvent {
+    readonly pool: string;
+    readonly poolName?: string;
+}
 export interface TxSerialized {
-    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxDecreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT" | "TxClaimGearRewards" | "TxEnableTokens" | "TxUpdateQuota";
+    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxDecreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT" | "TxClaimRewards" | "TxEnableTokens" | "TxUpdateQuota" | "TxGaugeStake" | "TxGaugeUnstake" | "TxGaugeClaim" | "TxGaugeVote" | "TxWithdrawCollateral" | "TxAddBot" | "TxRemoveBot" | "TxLiquidateAccount";
     content: string;
 }
 export declare class TxSerializer {
@@ -13,11 +21,13 @@ interface AddLiquidityProps extends EVMTxProps {
     amount: bigint;
     underlyingToken: string;
     pool: string;
+    poolName?: string;
 }
-export declare class TxAddLiquidity extends EVMTx {
+export declare class TxAddLiquidity extends EVMTx implements PoolEvent {
     readonly amount: bigint;
     readonly underlyingToken: string;
     readonly pool: string;
+    readonly poolName?: string;
     constructor(opts: AddLiquidityProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -26,11 +36,13 @@ interface RemoveLiquidityProps extends EVMTxProps {
     amount: bigint;
     dieselToken: string;
     pool: string;
+    poolName?: string;
 }
-export declare class TxRemoveLiquidity extends EVMTx {
+export declare class TxRemoveLiquidity extends EVMTx implements PoolEvent {
     readonly amount: bigint;
     readonly dieselToken: string;
     readonly pool: string;
+    readonly poolName?: string;
     constructor(opts: RemoveLiquidityProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -43,8 +55,9 @@ interface SwapProps extends EVMTxProps {
     tokenFrom: string;
     tokenTo?: string;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TXSwap extends EVMTx {
+export declare class TXSwap extends EVMTx implements CMEvent {
     readonly protocol: string;
     readonly operation: string;
     readonly amountFrom: bigint;
@@ -52,6 +65,7 @@ export declare class TXSwap extends EVMTx {
     readonly tokenFrom: string;
     readonly tokenTo?: string;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: SwapProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -60,11 +74,13 @@ interface AddCollateralProps extends EVMTxProps {
     amount: bigint;
     addedToken: string;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxAddCollateral extends EVMTx {
+export declare class TxAddCollateral extends EVMTx implements CMEvent {
     readonly amount: bigint;
     readonly addedToken: string;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: AddCollateralProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -73,11 +89,13 @@ interface IncreaseBorrowAmountProps extends EVMTxProps {
     amount: bigint;
     underlyingToken: string;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxIncreaseBorrowAmount extends EVMTx {
+export declare class TxIncreaseBorrowAmount extends EVMTx implements CMEvent {
     readonly amount: bigint;
     readonly underlyingToken: string;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: IncreaseBorrowAmountProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -86,11 +104,13 @@ interface DecreaseBorrowAmountProps extends EVMTxProps {
     amount: bigint;
     underlyingToken: string;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxDecreaseBorrowAmount extends EVMTx {
+export declare class TxDecreaseBorrowAmount extends EVMTx implements CMEvent {
     readonly amount: bigint;
     readonly underlyingToken: string;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: DecreaseBorrowAmountProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -100,12 +120,14 @@ interface OpenAccountProps extends EVMTxProps {
     underlyingToken: string;
     leverage: number;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxOpenAccount extends EVMTx {
+export declare class TxOpenAccount extends EVMTx implements CMEvent {
     readonly amount: bigint;
     readonly underlyingToken: string;
     readonly leverage: number;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: OpenAccountProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -113,14 +135,18 @@ export declare class TxOpenAccount extends EVMTx {
 interface TxOpenMultitokenAccountProps extends EVMTxProps {
     borrowedAmount: bigint;
     creditManager: string;
+    creditManagerName?: string;
     underlyingToken: string;
     assets: Array<string>;
+    withdrawDebt: boolean;
 }
-export declare class TxOpenMultitokenAccount extends EVMTx {
+export declare class TxOpenMultitokenAccount extends EVMTx implements CMEvent {
     readonly borrowedAmount: bigint;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     readonly underlyingToken: string;
     readonly assets: Array<string>;
+    readonly withdrawDebt: boolean;
     constructor(opts: TxOpenMultitokenAccountProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -134,37 +160,50 @@ export declare class TxClaimReward extends EVMTx {
     toString(): string;
     serialize(): TxSerialized;
 }
-type TxClaimNFTProps = EVMTxProps;
 export declare class TxClaimNFT extends EVMTx {
-    constructor(opts: TxClaimNFTProps);
     toString(): string;
     serialize(): TxSerialized;
 }
-interface TxClaimGearRewardsProps extends EVMTxProps {
+interface TxClaimRewardsProps extends EVMTxProps {
     token: string;
     amount: bigint;
 }
-export declare class TxClaimGearRewards extends EVMTx {
+export declare class TxClaimRewards extends EVMTx {
     readonly token: string;
     readonly amount: bigint;
-    constructor(opts: TxClaimGearRewardsProps);
+    constructor(opts: TxClaimRewardsProps);
     toString(): string;
     serialize(): TxSerialized;
 }
 interface RepayAccountProps extends EVMTxProps {
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxRepayAccount extends EVMTx {
+export declare class TxRepayAccount extends EVMTx implements CMEvent {
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: RepayAccountProps);
     toString(): string;
     serialize(): TxSerialized;
 }
+interface LiquidateAccountProps extends EVMTxProps {
+    creditManager: string;
+    creditManagerName?: string;
+}
+export declare class TxLiquidateAccount extends EVMTx implements CMEvent {
+    readonly creditManager: string;
+    readonly creditManagerName?: string;
+    constructor(opts: LiquidateAccountProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
 interface CloseAccountProps extends EVMTxProps {
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxCloseAccount extends EVMTx {
+export declare class TxCloseAccount extends EVMTx implements CMEvent {
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: CloseAccountProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -182,11 +221,13 @@ interface TxEnableTokensProps extends EVMTxProps {
     enabledTokens: Array<string>;
     disabledTokens: Array<string>;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxEnableTokens extends EVMTx {
+export declare class TxEnableTokens extends EVMTx implements CMEvent {
     readonly enabledTokens: Array<string>;
     readonly disabledTokens: Array<string>;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: TxEnableTokensProps);
     toString(): string;
     serialize(): TxSerialized;
@@ -195,13 +236,85 @@ interface TxUpdateQuotaProps extends EVMTxProps {
     updatedQuotas: Array<Asset>;
     underlyingToken: string;
     creditManager: string;
+    creditManagerName?: string;
 }
-export declare class TxUpdateQuota extends EVMTx {
+export declare class TxUpdateQuota extends EVMTx implements CMEvent {
     readonly updatedQuotas: Array<Asset>;
     readonly underlyingToken: string;
     readonly creditManager: string;
+    readonly creditManagerName?: string;
     constructor(opts: TxUpdateQuotaProps);
     toString(): string;
     serialize(): TxSerialized;
 }
+interface TxGaugeStakeProps extends EVMTxProps {
+    amount: bigint;
+}
+export declare class TxGaugeStake extends EVMTx {
+    readonly amount: bigint;
+    constructor(opts: TxGaugeStakeProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
+interface TxGaugeUnstakeProps extends EVMTxProps {
+    amount: bigint;
+}
+export declare class TxGaugeUnstake extends EVMTx {
+    readonly amount: bigint;
+    constructor(opts: TxGaugeUnstakeProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
+export declare class TxGaugeClaim extends EVMTx {
+    toString(): string;
+    serialize(): TxSerialized;
+}
+interface TxGaugeVoteProps extends EVMTxProps {
+    tokens: Array<{
+        token: string;
+    }>;
+}
+export declare class TxGaugeVote extends EVMTx {
+    readonly tokens: Array<{
+        token: string;
+    }>;
+    constructor(opts: TxGaugeVoteProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
+interface WithdrawCollateralProps extends EVMTxProps {
+    amount: bigint;
+    token: string;
+    to: string;
+    creditManager: string;
+    creditManagerName?: string;
+}
+export declare class TxWithdrawCollateral extends EVMTx implements CMEvent {
+    readonly amount: bigint;
+    readonly token: string;
+    readonly to: string;
+    readonly creditManager: string;
+    readonly creditManagerName?: string;
+    constructor(opts: WithdrawCollateralProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
+interface TxAddBotProps extends EVMTxProps {
+    creditManager: string;
+    creditManagerName?: string;
+}
+export declare class TxAddBot extends EVMTx implements CMEvent {
+    readonly creditManager: string;
+    readonly creditManagerName?: string;
+    constructor(opts: TxAddBotProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
+export declare class TxRemoveBot extends EVMTx implements CMEvent {
+    readonly creditManager: string;
+    readonly creditManagerName?: string;
+    constructor(opts: TxAddBotProps);
+    toString(): string;
+    serialize(): TxSerialized;
+}
 export {};