@gearbox-protocol/deploy-tools 5.24.30 → 5.24.31

package/dist/index.mjs

@@ -369150,9 +369150,7 @@ var chains = {
       ...mainnet,
       network: "Mainnet",
       defaultMarketConfigurators: {
-        "0x354fe9f450F60b8547f88BE042E4A45b46128a06": "Chaos Labs"
-      },
-      testMarketConfigurators: {
+        "0x354fe9f450F60b8547f88BE042E4A45b46128a06": "Chaos Labs",
         "0x4d427D418342d8CE89a7634c3a402851978B680A": "K3"
       },
       isPublic: true,
@@ -370132,7 +370130,8 @@ var iGearboxRouterV310Abi = [
           { name: "token", type: "address", internalType: "address" },
           { name: "balance", type: "uint256", internalType: "uint256" },
           { name: "leftoverBalance", type: "uint256", internalType: "uint256" },
-          { name: "numSplits", type: "uint256", internalType: "uint256" }
+          { name: "numSplits", type: "uint256", internalType: "uint256" },
+          { name: "claimRewards", type: "bool", internalType: "bool" }
         ]
       }
     ],
@@ -370240,7 +370239,8 @@ var iGearboxRouterV310Abi = [
           { name: "token", type: "address", internalType: "address" },
           { name: "balance", type: "uint256", internalType: "uint256" },
           { name: "leftoverBalance", type: "uint256", internalType: "uint256" },
-          { name: "numSplits", type: "uint256", internalType: "uint256" }
+          { name: "numSplits", type: "uint256", internalType: "uint256" },
+          { name: "claimRewards", type: "bool", internalType: "bool" }
         ]
       }
     ],
@@ -384273,7 +384273,7 @@ var AbstractRouterContract = class extends BaseContract {
   removeHook = this.hooks.removeHook.bind(this.hooks);
   getExpectedAndLeftover(ca, cm, balances) {
     const b = balances || this.getDefaultExpectedAndLeftover(ca);
-    const { leftoverBalances, expectedBalances } = b;
+    const { leftoverBalances, expectedBalances, tokensToClaim } = b;
     const expected = new AddressMap();
     const leftover = new AddressMap();
     for (const token of cm.collateralTokens) {
@@ -384284,7 +384284,11 @@ var AbstractRouterContract = class extends BaseContract {
         balance: leftoverBalances.get(token)?.balance || 1n
       });
     }
-    return { expectedBalances: expected, leftoverBalances: leftover };
+    return {
+      expectedBalances: expected,
+      leftoverBalances: leftover,
+      tokensToClaim
+    };
   }
   getDefaultExpectedAndLeftover(ca) {
     const expectedBalances = new AddressMap();
@@ -384299,7 +384303,11 @@ var AbstractRouterContract = class extends BaseContract {
         leftoverBalances.upsert(token, { token, balance });
       }
     }
-    return { expectedBalances, leftoverBalances };
+    return {
+      expectedBalances,
+      leftoverBalances,
+      tokensToClaim: new AddressMap()
+    };
   }
 };
 
@@ -384557,7 +384565,8 @@ var RouterV300Contract = class extends AbstractRouterContract {
       cm,
       balances ? {
         expectedBalances: assetsMap(balances.expectedBalances),
-        leftoverBalances: assetsMap(balances.leftoverBalances)
+        leftoverBalances: assetsMap(balances.leftoverBalances),
+        tokensToClaim: assetsMap(balances.tokensToClaim || [])
       } : void 0
     );
     await this.hooks.triggerHooks("foundPathOptions", {
@@ -384802,7 +384811,8 @@ var RouterV310Contract = class extends AbstractRouterContract {
         token,
         balance: expectedMap.get(token) ?? 0n,
         leftoverBalance: leftoverMap.get(token) ?? 0n,
-        numSplits: getNumSplits(token)
+        numSplits: getNumSplits(token),
+        claimRewards: false
       })
     );
     this.logger?.debug(
@@ -384843,12 +384853,13 @@ var RouterV310Contract = class extends AbstractRouterContract {
    */
   async findBestClosePath(props) {
     const { creditAccount: ca, creditManager: cm, slippage, balances } = props;
-    const { expectedBalances, leftoverBalances } = this.getExpectedAndLeftover(
+    const { expectedBalances, leftoverBalances, tokensToClaim } = this.getExpectedAndLeftover(
       ca,
       cm,
       balances ? {
         expectedBalances: assetsMap(balances.expectedBalances),
-        leftoverBalances: assetsMap(balances.leftoverBalances)
+        leftoverBalances: assetsMap(balances.leftoverBalances),
+        tokensToClaim: assetsMap(balances.tokensToClaim || [])
       } : void 0
     );
     const getNumSplits = this.#numSplitsGetter(cm, expectedBalances.values());
@@ -384858,7 +384869,8 @@ var RouterV310Contract = class extends AbstractRouterContract {
         token,
         balance: expectedBalances.get(token)?.balance || 0n,
         leftoverBalance: leftoverBalances.get(token)?.balance || 0n,
-        numSplits: getNumSplits(token)
+        numSplits: getNumSplits(token),
+        claimRewards: !!tokensToClaim.get(token)
       });
     }
     this.logger?.debug(
@@ -384871,12 +384883,23 @@ var RouterV310Contract = class extends AbstractRouterContract {
       },
       "calling routeManyToOne"
     );
-    const { result } = await this.contract.simulate.routeManyToOne([
-      cm.address,
-      ca.underlying,
+    const targetToken = ca.underlying;
+    const filtered = tData.filter((b) => {
+      return b.balance > 10 && b.balance - b.leftoverBalance > 1 || !!b.claimRewards;
+    });
+    const skipSwap = filtered.length === 0 || filtered.length === 1 && filtered[0].token.toLowerCase() === targetToken.toLowerCase();
+    const { result } = await (skipSwap ? {
+      result: {
+        amount: 0n,
+        minAmount: 0n,
+        calls: []
+      }
+    } : this.contract.simulate.routeManyToOne([
+      ca.creditAccount,
+      targetToken,
       BigInt(slippage),
       tData
-    ]);
+    ]));
     const underlyingBalance = ca.tokens.find((t) => t.token === ca.underlying)?.balance ?? 0n;
     return {
       underlyingBalance: underlyingBalance + result.minAmount,
@@ -384899,8 +384922,15 @@ var RouterV310Contract = class extends AbstractRouterContract {
         balance: priceOracle.convertToUSD(token, balance)
       };
     }).sort((a, b) => {
-      return b.balance > a.balance ? -1 : 1;
+      return a.balance > b.balance ? -1 : 1;
     });
+    this.logger?.debug(
+      inUSD.map((v) => ({
+        token: this.labelAddress(v.token),
+        balance: formatBN(v.balance, 8) + ` (${v.balance})`
+      })),
+      "balances in usd"
+    );
     const map = new AddressMap(
       inUSD.map(({ token }, i) => [token, i === 0 ? 4n : 1n])
     );
@@ -384909,9 +384939,10 @@ var RouterV310Contract = class extends AbstractRouterContract {
   #debugTokenData(tData) {
     return tData.map((t) => ({
       token: this.labelAddress(t.token),
-      balance: this.sdk.tokensMeta.formatBN(t.token, t.balance),
-      leftoverBalance: this.sdk.tokensMeta.formatBN(t.token, t.leftoverBalance),
-      numSplits: t.numSplits
+      balance: this.sdk.tokensMeta.formatBN(t.token, t.balance) + ` (${t.balance})`,
+      leftoverBalance: this.sdk.tokensMeta.formatBN(t.token, t.leftoverBalance) + ` (${t.leftoverBalance})`,
+      numSplits: t.numSplits,
+      claimRewards: t.claimRewards
     }));
   }
   /**
@@ -384946,7 +384977,7 @@ function balancesAfterOpen(target, targetAmount, expected, leftover) {
   ]);
   for (const t of tokens) {
     if (t === targetAddr) {
-      result[t] = expected.get(t) ?? 0n + targetAmount;
+      result[t] = (expected.get(t) ?? 0n) + targetAmount;
     } else {
       result[t] = BigIntMath.min(expected.get(t) ?? 0n, leftover.get(t) ?? 0n);
     }
@@ -385703,13 +385734,7 @@ var CreditAccountsService = class extends SDKConstruct {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, [
-      ...priceUpdates,
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
-        minQuota,
-        averageQuota
-      })
-    ]);
+    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -385967,12 +385992,12 @@ var CreditAccountsService = class extends SDKConstruct {
       ...priceUpdatesCalls,
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
       ...this.#prepareAddCollateral(cm.creditFacade, collateral, permits),
+      ...openPathCalls,
+      ...withdrawDebt ? [this.#prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : [],
       ...this.#prepareUpdateQuotas(cm.creditFacade, {
         minQuota,
         averageQuota
-      }),
-      ...openPathCalls,
-      ...withdrawDebt ? [this.#prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : []
+      })
     ];
     const tx = cmSuite.creditFacade.openCreditAccount(to, calls, referralCode);
     tx.value = ethAmount.toString(10);
@@ -386014,6 +386039,8 @@ var CreditAccountsService = class extends SDKConstruct {
   }
   /**
    * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
+   *
+   * This can be used by batch liquidator
    * @param accounts
    * @returns
    */
@@ -386042,19 +386069,11 @@ var CreditAccountsService = class extends SDKConstruct {
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
   async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
-    const tokensByPool = /* @__PURE__ */ new Map();
-    const oracleByPool = /* @__PURE__ */ new Map();
     const quotaRecord = desiredQuotas ? assetsMap(desiredQuotas) : desiredQuotas;
     const caBalancesRecord = creditAccount ? assetsMap(creditAccount.tokens) : creditAccount;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
-    const pool = market.pool.pool.address;
-    oracleByPool.set(pool, market.priceOracle);
-    const insertToken = (p, t) => {
-      const tokens = tokensByPool.get(p) ?? /* @__PURE__ */ new Set();
-      tokens.add(t);
-      tokensByPool.set(pool, tokens);
-    };
+    const tokens = /* @__PURE__ */ new Set([getAddress(cm.underlying)]);
     for (const t of cm.collateralTokens) {
       if (creditAccount && caBalancesRecord && quotaRecord) {
         const balanceAsset = caBalancesRecord.get(t);
@@ -386063,28 +386082,30 @@ var CreditAccountsService = class extends SDKConstruct {
         const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
         const quotaAsset = quotaRecord.get(t);
         const quotaBalance = quotaAsset?.balance || 0n;
-        if (balance > 10n && isEnabled || quotaBalance > 0)
-          insertToken(pool, t);
+        if (balance > 10n && isEnabled || quotaBalance > 0) {
+          tokens.add(getAddress(t));
+        }
       } else if (creditAccount && caBalancesRecord) {
         const balanceAsset = caBalancesRecord.get(t);
         const balance = balanceAsset?.balance || 0n;
         const mask = balanceAsset?.mask || 0n;
         const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
-        if (balance > 10n && isEnabled) insertToken(pool, t);
+        if (balance > 10n && isEnabled) {
+          tokens.add(getAddress(t));
+        }
       } else if (quotaRecord) {
         const quotaAsset = quotaRecord.get(t);
         const quotaBalance = quotaAsset?.balance || 0n;
-        if (quotaBalance > 0) insertToken(pool, t);
+        if (quotaBalance > 0) {
+          tokens.add(getAddress(t));
+        }
       }
     }
-    const priceFeeds = [];
-    for (const [pool2, oracle] of oracleByPool.entries()) {
-      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
-      priceFeeds.push(...oracle.priceFeedsForTokens(tokens));
-    }
+    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens));
+    const tStr = Array.from(tokens).map((t) => this.labelAddress(t)).join(", ");
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
-      `generating price feed updates for ${priceFeeds.length} price feeds`
+      `generating price feed updates for ${tStr} from ${priceFeeds.length} price feeds`
     );
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
       priceFeeds,
@@ -386478,6 +386499,24 @@ var AbstractAddressProviderContract = class extends BaseContract {
     }
     return [this.getAddress(contract, version4), version4];
   }
+  getLatestInRange(contract, range2) {
+    const allVersions = this.#addresses[contract];
+    if (!allVersions) {
+      return void 0;
+    }
+    let version4 = 0;
+    let address;
+    for (const [v, a] of TypedObjectUtils.entries(allVersions)) {
+      if (v >= range2[0] && v <= range2[1] && v >= version4) {
+        version4 = v;
+        address = a;
+      }
+    }
+    if (!address) {
+      return void 0;
+    }
+    return [address, version4];
+  }
   get state() {
     return {
       baseParams: {
@@ -386566,6 +386605,9 @@ var AddressProviderContractV3_1 = class extends AbstractAddressProviderContract
     const entries = await this.contract.read.getAllEntries({
       blockNumber
     });
+    this.logger?.debug(
+      `loaded ${entries.length} events in block ${blockNumber}`
+    );
     for (const { key, ver, value } of entries) {
       this.setInternalAddress(key, value, Number(ver));
     }
@@ -386623,10 +386665,14 @@ var AddressProviderContractV3 = class extends AbstractAddressProviderContract {
     }
   }
   async syncState(blockNumber) {
+    const fromBlock = ADDRESS_PROVIDER_BLOCK[this.sdk.provider.networkType];
+    this.logger?.debug(
+      `loading events from block ${fromBlock} to ${blockNumber}`
+    );
     const events = await this.sdk.provider.publicClient.getLogs({
       address: this.address,
       event: getAbiItem({ abi: this.abi, name: "SetAddress" }),
-      fromBlock: ADDRESS_PROVIDER_BLOCK[this.sdk.provider.networkType],
+      fromBlock,
       toBlock: blockNumber,
       strict: true
     });
@@ -387506,17 +387552,18 @@ var CreditSuite = class extends SDKConstruct {
   creditManager;
   creditFacade;
   creditConfigurator;
+  state;
   constructor(sdk, marketData, index2) {
     super(sdk);
     const { creditManagers, pool } = marketData;
-    const creditManager = creditManagers[index2];
-    const { name } = creditManager.creditManager;
+    this.state = creditManagers[index2];
+    const { name } = this.state.creditManager;
     this.name = name;
     this.pool = pool.baseParams.addr;
     this.underlying = pool.underlying;
-    this.creditManager = createCreditManager(sdk, creditManager);
-    this.creditFacade = createCreditFacade(sdk, creditManager);
-    this.creditConfigurator = createCreditConfigurator(sdk, creditManager);
+    this.creditManager = createCreditManager(sdk, this.state);
+    this.creditFacade = createCreditFacade(sdk, this.state);
+    this.creditConfigurator = createCreditConfigurator(sdk, this.state);
   }
   async tvl() {
     const tvl = 0n;
@@ -393009,9 +393056,10 @@ var PriceFeedRegister = class extends SDKConstruct {
       }
     }
     const result = { txs, timestamp: maxTimestamp };
+    const tsDelta = BigInt(maxTimestamp) - this.sdk.timestamp;
     this.logger?.debug(
       logContext,
-      `generated ${txs.length} price feed update transactions, timestamp: ${maxTimestamp}`
+      `generated ${txs.length} price feed update transactions, timestamp: ${maxTimestamp} (delta ${tsDelta})`
     );
     if (txs.length) {
       await this.#hooks.triggerHooks("updatesGenerated", result);
@@ -393049,7 +393097,7 @@ var PriceFeedRegister = class extends SDKConstruct {
     const configurators = marketConfigurators ?? this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
     this.logger?.debug(
       { configurators, pools },
-      "calling getUpdatablePriceFeeds"
+      `calling getUpdatablePriceFeeds in block ${this.sdk.currentBlock}`
     );
     const result = await this.provider.publicClient.readContract({
       address: marketCompressorAddress,
@@ -393061,9 +393109,12 @@ var PriceFeedRegister = class extends SDKConstruct {
           pools: pools ?? [],
           underlying: ADDRESS_0X0
         }
-      ]
+      ],
+      blockNumber: this.sdk.currentBlock
     });
-    this.logger?.debug(`loaded ${result.length} partial updatable price feeds`);
+    this.logger?.debug(
+      `loaded ${result.length} partial updatable price feeds in block ${this.sdk.currentBlock}`
+    );
     return result.map((baseParams) => this.#createUpdatableProxy({ baseParams }));
   }
   create(data) {
@@ -394169,6 +394220,14 @@ var PoolSuite = class extends SDKConstruct {
       "Rate keeper is not a gauge, but a " + this.rateKeeper.contractType
     );
   }
+  get tumbler() {
+    if (this.rateKeeper instanceof TumblerContract) {
+      return this.rateKeeper;
+    }
+    throw new Error(
+      "Rate keeper is not a tumbler, but a " + this.rateKeeper.contractType
+    );
+  }
   get linearModel() {
     if (this.interestRateModel instanceof LinearInterestRateModelContract) {
       return this.interestRateModel;
@@ -394181,7 +394240,7 @@ var PoolSuite = class extends SDKConstruct {
     return this.pool.underlying;
   }
   get dirty() {
-    return this.pool.dirty || this.gauge.dirty || this.pqk.dirty || this.interestRateModel.dirty;
+    return this.pool.dirty || this.rateKeeper.dirty || this.pqk.dirty || this.interestRateModel.dirty;
   }
   get watchAddresses() {
     return /* @__PURE__ */ new Set([
@@ -394340,7 +394399,7 @@ var MarketRegister = class extends SDKConstruct {
     }
     this.#logger?.debug(
       { configurators, pools },
-      `calling getMarkets with ${txs.length} price updates`
+      `calling getMarkets with ${txs.length} price updates in block ${this.sdk.currentBlock}`
     );
     let markets = [];
     if (txs.length) {
@@ -394355,7 +394414,8 @@ var MarketRegister = class extends SDKConstruct {
               functionName: "getMarkets",
               args: [this.#marketFilter]
             }
-          ]
+          ],
+          blockNumber: this.sdk.currentBlock
         }
       );
       markets = resp;
@@ -394364,8 +394424,8 @@ var MarketRegister = class extends SDKConstruct {
         abi: iMarketCompressorAbi,
         address: marketCompressorAddress,
         functionName: "getMarkets",
-        args: [this.#marketFilter]
-        // gas: 550_000_000n,
+        args: [this.#marketFilter],
+        blockNumber: this.sdk.currentBlock
       });
     }
     for (const data of markets) {
@@ -394374,7 +394434,9 @@ var MarketRegister = class extends SDKConstruct {
         new MarketSuite(this.sdk, data)
       );
     }
-    this.#logger?.info(`loaded ${markets.length} markets`);
+    this.#logger?.info(
+      `loaded ${markets.length} markets in block ${this.sdk.currentBlock}`
+    );
   }
   /**
    * Loads new prices and price feeds for given oracles from PriceFeedCompressor, defaults to all oracles
@@ -394512,10 +394574,16 @@ var V300StalenessPeriodPlugin = class extends SDKConstruct {
     }
     const events = await this.client.getLogs({
       address: addresses,
-      event: getAbiItem({
-        abi: iPriceOracleV300Abi,
-        name: "SetReservePriceFeed"
-      }),
+      events: [
+        getAbiItem({
+          abi: iPriceOracleV300Abi,
+          name: "SetReservePriceFeed"
+        }),
+        getAbiItem({
+          abi: iPriceOracleV300Abi,
+          name: "SetPriceFeed"
+        })
+      ],
       fromBlock,
       toBlock,
       strict: true
@@ -394529,9 +394597,10 @@ var V300StalenessPeriodPlugin = class extends SDKConstruct {
       const token = getAddress(e.args.token);
       const stalenessPeriod = e.args.stalenessPeriod;
       for (const o of oracles) {
-        const pf = o.reservePriceFeeds.get(token);
+        const map = e.eventName === "SetReservePriceFeed" ? o.reservePriceFeeds : o.mainPriceFeeds;
+        const pf = map.get(token);
         if (hexEq(pf?.address, priceFeed) && hexEq(o.address, oracle)) {
-          o.reservePriceFeeds.upsert(
+          map.upsert(
             token,
             new PriceFeedRef(this.sdk, priceFeed, stalenessPeriod)
           );
@@ -394667,6 +394736,11 @@ var GearboxSDK = class _GearboxSDK {
       },
       `${re}attaching gearbox sdk`
     );
+    if (!!blockNumber && !redstoneHistoricTimestamp) {
+      this.logger?.warn(
+        `${re}attaching to fixed block number, but redstoneHistoricTimestamp is not set. price updates might fail`
+      );
+    }
     this.#attachConfig = opts;
     const time = Date.now();
     const block = await this.provider.publicClient.getBlock(
@@ -394683,11 +394757,7 @@ var GearboxSDK = class _GearboxSDK {
       this.priceFeeds.redstoneUpdater.gateways = redstoneGateways;
     }
     this.logger?.debug(
-      {
-        number: block.number,
-        timestamp: block.timestamp
-      },
-      `${re}attach block`
+      `${re}attach block number ${this.currentBlock} timestamp ${this.timestamp}`
     );
     this.#addressProvider = await createAddressProvider(this, addressProvider);
     this.logger?.debug(
@@ -394839,6 +394909,11 @@ var GearboxSDK = class _GearboxSDK {
    */
   async syncState(opts) {
     let { blockNumber, timestamp, skipPriceUpdate } = opts ?? {};
+    if (this.#attachConfig?.redstoneHistoricTimestamp) {
+      throw new Error(
+        "syncState is not supported with redstoneHistoricTimestamp"
+      );
+    }
     if (!blockNumber || !timestamp) {
       const block = await this.provider.publicClient.getBlock({
         blockTag: "latest"
@@ -394877,16 +394952,16 @@ var GearboxSDK = class _GearboxSDK {
         contract.processLog(event);
       }
     }
-    await this.marketRegister.syncState(skipPriceUpdate);
     this.#currentBlock = blockNumber;
     this.#timestamp = timestamp;
+    await this.marketRegister.syncState(skipPriceUpdate);
     await this.#hooks.triggerHooks("syncState", { blockNumber, timestamp });
     const pluginsList = TypedObjectUtils.entries(this.plugins);
     const pluginResponse = await Promise.allSettled(
       pluginsList.map(([name, plugin]) => {
-        if (plugin.attach) {
+        if (plugin.syncState) {
           this.logger?.debug(`syncing plugin ${name}`);
-          return plugin.attach();
+          return plugin.syncState();
         }
         return void 0;
       })
@@ -416185,7 +416260,11 @@ var AccountOpener = class extends SDKConstruct {
       chain: service.sdk.provider.chain,
       transport: service.sdk.provider.transport
     });
-    this.#faucet = options.faucet ?? service.sdk.addressProvider.getAddress("FAUCET");
+    try {
+      this.#faucet = options.faucet ?? service.sdk.addressProvider.getAddress("FAUCET");
+    } catch (e) {
+      this.#logger?.warn("faucet not found, will not claim from faucet");
+    }
     this.#borrower = options.borrower;
     this.#poolDepositMultiplier = options.poolDepositMultiplier ?? 11000n;
   }
@@ -416198,7 +416277,7 @@ var AccountOpener = class extends SDKConstruct {
   /**
    * Tries to open account with underlying only in each CM
    */
-  async openCreditAccounts(targets, depositIntoPools = true) {
+  async openCreditAccounts(targets, depositIntoPools = true, claimFromFaucet = true) {
     if (depositIntoPools) {
       try {
         await this.#depositIntoPools(targets);
@@ -416206,7 +416285,9 @@ var AccountOpener = class extends SDKConstruct {
         this.#logger?.warn(`failed to deposit into pools: ${e}`);
       }
     }
-    await this.#prepareBorrower(targets);
+    if (claimFromFaucet) {
+      await this.#prepareBorrower(targets);
+    }
     const toApprove = new AddressMap();
     for (const c of targets) {
       const cm = this.sdk.marketRegister.findCreditManager(c.creditManager);
@@ -416239,20 +416320,80 @@ var AccountOpener = class extends SDKConstruct {
     return results;
   }
   async #openAccount(input, index2, total) {
+    const { creditManager, target: collateral } = input;
+    const cm = this.sdk.marketRegister.findCreditManager(creditManager);
+    const symbol = this.sdk.tokensMeta.symbol(collateral);
+    const logger2 = this.#logger?.child?.({
+      creditManager: cm.name,
+      collateral: symbol
+    });
+    logger2?.debug(`opening account #${index2}/${total}`);
+    const borrower = await this.#getBorrower();
+    const tx = await this.prepareOpen(input);
+    let hash2;
+    try {
+      hash2 = await sendRawTx(this.#anvil, {
+        tx,
+        account: borrower
+      });
+      logger2?.debug(`send transaction ${hash2}`);
+    } catch (e) {
+      return {
+        input,
+        error: `${e}`,
+        rawTx: tx
+      };
+    }
+    const receipt = await this.#anvil.waitForTransactionReceipt({ hash: hash2 });
+    if (receipt.status === "reverted") {
+      return {
+        input,
+        error: `open credit account tx reverted`,
+        txHash: hash2,
+        rawTx: tx
+      };
+    }
+    logger2?.info(`opened credit account ${index2}/${total}`);
+    const logs = parseEventLogs({
+      abi: iCreditFacadeV300Abi,
+      logs: receipt.logs,
+      eventName: "OpenCreditAccount"
+    });
+    logger2?.info(`found ${logs.length} logs`);
+    let account;
+    if (logs.length > 0) {
+      try {
+        logger2?.debug(
+          `getting credit account data for ${logs[0].args.creditAccount}`
+        );
+        account = await this.#service.getCreditAccountData(
+          logs[0].args.creditAccount
+        );
+      } catch (e) {
+        logger2?.error(`failed to get credit account data: ${e}`);
+      }
+    }
+    return {
+      input,
+      txHash: hash2,
+      rawTx: tx,
+      account
+    };
+  }
+  async prepareOpen(input) {
     const {
       creditManager,
-      collateral,
+      target,
       leverage = DEFAULT_LEVERAGE,
       slippage = 50
     } = input;
     const borrower = await this.#getBorrower();
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const symbol = this.sdk.tokensMeta.symbol(collateral);
+    const symbol = this.sdk.tokensMeta.symbol(target);
     const logger2 = this.#logger?.child?.({
       creditManager: cm.name,
-      collateral: symbol
+      target: symbol
     });
-    logger2?.debug(`opening account #${index2}/${total}`);
     const { minDebt, underlying } = cm.creditFacade;
     const expectedBalances = [];
     const leftoverBalances = [];
@@ -416273,19 +416414,19 @@ var AccountOpener = class extends SDKConstruct {
       expectedBalances,
       leftoverBalances,
       slippage,
-      target: collateral
+      target
     });
     logger2?.debug(strategy, "found open strategy");
     const debt = minDebt * BigInt(leverage - 1);
     const averageQuota = this.#getCollateralQuota(
       cm,
-      collateral,
+      target,
       strategy.amount,
       debt
     );
     const minQuota = this.#getCollateralQuota(
       cm,
-      collateral,
+      target,
       strategy.minAmount,
       debt
     );
@@ -416309,55 +416450,7 @@ var AccountOpener = class extends SDKConstruct {
       );
     }
     logger2?.debug("prepared open account transaction");
-    let hash2;
-    try {
-      hash2 = await sendRawTx(this.#anvil, {
-        tx,
-        account: borrower
-      });
-      logger2?.debug(`send transaction ${hash2}`);
-    } catch (e) {
-      return {
-        input,
-        error: `${e}`,
-        rawTx: tx
-      };
-    }
-    const receipt = await this.#anvil.waitForTransactionReceipt({ hash: hash2 });
-    if (receipt.status === "reverted") {
-      return {
-        input,
-        error: `open credit account tx reverted`,
-        txHash: hash2,
-        rawTx: tx
-      };
-    }
-    logger2?.info(`opened credit account ${index2}/${total}`);
-    const logs = parseEventLogs({
-      abi: iCreditFacadeV300Abi,
-      logs: receipt.logs,
-      eventName: "OpenCreditAccount"
-    });
-    logger2?.info(`found ${logs.length} logs`);
-    let account;
-    if (logs.length > 0) {
-      try {
-        logger2?.debug(
-          `getting credit account data for ${logs[0].args.creditAccount}`
-        );
-        account = await this.#service.getCreditAccountData(
-          logs[0].args.creditAccount
-        );
-      } catch (e) {
-        logger2?.error(`failed to get credit account data: ${e}`);
-      }
-    }
-    return {
-      input,
-      txHash: hash2,
-      rawTx: tx,
-      account
-    };
+    return tx;
   }
   async getOpenedAccounts() {
     return await this.#service.getCreditAccounts({
@@ -416456,7 +416549,6 @@ var AccountOpener = class extends SDKConstruct {
    * Creates borrower wallet,
    * Sets ETH balance,
    * Gets tokens from faucet,
-   * Approves collateral tokens to credit manager,
    * Gets DEGEN_NFT,
    */
   async #prepareBorrower(targets) {
@@ -416493,7 +416585,7 @@ var AccountOpener = class extends SDKConstruct {
     }
     const hash2 = await this.#anvil.writeContract({
       account: claimer,
-      address: this.#faucet,
+      address: this.faucet,
       abi: [
         {
           type: "function",
@@ -416661,6 +416753,12 @@ var AccountOpener = class extends SDKConstruct {
     quota = quota * (PERCENTAGE_FACTOR + 500n) / PERCENTAGE_FACTOR;
     return quota / PERCENTAGE_FACTOR * PERCENTAGE_FACTOR;
   }
+  get faucet() {
+    if (!this.#faucet) {
+      throw new Error("faucet not found");
+    }
+    return this.#faucet;
+  }
 };
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/dev/detectChain.js
@@ -423644,6 +423742,26 @@ var UniswapV2AdapterContract = class extends AbstractAdapterContract {
       abi: abi43
     });
   }
+  parseFunctionParams(params) {
+    switch (params.functionName) {
+      case "swapDiffTokensForTokens": {
+        const [leftoverAmount, rateMinRAY, path12, _deadline] = params.args;
+        const leftoverAmountStr = this.sdk.tokensMeta.formatBN(
+          path12[0],
+          leftoverAmount
+        );
+        const pathStr = path12.map((t) => this.labelAddress(t)).join(" => ");
+        return [
+          `(leftoverAmount: ${leftoverAmountStr}, rate: ${formatBN(
+            rateMinRAY,
+            27
+          )},  path: ${pathStr}`
+        ];
+      }
+      default:
+        return void 0;
+    }
+  }
 };
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/adapters/UniswapV3AdapterContract.js
@@ -423951,31 +424069,31 @@ function openAccounts() {
         {
           creditManager: "0x50ba483272484fc5eebe8676dc87d814a11faef6",
           // restaking weth
-          collateral: "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"
+          target: "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"
           // ezETH
         },
         {
           creditManager: "0x50ba483272484fc5eebe8676dc87d814a11faef6",
           // restaking weth
-          collateral: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+          target: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
           // WETH
         },
         {
           creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
           // [Trade USDC Tier 1]
-          collateral: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
+          target: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
           // WBTC
         },
         {
           creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
           // [Trade USDC Tier 1]
-          collateral: "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+          target: "0x6B175474E89094C44Da98b954EedeAC495271d0F"
           // DAI
         },
         {
           creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
           // [Trade USDC Tier 1]
-          collateral: "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497"
+          target: "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497"
           // sUSDe
         }
       ];
@@ -423984,7 +424102,7 @@ function openAccounts() {
           {
             creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
             // [Trade USDC Tier 1]
-            collateral: "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+            target: "0x6B175474E89094C44Da98b954EedeAC495271d0F"
             // DAI
           }
         ];
@@ -424011,9 +424129,9 @@ function openAccounts() {
           collateralTokens.delete(getAddress(cm.underlying));
           accounts.push(
             ...Array.from(collateralTokens).map(
-              (collateral) => ({
+              (target) => ({
                 creditManager: cmAddr,
-                collateral,
+                target,
                 leverage: 3
               })
             )
@@ -424031,11 +424149,11 @@ function openAccounts() {
           )
         );
         log_default.debug(
-          `found ${cms.length} cms with stkcvxRLUSDUSDC as collateral: ${cms.map((cm) => cm.name)}`
+          `found ${cms.length} cms with stkcvxRLUSDUSDC as target: ${cms.map((cm) => cm.name)}`
         );
         accounts = cms.map((cm) => ({
           creditManager: cm.creditManager.address,
-          collateral: t.addr
+          target: t.addr
         }));
       }
       const results = await accountOpener.openCreditAccounts(accounts, true);
@@ -424151,7 +424269,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.24.30",
+  version: "5.24.31",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -424194,7 +424312,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.359",
+    "@gearbox-protocol/sdk": "3.0.0-vfour.388",
     "@gearbox-protocol/sdk-gov": "^2.37.0",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.14",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.24.30",
+  "version": "5.24.31",
   "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.359",
+    "@gearbox-protocol/sdk": "3.0.0-vfour.388",
     "@gearbox-protocol/sdk-gov": "^2.37.0",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.14",