Update CachingUtils.ts

src/utils/CachingUtils.ts

@@ -2,8 +2,10 @@ import { DEFAULT_CACHING_SAFE_LAG, DEFAULT_CACHING_TTL } from "../constants";
 import { CachingMechanismInterface, Deposit, Fill, SlowFillRequest } from "../interfaces";
 import { assert } from "./LogUtils";
 import { composeRevivers, objectWithBigNumberReviver } from "./ReviverUtils";
+import { getV3RelayHashFromEvent } from "./SpokeUtils";
 import { getCurrentTime } from "./TimeUtils";
 import { isDefined } from "./TypeGuards";
+import { isV2Deposit, isV2Fill } from "./V3Utils";
 
 export function shouldCache(eventTimestamp: number, latestTime: number, cachingMaxAge: number): boolean {
   assert(eventTimestamp.toString().length === 10, "eventTimestamp must be in seconds");
@@ -45,9 +47,15 @@ export async function setDepositInCache(
 
 /**
  * Resolves the key for caching a bridge event.
- * @param bridgeEvent The depositId, depositor, and originChainId are used to generate the key.
+ * @param bridgeEvent The depositId, and originChainId are used to generate the key for v2, and the 
+ * full V3 relay hash is used for v3 events..
  * @returns The key for caching the event.
  */
 export function getDepositKey(bridgeEvent: Deposit | Fill | SlowFillRequest): string {
-  return `deposit_${bridgeEvent.originChainId}_${bridgeEvent.depositId}_${bridgeEvent.depositor}`;
+  if (isV2Deposit(bridgeEvent as Deposit) || isV2Fill(bridgeEvent)) {
+    return `deposit_${bridgeEvent.originChainId}_${bridgeEvent.depositId}`;
+  } else {
+    const relayHash = getV3RelayHashFromEvent(bridgeEvent);
+    return `deposit_${bridgeEvent.originChainId}_${bridgeEvent.depositId}_${relayHash}`;
+  }
 }