fix: use publicClient for estimate gas (#438)

* fix: use publicClient for estimate gas

* fix tests and upgrade prool

* fix

* changeset

Author: coffeexcoin

.changeset/twelve-foxes-swim.md

@@ -0,0 +1,5 @@
+---
+"@abstract-foundation/agw-client": patch
+---
+
+Use publicClient for estimate gas instead of internal/wrapped transport

packages/agw-client/package.json

@@ -60,7 +60,7 @@
   "devDependencies": {
     "@types/node": "^22.12.5",
     "@vitest/coverage-v8": "^3.2.4",
-    "prool": "^0.0.23",
+    "prool": "^0.2.4",
     "viem": "^2.37.0",
     "vitest": "^3.2.4"
   },

packages/agw-client/src/actions/prepareTransaction.ts

@@ -426,7 +426,7 @@ export async function prepareTransactionRequest<
       (async () => {
         try {
           request.gas = await getAction(
-            client,
+            publicClient,
             estimateGas,
             'estimateGas',
           )({

packages/agw-client/test/anvil.ts

@@ -1,5 +1,4 @@
-import { createServer } from 'prool';
-import { type AnvilParameters, anvil } from 'prool/instances';
+import { Instance, Server } from 'prool';
 import {
   type Account,
   type Address,
@@ -49,7 +48,7 @@ function getEnv(key: string, fallback: string): string {
 }
 
 type DefineAnvilParameters<chain extends Chain> = Omit<
-  AnvilParameters,
+  Instance.anvil.Parameters,
   'forkBlockNumber' | 'forkUrl'
 > & {
   chain: chain;
@@ -208,8 +207,8 @@ function defineAnvil<const chain extends Chain>(
       await fetch(`${rpcUrl.http}/restart`);
     },
     async start() {
-      return await createServer({
-        instance: anvil({
+      return await Server.create({
+        instance: Instance.anvil({
           forkUrl,
           forkBlockNumber,
           ...options,

packages/agw-client/test/debug-global-setup.ts

@@ -0,0 +1,12 @@
+import globalSetup from './globalSetup.ts';
+
+async function main() {
+  const stop = await globalSetup();
+  console.log('global setup ok', typeof stop);
+  if (typeof stop === 'function') await stop();
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

packages/agw-client/test/src/actions/prepareTransaction.test.ts

@@ -1,15 +1,15 @@
 import {
   createClient,
-  createNonceManager,
-  createPublicClient,
   createWalletClient,
   EIP1193RequestFn,
   encodeFunctionData,
   http,
   keccak256,
   NonceManager,
-  nonceManager,
+  PublicClient,
   parseEther,
+  publicActions,
+  Transport,
   toBytes,
   toHex,
 } from 'viem';
@@ -63,6 +63,12 @@ const baseClientRequestSpy = vi.fn(async ({ method, params }) => {
   }
   if (method === 'eth_estimateGas') {
     return MOCK_ETH_ESTIMATE_GAS_LIMIT;
+  } else if (method === 'zks_estimateFee') {
+    throw new Error('zks_estimateFee not supported');
+  } else if (method === 'eth_gasPrice') {
+    return toHex(MOCK_FEE_PER_GAS);
+  } else if (method === 'eth_getBalance') {
+    return toHex(1000000000000000000n); // 1 ETH
   }
   return anvilAbstractTestnet.getClient().request({ method, params } as any);
 });
@@ -82,23 +88,9 @@ signerClient.request = (async ({ method, params }) => {
   return anvilAbstractTestnet.getClient().request({ method, params } as any);
 }) as EIP1193RequestFn;
 
-const publicClient = createPublicClient({
-  chain: anvilAbstractTestnet.chain as ChainEIP712,
-  transport: anvilAbstractTestnet.clientConfig.transport,
-});
-
-publicClient.request = (async ({ method, params }) => {
-  if (method === 'zks_estimateFee') {
-    throw new Error('zks_estimateFee not supported');
-  } else if (method === 'eth_estimateGas') {
-    return toHex(MOCK_ETH_ESTIMATE_GAS_LIMIT);
-  } else if (method === 'eth_gasPrice') {
-    return toHex(MOCK_FEE_PER_GAS);
-  } else if (method === 'eth_getBalance') {
-    return toHex(1000000000000000000n); // 1 ETH
-  }
-  return anvilAbstractTestnet.getClient().request({ method, params } as any);
-}) as EIP1193RequestFn;
+const publicClient = baseClient.extend(
+  publicActions,
+) as unknown as PublicClient<Transport, ChainEIP712>;
 
 publicClient.getTransactionCount = vi.fn(async () => {
   return MOCK_NONCE;
@@ -354,13 +346,13 @@ test.each([
 ])('$name', async ({ balance, value, isSponsored, errorType }) => {
   vi.mocked(isSmartAccountDeployed).mockResolvedValue(true);
 
-  // Create a modified public client that returns a specified balance
-  const publicClientWithCustomBalance = createPublicClient({
+  const customBaseClient = createClient({
+    account: address.smartAccountAddress,
     chain: anvilAbstractTestnet.chain as ChainEIP712,
     transport: anvilAbstractTestnet.clientConfig.transport,
   });
 
-  publicClientWithCustomBalance.request = (async ({ method, params }) => {
+  customBaseClient.request = (async ({ method, params }) => {
     if (method === 'zks_estimateFee') {
       throw new Error('zks_estimateFee not supported');
     } else if (method === 'eth_estimateGas') {
@@ -373,6 +365,11 @@ test.each([
     return anvilAbstractTestnet.getClient().request({ method, params } as any);
   }) as EIP1193RequestFn;
 
+  // Create a modified public client that returns a specified balance
+  const publicClientWithCustomBalance = customBaseClient.extend(
+    publicActions,
+  ) as unknown as PublicClient<Transport, ChainEIP712>;
+
   const txWithoutPaymaster = {
     ...transaction,
     ...(value !== undefined && { value }),

packages/agw-client/test/src/actions/sendTransactionInternal.test.ts

@@ -7,7 +7,10 @@ import {
   encodeAbiParameters,
   Hex,
   http,
+  PublicClient,
   parseAbiParameters,
+  publicActions,
+  Transport,
   toFunctionSelector,
 } from 'viem';
 import { toAccount } from 'viem/accounts';
@@ -102,13 +105,14 @@ signerClient.request = (async ({ method, params }) => {
   return anvilAbstractTestnet.getClient().request({ method, params } as any);
 }) as EIP1193RequestFn;
 
-const publicClient = createPublicClient({
-  chain: anvilAbstractTestnet.chain as ChainEIP712,
-  transport: anvilAbstractTestnet.clientConfig.transport,
-});
+const publicClient = baseClient.extend(
+  publicActions,
+) as unknown as PublicClient<Transport, ChainEIP712>;
 
 publicClient.request = (async ({ method, params }) => {
-  if (method === 'zks_estimateFee') {
+  if (method === 'eth_estimateGas') {
+    return 158774n;
+  } else if (method === 'zks_estimateFee') {
     throw new Error('zks_estimateFee not supported');
   }
   return anvilAbstractTestnet.getClient().request({ method, params } as any);