@gearbox-protocol/sdk 8.13.0 → 8.14.0

package/dist/cjs/dev/AccountOpener.js

@@ -73,9 +73,10 @@ class AccountOpener extends import_sdk.SDKConstruct {
    * Tries to open account with underlying only in each CM
    */
   async openCreditAccounts(targets, depositIntoPools = true, claimFromFaucet2 = true) {
+    let deposits = [];
     if (depositIntoPools) {
       try {
-        await this.#depositIntoPools(targets);
+        deposits = await this.#depositIntoPools(targets);
       } catch (e) {
         this.#logger?.warn(`failed to deposit into pools: ${e}`);
       }
@@ -96,13 +97,13 @@ class AccountOpener extends import_sdk.SDKConstruct {
         await this.#approve(token, cm);
       }
     }
-    const results = [];
+    const accounts = [];
     let success = 0;
     for (let i = 0; i < targets.length; i++) {
       const target = targets[i];
       try {
         const result = await this.#openAccount(target, i + 1, targets.length);
-        results.push(result);
+        accounts.push(result);
         success += result.account ? 1 : 0;
         if (result.error) {
           this.#logger?.error(
@@ -113,7 +114,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
         this.#logger?.error(
           `failed to open account #${i + 1}/${targets.length}: ${e}`
         );
-        results.push({
+        accounts.push({
           input: target,
           error: e
         });
@@ -121,12 +122,12 @@ class AccountOpener extends import_sdk.SDKConstruct {
     }
     this.#logger?.info(`opened ${success}/${targets.length} accounts`);
     try {
-      await this.#directlyDistributeTokens(results);
+      await this.#directlyDistributeTokens(accounts);
       this.#logger?.info("distributed direct transfer tokens");
     } catch (e) {
       this.#logger?.error(`failed to distribute tokens: ${e}`);
     }
-    return results;
+    return { deposits, accounts };
   }
   async #openAccount(input, index, total) {
     const { creditManager, target: collateral } = input;
@@ -316,58 +317,82 @@ class AccountOpener extends import_sdk.SDKConstruct {
     const depositor = await this.#createAccount();
     this.#logger?.debug(`created depositor ${depositor.address}`);
     await this.#claimFromFaucet(depositor, "depositor", totalUSD);
+    const results = [];
     for (const [pool, amount] of deposits) {
-      try {
-        await this.#depositToPool(pool, depositor, amount);
-      } catch (e) {
-        this.#logger?.warn(`failed to deposit into ${pool.name}: ${e}`);
-      }
+      const result = await this.#depositToPool(pool, depositor, amount);
+      results.push(result);
     }
+    return results;
   }
   async #depositToPool(pool, depositor, amount) {
     const { underlying, address } = pool;
     const poolName = this.sdk.provider.addressLabels.get(address);
-    const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
-    this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
-    const allowance = await this.#anvil.readContract({
-      address: underlying,
-      abi: import_iERC20.ierc20Abi,
-      functionName: "balanceOf",
-      args: [depositor.address]
-    });
-    this.#logger?.debug(
-      `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)}`
-    );
-    let hash = await this.#anvil.writeContract({
-      account: depositor,
-      address: underlying,
-      abi: import_iERC20.ierc20Abi,
-      functionName: "approve",
-      args: [address, allowance],
-      chain: this.#anvil.chain
-    });
-    let receipt = await this.#anvil.waitForTransactionReceipt({ hash });
-    if (receipt.status === "reverted") {
-      throw new Error(
-        `tx ${hash} that approves underlying from depositor for pool ${poolName} reverted`
+    const poolData = {
+      pool: address,
+      token: underlying,
+      amount
+    };
+    let txHash;
+    try {
+      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
+      this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
+      const allowance = await this.#anvil.readContract({
+        address: underlying,
+        abi: import_iERC20.ierc20Abi,
+        functionName: "balanceOf",
+        args: [depositor.address]
+      });
+      this.#logger?.debug(
+        `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)}`
       );
+      txHash = await this.#anvil.writeContract({
+        account: depositor,
+        address: underlying,
+        abi: import_iERC20.ierc20Abi,
+        functionName: "approve",
+        args: [address, allowance],
+        chain: this.#anvil.chain
+      });
+      let receipt = await this.#anvil.waitForTransactionReceipt({
+        hash: txHash
+      });
+      if (receipt.status === "reverted") {
+        throw new Error(
+          `tx ${txHash} that approves underlying from depositor for pool ${poolName} reverted`
+        );
+      }
+      this.#logger?.debug(
+        `depositor approved underlying for pool ${poolName}: ${txHash}`
+      );
+      txHash = await this.#anvil.writeContract({
+        account: depositor,
+        address,
+        abi: import_v300.iPoolV300Abi,
+        functionName: "deposit",
+        args: [amount, depositor.address],
+        chain: this.#anvil.chain
+      });
+      receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });
+      if (receipt.status === "reverted") {
+        throw new Error(
+          `tx ${txHash} that deposits to pool ${poolName} reverted`
+        );
+      }
+      this.#logger?.debug(`deposited ${amnt} into ${poolName}`);
+      return {
+        ...poolData,
+        txHash,
+        success: true
+      };
+    } catch (e) {
+      this.#logger?.error(`failed to deposit to pool ${poolName}: ${e}`);
+      return {
+        ...poolData,
+        txHash,
+        success: false,
+        error: e
+      };
     }
-    this.#logger?.debug(
-      `depositor approved underlying for pool ${poolName}: ${hash}`
-    );
-    hash = await this.#anvil.writeContract({
-      account: depositor,
-      address,
-      abi: import_v300.iPoolV300Abi,
-      functionName: "deposit",
-      args: [amount, depositor.address],
-      chain: this.#anvil.chain
-    });
-    receipt = await this.#anvil.waitForTransactionReceipt({ hash });
-    if (receipt.status === "reverted") {
-      throw new Error(`tx ${hash} that deposits to pool ${poolName} reverted`);
-    }
-    this.#logger?.debug(`deposited ${amnt} into ${poolName}`);
   }
   /**
    * Creates borrower wallet,

package/dist/esm/dev/AccountOpener.js

@@ -65,9 +65,10 @@ class AccountOpener extends SDKConstruct {
    * Tries to open account with underlying only in each CM
    */
   async openCreditAccounts(targets, depositIntoPools = true, claimFromFaucet2 = true) {
+    let deposits = [];
     if (depositIntoPools) {
       try {
-        await this.#depositIntoPools(targets);
+        deposits = await this.#depositIntoPools(targets);
       } catch (e) {
         this.#logger?.warn(`failed to deposit into pools: ${e}`);
       }
@@ -88,13 +89,13 @@ class AccountOpener extends SDKConstruct {
         await this.#approve(token, cm);
       }
     }
-    const results = [];
+    const accounts = [];
     let success = 0;
     for (let i = 0; i < targets.length; i++) {
       const target = targets[i];
       try {
         const result = await this.#openAccount(target, i + 1, targets.length);
-        results.push(result);
+        accounts.push(result);
         success += result.account ? 1 : 0;
         if (result.error) {
           this.#logger?.error(
@@ -105,7 +106,7 @@ class AccountOpener extends SDKConstruct {
         this.#logger?.error(
           `failed to open account #${i + 1}/${targets.length}: ${e}`
         );
-        results.push({
+        accounts.push({
           input: target,
           error: e
         });
@@ -113,12 +114,12 @@ class AccountOpener extends SDKConstruct {
     }
     this.#logger?.info(`opened ${success}/${targets.length} accounts`);
     try {
-      await this.#directlyDistributeTokens(results);
+      await this.#directlyDistributeTokens(accounts);
       this.#logger?.info("distributed direct transfer tokens");
     } catch (e) {
       this.#logger?.error(`failed to distribute tokens: ${e}`);
     }
-    return results;
+    return { deposits, accounts };
   }
   async #openAccount(input, index, total) {
     const { creditManager, target: collateral } = input;
@@ -308,58 +309,82 @@ class AccountOpener extends SDKConstruct {
     const depositor = await this.#createAccount();
     this.#logger?.debug(`created depositor ${depositor.address}`);
     await this.#claimFromFaucet(depositor, "depositor", totalUSD);
+    const results = [];
     for (const [pool, amount] of deposits) {
-      try {
-        await this.#depositToPool(pool, depositor, amount);
-      } catch (e) {
-        this.#logger?.warn(`failed to deposit into ${pool.name}: ${e}`);
-      }
+      const result = await this.#depositToPool(pool, depositor, amount);
+      results.push(result);
     }
+    return results;
   }
   async #depositToPool(pool, depositor, amount) {
     const { underlying, address } = pool;
     const poolName = this.sdk.provider.addressLabels.get(address);
-    const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
-    this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
-    const allowance = await this.#anvil.readContract({
-      address: underlying,
-      abi: ierc20Abi,
-      functionName: "balanceOf",
-      args: [depositor.address]
-    });
-    this.#logger?.debug(
-      `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)}`
-    );
-    let hash = await this.#anvil.writeContract({
-      account: depositor,
-      address: underlying,
-      abi: ierc20Abi,
-      functionName: "approve",
-      args: [address, allowance],
-      chain: this.#anvil.chain
-    });
-    let receipt = await this.#anvil.waitForTransactionReceipt({ hash });
-    if (receipt.status === "reverted") {
-      throw new Error(
-        `tx ${hash} that approves underlying from depositor for pool ${poolName} reverted`
+    const poolData = {
+      pool: address,
+      token: underlying,
+      amount
+    };
+    let txHash;
+    try {
+      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
+      this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
+      const allowance = await this.#anvil.readContract({
+        address: underlying,
+        abi: ierc20Abi,
+        functionName: "balanceOf",
+        args: [depositor.address]
+      });
+      this.#logger?.debug(
+        `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance)}`
       );
+      txHash = await this.#anvil.writeContract({
+        account: depositor,
+        address: underlying,
+        abi: ierc20Abi,
+        functionName: "approve",
+        args: [address, allowance],
+        chain: this.#anvil.chain
+      });
+      let receipt = await this.#anvil.waitForTransactionReceipt({
+        hash: txHash
+      });
+      if (receipt.status === "reverted") {
+        throw new Error(
+          `tx ${txHash} that approves underlying from depositor for pool ${poolName} reverted`
+        );
+      }
+      this.#logger?.debug(
+        `depositor approved underlying for pool ${poolName}: ${txHash}`
+      );
+      txHash = await this.#anvil.writeContract({
+        account: depositor,
+        address,
+        abi: iPoolV300Abi,
+        functionName: "deposit",
+        args: [amount, depositor.address],
+        chain: this.#anvil.chain
+      });
+      receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });
+      if (receipt.status === "reverted") {
+        throw new Error(
+          `tx ${txHash} that deposits to pool ${poolName} reverted`
+        );
+      }
+      this.#logger?.debug(`deposited ${amnt} into ${poolName}`);
+      return {
+        ...poolData,
+        txHash,
+        success: true
+      };
+    } catch (e) {
+      this.#logger?.error(`failed to deposit to pool ${poolName}: ${e}`);
+      return {
+        ...poolData,
+        txHash,
+        success: false,
+        error: e
+      };
     }
-    this.#logger?.debug(
-      `depositor approved underlying for pool ${poolName}: ${hash}`
-    );
-    hash = await this.#anvil.writeContract({
-      account: depositor,
-      address,
-      abi: iPoolV300Abi,
-      functionName: "deposit",
-      args: [amount, depositor.address],
-      chain: this.#anvil.chain
-    });
-    receipt = await this.#anvil.waitForTransactionReceipt({ hash });
-    if (receipt.status === "reverted") {
-      throw new Error(`tx ${hash} that deposits to pool ${poolName} reverted`);
-    }
-    this.#logger?.debug(`deposited ${amnt} into ${poolName}`);
   }
   /**
    * Creates borrower wallet,

package/dist/types/dev/AccountOpener.d.ts

@@ -1,4 +1,4 @@
-import type { Address, Hash, PrivateKeyAccount } from "viem";
+import type { Address, Hash, Hex, PrivateKeyAccount } from "viem";
 import { BaseError } from "viem";
 import type { CreditAccountData, ICreditAccountsService, RawTx } from "../sdk/index.js";
 import { SDKConstruct } from "../sdk/index.js";
@@ -40,6 +40,22 @@ export interface OpenAccountResult {
     rawTx?: RawTx;
     account?: CreditAccountData;
 }
+export type PoolDepositResult = {
+    pool: Address;
+    token: Address;
+    amount: bigint;
+} & ({
+    success: true;
+    txHash: Hex;
+} | {
+    success: false;
+    error: Error;
+    txHash?: Hex;
+});
+export interface OpenAccountsResult {
+    deposits: PoolDepositResult[];
+    accounts: OpenAccountResult[];
+}
 export declare class AccountOpener extends SDKConstruct {
     #private;
     constructor(service: ICreditAccountsService, options?: AccountOpenerOptions);
@@ -47,7 +63,7 @@ export declare class AccountOpener extends SDKConstruct {
     /**
      * Tries to open account with underlying only in each CM
      */
-    openCreditAccounts(targets: TargetAccount[], depositIntoPools?: boolean, claimFromFaucet?: boolean): Promise<OpenAccountResult[]>;
+    openCreditAccounts(targets: TargetAccount[], depositIntoPools?: boolean, claimFromFaucet?: boolean): Promise<OpenAccountsResult>;
     prepareOpen(input: TargetAccount): Promise<RawTx>;
     getOpenedAccounts(): Promise<CreditAccountData[]>;
     get faucet(): Address;

package/package.json

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