fix(blue-sdk-wagmi): remove blockNumber from query keys to prevent OOM

prd-carapulse[bot] · web-flow · commit 4331527f7404 · 2026-03-25T11:33:52.000Z
Remove blockNumber and blockTag from all fetch*QueryKey functions so that
TanStack Query reuses a single cache entry per entity instead of creating
~2,200 new entries every block (~10s on Base L2).

Before: each block spawns N new Query objects, old ones fail to gc at scale,
memory grows ~2.3 MB/s → OOM in ~20 min on heavy markets (Base cbBTC/USDC).

After: queries are stable. blockNumber/blockTag are captured in the queryFn
closure and passed to the underlying viem fetch calls, so RPC reads still
target the correct block. Consumers drive re-fetches by calling
invalidateAllBlueSdkQueries(queryClient) on each new block.

Changes:
- queries/fetch*.ts: exclude blockNumber and blockTag from queryKey return;
  capture them from the parameters closure for queryFn.
- hooks/use*.ts: remove staleTime: Infinity default when blockNumber is set.
  Consumers can still pass staleTime via the query parameter.
- simulation-sdk-wagmi/useSimulationState: drop Infinity staleTime override.
- New export: invalidateAllBlueSdkQueries() + BLUE_SDK_QUERY_NAMES constant
  for consumer-driven block-change invalidation.

BREAKING CHANGE: Query keys no longer contain blockNumber/blockTag.
Code that accesses the cache with block-specific keys
(queryClient.getQueryData(['fetchMarket', { ..., blockNumber }]))
must be updated. staleTime no longer defaults to Infinity when
blockNumber is provided.
diff --git a/packages/blue-sdk-wagmi/src/hooks/useHolding.ts b/packages/blue-sdk-wagmi/src/hooks/useHolding.ts
@@ -49,8 +49,6 @@ export function useHolding<
     enabled:
       parameters.user != null && parameters.token != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useHoldings.ts b/packages/blue-sdk-wagmi/src/hooks/useHoldings.ts
@@ -54,9 +54,7 @@ export function useHoldings<
       }),
       enabled: holding.user != null && holding.token != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useMarket.ts b/packages/blue-sdk-wagmi/src/hooks/useMarket.ts
@@ -48,8 +48,6 @@ export function useMarket<
     ...options,
     enabled: parameters.marketId != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useMarkets.ts b/packages/blue-sdk-wagmi/src/hooks/useMarkets.ts
@@ -46,9 +46,7 @@ export function useMarkets<config extends Config = ResolvedRegister["config"]>({
       }),
       enabled: marketId != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/usePosition.ts b/packages/blue-sdk-wagmi/src/hooks/usePosition.ts
@@ -52,8 +52,6 @@ export function usePosition<
     enabled:
       parameters.user != null && parameters.marketId != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/usePositions.ts b/packages/blue-sdk-wagmi/src/hooks/usePositions.ts
@@ -55,9 +55,7 @@ export function usePositions<
       enabled:
         position.user != null && position.marketId != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useToken.ts b/packages/blue-sdk-wagmi/src/hooks/useToken.ts
@@ -43,8 +43,6 @@ export function useToken<
     ...options,
     enabled: parameters.token != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useTokens.ts b/packages/blue-sdk-wagmi/src/hooks/useTokens.ts
@@ -45,9 +45,7 @@ export function useTokens<config extends Config = ResolvedRegister["config"]>({
       }),
       enabled: token != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useUser.ts b/packages/blue-sdk-wagmi/src/hooks/useUser.ts
@@ -43,8 +43,6 @@ export function useUser<
     ...options,
     enabled: parameters.user != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useUsers.ts b/packages/blue-sdk-wagmi/src/hooks/useUsers.ts
@@ -45,9 +45,7 @@ export function useUsers<config extends Config = ResolvedRegister["config"]>({
       }),
       enabled: user != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVault.ts b/packages/blue-sdk-wagmi/src/hooks/useVault.ts
@@ -43,8 +43,6 @@ export function useVault<
     ...options,
     enabled: parameters.vault != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultMarketConfig.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultMarketConfig.ts
@@ -50,8 +50,6 @@ export function useVaultMarketConfig<
     enabled:
       parameters.vault != null && parameters.marketId != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultMarketConfigs.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultMarketConfigs.ts
@@ -60,9 +60,7 @@ export function useVaultMarketConfigs<
         vaultMarketConfig.marketId != null &&
         query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultUser.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultUser.ts
@@ -53,8 +53,6 @@ export function useVaultUser<
     enabled:
       parameters.vault != null && parameters.user != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultUsers.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultUsers.ts
@@ -54,9 +54,7 @@ export function useVaultUsers<
       }),
       enabled: vault != null && user != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultV2.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultV2.ts
@@ -48,8 +48,6 @@ export function useVaultV2<
     ...options,
     enabled: parameters.vaultV2 != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultV2Adapter.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultV2Adapter.ts
@@ -49,8 +49,6 @@ export function useVaultV2Adapter<
     ...options,
     enabled: parameters.vaultV2Adapter != null && query.enabled,
     structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-    staleTime:
-      query.staleTime ??
-      (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+    staleTime: query.staleTime,
   });
 }
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultV2Adapters.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultV2Adapters.ts
@@ -53,9 +53,7 @@ export function useVaultV2Adapters<
       }),
       enabled: vaultV2Adapter != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaultV2s.ts b/packages/blue-sdk-wagmi/src/hooks/useVaultV2s.ts
@@ -50,9 +50,7 @@ export function useVaultV2s<
       }),
       enabled: vaultV2 != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/hooks/useVaults.ts b/packages/blue-sdk-wagmi/src/hooks/useVaults.ts
@@ -45,9 +45,7 @@ export function useVaults<config extends Config = ResolvedRegister["config"]>({
       }),
       enabled: vault != null && query.enabled,
       structuralSharing: query.structuralSharing ?? replaceDeepEqual,
-      staleTime:
-        query.staleTime ??
-        (parameters.blockNumber != null ? Number.POSITIVE_INFINITY : undefined),
+      staleTime: query.staleTime,
     })),
   });
 
diff --git a/packages/blue-sdk-wagmi/src/index.ts b/packages/blue-sdk-wagmi/src/index.ts
@@ -1,4 +1,5 @@
 export * from "./hooks/index.js";
 export * from "./queries/index.js";
+export * from "./query-key-prefix.js";
 export * from "./types/index.js";
 export * from "./utils/index.js";
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchHolding.ts b/packages/blue-sdk-wagmi/src/queries/fetchHolding.ts
@@ -19,6 +19,8 @@ export function fetchHoldingQueryOptions<config extends Config>(
   config: config,
   parameters: FetchHoldingParameters,
 ) {
+  const { blockNumber, blockTag } = parameters;
+
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
@@ -30,6 +32,8 @@ export function fetchHoldingQueryOptions<config extends Config>(
       return fetchHolding(user, token, config.getClient({ chainId }), {
         chainId,
         ...parameters,
+        blockNumber,
+        blockTag,
       });
     },
     queryKey: fetchHoldingQueryKey(parameters),
@@ -46,8 +50,6 @@ export function fetchHoldingQueryKey({
   user,
   token,
   chainId,
-  blockTag,
-  blockNumber,
   deployless,
   account,
   stateOverride,
@@ -59,8 +61,6 @@ export function fetchHoldingQueryKey({
       user,
       token,
       chainId,
-      blockTag,
-      blockNumber,
       deployless,
       account,
       stateOverride,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchMarket.ts b/packages/blue-sdk-wagmi/src/queries/fetchMarket.ts
@@ -19,6 +19,8 @@ export function fetchMarketQueryOptions<config extends Config>(
   config: config,
   parameters: FetchMarketParameters,
 ) {
+  const { blockNumber, blockTag } = parameters;
+
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
@@ -29,6 +31,8 @@ export function fetchMarketQueryOptions<config extends Config>(
       return fetchMarket(marketId, config.getClient({ chainId }), {
         chainId,
         ...parameters,
+        blockNumber,
+        blockTag,
       });
     },
     queryKey: fetchMarketQueryKey(parameters),
@@ -44,8 +48,6 @@ export function fetchMarketQueryOptions<config extends Config>(
 export function fetchMarketQueryKey({
   marketId,
   chainId,
-  blockTag,
-  blockNumber,
   deployless,
   account,
   stateOverride,
@@ -56,8 +58,6 @@ export function fetchMarketQueryKey({
     {
       marketId,
       chainId,
-      blockTag,
-      blockNumber,
       deployless,
       account,
       stateOverride,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchPosition.ts b/packages/blue-sdk-wagmi/src/queries/fetchPosition.ts
@@ -16,6 +16,8 @@ export function fetchPositionQueryOptions<config extends Config>(
   config: config,
   parameters: FetchPositionParameters,
 ) {
+  const { blockNumber, blockTag } = parameters;
+
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
@@ -27,6 +29,8 @@ export function fetchPositionQueryOptions<config extends Config>(
       return fetchPosition(user, marketId, config.getClient({ chainId }), {
         chainId,
         ...parameters,
+        blockNumber,
+        blockTag,
       });
     },
     queryKey: fetchPositionQueryKey(parameters),
@@ -43,8 +47,6 @@ export function fetchPositionQueryKey({
   user,
   marketId,
   chainId,
-  blockTag,
-  blockNumber,
   account,
   stateOverride,
 }: FetchPositionParameters) {
@@ -55,8 +57,6 @@ export function fetchPositionQueryKey({
       user,
       marketId,
       chainId,
-      blockTag,
-      blockNumber,
       account,
       stateOverride,
     } as FetchPositionParameters,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchToken.ts b/packages/blue-sdk-wagmi/src/queries/fetchToken.ts
@@ -19,6 +19,8 @@ export function fetchTokenQueryOptions<config extends Config>(
   config: config,
   parameters: FetchTokenParameters,
 ) {
+  const { blockNumber, blockTag } = parameters;
+
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
@@ -29,6 +31,8 @@ export function fetchTokenQueryOptions<config extends Config>(
       return fetchToken(token, config.getClient({ chainId }), {
         chainId,
         ...parameters,
+        blockNumber,
+        blockTag,
       });
     },
     queryKey: fetchTokenQueryKey(parameters),
@@ -44,8 +48,6 @@ export function fetchTokenQueryOptions<config extends Config>(
 export function fetchTokenQueryKey({
   token,
   chainId,
-  blockTag,
-  blockNumber,
   deployless,
   account,
   stateOverride,
@@ -56,8 +58,6 @@ export function fetchTokenQueryKey({
     {
       token,
       chainId,
-      blockTag,
-      blockNumber,
       deployless,
       account,
       stateOverride,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchUser.ts b/packages/blue-sdk-wagmi/src/queries/fetchUser.ts
@@ -15,6 +15,8 @@ export function fetchUserQueryOptions<config extends Config>(
   config: config,
   parameters: FetchUserParameters,
 ) {
+  const { blockNumber, blockTag } = parameters;
+
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
@@ -25,6 +27,8 @@ export function fetchUserQueryOptions<config extends Config>(
       return fetchUser(user, config.getClient({ chainId }), {
         chainId,
         ...parameters,
+        blockNumber,
+        blockTag,
       });
     },
     queryKey: fetchUserQueryKey(parameters),
@@ -40,8 +44,6 @@ export function fetchUserQueryOptions<config extends Config>(
 export function fetchUserQueryKey({
   user,
   chainId,
-  blockTag,
-  blockNumber,
   account,
   stateOverride,
 }: FetchUserParameters) {
@@ -51,8 +53,6 @@ export function fetchUserQueryKey({
     {
       user,
       chainId,
-      blockTag,
-      blockNumber,
       account,
       stateOverride,
     } as FetchUserParameters,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVault.ts b/packages/blue-sdk-wagmi/src/queries/fetchVault.ts
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultMarketConfig.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultMarketConfig.ts
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultUser.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultUser.ts
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultV2.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultV2.ts
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultV2Adapter.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultV2Adapter.ts
diff --git a/packages/blue-sdk-wagmi/src/query-key-prefix.ts b/packages/blue-sdk-wagmi/src/query-key-prefix.ts
diff --git a/packages/simulation-sdk-wagmi/src/hooks/useSimulationState.ts b/packages/simulation-sdk-wagmi/src/hooks/useSimulationState.ts
