@gearbox-protocol/sdk 3.0.0-next.7 → 3.0.0-next.9

package/lib/core/trade.d.ts

@@ -1,26 +1,12 @@
 import { SupportedContract } from "@gearbox-protocol/sdk-gov";
-import { Signer } from "ethers";
 import { MultiCall, PathFinderResult, SwapOperation } from "../pathfinder/core";
-import { ICreditFacadeV2 } from "../types";
 import { CreditManagerData } from "./creditManager";
-import { EVMTx } from "./eventOrTx";
 interface Info {
     name: string;
     contractAddress: string;
     creditManager: string;
 }
-export interface TradeProps {
-    adapter: Info;
-    tradePath: PathFinderResult;
-    creditFacade: string;
-    tokenFrom: string;
-    tokenTo: string;
-    sourceAmount: bigint;
-    expectedAmount: bigint;
-    swapType: SwapOperation;
-    swapName: TradeOperations;
-}
-export type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap" | "unknownOperation";
+export type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap";
 export interface GetTradesProps {
     from: string;
     to: string;
@@ -28,11 +14,12 @@ export interface GetTradesProps {
     results: Array<PathFinderResult>;
     creditManager: CreditManagerData;
     currentContracts: Record<SupportedContract, string>;
+    swapType: SwapOperation;
+    swapName: TradeOperations;
 }
 export declare class Trade {
     readonly helper: Info;
     readonly tradePath: PathFinderResult;
-    readonly creditFacade: string;
     readonly swapType: SwapOperation;
     readonly sourceAmount: bigint;
     readonly expectedAmount: bigint;
@@ -40,17 +27,12 @@ export declare class Trade {
     readonly tokenFrom: string;
     readonly tokenTo: string;
     readonly operationName: TradeOperations;
-    constructor(props: TradeProps);
+    private constructor();
     getName(): string;
-    execute(signer: Signer): Promise<EVMTx>;
     toString(): string;
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, }: GetTradesProps): Trade[];
-    static getOperationName(tokenInAddress: string, tokenOutAddress: string): TradeOperations;
+    static getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }: GetTradesProps): Trade[];
     static getCallInfo(calls: Array<MultiCall>, creditManager: string, currentContracts: Record<SupportedContract, string>): Info[];
     private static getContractSymbol;
-    static getTradeId(trade: Trade): string;
     static sortTrades(trades: Array<Trade>, swapStrategy: string): Trade[];
-    static executeMulticallPath(creditFacade: string | ICreditFacadeV2, signer: Signer, calls: Array<MultiCall>): Promise<import("ethers").ContractTransaction>;
-    private static executeOnCreditFacade;
 }
 export {};

package/lib/core/trade.js

@@ -4,19 +4,10 @@ exports.Trade = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const txParser_1 = require("../parsers/txParser");
 const core_1 = require("../pathfinder/core");
-const types_1 = require("../types");
 const formatter_1 = require("../utils/formatter");
-const transactions_1 = require("./transactions");
-const OPERATION_NAMES = {
-    farmWithdraw: "Farm withdraw",
-    farmDeposit: "Farm deposit",
-    swap: "Swap",
-    unknownOperation: "Unknown operation",
-};
 class Trade {
     helper;
     tradePath;
-    creditFacade;
     swapType;
     sourceAmount;
     expectedAmount;
@@ -27,7 +18,6 @@ class Trade {
     constructor(props) {
         this.helper = props.adapter;
         this.tradePath = props.tradePath;
-        this.creditFacade = props.creditFacade;
         this.swapType = props.swapType;
         this.sourceAmount = props.sourceAmount;
         this.expectedAmount = props.expectedAmount;
@@ -39,20 +29,6 @@ class Trade {
     getName() {
         return this.helper.name;
     }
-    async execute(signer) {
-        const receipt = await Trade.executeMulticallPath(this.creditFacade, signer, this.tradePath.calls);
-        return new transactions_1.TXSwap({
-            txHash: receipt.hash,
-            protocol: this.helper.contractAddress,
-            operation: OPERATION_NAMES[this.operationName],
-            amountFrom: this.sourceAmount,
-            amountTo: this.expectedAmount,
-            tokenFrom: this.tokenFrom,
-            tokenTo: this.tokenTo,
-            creditManager: this.helper.creditManager,
-            timestamp: 0,
-        });
-    }
     toString() {
         const symbolFrom = sdk_gov_1.tokenSymbolByAddress[this.tokenFrom.toLowerCase()];
         const symbolTo = sdk_gov_1.tokenSymbolByAddress[this.tokenTo.toLowerCase()];
@@ -64,43 +40,25 @@ class Trade {
         const decimalsTo = sdk_gov_1.decimals[symbolTo];
         return `${this.operationName} ${(0, formatter_1.formatBN)(this.sourceAmount, decimalsFrom)} ${symbolFrom} ⇒ ${(0, formatter_1.formatBN)(this.expectedAmount, decimalsTo)} ${symbolTo} on ${this.helper.name}`;
     }
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, }) {
+    static getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }) {
         const trades = results.reduce((acc, tradePath) => {
             const { calls } = tradePath;
             const callInfo = Trade.getCallInfo(calls, creditManager.address, currentContracts);
             const trade = new Trade({
                 tradePath,
-                creditFacade: creditManager.creditFacade,
                 adapter: callInfo[0],
-                swapType: core_1.SwapOperation.EXACT_INPUT,
+                swapType,
                 sourceAmount: amount,
                 expectedAmount: tradePath.amount,
                 tokenFrom: from,
                 tokenTo: to,
-                swapName: Trade.getOperationName(from, to),
+                swapName,
             });
             acc.push(trade);
             return acc;
         }, []);
         return trades;
     }
-    static getOperationName(tokenInAddress, tokenOutAddress) {
-        const tokenInSymbol = sdk_gov_1.tokenSymbolByAddress[tokenInAddress];
-        const tokenOutSymbol = sdk_gov_1.tokenSymbolByAddress[tokenOutAddress];
-        const tokenInIsLp = (0, sdk_gov_1.isLPToken)(tokenInSymbol);
-        const tokenOutIsLp = (0, sdk_gov_1.isLPToken)(tokenOutSymbol);
-        if (!tokenInSymbol)
-            throw new Error(`Unknown token: ${tokenInAddress}`);
-        if (!tokenOutSymbol)
-            throw new Error(`Unknown token: ${tokenOutAddress}`);
-        if (tokenInIsLp && !tokenOutIsLp)
-            return "farmWithdraw";
-        if (!tokenInIsLp && tokenOutIsLp)
-            return "farmDeposit";
-        if (!tokenInIsLp && !tokenOutIsLp)
-            return "swap";
-        return "unknownOperation";
-    }
     static getCallInfo(calls, creditManager, currentContracts) {
         const callAdapters = calls.reduce((acc, call) => {
             const contractSymbol = this.getContractSymbol(call.target.toLowerCase());
@@ -126,9 +84,6 @@ class Trade {
             return undefined;
         }
     }
-    static getTradeId(trade) {
-        return `${trade.getName()}:${trade.expectedAmount.toString()}`;
-    }
     static sortTrades(trades, swapStrategy) {
         if (trades.length === 0)
             return [];
@@ -144,16 +99,5 @@ class Trade {
         });
         return sorted;
     }
-    static async executeMulticallPath(creditFacade, signer, calls) {
-        if (calls.length < 1)
-            throw new Error("No path to execute");
-        const safeCreditFacade = typeof creditFacade === "string"
-            ? types_1.ICreditFacadeV2__factory.connect(creditFacade, signer)
-            : creditFacade;
-        return this.executeOnCreditFacade(calls, safeCreditFacade);
-    }
-    static async executeOnCreditFacade(calls, creditFacade) {
-        return creditFacade.multicall(calls);
-    }
 }
 exports.Trade = Trade;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.7",
+  "version": "3.0.0-next.9",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -31,8 +31,7 @@
   },
   "dependencies": {
     "@gearbox-protocol/integrations-v3": "^1.15.0",
-    "@gearbox-protocol/sdk-gov": "^1.5.26",
-    "@types/deep-eql": "^4.0.0",
+    "@gearbox-protocol/sdk-gov": "^1.5.27",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
     "deep-eql": "^4.1.0",
@@ -51,6 +50,7 @@
     "@openzeppelin/contracts": "4.8.3",
     "@typechain/ethers-v5": "^10.1.0",
     "@types/chai": "^4.3.3",
+    "@types/deep-eql": "^4.0.0",
     "@types/jest": "^28.1.7",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.7.6",