Sync with master and fix conflicts

Author: pedromcunha

src/adapters/hyperliquid/index.ts

@@ -0,0 +1,26 @@
+import { Chain } from "@defillama/sdk/build/general";
+import { BridgeAdapter, PartialContractEventParams } from "../../helpers/bridgeAdapter.type";
+import { constructTransferParams } from "../../helpers/eventParams";
+import { getTxDataFromEVMEventLogs } from "../../helpers/processTransactions";
+
+const HYPERLIQUID_BRIDGE_ADDRESS = "0x2Df1c51E09aECF9cacB7bc98cB1742757f163dF7";
+
+const erc20WithdrawalEventParams: PartialContractEventParams = constructTransferParams(
+  HYPERLIQUID_BRIDGE_ADDRESS,
+  false
+);
+
+const erc20DepositEventParams: PartialContractEventParams = constructTransferParams(HYPERLIQUID_BRIDGE_ADDRESS, true);
+
+const constructParams = (chain: string) => {
+  let eventParams = [] as PartialContractEventParams[];
+  eventParams.push(erc20WithdrawalEventParams, erc20DepositEventParams);
+  return async (fromBlock: number, toBlock: number) =>
+    getTxDataFromEVMEventLogs("hyperliquid", chain as Chain, fromBlock, toBlock, eventParams);
+};
+
+const adapter: BridgeAdapter = {
+  arbitrum: constructParams("arbitrum"),
+};
+
+export default adapter;

src/adapters/index.ts

@@ -76,6 +76,7 @@ import wormhole from "./wormhole";
 import thresholdnetwork from "./threshold-network";
 import zircuit from "./zircuit";
 import relay from "./relay";
+import hyperliquid from "./hyperliquid";
 
 export default {
   polygon,
@@ -155,6 +156,7 @@ export default {
   thresholdnetwork,
   zircuit,
   relay,
+  hyperliquid,
 } as {
   [bridge: string]: BridgeAdapter | AsyncBridgeAdapter;
 };

src/adapters/orbiter/index.ts

@@ -36,8 +36,13 @@ const eoaAddressErc = [
   "0x8086061cf07c03559fbb4aa58f191f9c4a5df2b2",
   "0x732efacd14b0355999aebb133585787921aba3a9",
   "0x34723b92ae9708ba33843120a86035d049da7dfa",
-  "0x095d2918b03b2e86d68551dcf11302121fb626c9"
-
+  "0x095d2918b03b2e86d68551dcf11302121fb626c9",
+  "0x3bDB03ad7363152DFBc185Ee23eBC93F0CF93fd1",
+  "0xACc517ea627CEb71Cf25e002AdAa9761623837b9",
+  "0x9C6750D463aD17Deec97A630aF766F0A78F95127",
+  "0xA8bD77769c875f8490E4B49f4c02A1Dd83D21a18",
+  "0xa383A72e000C056ccEaa9305B7B5d2D90887fbFd",
+  "0xed01d58Fe6433A5Fe69720a0aa0Ab1d1fdB15212"
 ];
 
 const eoaAddressNative = [
@@ -53,8 +58,14 @@ const eoaAddressNative = [
   "0x8086061cf07c03559fbb4aa58f191f9c4a5df2b2",
   "0x732efacd14b0355999aebb133585787921aba3a9",
   "0x34723b92ae9708ba33843120a86035d049da7dfa",
-  "0x095d2918b03b2e86d68551dcf11302121fb626c9"
-
+  "0x095d2918b03b2e86d68551dcf11302121fb626c9",
+  "0x095d2918b03b2e86d68551dcf11302121fb626c9",
+  "0x3bDB03ad7363152DFBc185Ee23eBC93F0CF93fd1",
+  "0xACc517ea627CEb71Cf25e002AdAa9761623837b9",
+  "0x9C6750D463aD17Deec97A630aF766F0A78F95127",
+  "0xA8bD77769c875f8490E4B49f4c02A1Dd83D21a18",
+  "0xa383A72e000C056ccEaa9305B7B5d2D90887fbFd",
+  "0xed01d58Fe6433A5Fe69720a0aa0Ab1d1fdB15212"
 ];
 
 const nativeTokens: Record<string, string> = {

src/data/bridgeNetworkData.ts

@@ -1804,4 +1804,14 @@ export default [
       "Proof of Play Boss",
     ],
   },
+  {
+    id: 80,
+    displayName: "Hyperliquid",
+    bridgeDbName: "hyperliquid",
+    iconLink: "icons:hyperliquid",
+    largeTxThreshold: 10000,
+    url: "https://app.hyperliquid.xyz/trade",
+    chains: ["Arbitrum", "Hyperliquid"],
+    destinationChain: "Hyperliquid",
+  },
 ] as BridgeNetwork[];

src/server/cron.ts

@@ -5,6 +5,7 @@ import { runAdaptersFromTo } from "./jobs/runAdaptersFromTo";
 import { handler as runWormhole } from "../handlers/runWormhole";
 import { aggregateHourlyVolume } from "./jobs/aggregateHourlyVolume";
 import { aggregateDailyVolume } from "./jobs/aggregateDailyVolume";
+import { warmAllCaches } from "./jobs/warmCache";
 
 const createTimeout = (minutes: number) =>
   new Promise((_, reject) =>
@@ -21,6 +22,10 @@ const withTimeout = async (promise: Promise<any>, timeoutMinutes: number) => {
 };
 
 const cron = () => {
+  if (process.env.NO_CRON) {
+    return;
+  }
+
   new CronJob("15,30,45 * * * *", async () => {
     await withTimeout(runAllAdapters(), 10);
   }).start();
@@ -44,6 +49,10 @@ const cron = () => {
   new CronJob("35 * * * *", async () => {
     await withTimeout(aggregateDailyVolume(), 20);
   }).start();
+
+  new CronJob("*/5 * * * *", async () => {
+    await withTimeout(warmAllCaches(), 4);
+  }).start();
 };
 
 export default cron;

src/server/index.ts

@@ -12,7 +12,7 @@ import getTransactions from "../handlers/getTransactions";
 import runAdapter from "../handlers/runAdapter";
 import getBridgeStatsOnDay from "../handlers/getBridgeStatsOnDay";
 import cron from "./cron";
-import { generateApiCacheKey, cache } from "../utils/cache";
+import { generateApiCacheKey, cache, registerCacheHandler, warmCache, needsWarming } from "../utils/cache";
 
 dotenv.config();
 
@@ -42,7 +42,13 @@ const lambdaToFastify = (handler: Function) => async (request: any, reply: any)
 
   const cacheKey = generateApiCacheKey(event);
   const cachedData = cache.get(cacheKey);
+
+  registerCacheHandler(cacheKey, () => handler(event));
+
   if (cachedData) {
+    if (needsWarming(cacheKey)) {
+      warmCache(cacheKey);
+    }
     return reply.code(200).send(cachedData);
   }
 

src/server/jobs/warmCache.ts

@@ -0,0 +1,18 @@
+import { warmCache, handlerRegistry, needsWarming } from "../../utils/cache";
+
+const warmAllCaches = async () => {
+  const cacheKeys = Array.from(handlerRegistry.keys());
+
+  for (const cacheKey of cacheKeys) {
+    try {
+      if (needsWarming(cacheKey)) {
+        await warmCache(cacheKey);
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+      }
+    } catch (error) {
+      console.error(`Failed to warm cache for key ${cacheKey}:`, error);
+    }
+  }
+};
+
+export { warmAllCaches };

src/utils/cache.ts

@@ -1,17 +1,20 @@
 import { LRUCache } from "lru-cache";
 import hash from "object-hash";
 
-export const cache = new LRUCache({
-  max: 1000,
-  ttl: 1000 * 60 * 60,
-});
-
 interface APIEvent {
   pathParameters?: Record<string, any>;
   queryStringParameters?: Record<string, any>;
   body?: any;
 }
 
+export const handlerRegistry = new Map<string, Function>();
+
+export const cache = new LRUCache<string, any>({
+  max: 1000,
+  ttl: 1000 * 60 * 60,
+  updateAgeOnGet: false,
+});
+
 export const generateApiCacheKey = (event: APIEvent): string => {
   const eventToNormalize = {
     path: event.pathParameters || {},
@@ -27,6 +30,33 @@ export const generateApiCacheKey = (event: APIEvent): string => {
   }).substring(0, 16);
 };
 
+export const CACHE_WARM_THRESHOLD = 1000 * 60 * 10;
+
+export const needsWarming = (cacheKey: string): boolean => {
+  if (!cache.has(cacheKey)) return true;
+
+  const ttlRemaining = cache.getRemainingTTL(cacheKey);
+  return ttlRemaining !== undefined && ttlRemaining < CACHE_WARM_THRESHOLD;
+};
+
+export const warmCache = async (cacheKey: string): Promise<void> => {
+  const handler = handlerRegistry.get(cacheKey);
+  if (!handler) {
+    return;
+  }
+  try {
+    const result = await handler();
+    const parsedBody = JSON.parse(result.body);
+    cache.set(cacheKey, parsedBody);
+  } catch (error) {
+    throw error;
+  }
+};
+
+export const registerCacheHandler = (cacheKey: string, handler: Function) => {
+  handlerRegistry.set(cacheKey, handler);
+};
+
 export const getCacheKey = (...parts: (string | undefined)[]) => parts.filter(Boolean).join(":");
 
 export const DEFAULT_TTL = 600;

src/utils/runAdapterHistorical.ts

@@ -98,7 +98,7 @@ const runAllAdaptersHistorical = async (startTimestamp: number, endTimestamp: nu
   }
 };
 
-if (bridgeName && chain) {
+if (bridgeName) {
   fillAdapterHistorical(startTs, endTs, bridgeName, chain);
 } else {
   runAllAdaptersHistorical(startTs, endTs);