update bundler fee estimation

Author: alvrs

packages/common/src/transports/wiresaw.ts

@@ -34,6 +34,7 @@ export function wiresaw<const wiresawTransport extends Transport>(
       ...rest,
       // TODO: type `request` so we don't have to cast
       async request(req): ReturnType<EIP1193RequestFn> {
+        console.log("rpc request", req.method);
         try {
           if (req.method === "eth_chainId") {
             if (chainId != null) return chainId;

packages/entrykit/playground/wagmiConfig.ts

@@ -4,7 +4,6 @@ import { createWagmiConfig } from "../src/createWagmiConfig";
 import { chainId } from "./common";
 import { garnet, pyrope } from "@latticexyz/common/chains";
 import { wiresaw } from "@latticexyz/common/internal";
-import { withFeeCache } from "../src/utils/withFeeCache";
 
 const redstoneWithPaymaster = {
   ...redstone,
@@ -81,7 +80,7 @@ const chains = [
   mainnet,
   garnetWithPaymaster,
   anvilWithPaymaster,
-  withFeeCache(redstoneWithPaymaster),
+  redstoneWithPaymaster,
   pyropeWithPaymaster,
 ] as const satisfies Chain[];
 

packages/entrykit/src/actions/cachedFeesPerGas.ts

@@ -0,0 +1,28 @@
+import { Client, EstimateFeesPerGasReturnType } from "viem";
+import { estimateFeesPerGas } from "viem/actions";
+
+type CachedFeesPerGasOptions = {
+  updateInterval?: number;
+};
+
+export function cachedFeesPerGas(
+  client: Client,
+  options: CachedFeesPerGasOptions = { updateInterval: 30_000 },
+): () => Promise<EstimateFeesPerGasReturnType<"eip1559">> {
+  let fees: EstimateFeesPerGasReturnType<"eip1559"> | null = null;
+
+  async function updateFees() {
+    console.log("updating fees");
+    fees = await estimateFeesPerGas(client);
+  }
+
+  updateFees();
+  setInterval(updateFees, options.updateInterval);
+
+  return async () => {
+    console.log("asking for fees");
+    if (fees) return fees;
+    fees = await estimateFeesPerGas(client);
+    return fees;
+  };
+}

packages/entrykit/src/createBundlerClient.ts

@@ -7,8 +7,7 @@ import {
 } from "viem/account-abstraction";
 import { defaultClientConfig } from "./common";
 import { getPaymaster } from "./getPaymaster";
-import { getAction } from "viem/utils";
-import { estimateFeesPerGas } from "viem/actions";
+import { cachedFeesPerGas } from "./actions/cachedFeesPerGas";
 
 export function createBundlerClient<
   transport extends Transport,
@@ -59,7 +58,6 @@ function createFeeEstimator(client: Client): undefined | (() => Promise<Estimate
   // because viem sets fees way too high by default
   // https://github.com/wevm/viem/blob/253b1072ad9fe36a0e0491e173c85a6d69209ada/src/account-abstraction/actions/bundler/prepareUserOperation.ts#L436-L457
   if ([690, 17069, 695569].includes(client.chain.id)) {
-    // TODO: move to fee ref or similar approach
-    return () => getAction(client, estimateFeesPerGas, "estimateFeesPerGas")({ chain: client.chain });
+    return cachedFeesPerGas(client);
   }
 }

packages/entrykit/src/utils/withFeeCache.ts

@@ -1,5 +1,5 @@
-import { Chain, createClient, EstimateFeesPerGasReturnType, http } from "viem";
-import { estimateFeesPerGas } from "viem/actions";
+import { Chain, createClient, http } from "viem";
+import { cachedFeesPerGas } from "../actions/cachedFeesPerGas";
 
 type WithFeeCacheOptions = {
   updateInterval?: number;
@@ -11,30 +11,16 @@ export function withFeeCache(chain: Chain, options: WithFeeCacheOptions = { upda
     throw new Error("withFeeCache: estimateFeesPerGas already defined in chain config");
   }
 
-  let fees: EstimateFeesPerGasReturnType<"eip1559"> | null = null;
-
   const client = createClient({
     chain,
     transport: http(),
   });
 
-  async function updateFees() {
-    console.log("updating fees");
-    fees = await estimateFeesPerGas(client);
-    console.log("updated fees", fees);
-  }
-
-  updateFees();
-  setInterval(updateFees, options.updateInterval);
-
   return {
     ...chain,
     fees: {
       ...chain.fees,
-      estimateFeesPerGas: async (args) => {
-        console.log("asking for fees", args);
-        return fees;
-      },
+      estimateFeesPerGas: cachedFeesPerGas(client, options),
     },
   };
 }