@gearbox-protocol/sdk 3.0.0-next.156 → 3.0.0-next.158

package/lib/core/transactions.d.ts

@@ -10,7 +10,7 @@ interface PoolEvent {
     readonly poolName?: string;
 }
 export interface TxSerialized {
-    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxDecreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT" | "TxClaimGearRewards" | "TxEnableTokens" | "TxUpdateQuota" | "TxGaugeStake" | "TxGaugeUnstake" | "TxGaugeClaim" | "TxGaugeVote" | "TxWithdrawCollateral";
+    type: "TxAddLiquidity" | "TxRemoveLiquidity" | "TxSwap" | "TxAddCollateral" | "TxIncreaseBorrowAmount" | "TxDecreaseBorrowAmount" | "TxOpenAccount" | "TxRepayAccount" | "TxCloseAccount" | "TxApprove" | "TxOpenMultitokenAccount" | "TxClaimReward" | "TxClaimNFT" | "TxClaimRewards" | "TxEnableTokens" | "TxUpdateQuota" | "TxGaugeStake" | "TxGaugeUnstake" | "TxGaugeClaim" | "TxGaugeVote" | "TxWithdrawCollateral";
     content: string;
 }
 export declare class TxSerializer {
@@ -162,14 +162,14 @@ export declare class TxClaimNFT extends EVMTx {
     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;
 }

package/lib/core/transactions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.TxWithdrawCollateral = exports.TxGaugeVote = exports.TxGaugeClaim = exports.TxGaugeUnstake = exports.TxGaugeStake = exports.TxUpdateQuota = exports.TxEnableTokens = exports.TxApprove = exports.TxCloseAccount = exports.TxRepayAccount = exports.TxClaimRewards = 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");
@@ -39,8 +39,8 @@ class TxSerializer {
                     return new TxClaimReward(params);
                 case "TxClaimNFT":
                     return new TxClaimNFT(params);
-                case "TxClaimGearRewards":
-                    return new TxClaimGearRewards(params);
+                case "TxClaimRewards":
+                    return new TxClaimRewards(params);
                 case "TxEnableTokens":
                     return new TxEnableTokens(params);
                 case "TxUpdateQuota":
@@ -313,7 +313,7 @@ class TxClaimNFT extends eventOrTx_1.EVMTx {
     }
 }
 exports.TxClaimNFT = TxClaimNFT;
-class TxClaimGearRewards extends eventOrTx_1.EVMTx {
+class TxClaimRewards extends eventOrTx_1.EVMTx {
     token;
     amount;
     constructor(opts) {
@@ -323,16 +323,16 @@ class TxClaimGearRewards extends eventOrTx_1.EVMTx {
     }
     toString() {
         const [symbol, decimals] = (0, sdk_gov_1.extractTokenData)(this.token);
-        return `GEAR Rewards claimed: ${(0, sdk_gov_1.formatBN)(this.amount, decimals || 18)} ${symbol} `;
+        return `Rewards claimed: ${(0, sdk_gov_1.formatBN)(this.amount, decimals || 18)} ${symbol} `;
     }
     serialize() {
         return {
-            type: "TxClaimGearRewards",
+            type: "TxClaimRewards",
             content: JSON.stringify(this),
         };
     }
 }
-exports.TxClaimGearRewards = TxClaimGearRewards;
+exports.TxClaimRewards = TxClaimRewards;
 class TxRepayAccount extends eventOrTx_1.EVMTx {
     creditManager;
     creditManagerName;

package/lib/pathfinder/pathOptions.d.ts

@@ -8,9 +8,8 @@ export interface PathOption {
 export type PathOptionSerie = Array<PathOption>;
 export type BalanceInterface = Pick<CaTokenBalance, "balance">;
 export declare class PathOptionFactory {
-    static generatePathOptions(balances: Record<string, BalanceInterface>, loopsInTx: number): Array<PathOptionSerie>;
+    static generatePathOptions(balances: Record<string, BalanceInterface>, loopsInTx: number, network: NetworkType): Array<PathOptionSerie>;
     static getCurvePools(balances: Record<string, BalanceInterface>): Array<CurveLPToken>;
     static getBalancerPools(balances: Record<string, BalanceInterface>): Array<BalancerLPToken>;
     static next(path: PathOptionSerie): PathOptionSerie;
-    static detectNetwork(underlying: string): NetworkType;
 }

package/lib/pathfinder/pathOptions.js

@@ -4,10 +4,9 @@ exports.PathOptionFactory = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const aura_1 = require("@gearbox-protocol/sdk-gov/lib/tokens/aura");
 class PathOptionFactory {
-    static generatePathOptions(balances, loopsInTx) {
+    static generatePathOptions(balances, loopsInTx, network) {
         const curvePools = PathOptionFactory.getCurvePools(balances);
         const balancerPools = PathOptionFactory.getBalancerPools(balances);
-        const network = PathOptionFactory.detectNetwork(Object.keys(balances)[0]);
         const curveInitPO = curvePools.map(symbol => {
             return {
                 target: sdk_gov_1.tokenDataByNetwork[network][symbol],
@@ -90,10 +89,5 @@ class PathOptionFactory {
         }
         throw new Error("Path options overflow");
     }
-    static detectNetwork(underlying) {
-        return sdk_gov_1.tokenDataByNetwork.Mainnet[sdk_gov_1.tokenSymbolByAddress[underlying.toLowerCase()]].toLowerCase() === underlying.toLowerCase()
-            ? "Mainnet"
-            : "Arbitrum";
-    }
 }
 exports.PathOptionFactory = PathOptionFactory;

package/lib/pathfinder/pathOptions.spec.js

@@ -63,7 +63,7 @@ describe("PathOptionFactory test", () => {
             [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV]: { balance: 200n },
             [sdk_gov_1.tokenDataByNetwork.Mainnet["50OHM_50DAI"]]: { balance: 200n },
         };
-        const result = pathOptions_1.PathOptionFactory.generatePathOptions(balances, 4);
+        const result = pathOptions_1.PathOptionFactory.generatePathOptions(balances, 4, "Mainnet");
         const expected = [
             {
                 target: sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"],
@@ -135,7 +135,4 @@ describe("PathOptionFactory test", () => {
         expectedCurvePools = ["3Crv", "steCRV"];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);
     });
-    it("detectNetwork works correctly", () => {
-        (0, chai_1.expect)(pathOptions_1.PathOptionFactory.detectNetwork(sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"])).to.be.eq("Mainnet");
-    });
 });

package/lib/pathfinder/pathfinder.d.ts

@@ -28,6 +28,7 @@ interface FindBestClosePathProps {
     leftoverBalances: Record<string, Asset>;
     slippage: number;
     noConcurrency?: boolean;
+    network: NetworkType;
 }
 interface FindOpenStrategyPathProps {
     creditManager: CreditManagerData;
@@ -64,7 +65,7 @@ export declare class PathFinder {
      *          - underlyingBalance - total balance of underlying token
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
-    findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency, }: FindBestClosePathProps): Promise<PathFinderCloseResult>;
+    findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency, network, }: FindBestClosePathProps): Promise<PathFinderCloseResult>;
     static compare(r1: PathFinderResult, r2: PathFinderResult): PathFinderResult;
     getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>): string[];
     static getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>, connectors: string[]): string[];

package/lib/pathfinder/pathfinder.js

@@ -105,9 +105,9 @@ class PathFinder {
      *          - underlyingBalance - total balance of underlying token
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
-    async findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency = false, }) {
+    async findBestClosePath({ creditAccount, creditManager: cm, expectedBalances, leftoverBalances, slippage, noConcurrency = false, network, }) {
         const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
-        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, 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

package/lib/pathfinder/v1/pathfinderv1.d.ts

@@ -39,7 +39,7 @@ export declare class PathFinderV1 {
      *          - underlyingBalance - total balance of underlying token
      *          - calls - list of calls which should be done to swap & unwrap everything to underlying token
      */
-    findBestClosePath(creditAccount: CreditAccountData, slippage: number, noConcurency?: boolean): Promise<PathFinderV1CloseResult>;
+    findBestClosePath(creditAccount: CreditAccountData, slippage: number, noConcurency: boolean | undefined, network: NetworkType): Promise<PathFinderV1CloseResult>;
     static compare(r1: CloseResult, r2: CloseResult, gasPriceRAY: bigint): CloseResult;
     getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>): string[];
     static getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>, connectors: string[]): string[];

package/lib/pathfinder/v1/pathfinderv1.js

@@ -107,9 +107,9 @@ class PathFinderV1 {
      *          - 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) {
+    async findBestClosePath(creditAccount, slippage, noConcurency = false, network) {
         const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
-        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+        const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx, network);
         const connectors = this.getAvailableConnectors(creditAccount.balances);
         let results = [];
         if (noConcurency) {

package/lib/tokens/tokenData.js

@@ -7,7 +7,10 @@ const ALIASES = {
 };
 const NETWROK_DEPENDENT_ALIASES = {
     Mainnet: {},
-    Optimism: {},
+    Optimism: {
+        dUSDCV3: "dUSDC.eV3",
+        sdUSDCV3: "sdUSDC.eV3",
+    },
     Arbitrum: {
         dUSDCV3: "dUSDC.eV3",
         sdUSDCV3: "sdUSDC.eV3",

package/package.json

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