@gearbox-protocol/sdk 9.9.4 → 9.9.5

package/dist/cjs/dev/AccountOpener.js

@@ -257,11 +257,14 @@ class AccountOpener extends import_sdk.SDKConstruct {
     }
     logger?.debug(
       {
-        minDebt: this.sdk.tokensMeta.formatBN(underlying, minDebt),
+        minDebt: this.sdk.tokensMeta.formatBN(underlying, minDebt, {
+          symbol: true
+        }),
         leverage: leverage.toString(),
         expectedUnderlyingBalance: this.sdk.tokensMeta.formatBN(
           underlying,
-          expectedUnderlyingBalance
+          expectedUnderlyingBalance,
+          { symbol: true }
         )
       },
       "looking for open strategy"
@@ -274,7 +277,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
     });
     if (borrowerBalance < minDebt) {
       this.#logger?.warn(
-        `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance)} is less than the minimum debt: ${this.sdk.tokensMeta.formatBN(underlying, minDebt)}`
+        `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance, { symbol: true })} is less than the minimum debt: ${this.sdk.tokensMeta.formatBN(underlying, minDebt, { symbol: true })}`
       );
       if (this.#allowMint) {
         borrowerBalance = await this.#tryMint(
@@ -285,7 +288,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
       }
     }
     this.#logger?.debug(
-      `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance)} ${this.sdk.tokensMeta.symbol(underlying)}`
+      `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance, { symbol: true })}`
     );
     const strategy = await this.sdk.routerFor(cm).findOpenStrategyPath({
       creditManager: cm.creditManager,
@@ -360,7 +363,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
       amount = amount > cm.creditFacade.maxDebt ? cm.creditFacade.maxDebt : amount;
       minAvailableByPool[cm.pool] = (minAvailableByPool[cm.pool] ?? 0n) + amount;
       this.#logger?.debug(
-        `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount)} ${this.sdk.tokensMeta.symbol(cm.underlying)} in pool (leverage: ${Number(leverage / import_sdk.PERCENTAGE_FACTOR)}%)`
+        `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount, { symbol: true })} in pool (leverage: ${Number(leverage / import_sdk.PERCENTAGE_FACTOR)}%)`
       );
     }
     let totalUSD = 0n;
@@ -374,9 +377,11 @@ class AccountOpener extends import_sdk.SDKConstruct {
         minAvailable,
         pool.availableLiquidity,
         diff
-      ].map((v) => this.sdk.tokensMeta.formatBN(pool.underlying, v));
+      ].map(
+        (v) => this.sdk.tokensMeta.formatBN(pool.underlying, v, { symbol: true })
+      );
       this.#logger?.debug(
-        `Pool ${this.labelAddress(pool.address)} has ${availableS} liquidity, needs ${diffS} more for the minimum of ${minS} ${this.sdk.tokensMeta.symbol(pool.underlying)}`
+        `Pool ${this.labelAddress(pool.address)} has ${availableS} liquidity, needs ${diffS} more for the minimum of ${minS}`
       );
       if (diff > 0n) {
         deposits.push([pool, diff]);
@@ -389,7 +394,15 @@ class AccountOpener extends import_sdk.SDKConstruct {
     );
     const depositor = await this.#getDepositor();
     this.#logger?.debug(`depositor: ${depositor.address}`);
-    await this.#claimFromFaucet(depositor, "depositor", totalUSD);
+    try {
+      await this.#claimFromFaucet(depositor, "depositor", totalUSD);
+    } catch (e) {
+      if (this.#allowMint) {
+        this.#logger?.error(`depositor failed to claim from faucet: ${e}`);
+      } else {
+        throw e;
+      }
+    }
     const results = [];
     for (const [pool, amount] of deposits) {
       const result = await this.#depositToPool(pool, depositor, amount);
@@ -407,7 +420,9 @@ class AccountOpener extends import_sdk.SDKConstruct {
     };
     let txHash;
     try {
-      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
+      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount, {
+        symbol: true
+      });
       this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
       let allowance = await this.#anvil.readContract({
         address: underlying,
@@ -417,7 +432,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
       });
       if (allowance < amount) {
         this.#logger?.warn(
-          `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)} is less than the amount to deposit: ${amnt}`
+          `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance, { symbol: true })} is less than the amount to deposit: ${amnt}`
         );
         if (this.#allowMint) {
           allowance = await this.#tryMint(
@@ -428,7 +443,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
         }
       }
       this.#logger?.debug(
-        `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)}`
+        `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance, { symbol: true })}`
       );
       txHash = await this.#anvil.writeContract({
         account: depositor,
@@ -486,14 +501,11 @@ class AccountOpener extends import_sdk.SDKConstruct {
    * @param amount
    */
   async #tryMint(token, dest, amount) {
-    const symbol = this.sdk.tokensMeta.symbol(token);
-    const amnt = this.sdk.tokensMeta.formatBN(token, amount);
+    const amnt = this.sdk.tokensMeta.formatBN(token, amount, { symbol: true });
     try {
       await this.#mint(token, dest, amount);
     } catch (e) {
-      this.#logger?.warn(
-        `failed to mint ${amnt} ${symbol} to ${dest.address}: ${e}`
-      );
+      this.#logger?.warn(`failed to mint ${amnt} to ${dest.address}: ${e}`);
     }
     return await this.#anvil.readContract({
       address: token,
@@ -517,6 +529,44 @@ class AccountOpener extends import_sdk.SDKConstruct {
       address: owner,
       value: (0, import_viem.parseEther)("100")
     });
+    try {
+      await this.#mintDirectly(owner, token, amount, dest.address);
+    } catch (e) {
+      this.#logger?.warn(
+        `failed to mint directly ${amnt} ${symbol} to ${dest.address}: ${e}`
+      );
+      try {
+        this.#mintAndTransfer(owner, token, amount, dest.address);
+      } catch (e2) {
+        this.#logger?.warn(
+          `failed to mint and transfer ${amnt} ${symbol} to ${dest.address}: ${e2}`
+        );
+      }
+    }
+    await this.#anvil.stopImpersonatingAccount({ address: owner });
+  }
+  async #mintDirectly(owner, token, amount, dest) {
+    const hash = await this.#anvil.writeContract({
+      account: owner,
+      address: token,
+      abi: (0, import_viem.parseAbi)([
+        "function mint(address to, uint256 amount) returns (bool)"
+      ]),
+      functionName: "mint",
+      args: [dest, amount],
+      chain: this.#anvil.chain
+    });
+    this.#logger?.debug(
+      `mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}`
+    );
+    const receipt = await this.#anvil.waitForTransactionReceipt({ hash });
+    if (receipt.status === "reverted") {
+      throw new Error(
+        `failed to mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}: reverted`
+      );
+    }
+  }
+  async #mintAndTransfer(owner, token, amount, dest) {
     let hash = await this.#anvil.writeContract({
       account: owner,
       address: token,
@@ -525,11 +575,13 @@ class AccountOpener extends import_sdk.SDKConstruct {
       args: [amount],
       chain: this.#anvil.chain
     });
-    this.#logger?.debug(`mint ${amnt} ${symbol} to ${owner} in tx ${hash}`);
+    this.#logger?.debug(
+      `mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}`
+    );
     let receipt = await this.#anvil.waitForTransactionReceipt({ hash });
     if (receipt.status === "reverted") {
       throw new Error(
-        `failed to mint ${amnt} ${symbol} to ${owner} in tx ${hash}: reverted`
+        `failed to mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}: reverted`
       );
     }
     hash = await this.#anvil.writeContract({
@@ -537,19 +589,18 @@ class AccountOpener extends import_sdk.SDKConstruct {
       address: token,
       abi: import_iERC20.ierc20Abi,
       functionName: "transfer",
-      args: [dest.address, amount],
+      args: [dest, amount],
       chain: this.#anvil.chain
     });
     this.#logger?.debug(
-      `transfer ${amnt} ${symbol} from ${owner} to ${dest.address} in tx ${hash}`
+      `transfer ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })}  from ${owner} to ${dest} in tx ${hash}`
     );
     receipt = await this.#anvil.waitForTransactionReceipt({ hash });
     if (receipt.status === "reverted") {
       throw new Error(
-        `failed to transfer ${amnt} ${symbol} from ${owner} to ${dest.address} in tx ${hash}: reverted`
+        `failed to transfer ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })}  from ${owner} to ${dest} in tx ${hash}: reverted`
       );
     }
-    await this.#anvil.stopImpersonatingAccount({ address: owner });
   }
   /**
    * Creates borrower wallet,
@@ -816,17 +867,23 @@ class AccountOpener extends import_sdk.SDKConstruct {
     const desiredQuota = this.#calcQuota(amount, debt, collateralLT);
     logger?.debug(
       {
-        desiredQuota: this.sdk.tokensMeta.formatBN(underlying, desiredQuota),
+        desiredQuota: this.sdk.tokensMeta.formatBN(underlying, desiredQuota, {
+          symbol: true
+        }),
         availableQuota: this.sdk.tokensMeta.formatBN(
           underlying,
-          availableQuota
+          availableQuota,
+          { symbol: true }
         ),
         collateralAmount: this.sdk.tokensMeta.formatBN(
           collateral,
-          collateralAmount
+          collateralAmount,
+          { symbol: true }
         ),
-        amount: this.sdk.tokensMeta.formatBN(underlying, amount),
-        debt: this.sdk.tokensMeta.formatBN(underlying, debt),
+        amount: this.sdk.tokensMeta.formatBN(underlying, amount, {
+          symbol: true
+        }),
+        debt: this.sdk.tokensMeta.formatBN(underlying, debt, { symbol: true }),
         lt: Number(collateralLT)
       },
       "calculated quota"

package/dist/esm/dev/AccountOpener.js

@@ -250,11 +250,14 @@ class AccountOpener extends SDKConstruct {
     }
     logger?.debug(
       {
-        minDebt: this.sdk.tokensMeta.formatBN(underlying, minDebt),
+        minDebt: this.sdk.tokensMeta.formatBN(underlying, minDebt, {
+          symbol: true
+        }),
         leverage: leverage.toString(),
         expectedUnderlyingBalance: this.sdk.tokensMeta.formatBN(
           underlying,
-          expectedUnderlyingBalance
+          expectedUnderlyingBalance,
+          { symbol: true }
         )
       },
       "looking for open strategy"
@@ -267,7 +270,7 @@ class AccountOpener extends SDKConstruct {
     });
     if (borrowerBalance < minDebt) {
       this.#logger?.warn(
-        `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance)} is less than the minimum debt: ${this.sdk.tokensMeta.formatBN(underlying, minDebt)}`
+        `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance, { symbol: true })} is less than the minimum debt: ${this.sdk.tokensMeta.formatBN(underlying, minDebt, { symbol: true })}`
       );
       if (this.#allowMint) {
         borrowerBalance = await this.#tryMint(
@@ -278,7 +281,7 @@ class AccountOpener extends SDKConstruct {
       }
     }
     this.#logger?.debug(
-      `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance)} ${this.sdk.tokensMeta.symbol(underlying)}`
+      `borrower balance in underlying: ${this.sdk.tokensMeta.formatBN(underlying, borrowerBalance, { symbol: true })}`
     );
     const strategy = await this.sdk.routerFor(cm).findOpenStrategyPath({
       creditManager: cm.creditManager,
@@ -353,7 +356,7 @@ class AccountOpener extends SDKConstruct {
       amount = amount > cm.creditFacade.maxDebt ? cm.creditFacade.maxDebt : amount;
       minAvailableByPool[cm.pool] = (minAvailableByPool[cm.pool] ?? 0n) + amount;
       this.#logger?.debug(
-        `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount)} ${this.sdk.tokensMeta.symbol(cm.underlying)} in pool (leverage: ${Number(leverage / PERCENTAGE_FACTOR)}%)`
+        `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount, { symbol: true })} in pool (leverage: ${Number(leverage / PERCENTAGE_FACTOR)}%)`
       );
     }
     let totalUSD = 0n;
@@ -367,9 +370,11 @@ class AccountOpener extends SDKConstruct {
         minAvailable,
         pool.availableLiquidity,
         diff
-      ].map((v) => this.sdk.tokensMeta.formatBN(pool.underlying, v));
+      ].map(
+        (v) => this.sdk.tokensMeta.formatBN(pool.underlying, v, { symbol: true })
+      );
       this.#logger?.debug(
-        `Pool ${this.labelAddress(pool.address)} has ${availableS} liquidity, needs ${diffS} more for the minimum of ${minS} ${this.sdk.tokensMeta.symbol(pool.underlying)}`
+        `Pool ${this.labelAddress(pool.address)} has ${availableS} liquidity, needs ${diffS} more for the minimum of ${minS}`
       );
       if (diff > 0n) {
         deposits.push([pool, diff]);
@@ -382,7 +387,15 @@ class AccountOpener extends SDKConstruct {
     );
     const depositor = await this.#getDepositor();
     this.#logger?.debug(`depositor: ${depositor.address}`);
-    await this.#claimFromFaucet(depositor, "depositor", totalUSD);
+    try {
+      await this.#claimFromFaucet(depositor, "depositor", totalUSD);
+    } catch (e) {
+      if (this.#allowMint) {
+        this.#logger?.error(`depositor failed to claim from faucet: ${e}`);
+      } else {
+        throw e;
+      }
+    }
     const results = [];
     for (const [pool, amount] of deposits) {
       const result = await this.#depositToPool(pool, depositor, amount);
@@ -400,7 +413,9 @@ class AccountOpener extends SDKConstruct {
     };
     let txHash;
     try {
-      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
+      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount, {
+        symbol: true
+      });
       this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
       let allowance = await this.#anvil.readContract({
         address: underlying,
@@ -410,7 +425,7 @@ class AccountOpener extends SDKConstruct {
       });
       if (allowance < amount) {
         this.#logger?.warn(
-          `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)} is less than the amount to deposit: ${amnt}`
+          `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance, { symbol: true })} is less than the amount to deposit: ${amnt}`
         );
         if (this.#allowMint) {
           allowance = await this.#tryMint(
@@ -421,7 +436,7 @@ class AccountOpener extends SDKConstruct {
         }
       }
       this.#logger?.debug(
-        `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)}`
+        `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance, { symbol: true })}`
       );
       txHash = await this.#anvil.writeContract({
         account: depositor,
@@ -479,14 +494,11 @@ class AccountOpener extends SDKConstruct {
    * @param amount
    */
   async #tryMint(token, dest, amount) {
-    const symbol = this.sdk.tokensMeta.symbol(token);
-    const amnt = this.sdk.tokensMeta.formatBN(token, amount);
+    const amnt = this.sdk.tokensMeta.formatBN(token, amount, { symbol: true });
     try {
       await this.#mint(token, dest, amount);
     } catch (e) {
-      this.#logger?.warn(
-        `failed to mint ${amnt} ${symbol} to ${dest.address}: ${e}`
-      );
+      this.#logger?.warn(`failed to mint ${amnt} to ${dest.address}: ${e}`);
     }
     return await this.#anvil.readContract({
       address: token,
@@ -510,6 +522,44 @@ class AccountOpener extends SDKConstruct {
       address: owner,
       value: parseEther("100")
     });
+    try {
+      await this.#mintDirectly(owner, token, amount, dest.address);
+    } catch (e) {
+      this.#logger?.warn(
+        `failed to mint directly ${amnt} ${symbol} to ${dest.address}: ${e}`
+      );
+      try {
+        this.#mintAndTransfer(owner, token, amount, dest.address);
+      } catch (e2) {
+        this.#logger?.warn(
+          `failed to mint and transfer ${amnt} ${symbol} to ${dest.address}: ${e2}`
+        );
+      }
+    }
+    await this.#anvil.stopImpersonatingAccount({ address: owner });
+  }
+  async #mintDirectly(owner, token, amount, dest) {
+    const hash = await this.#anvil.writeContract({
+      account: owner,
+      address: token,
+      abi: parseAbi([
+        "function mint(address to, uint256 amount) returns (bool)"
+      ]),
+      functionName: "mint",
+      args: [dest, amount],
+      chain: this.#anvil.chain
+    });
+    this.#logger?.debug(
+      `mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}`
+    );
+    const receipt = await this.#anvil.waitForTransactionReceipt({ hash });
+    if (receipt.status === "reverted") {
+      throw new Error(
+        `failed to mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}: reverted`
+      );
+    }
+  }
+  async #mintAndTransfer(owner, token, amount, dest) {
     let hash = await this.#anvil.writeContract({
       account: owner,
       address: token,
@@ -518,11 +568,13 @@ class AccountOpener extends SDKConstruct {
       args: [amount],
       chain: this.#anvil.chain
     });
-    this.#logger?.debug(`mint ${amnt} ${symbol} to ${owner} in tx ${hash}`);
+    this.#logger?.debug(
+      `mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}`
+    );
     let receipt = await this.#anvil.waitForTransactionReceipt({ hash });
     if (receipt.status === "reverted") {
       throw new Error(
-        `failed to mint ${amnt} ${symbol} to ${owner} in tx ${hash}: reverted`
+        `failed to mint ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })} to ${owner} in tx ${hash}: reverted`
       );
     }
     hash = await this.#anvil.writeContract({
@@ -530,19 +582,18 @@ class AccountOpener extends SDKConstruct {
       address: token,
       abi: ierc20Abi,
       functionName: "transfer",
-      args: [dest.address, amount],
+      args: [dest, amount],
       chain: this.#anvil.chain
     });
     this.#logger?.debug(
-      `transfer ${amnt} ${symbol} from ${owner} to ${dest.address} in tx ${hash}`
+      `transfer ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })}  from ${owner} to ${dest} in tx ${hash}`
     );
     receipt = await this.#anvil.waitForTransactionReceipt({ hash });
     if (receipt.status === "reverted") {
       throw new Error(
-        `failed to transfer ${amnt} ${symbol} from ${owner} to ${dest.address} in tx ${hash}: reverted`
+        `failed to transfer ${this.sdk.tokensMeta.formatBN(token, amount, { symbol: true })}  from ${owner} to ${dest} in tx ${hash}: reverted`
       );
     }
-    await this.#anvil.stopImpersonatingAccount({ address: owner });
   }
   /**
    * Creates borrower wallet,
@@ -809,17 +860,23 @@ class AccountOpener extends SDKConstruct {
     const desiredQuota = this.#calcQuota(amount, debt, collateralLT);
     logger?.debug(
       {
-        desiredQuota: this.sdk.tokensMeta.formatBN(underlying, desiredQuota),
+        desiredQuota: this.sdk.tokensMeta.formatBN(underlying, desiredQuota, {
+          symbol: true
+        }),
         availableQuota: this.sdk.tokensMeta.formatBN(
           underlying,
-          availableQuota
+          availableQuota,
+          { symbol: true }
         ),
         collateralAmount: this.sdk.tokensMeta.formatBN(
           collateral,
-          collateralAmount
+          collateralAmount,
+          { symbol: true }
         ),
-        amount: this.sdk.tokensMeta.formatBN(underlying, amount),
-        debt: this.sdk.tokensMeta.formatBN(underlying, debt),
+        amount: this.sdk.tokensMeta.formatBN(underlying, amount, {
+          symbol: true
+        }),
+        debt: this.sdk.tokensMeta.formatBN(underlying, debt, { symbol: true }),
         lt: Number(collateralLT)
       },
       "calculated quota"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "9.9.4",
+  "version": "9.9.5",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",