@gearbox-protocol/sdk 3.0.0-vfour.243 → 3.0.0-vfour.244

package/dist/cjs/dev/index.cjs

@@ -283,24 +283,58 @@ var AccountOpener = class extends sdk.SDKConstruct {
     this.#logger?.debug(`created depositor ${depositor.address}`);
     await this.#claimFromFaucet(depositor, totalUSD);
     for (const [pool, amount] of deposits) {
-      const poolName = this.sdk.provider.addressLabels.get(pool.address);
-      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
-      this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
       try {
-        await this.#anvil.writeContract({
-          account: depositor,
-          chain: this.#anvil.chain,
-          address: pool.address,
-          abi: sdk.iPoolV300Abi,
-          functionName: "deposit",
-          args: [amount, depositor.address]
-        });
-        this.#logger?.debug(`deposited ${amnt} into ${poolName}`);
+        await this.#depositToPool(pool, depositor, amount);
       } catch (e) {
-        this.#logger?.warn(`failed to deposit ${amnt} into ${poolName}: ${e}`);
+        this.#logger?.warn(`failed to deposit into ${pool.name}: ${e}`);
       }
     }
   }
+  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: sdk.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: sdk.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`
+      );
+    }
+    this.#logger?.debug(
+      `depositor approved underlying for pool ${poolName}: ${hash}`
+    );
+    hash = await this.#anvil.writeContract({
+      account: depositor,
+      address,
+      abi: sdk.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,
    * Sets ETH balance,

package/dist/esm/dev/index.mjs

@@ -1,6 +1,6 @@
 import { createTestClient, publicActions, walletActions, toHex, parseEventLogs, isAddress, parseEther, createWalletClient, http, createPublicClient, stringToHex } from 'viem';
 import { privateKeyToAccount, generatePrivateKey } from 'viem/accounts';
-import { SDKConstruct, childLogger, AddressMap, sendRawTx, iCreditFacadeV300Abi, PERCENTAGE_FACTOR, formatBN, iPoolV300Abi, ADDRESS_0X0, ierc20Abi, MAX_UINT256, iDegenNftv2Abi, AP_PRICE_FEED_COMPRESSOR, iPriceFeedCompressorAbi, rawTxToMulticallPriceUpdate, GearboxSDK, json_stringify, iAddressProviderV300Abi, ADDRESS_PROVIDER, iAddressProviderV310Abi, WAD } from '../sdk/index.mjs';
+import { SDKConstruct, childLogger, AddressMap, sendRawTx, iCreditFacadeV300Abi, PERCENTAGE_FACTOR, formatBN, ierc20Abi, iPoolV300Abi, ADDRESS_0X0, MAX_UINT256, iDegenNftv2Abi, AP_PRICE_FEED_COMPRESSOR, iPriceFeedCompressorAbi, rawTxToMulticallPriceUpdate, GearboxSDK, json_stringify, iAddressProviderV300Abi, ADDRESS_PROVIDER, iAddressProviderV310Abi, WAD } from '../sdk/index.mjs';
 import { writeFile, readFile } from 'node:fs/promises';
 
 // src/dev/AccountOpener.ts
@@ -281,24 +281,58 @@ var AccountOpener = class extends SDKConstruct {
     this.#logger?.debug(`created depositor ${depositor.address}`);
     await this.#claimFromFaucet(depositor, totalUSD);
     for (const [pool, amount] of deposits) {
-      const poolName = this.sdk.provider.addressLabels.get(pool.address);
-      const amnt = this.sdk.tokensMeta.formatBN(pool.underlying, amount) + " " + this.sdk.tokensMeta.symbol(pool.underlying);
-      this.#logger?.debug(`depositing ${amnt} into pool ${poolName}`);
       try {
-        await this.#anvil.writeContract({
-          account: depositor,
-          chain: this.#anvil.chain,
-          address: pool.address,
-          abi: iPoolV300Abi,
-          functionName: "deposit",
-          args: [amount, depositor.address]
-        });
-        this.#logger?.debug(`deposited ${amnt} into ${poolName}`);
+        await this.#depositToPool(pool, depositor, amount);
       } catch (e) {
-        this.#logger?.warn(`failed to deposit ${amnt} into ${poolName}: ${e}`);
+        this.#logger?.warn(`failed to deposit into ${pool.name}: ${e}`);
       }
     }
   }
+  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`
+      );
+    }
+    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,
    * Sets ETH balance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfour.243",
+  "version": "3.0.0-vfour.244",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.cjs",