@merkl/api 0.12.2 → 0.12.4

package/dist/src/backgroundJobs/index.js

@@ -1,4 +1,7 @@
+import { Redis } from "../cache";
 import { redisClient } from "../cache/redis";
+import { getEulerV2Vaults } from "../libs/campaigns/utils/getEulerV2Vaults";
+import { getUniswapV4Pools } from "../libs/campaigns/utils/getUniswapV4Pools";
 import { DungeonKeeperController } from "../modules/v4/dungeonKeeper";
 import { log } from "../utils/logger";
 import { engineDbClient } from "../utils/prisma";
@@ -25,6 +28,12 @@ new Elysia({
     .use(priceUpdater) // /v3/updatePrices
     .use(healthCheck) // /v3/health
     .use(sync) // GET /jobs/api/sync-with-engine
+    .get("/eulerUpdate", async () => {
+    await Redis.safeSet("EulerV2Vaults", getEulerV2Vaults);
+})
+    .get("/uniswapv4Update", async () => {
+    await Redis.safeSet("UniswapV4Pools", getUniswapV4Pools);
+})
     .group("/v4", app => {
     return app.use(DungeonKeeperController);
 })

package/dist/src/cache/declaration.d.ts

@@ -32,7 +32,7 @@ export declare const CacheDeclaration: {
     };
     EulerV2Vaults: {
         compressed: false;
-        redisTTL: TTLType.Minutes30;
+        redisTTL: TTLType.Hours3;
         localCache: false;
     };
     CompoundV2ForksVaults: {

package/dist/src/cache/declaration.js

@@ -20,7 +20,7 @@ export const CacheDeclaration = {
     },
     EulerV2Vaults: {
         compressed: false,
-        redisTTL: TTLType.Minutes30,
+        redisTTL: TTLType.Hours3,
         localCache: false,
     },
     CompoundV2ForksVaults: {

package/dist/src/cache/redis.d.ts

@@ -1,3 +1,4 @@
+import { type RedisFunctions, type RedisModules, type RedisScripts } from "redis";
 export declare const REDIS_RETRIES = 0;
 export declare const REDIS_READ_TIMEOUT: number;
 export declare const REDIS_WRITE_TIMEOUT = 4000;
@@ -308,4 +309,4 @@ export declare const redisClient: import("@redis/client").RedisClientType<{
         RESERVE: typeof import("@redis/bloom/dist/commands/top-k/RESERVE");
         reserve: typeof import("@redis/bloom/dist/commands/top-k/RESERVE");
     };
-} & import("redis").RedisModules, import("redis").RedisFunctions, import("redis").RedisScripts>;
+} & RedisModules, RedisFunctions, RedisScripts>;

package/dist/src/cache/redis.js

@@ -1,5 +1,5 @@
 import { log } from "../utils/logger";
-import { createClient } from "redis";
+import { createClient, } from "redis";
 const REDISHOST = process.env.REDISHOST || "redis";
 const REDISPORT = !!process.env.REDISPORT ? Number(process.env.REDISPORT) : 6379;
 const REDISPASSWORD = process.env.REDISPASSWORD || "";
@@ -35,15 +35,22 @@ export var TTLType;
  */
 const redisConfig = {
     url: `redis://${REDISHOST}:${REDISPORT}`,
-    socket: REDISHOST === "redis" ? undefined : { tls: true },
+    socket: REDISHOST === "redis"
+        ? undefined
+        : {
+            tls: true,
+            reconnectStrategy: retries => Math.min(retries * 100, 5000),
+            keepAlive: 5_000,
+        },
     password: REDISPASSWORD,
 };
 export const redisClient = createClient(redisConfig);
 redisClient.on("error", error => {
-    log.error("Redis", error);
+    log.error("[REDIS]", error);
+    redisClient.connect().catch(() => { }); // Auto-reconnect
 });
 redisClient.connect();
-redisClient.on("end", () => log.info("Redis: disconnected"));
+redisClient.on("end", () => log.debug("[REDIS]: disconnected"));
 redisClient.on("ready", () => {
-    log.debug("Redis: connected!");
+    log.debug("[REDIS]: connected");
 });

package/dist/src/jobs/etl/pendings.js

@@ -64,7 +64,7 @@ const load = async (pendings) => {
     log.info(`pushing ${pendings.length} pendings`);
     const { updated, created } = await updatePendings({
         distributionChainId: chainId,
-        rewardToken: pendings[0].rewardToken,
+        rewardToken: pendings[0].rewardToken, // sometimes undefined
         campaignId,
         root,
         data: pendings,

package/dist/src/jobs/update-prices.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/jobs/update-prices.js

@@ -0,0 +1,10 @@
+import { TokenService } from "../modules/v4";
+import { log } from "../utils/logger";
+import { Pricer } from "../utils/pricer";
+const pricer = await Pricer.load();
+await pricer.update();
+log.info("✅ Price cache updated successfully!");
+log.info("⏳ Updating API database...");
+await TokenService.updatePrices(pricer);
+log.info("✅ API database updated successfully!");
+process.exit(0);

package/dist/src/libs/campaigns/utils/getEulerV2Vaults.d.ts

@@ -18,4 +18,5 @@ export type EulerVaultType = {
         symbolUnderlying: string;
     }[];
 };
+export declare function getEulerV2Vaults(): Promise<EulerVaultType[]>;
 export declare const getEulerV2VaultsWithCache: () => Promise<EulerVaultType[]>;

package/dist/src/libs/campaigns/utils/getEulerV2Vaults.js

@@ -12,7 +12,7 @@ export var LoggedEntityType;
     LoggedEntityType["EULER"] = "EULER_VAULT";
     LoggedEntityType["UNISWAP_V4"] = "UNISWAP_V4";
 })(LoggedEntityType || (LoggedEntityType = {}));
-async function getEulerV2Vaults() {
+export async function getEulerV2Vaults() {
     let vaults = [];
     // 0_ Fetch all euler vaults from database
     const storedVaults = await apiDbClient.logged.findMany({

package/dist/src/libs/campaigns/utils/getUniswapV4Pools.d.ts

@@ -4,4 +4,5 @@ export type UniswapV4PoolsReturnType = {
         [poolId: string]: UniswapV4PoolType;
     };
 };
+export declare function getUniswapV4Pools(): Promise<UniswapV4PoolsReturnType>;
 export declare const getUniswapV4PoolsWithCache: () => Promise<UniswapV4PoolsReturnType>;

package/dist/src/libs/campaigns/utils/getUniswapV4Pools.js

@@ -2,11 +2,11 @@ import { Redis } from "../../../cache";
 import { log } from "../../../utils/logger";
 import { apiDbClient } from "../../../utils/prisma";
 import { providers } from "../../../utils/providers";
-import { ChainInteractionService, ERC20Interface, NETWORK_LABELS, NULL_ADDRESS, PoolManagerInterface, UniswapV4Addresses, getContractCreationBlock, } from "@sdk";
+import { ChainInteractionService, ERC20Interface, NETWORK_LABELS, NULL_ADDRESS, UniswapV4Addresses, UniswapV4PoolManagerInterface, getContractCreationBlock, } from "@sdk";
 import { safeFetchLogs } from "./fetchLogs";
 import { LoggedEntityType } from "./getEulerV2Vaults";
 const UNIV4_CHAINIDS = Object.keys(UniswapV4Addresses).map((x) => Number(x));
-async function getUniswapV4Pools() {
+export async function getUniswapV4Pools() {
     const pools = {};
     // 0_ Fetch all euler vaults from database
     const storedPools = await apiDbClient.logged.findMany({
@@ -30,9 +30,9 @@ async function getUniswapV4Pools() {
             }
             const toBlock = await jsonRPCprovider.getBlockNumber();
             const logs = await safeFetchLogs(chainId, // TODO: rm type enforcing
-            [PoolManagerInterface.getEventTopic("Initialize")], [poolManagerAddress], fromBlock, toBlock);
+            [UniswapV4PoolManagerInterface.getEventTopic("Initialize")], [poolManagerAddress], fromBlock, toBlock);
             const decodedPools = await Promise.all(logs.map(async (log) => {
-                const [id, currency0, currency1, fee, tickSpacing, hooks] = PoolManagerInterface.decodeEventLog("Initialize", log.data, log.topics);
+                const [id, currency0, currency1, fee, tickSpacing, hooks] = UniswapV4PoolManagerInterface.decodeEventLog("Initialize", log.data, log.topics);
                 // Respect typing
                 return {
                     poolId: id,

package/dist/src/routes/v3/euler.js

@@ -5,5 +5,5 @@ export default (app) => app.get("/euler", async () => {
     return await getEulerV2VaultsWithCache();
 }, {
     query: t.Object({}),
-    tags: ["Protocols"],
+    tags: ["euler"],
 });