@gearbox-protocol/deploy-tools 5.3.10 → 5.3.12

package/dist/index.mjs

@@ -383761,11 +383761,11 @@ var RouterV3Contract = class extends BaseContract {
     return {
       balances: {
         ...balancesAfter,
-        [target]: (expectedMap.get(target) ?? 0n) + result.amount
+        [target.toLowerCase()]: (expectedMap.get(target) ?? 0n) + result.amount
       },
       minBalances: {
         ...balancesAfter,
-        [target]: (expectedMap.get(target) ?? 0n) + result.minAmount
+        [target.toLowerCase()]: (expectedMap.get(target) ?? 0n) + result.minAmount
       },
       amount: result.amount,
       minAmount: result.minAmount,
@@ -409245,29 +409245,24 @@ var AccountOpener = class {
    * Tries to open account with underlying only in each CM
    */
   async openCreditAccounts(targets) {
-    const borrower = await this.#prepareBorrower(targets);
+    await this.#prepareBorrower(targets);
     for (const c of targets) {
       const cm = this.sdk.marketRegister.findCreditManager(c.creditManager);
       await this.#approve(c.collateral, cm);
     }
-    for (const target of targets) {
+    for (let i = 0; i < targets.length; i++) {
+      const target = targets[i];
       try {
-        await this.#openAccount(target);
+        await this.#openAccount(target, i + 1, targets.length);
       } catch (e) {
         this.#logger?.error(e);
       }
     }
-    const accounts = await this.#service.getCreditAccounts({
-      owner: borrower.address
-    });
+    const accounts = await this.getOpenedAccounts();
     this.#logger?.info(`opened ${accounts.length} accounts`);
+    return accounts;
   }
-  async #openAccount({
-    creditManager,
-    collateral,
-    leverage = 4,
-    slippage = 50
-  }) {
+  async #openAccount({ creditManager, collateral, leverage = 4, slippage = 50 }, index2, total) {
     const borrower = await this.#getBorrower();
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const symbol = this.sdk.tokensMeta.symbol(collateral);
@@ -409275,6 +409270,7 @@ var AccountOpener = class {
       creditManager: cm.name,
       collateral: symbol
     });
+    logger2?.debug(`opening account #${index2}/${total}`);
     const { minDebt, underlying } = cm.creditFacade;
     const expectedBalances = [];
     const leftoverBalances = [];
@@ -409299,26 +409295,20 @@ var AccountOpener = class {
     });
     logger2?.debug(strategy, "found open strategy");
     const debt = minDebt * BigInt(leverage - 1);
+    const collateralLT = BigInt(cm.collateralTokens[collateral]);
+    const inUnderlying = collateral.toLowerCase() === underlying.toLowerCase();
     const { tx, calls } = await this.#service.openCA({
       creditManager: cm.creditManager.address,
-      averageQuota: [
+      averageQuota: inUnderlying ? [] : [
         {
           token: collateral,
-          balance: this.#calcQuota(
-            strategy.amount,
-            debt,
-            BigInt(cm.collateralTokens[collateral])
-          )
+          balance: this.#calcQuota(strategy.amount, debt, collateralLT)
         }
       ],
-      minQuota: [
+      minQuota: inUnderlying ? [] : [
         {
           token: collateral,
-          balance: this.#calcQuota(
-            strategy.minAmount,
-            debt,
-            BigInt(cm.collateralTokens[collateral])
-          )
+          balance: this.#calcQuota(strategy.minAmount, debt, collateralLT)
         }
       ],
       collateral: [{ token: underlying, balance: minDebt }],
@@ -409345,10 +409335,7 @@ var AccountOpener = class {
     if (receipt.status === "reverted") {
       throw new Error(`open credit account tx ${hash2} reverted`);
     }
-    logger2?.debug(
-      `opened credit account in ${cm.name} with collateral ${symbol}`
-    );
-    return this.getOpenedAccounts();
+    logger2?.debug(`opened credit account ${index2}/${total}`);
   }
   async getOpenedAccounts() {
     return await this.#service.getCreditAccounts({
@@ -417933,7 +417920,13 @@ function openAccounts() {
           creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
           // [Trade USDC Tier 1]
           collateral: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
-          // wbtc
+          // WBTC
+        },
+        {
+          creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
+          // [Trade USDC Tier 1]
+          collateral: "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+          // DAI
         },
         {
           creditManager: "0x3EB95430FdB99439A86d3c6D7D01C3c561393556",
@@ -418001,7 +417994,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.3.10",
+  version: "5.3.12",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -418044,7 +418037,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.161",
+    "@gearbox-protocol/sdk": "^3.0.0-vfour.162",
     "@gearbox-protocol/sdk-gov": "^2.33.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.5",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.3.10",
+  "version": "5.3.12",
   "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.161",
+    "@gearbox-protocol/sdk": "^3.0.0-vfour.162",
     "@gearbox-protocol/sdk-gov": "^2.33.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.5",