WIP

Signed-off-by: Matt Rice <[email protected]>

Author: mrice32

api/_cache.ts

@@ -88,6 +88,20 @@ export class RedisCache implements interfaces.CachingMechanismInterface {
 
 export const redisCache = new RedisCache();
 
+// For some reason, the upstash client seems to strip the quote characters from the value.
+// This is a workaround to add the quote characters back to the value so the provider responses won't fail to parse.
+export class ProviderRedisCache extends RedisCache {
+  async get<T>(key: string): Promise<T | null> {
+    const value = await super.get<T>(key);
+    if (typeof value === "string") {
+      return ('"' + value + '"') as T;
+    }
+    return value;
+  }
+}
+
+export const providerRedisCache = new ProviderRedisCache();
+
 export function buildCacheKey(
   prefix: string,
   ...args: (string | number)[]

api/_utils.ts

@@ -74,7 +74,7 @@ import {
   buildInternalCacheKey,
   getCachedValue,
   makeCacheGetterAndSetter,
-  redisCache,
+  providerRedisCache,
 } from "./_cache";
 import {
   MissingParamError,
@@ -1261,6 +1261,23 @@ export const getProvider = (
   return providerCache[cacheKey];
 };
 
+// For most chains, we can cache immediately.
+const DEFAULT_CACHE_BLOCK_DISTANCE = 0;
+
+// For chains that can reorg (mainnet and polygon), establish a buffer beyond which reorgs are rare.
+const CUSTOM_CACHE_BLOCK_DISTANCE: Record<number, number> = {
+  1: 2,
+  137: 10,
+};
+
+function getCacheBlockDistance(chainId: number) {
+  const cacheBlockDistance = CUSTOM_CACHE_BLOCK_DISTANCE[chainId];
+  if (!cacheBlockDistance) {
+    return DEFAULT_CACHE_BLOCK_DISTANCE;
+  }
+  return cacheBlockDistance;
+}
+
 /**
  * Resolves a provider from the `rpc-providers.json` configuration file.
  */
@@ -1290,9 +1307,10 @@ function getProviderFromConfigJson(
       3, // retries
       0.5, // delay
       5, // max. concurrency
-      "RPC_PROVIDER", // cache namespace
+      `RPC_PROVIDER_${process.env.RPC_CACHE_NAMESPACE}`, // cache namespace
       0, // disable RPC calls logging
-      redisCache
+      providerRedisCache,
+      getCacheBlockDistance(chainId)
     );
   }
 
@@ -1301,9 +1319,10 @@ function getProviderFromConfigJson(
     chainId,
     3, // max. concurrency used in `SpeedProvider`
     5, // max. concurrency used in `RateLimitedProvider`
-    "RPC_PROVIDER", // cache namespace
+    `RPC_PROVIDER_${process.env.RPC_CACHE_NAMESPACE}`, // cache namespace
     0, // disable RPC calls logging
-    redisCache
+    providerRedisCache,
+    getCacheBlockDistance(chainId)
   );
 }