@gearbox-protocol/deploy-tools 5.16.12 → 5.16.13

package/dist/index.mjs

@@ -371699,12 +371699,13 @@ var PriceOracleBaseContract = class extends BaseContract {
         )
       );
     }
+    const [address] = this.sdk.addressProvider.getLatestVersion(
+      AP_PRICE_FEED_COMPRESSOR
+    );
     return {
       call: {
         abi: iPriceFeedCompressorAbi,
-        address: this.sdk.addressProvider.getLatestVersion(
-          AP_PRICE_FEED_COMPRESSOR
-        ),
+        address,
         functionName: "getPriceFeeds",
         args
       },
@@ -373198,6 +373199,54 @@ var iSwapperV300Abi = [
   }
 ];
 
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/router/AbstractRouterContract.js
+var AbstractRouterContract = class extends BaseContract {
+  hooks = new Hooks();
+  addHook = this.hooks.addHook.bind(this.hooks);
+  removeHook = this.hooks.removeHook.bind(this.hooks);
+  getExpectedAndLeftover(ca, cm, balances) {
+    const b = balances || this.getDefaultExpectedAndLeftover(ca);
+    const { leftoverBalances, expectedBalances } = b;
+    const expected = new AddressMap();
+    const leftover = new AddressMap();
+    for (const token of cm.collateralTokens) {
+      const actual = expectedBalances.get(token)?.balance || 0n;
+      expected.upsert(token, { token, balance: actual > 10n ? actual : 0n });
+      leftover.upsert(token, {
+        token,
+        balance: leftoverBalances.get(token)?.balance || 1n
+      });
+    }
+    return { expectedBalances: expected, leftoverBalances: leftover };
+  }
+  getDefaultExpectedAndLeftover(ca) {
+    const expectedBalances = new AddressMap();
+    const leftoverBalances = new AddressMap();
+    for (const { token: t, balance, mask } of ca.tokens) {
+      const token = t;
+      const isEnabled = (mask & ca.enabledTokensMask) !== 0n;
+      expectedBalances.upsert(token, { token, balance });
+      const decimals2 = this.sdk.tokensMeta.decimals(token);
+      const minBalance = 10n ** BigInt(Math.max(8, decimals2) - 8);
+      if (balance < minBalance || !isEnabled) {
+        leftoverBalances.upsert(token, { token, balance });
+      }
+    }
+    return { expectedBalances, leftoverBalances };
+  }
+};
+
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/router/helpers.js
+function balancesMap(assets) {
+  return new AddressMap(assets.map(({ token, balance }) => [token, balance]));
+}
+function compareRouterResults(a, b) {
+  return a.amount > b.amount ? a : b;
+}
+function assetsMap(assets) {
+  return new AddressMap(assets.map((a) => [a.token, a]));
+}
+
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/router/PathOptionFactory.js
 var PathOptionFactory = class _PathOptionFactory {
   // TODO: get rid of token data from SDK
@@ -373276,7 +373325,7 @@ var PathOptionFactory = class _PathOptionFactory {
   }
 };
 
-// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/router/RouterV3Contract.js
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/router/RouterV300Contract.js
 var MAX_GAS_PER_ROUTE = 200000000n;
 var GAS_PER_BLOCK = 400000000n;
 var LOOPS_PER_TX = Number(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
@@ -373293,19 +373342,16 @@ var PT_IN = {
 var OUT = {
   ["0x9D39A5DE30e57443BfF2A8307A4256c8797A3497".toLowerCase()]: "sUSDe"
 };
-var RouterV3Contract = class extends BaseContract {
+var RouterV300Contract = class extends AbstractRouterContract {
   #connectors;
-  #hooks = new Hooks();
   constructor(sdk, address) {
     super(sdk, {
       addr: address,
-      name: "RouterV3",
+      name: "RouterV300",
       abi: iRouterV300Abi
     });
     this.#connectors = getConnectors(sdk.provider.networkType);
   }
-  addHook = this.#hooks.addHook.bind(this.#hooks);
-  removeHook = this.#hooks.removeHook.bind(this.#hooks);
   /**
    * Finds all available swaps for NORMAL tokens
    * @param ca
@@ -373378,7 +373424,7 @@ var RouterV3Contract = class extends BaseContract {
       creditManager.collateralTokens
     );
     const isPTOverrideRedeem = PT_IN[tokenIn.toLowerCase()] && OUT[tokenOut.toLowerCase()];
-    const { result } = await (isPTOverrideRedeem ? this.overridePTRedeem(props) : this.contract.simulate.findOneTokenPath(
+    const { result } = await (isPTOverrideRedeem ? this.#overridePTRedeem(props) : this.contract.simulate.findOneTokenPath(
       [
         tokenIn,
         amount,
@@ -373397,74 +373443,6 @@ var RouterV3Contract = class extends BaseContract {
       calls: [...result.calls]
     };
   }
-  // TODO: remove me when new router will be added
-  async overridePTRedeem({
-    creditAccount,
-    creditManager,
-    tokenIn,
-    tokenOut,
-    amount,
-    slippage
-  }) {
-    const pendleSwapperAddress = await this.contract.read.componentAddressById([
-      37
-    ]);
-    const cm = this.sdk.marketRegister.findCreditManager(creditManager.address);
-    const PENDLE_ROUTER_BY_NETWORK = {
-      Mainnet: "0x888888888889758F76e7103c6CbF23ABbF58F946",
-      Arbitrum: "0x0",
-      Optimism: "0x0",
-      Base: "0x0",
-      Sonic: "0x0"
-    };
-    const pendleRouter = PENDLE_ROUTER_BY_NETWORK[this.sdk.provider.networkType];
-    const pendleAdapter = cm.creditManager.adapters.mustGet(pendleRouter);
-    const pendleSwapper = getContract({
-      address: pendleSwapperAddress,
-      abi: iSwapperV300Abi,
-      client: this.sdk.provider.publicClient
-    });
-    const result = await pendleSwapper.simulate.getBestDirectPairSwap([
-      {
-        swapOperation: 1,
-        creditAccount: creditAccount.creditAccount,
-        tokenIn,
-        tokenOut,
-        connectors: [],
-        amount,
-        leftoverAmount: 0n
-      },
-      pendleAdapter.address
-    ]);
-    const minAmount = result.result.amount * (PERCENTAGE_FACTOR - BigInt(slippage)) / PERCENTAGE_FACTOR;
-    const storeExpectedBalances = {
-      target: creditManager.creditFacade,
-      callData: encodeFunctionData({
-        abi: iCreditFacadeV300MulticallAbi,
-        functionName: "storeExpectedBalances",
-        args: [[{ token: tokenOut, amount: minAmount }]]
-      })
-    };
-    const compareBalances = {
-      target: creditManager.creditFacade,
-      callData: encodeFunctionData({
-        abi: iCreditFacadeV300MulticallAbi,
-        functionName: "compareBalances",
-        args: []
-      })
-    };
-    return {
-      result: {
-        amount: result.result.amount,
-        minAmount,
-        calls: [
-          storeExpectedBalances,
-          result.result.multiCall,
-          compareBalances
-        ]
-      }
-    };
-  }
   /**
    * @dev Finds the best path for opening Credit Account and converting all NORMAL tokens and LP token in the way to TARGET
    * @param creditManager CreditManagerData which represents credit manager you want to use to open Credit Account
@@ -373545,7 +373523,7 @@ var RouterV3Contract = class extends BaseContract {
         leftoverBalances: assetsMap(balances.leftoverBalances)
       } : void 0
     );
-    await this.#hooks.triggerHooks("foundPathOptions", {
+    await this.hooks.triggerHooks("foundPathOptions", {
       creditAccount: ca.creditAccount,
       pathOptions,
       expected,
@@ -373593,61 +373571,112 @@ var RouterV3Contract = class extends BaseContract {
   }
   /**
    * Finds input to be used with findBestClosePath
+   * Is used by batch liquidator
    * @param ca
    * @param cm
    * @returns
    */
   getFindClosePathInput(ca, cm, balances) {
-    const b = balances || this.getDefaultExpectedAndLeftover(ca);
-    const { leftoverBalances, expectedBalances } = b;
+    const { expectedBalances, leftoverBalances } = this.getExpectedAndLeftover(
+      ca,
+      cm,
+      balances
+    );
     const pathOptions = PathOptionFactory.generatePathOptions(
       ca.tokens,
       this.provider.networkType,
       LOOPS_PER_TX
     );
-    const expected = cm.collateralTokens.map((token) => {
-      const actual = expectedBalances.get(token)?.balance || 0n;
-      return {
-        token,
-        balance: actual > 10n ? actual : 0n
-      };
-    });
-    const leftover = cm.collateralTokens.map((token) => ({
-      token,
-      balance: leftoverBalances.get(token)?.balance || 1n
-    }));
     const connectors2 = this.getAvailableConnectors(cm.collateralTokens);
-    return { expected, leftover, connectors: connectors2, pathOptions };
-  }
-  getDefaultExpectedAndLeftover(ca) {
-    const expectedBalances = new AddressMap();
-    const leftoverBalances = new AddressMap();
-    for (const { token: t, balance, mask } of ca.tokens) {
-      const token = t;
-      const isEnabled = (mask & ca.enabledTokensMask) !== 0n;
-      expectedBalances.upsert(token, { token, balance });
-      const decimals2 = this.sdk.tokensMeta.decimals(token);
-      const minBalance = 10n ** BigInt(Math.max(8, decimals2) - 8);
-      if (balance < minBalance || !isEnabled) {
-        leftoverBalances.upsert(token, { token, balance });
-      }
-    }
-    return { expectedBalances, leftoverBalances };
+    return {
+      expected: expectedBalances.values(),
+      leftover: leftoverBalances.values(),
+      connectors: connectors2,
+      pathOptions
+    };
   }
   getAvailableConnectors(collateralTokens) {
     return collateralTokens.filter(
       (t) => this.#connectors.includes(t.toLowerCase())
     );
   }
+  // TODO: remove me when new router will be added
+  async #overridePTRedeem({
+    creditAccount,
+    creditManager,
+    tokenIn,
+    tokenOut,
+    amount,
+    slippage
+  }) {
+    const pendleSwapperAddress = await this.contract.read.componentAddressById([
+      37
+    ]);
+    const cm = this.sdk.marketRegister.findCreditManager(creditManager.address);
+    const PENDLE_ROUTER_BY_NETWORK = {
+      Mainnet: "0x888888888889758F76e7103c6CbF23ABbF58F946",
+      Arbitrum: "0x0",
+      Optimism: "0x0",
+      Base: "0x0",
+      Sonic: "0x0"
+    };
+    const pendleRouter = PENDLE_ROUTER_BY_NETWORK[this.sdk.provider.networkType];
+    const pendleAdapter = cm.creditManager.adapters.mustGet(pendleRouter);
+    const pendleSwapper = getContract({
+      address: pendleSwapperAddress,
+      abi: iSwapperV300Abi,
+      client: this.sdk.provider.publicClient
+    });
+    const result = await pendleSwapper.simulate.getBestDirectPairSwap([
+      {
+        swapOperation: 1,
+        creditAccount: creditAccount.creditAccount,
+        tokenIn,
+        tokenOut,
+        connectors: [],
+        amount,
+        leftoverAmount: 0n
+      },
+      pendleAdapter.address
+    ]);
+    const minAmount = result.result.amount * (PERCENTAGE_FACTOR - BigInt(slippage)) / PERCENTAGE_FACTOR;
+    const storeExpectedBalances = {
+      target: creditManager.creditFacade,
+      callData: encodeFunctionData({
+        abi: iCreditFacadeV300MulticallAbi,
+        functionName: "storeExpectedBalances",
+        args: [[{ token: tokenOut, amount: minAmount }]]
+      })
+    };
+    const compareBalances = {
+      target: creditManager.creditFacade,
+      callData: encodeFunctionData({
+        abi: iCreditFacadeV300MulticallAbi,
+        functionName: "compareBalances",
+        args: []
+      })
+    };
+    return {
+      result: {
+        amount: result.result.amount,
+        minAmount,
+        calls: [
+          storeExpectedBalances,
+          result.result.multiCall,
+          compareBalances
+        ]
+      }
+    };
+  }
 };
-function compareRouterResults(a, b) {
-  return a.amount > b.amount ? a : b;
-}
-function balancesMap(assets) {
-  return new AddressMap(assets.map(({ token, balance }) => [token, balance]));
-}
-function assetsMap(assets) {
-  return new AddressMap(assets.map((a) => [a.token, a]));
+
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/router/createRouter.js
+function createRouter(sdk) {
+  const [address, v] = sdk.addressProvider.getLatestVersion(AP_ROUTER);
+  if (v >= 300 && v < 310) {
+    return new RouterV300Contract(sdk, address);
+  }
+  throw new Error(`Unsupported router version ${v}`);
 }
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/accounts/CreditAccountsService.js
@@ -373657,7 +373686,7 @@ var CreditAccountsService = class extends SDKConstruct {
   #logger;
   constructor(sdk, options) {
     super(sdk);
-    this.#compressor = sdk.addressProvider.getLatestVersion(
+    [this.#compressor] = sdk.addressProvider.getLatestVersion(
       AP_CREDIT_ACCOUNT_COMPRESSOR
     );
     this.#batchSize = options?.batchSize;
@@ -374419,10 +374448,12 @@ var CreditAccountsService = class extends SDKConstruct {
     return this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
   }
   get rewardCompressor() {
-    return this.sdk.addressProvider.getLatestVersion(AP_REWARDS_COMPRESSOR);
+    return this.sdk.addressProvider.getLatestVersion(AP_REWARDS_COMPRESSOR)[0];
   }
   get peripheryCompressor() {
-    return this.sdk.addressProvider.getLatestVersion(AP_PERIPHERY_COMPRESSOR);
+    return this.sdk.addressProvider.getLatestVersion(
+      AP_PERIPHERY_COMPRESSOR
+    )[0];
   }
 };
 
@@ -374456,13 +374487,12 @@ var AbstractAddressProviderContract = class extends BaseContract {
     return result;
   }
   getLatestVersion(contract) {
-    if (!this.#latest[contract]) {
+    const version4 = this.#latest[contract];
+    if (!version4) {
       throw new Error(`Latest version for ${contract} not found`);
     }
-    this.logger?.debug(
-      `Latest version found for ${contract} : ${this.#latest[contract]}`
-    );
-    return this.getAddress(contract, this.#latest[contract]);
+    this.logger?.debug(`Latest version found for ${contract} : ${version4}`);
+    return [this.getAddress(contract, version4), version4];
   }
   get state() {
     return {
@@ -374626,8 +374656,8 @@ var AddressProviderContractV3 = class extends AbstractAddressProviderContract {
   }
 };
 
-// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/core/address-provider/getAddressProvider.js
-async function getAddressProvider(sdk, address, options) {
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/core/address-provider/createAddressProvider.js
+async function createAddressProvider(sdk, address, options) {
   const addr = options?.state?.baseParams.addr ?? address;
   let v = options?.state?.baseParams.version ?? options?.version;
   if (!v) {
@@ -374909,7 +374939,7 @@ var GearboxSDK = class _GearboxSDK {
       },
       "attaching"
     );
-    this.#addressProvider = await getAddressProvider(this, addressProvider);
+    this.#addressProvider = await createAddressProvider(this, addressProvider);
     this.logger?.debug(
       `address provider version: ${this.#addressProvider.version}`
     );
@@ -374934,8 +374964,7 @@ var GearboxSDK = class _GearboxSDK {
       ignoreUpdateablePrices
     );
     try {
-      const router = this.#addressProvider.getLatestVersion(AP_ROUTER);
-      this.#router = new RouterV3Contract(this, router);
+      this.#router = createRouter(this);
     } catch (e) {
       this.logger?.warn("Router not found", e);
     }
@@ -407595,7 +407624,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.16.12",
+  version: "5.16.13",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -407638,7 +407667,7 @@ var package_default = {
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "3.0.0-vfour.277",
+    "@gearbox-protocol/sdk": "3.0.0-vfour.279",
     "@gearbox-protocol/sdk-gov": "^2.36.5",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.5",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.16.12",
+  "version": "5.16.13",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -44,7 +44,7 @@
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "3.0.0-vfour.277",
+    "@gearbox-protocol/sdk": "3.0.0-vfour.279",
     "@gearbox-protocol/sdk-gov": "^2.36.5",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.5",