@merkl/api 0.20.80 → 0.20.82

package/dist/src/backgroundJobs/index.js

@@ -1,5 +1,3 @@
-// @ts-nocheck
-import { Redis } from "@/cache";
 import { redisClient } from "@/cache/redis";
 import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase } from "@/engine/dynamicData/utils/getEulerV2Vaults";
 import { CacheService } from "@/modules/v4/cache";
@@ -27,7 +25,7 @@ new Elysia({
     .get("/eulerUpdate", async () => {
     log.info("🔃 updating Euler vaults...");
     await updateEulerVaultsCollatInDatabase();
-    await Redis.safeSet("EulerV2Vaults", await getEulerV2Vaults()); // TODO: keeping it with Redis for debug purposes, will do the transition soon
+    await CacheService.set(TTLPresets.DAY_1, getEulerV2Vaults); // TODO: keeping it with Redis for debug purposes, will do the transition soon
 })
     .get("/uniswapv4Update", async () => {
     log.info("🔃 updating UniswapV4 pools...");

package/dist/src/eden/index.d.ts

@@ -4281,7 +4281,7 @@ declare const eden: {
                 };
                 fetch?: RequestInit | undefined;
             }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                200: EulerVaultType[];
+                200: EulerVaultType[] | undefined;
             }>>;
         }) & {
             index: {
@@ -4290,7 +4290,7 @@ declare const eden: {
                     query?: Record<string, unknown> | undefined;
                     fetch?: RequestInit | undefined;
                 } | undefined) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                    200: EulerVaultType[];
+                    200: EulerVaultType[] | null;
                 }>>;
             };
             update: ((params: {
@@ -10088,7 +10088,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: unknown;
                     headers: unknown;
                     response: {
-                        200: EulerVaultType[];
+                        200: EulerVaultType[] | null;
                     };
                 };
             };
@@ -10104,7 +10104,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                     headers: unknown;
                     response: {
-                        200: EulerVaultType[];
+                        200: EulerVaultType[] | undefined;
                     };
                 };
             };
@@ -14958,7 +14958,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 };
                 fetch?: RequestInit | undefined;
             }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                200: EulerVaultType[];
+                200: EulerVaultType[] | undefined;
             }>>;
         }) & {
             index: {
@@ -14967,7 +14967,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query?: Record<string, unknown> | undefined;
                     fetch?: RequestInit | undefined;
                 } | undefined) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                    200: EulerVaultType[];
+                    200: EulerVaultType[] | null;
                 }>>;
             };
             update: ((params: {

package/dist/src/index.d.ts

@@ -5352,7 +5352,7 @@ declare const app: Elysia<"", false, {
                     query: unknown;
                     headers: unknown;
                     response: {
-                        200: EulerVaultType[];
+                        200: EulerVaultType[] | null;
                     };
                 };
             };
@@ -5368,7 +5368,7 @@ declare const app: Elysia<"", false, {
                     };
                     headers: unknown;
                     response: {
-                        200: EulerVaultType[];
+                        200: EulerVaultType[] | undefined;
                     };
                 };
             };

package/dist/src/jobs/update-euler-vaults.js

@@ -1,12 +1,13 @@
-import { Redis } from "@/cache";
 import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase } from "@/engine/dynamicData/utils/getEulerV2Vaults";
+import { CacheService } from "@/modules/v4/cache";
+import { TTLPresets } from "@/modules/v4/cache/cache.model";
 import { logger } from "@/utils/logger";
 (async () => {
     try {
-        // First update collat values in database
+        // First update collat values directly in database
         await updateEulerVaultsCollatInDatabase();
         // Second update Redis cache
-        await Redis.safeSet("EulerV2Vaults", await getEulerV2Vaults());
+        await CacheService.set(TTLPresets.DAY_1, getEulerV2Vaults);
     }
     catch (e) {
         console.error(e);

package/dist/src/modules/v4/router.js

@@ -27,8 +27,6 @@ import bigintToString from "@/utils/bigintToString";
 import { opentelemetry } from "@elysiajs/opentelemetry";
 import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { PgInstrumentation } from "@opentelemetry/instrumentation-pg";
-import { RedisInstrumentation } from "@opentelemetry/instrumentation-redis";
 import { AlwaysOffSampler, BatchSpanProcessor } from "@opentelemetry/sdk-trace-node";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
 import Elysia from "elysia";
@@ -37,7 +35,7 @@ import { ReferralController } from "./referral/referral.controller";
 export const v4 = new Elysia({ tags: ["v4"], prefix: "/v4" })
     // ─── OpenTelemetry ───────────────────────────────────────────────────
     .use(opentelemetry({
-    sampler: process.env.TRACE === "true" ? new TailSampler(0.1) : new AlwaysOffSampler(),
+    sampler: process.env.TRACE === "true" ? new TailSampler(0.01) : new AlwaysOffSampler(),
     spanProcessors: [
         new BatchSpanProcessor(new OTLPTraceExporter({
             url: process.env.OTEL_COLLECTOR,
@@ -46,12 +44,8 @@ export const v4 = new Elysia({ tags: ["v4"], prefix: "/v4" })
             },
         })),
     ],
-    instrumentations: [
-        new PgInstrumentation(),
-        new RedisInstrumentation(),
-        new PrismaInstrumentation(),
-        getNodeAutoInstrumentations(),
-    ],
+    instrumentations: [getNodeAutoInstrumentations(), new PrismaInstrumentation()],
+    serviceName: "merkl-api",
 }))
     // ─── Error Handling ──────────────────────────────────────────────────
     .use(ErrorHandler)

package/dist/src/modules/v4/uniswap/uniswap.service.js

@@ -185,7 +185,6 @@ export class UniswapService {
                         fetchedAtBlock: pool.fetchedAtBlock,
                         lpFee: pool.lpFee,
                         poolId: id,
-                        poolKey: pool.poolKey,
                         symbolCurrency0,
                         symbolCurrency1,
                         tickSpacing: pool.tickSpacing,

package/dist/src/routes/v3/euler.d.ts

@@ -20,7 +20,7 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
                 query: unknown;
                 headers: unknown;
                 response: {
-                    200: EulerVaultType[];
+                    200: EulerVaultType[] | null;
                 };
             };
         };
@@ -36,7 +36,7 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
                 };
                 headers: unknown;
                 response: {
-                    200: EulerVaultType[];
+                    200: EulerVaultType[] | undefined;
                 };
             };
         };

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

@@ -1,19 +1,20 @@
-import { Redis } from "@/cache";
 import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase } from "@/engine/dynamicData/utils/getEulerV2Vaults";
 import { AuthorizationHeadersDto, BackOfficeGuard } from "@/guards/BackOffice.guard";
+import { CacheService } from "@/modules/v4/cache";
+import { TTLPresets } from "@/modules/v4/cache/cache.model";
 import { ChainUniqueDto } from "@/modules/v4/chain/chain.model";
 import { UnsupportedNetwork } from "@/utils/error";
 import { eulerChainIds } from "@sdk";
 import { t } from "elysia";
 export default (app) => app.group("/euler", router => router
     .get("/", async () => {
-    return await Redis.get("EulerV2Vaults");
+    return await CacheService.get(getEulerV2Vaults, []);
 }, {
     tags: ["euler"],
 })
     .get("/:chainId", async ({ params, query }) => {
-    return (await Redis.get("EulerV2Vaults"))
-        .filter(v => v.chainId === params.chainId)
+    return (await CacheService.get(getEulerV2Vaults, []))
+        ?.filter(v => v.chainId === params.chainId)
         .filter(v => (!!query.vaultAddress ? v.address === query.vaultAddress : true));
 }, {
     params: ChainUniqueDto,
@@ -28,7 +29,7 @@ export default (app) => app.group("/euler", router => router
 })
     .post("/update", async () => {
     await updateEulerVaultsCollatInDatabase();
-    await Redis.safeSet("EulerV2Vaults", await getEulerV2Vaults());
+    await CacheService.set(TTLPresets.DAY_1, getEulerV2Vaults);
 }, {
     headers: AuthorizationHeadersDto,
     beforeHandle: BackOfficeGuard,
@@ -36,7 +37,7 @@ export default (app) => app.group("/euler", router => router
 })
     .post("/update/:chainId", async ({ params }) => {
     await updateEulerVaultsCollatInDatabase(params.chainId);
-    await Redis.safeSet("EulerV2Vaults", await getEulerV2Vaults());
+    await CacheService.set(TTLPresets.DAY_1, getEulerV2Vaults);
     // // DEBUG ONLY
     // return await getEulerV2Vaults(params.chainId);
 }, {

package/dist/src/routes/v3/router.d.ts

@@ -235,7 +235,7 @@ export declare const v3: Elysia<"/v3", false, {
                     query: unknown;
                     headers: unknown;
                     response: {
-                        200: EulerVaultType[];
+                        200: EulerVaultType[] | null;
                     };
                 };
             };
@@ -251,7 +251,7 @@ export declare const v3: Elysia<"/v3", false, {
                     };
                     headers: unknown;
                     response: {
-                        200: EulerVaultType[];
+                        200: EulerVaultType[] | undefined;
                     };
                 };
             };