@gearbox-protocol/sdk 8.6.2 → 8.6.3

package/dist/cjs/dev/AccountOpener.js

@@ -388,7 +388,8 @@ class AccountOpener extends import_sdk.SDKConstruct {
   }
   async #claimFromFaucet(claimer, role, amountUSD) {
     await (0, import_claimFromFaucet.claimFromFaucet)({
-      anvil: this.#anvil,
+      publicClient: this.#anvil,
+      wallet: this.#anvil,
       faucet: this.faucet,
       claimer,
       role,

package/dist/cjs/dev/claimFromFaucet.js

@@ -26,21 +26,31 @@ var import_actions = require("viem/actions");
 var import_sdk = require("../sdk/index.js");
 const faucetAbi = (0, import_viem.parseAbi)([
   "function minAmountUSD() external view returns (uint256)",
+  "function claim() external",
   "function claim(uint256 amountUSD) external"
 ]);
 async function claimFromFaucet(opts) {
-  const { anvil, faucet, claimer, role, amountUSD, logger } = opts;
+  const {
+    publicClient,
+    wallet,
+    faucet,
+    claimer,
+    role,
+    amountUSD,
+    logger,
+    gasMultiplier = 10n
+  } = opts;
   let toClaimUSD;
-  if (typeof amountUSD === "function") {
-    toClaimUSD = await (0, import_actions.readContract)(anvil, {
+  if (typeof amountUSD === "bigint") {
+    toClaimUSD = amountUSD;
+  } else if (typeof amountUSD === "function") {
+    toClaimUSD = await (0, import_actions.readContract)(publicClient, {
       address: faucet,
       abi: faucetAbi,
       functionName: "minAmountUSD"
     });
     logger?.debug(`faucet min amount USD: ${toClaimUSD}`);
     toClaimUSD = amountUSD(toClaimUSD);
-  } else {
-    toClaimUSD = amountUSD;
   }
   if (toClaimUSD === 0n) {
     logger?.debug("amount is 0, skipping claim");
@@ -48,28 +58,26 @@ async function claimFromFaucet(opts) {
   }
   const [usr, amnt] = [
     [role, claimer.address].filter(Boolean).join(" "),
-    (0, import_sdk.formatBN)(toClaimUSD, 8)
+    toClaimUSD ? (0, import_sdk.formatBN)(toClaimUSD, 8) : "default amount"
   ];
   logger?.debug(`${usr} claiming ${amnt} USD from faucet`);
-  const hash = await anvil.writeContract({
+  const gas = await publicClient.estimateContractGas({
+    account: claimer,
+    address: faucet,
+    abi: faucetAbi,
+    functionName: "claim",
+    args: toClaimUSD ? [toClaimUSD] : []
+  });
+  const hash = await wallet.writeContract({
     account: claimer,
     address: faucet,
-    abi: [
-      {
-        type: "function",
-        inputs: [
-          { name: "amountUSD", internalType: "uint256", type: "uint256" }
-        ],
-        name: "claim",
-        outputs: [],
-        stateMutability: "nonpayable"
-      }
-    ],
+    abi: faucetAbi,
     functionName: "claim",
-    args: [toClaimUSD],
-    chain: anvil.chain
+    args: toClaimUSD ? [toClaimUSD] : [],
+    chain: wallet.chain,
+    gas: gas * gasMultiplier
   });
-  const receipt = await anvil.waitForTransactionReceipt({
+  const receipt = await publicClient.waitForTransactionReceipt({
     hash
   });
   if (receipt.status === "reverted") {

package/dist/esm/dev/AccountOpener.js

@@ -373,7 +373,8 @@ class AccountOpener extends SDKConstruct {
   }
   async #claimFromFaucet(claimer, role, amountUSD) {
     await claimFromFaucet({
-      anvil: this.#anvil,
+      publicClient: this.#anvil,
+      wallet: this.#anvil,
       faucet: this.faucet,
       claimer,
       role,

package/dist/esm/dev/claimFromFaucet.js

@@ -1,23 +1,35 @@
-import { parseAbi } from "viem";
+import {
+  parseAbi
+} from "viem";
 import { readContract } from "viem/actions";
 import { formatBN } from "../sdk/index.js";
 const faucetAbi = parseAbi([
   "function minAmountUSD() external view returns (uint256)",
+  "function claim() external",
   "function claim(uint256 amountUSD) external"
 ]);
 async function claimFromFaucet(opts) {
-  const { anvil, faucet, claimer, role, amountUSD, logger } = opts;
+  const {
+    publicClient,
+    wallet,
+    faucet,
+    claimer,
+    role,
+    amountUSD,
+    logger,
+    gasMultiplier = 10n
+  } = opts;
   let toClaimUSD;
-  if (typeof amountUSD === "function") {
-    toClaimUSD = await readContract(anvil, {
+  if (typeof amountUSD === "bigint") {
+    toClaimUSD = amountUSD;
+  } else if (typeof amountUSD === "function") {
+    toClaimUSD = await readContract(publicClient, {
       address: faucet,
       abi: faucetAbi,
       functionName: "minAmountUSD"
     });
     logger?.debug(`faucet min amount USD: ${toClaimUSD}`);
     toClaimUSD = amountUSD(toClaimUSD);
-  } else {
-    toClaimUSD = amountUSD;
   }
   if (toClaimUSD === 0n) {
     logger?.debug("amount is 0, skipping claim");
@@ -25,28 +37,26 @@ async function claimFromFaucet(opts) {
   }
   const [usr, amnt] = [
     [role, claimer.address].filter(Boolean).join(" "),
-    formatBN(toClaimUSD, 8)
+    toClaimUSD ? formatBN(toClaimUSD, 8) : "default amount"
   ];
   logger?.debug(`${usr} claiming ${amnt} USD from faucet`);
-  const hash = await anvil.writeContract({
+  const gas = await publicClient.estimateContractGas({
+    account: claimer,
+    address: faucet,
+    abi: faucetAbi,
+    functionName: "claim",
+    args: toClaimUSD ? [toClaimUSD] : []
+  });
+  const hash = await wallet.writeContract({
     account: claimer,
     address: faucet,
-    abi: [
-      {
-        type: "function",
-        inputs: [
-          { name: "amountUSD", internalType: "uint256", type: "uint256" }
-        ],
-        name: "claim",
-        outputs: [],
-        stateMutability: "nonpayable"
-      }
-    ],
+    abi: faucetAbi,
     functionName: "claim",
-    args: [toClaimUSD],
-    chain: anvil.chain
+    args: toClaimUSD ? [toClaimUSD] : [],
+    chain: wallet.chain,
+    gas: gas * gasMultiplier
   });
-  const receipt = await anvil.waitForTransactionReceipt({
+  const receipt = await publicClient.waitForTransactionReceipt({
     hash
   });
   if (receipt.status === "reverted") {

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

@@ -1,12 +1,13 @@
-import { type Address, type PrivateKeyAccount } from "viem";
+import { type Address, type PrivateKeyAccount, type PublicClient, type WalletClient } from "viem";
 import { type ILogger } from "../sdk/index.js";
-import type { AnvilClient } from "./createAnvilClient.js";
 interface ClaimFromFaucetOptions {
-    anvil: AnvilClient;
+    publicClient: PublicClient;
+    wallet: WalletClient;
     faucet: Address;
     claimer: PrivateKeyAccount;
     role?: string;
-    amountUSD: bigint | ((minAmountUSD: bigint) => bigint);
+    amountUSD?: bigint | ((minAmountUSD: bigint) => bigint);
+    gasMultiplier?: bigint;
     logger?: ILogger;
 }
 export declare function claimFromFaucet(opts: ClaimFromFaucetOptions): Promise<void>;

package/package.json

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