@merkl/api 0.20.167 → 0.20.168

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

@@ -57,56 +57,11 @@ const main = async () => {
     }, {});
     const now = new Date();
     const today = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), 0, 0, 0, 0)).getTime() / 1000;
-    const firstDayOfMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1, // Day 1 of the month
-    0, // 0 hours
-    0, // 0 minutes
-    0, // 0 seconds
-    0 // 0 milliseconds
-    )).getTime() / 1000;
+    const firstDayOfMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1, 0, 0, 0, 0)).getTime() / 1000;
     const promises = [
-        // ─── Rewards By Types ────────────────────────────────────────
-        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByType, firstDayOfMonth).then(async (result) => {
-            const currentMonthPages = await getPagesOfTheMonth(MONTHLY_REWARDS_BY_TYPES_DATABASE_ID);
-            const promises = [];
-            // ─── Check If Page Already Exists ────────────────────
-            for (const type of Object.keys(result)) {
-                const page = currentMonthPages.find(page => "properties" in page &&
-                    page.properties.Types.title[0].text.content === type);
-                // ─── If Page Exists, Update It ───────────────
-                if (page) {
-                    promises.push(notion.pages.update({
-                        page_id: page.id,
-                        properties: {
-                            Rewards: {
-                                type: "number",
-                                number: result[type],
-                            },
-                            To: { type: "date", date: { start: now.toISOString().split("T")[0] } },
-                        },
-                    }));
-                    // ─── Else, Create It ─────────────────
-                }
-                else {
-                    promises.push(notion.pages.create({
-                        parent: { type: "database_id", database_id: MONTHLY_REWARDS_BY_TYPES_DATABASE_ID },
-                        properties: {
-                            Types: {
-                                type: "title",
-                                title: [{ type: "text", text: { content: type } }],
-                            },
-                            Rewards: { type: "number", number: result[type] },
-                            From: { type: "date", date: { start: new Date(firstDayOfMonth * 1000).toISOString().split("T")[0] } },
-                            To: { type: "date", date: { start: now.toISOString().split("T")[0] } },
-                        },
-                    }));
-                }
-            }
-            // ─── Run All The Promises In Parallel ────────────────
-            await Promise.all(promises);
-            log.info("Total Distributed by Types data pushed to Notion successfully");
-        }),
-        // ─── Rewards By Chains ───────────────────────────────────────
-        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByChains, firstDayOfMonth).then(async (result) => {
+        // ─── Monthly Rewards ─────────────────────────────────────────────────────────
+        // ─── By Chains ───────────────────────────────────────────────
+        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByChain, firstDayOfMonth).then(async (result) => {
             const currentMonthPages = await getPagesOfTheMonth(MONTHLY_REWARDS_BY_CHAINS_DATABASE_ID);
             const promises = [];
             for (const chain of Object.keys(result)) {
@@ -143,7 +98,7 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Total Distributed by Chains data pushed to Notion successfully");
         }),
-        // ─── Rewards By Protocols ────────────────────────────────────
+        // ─── By Protocols ────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByProtocol, firstDayOfMonth).then(async (result) => {
             const currentMonthPages = await getPagesOfTheMonth(MONTHLY_REWARDS_BY_PROTOCOLS_DATABASE_ID);
             const promises = [];
@@ -181,44 +136,50 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Total Distributed by Protocols data pushed to Notion successfully");
         }),
-        // ─── Daily Rewards ───────────────────────────────────────────
-        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByProtocol, today).then(async (result) => {
-            const pagesOfTheDay = await getPagesOfTheDay(DAILY_REWARDS_BY_PROTOCOLS_DATABASE_ID);
+        // ─── By Types ────────────────────────────────────────────────
+        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByType, firstDayOfMonth).then(async (result) => {
+            const currentMonthPages = await getPagesOfTheMonth(MONTHLY_REWARDS_BY_TYPES_DATABASE_ID);
             const promises = [];
-            for (const protocol of Object.keys(result)) {
-                const page = pagesOfTheDay.find(page => "properties" in page &&
-                    page.properties.Protocols.title[0].text.content === protocol);
+            // ─── Check If Page Already Exists ────────────────────
+            for (const type of Object.keys(result)) {
+                const page = currentMonthPages.find(page => "properties" in page &&
+                    page.properties.Types.title[0].text.content === type);
+                // ─── If Page Exists, Update It ───────────────
                 if (page) {
                     promises.push(notion.pages.update({
                         page_id: page.id,
                         properties: {
                             Rewards: {
                                 type: "number",
-                                number: result[page.properties.Protocols.title[0].text.content],
+                                number: result[type],
                             },
-                            Date: { type: "date", date: { start: now.toISOString().split("T")[0] } },
+                            To: { type: "date", date: { start: now.toISOString().split("T")[0] } },
                         },
                     }));
+                    // ─── Else, Create It ─────────────────
                 }
                 else {
                     promises.push(notion.pages.create({
-                        parent: { type: "database_id", database_id: DAILY_REWARDS_BY_PROTOCOLS_DATABASE_ID },
+                        parent: { type: "database_id", database_id: MONTHLY_REWARDS_BY_TYPES_DATABASE_ID },
                         properties: {
-                            Protocols: { type: "title", title: [{ type: "text", text: { content: protocol } }] },
-                            Rewards: { type: "number", number: result[protocol] },
-                            Date: {
-                                type: "date",
-                                date: { start: now.toISOString().split("T")[0] },
+                            Types: {
+                                type: "title",
+                                title: [{ type: "text", text: { content: type } }],
                             },
+                            Rewards: { type: "number", number: result[type] },
+                            From: { type: "date", date: { start: new Date(firstDayOfMonth * 1000).toISOString().split("T")[0] } },
+                            To: { type: "date", date: { start: now.toISOString().split("T")[0] } },
                         },
                     }));
                 }
             }
+            // ─── Run All The Promises In Parallel ────────────────
             await Promise.all(promises);
-            log.info("Total Distributed by Protocols data pushed to Notion successfully");
+            log.info("Total Distributed by Types data pushed to Notion successfully");
         }),
+        // ─── Daily Rewards ───────────────────────────────────────────────────────────
         // ─── By Chains ───────────────────────────────────────────────
-        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByChains, today).then(async (result) => {
+        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByChain, today).then(async (result) => {
             const pagesOfTheDay = await getPagesOfTheDay(DAILY_REWARDS_BY_CHAINS_DATABASE_ID);
             const promises = [];
             for (const chain of Object.keys(result)) {
@@ -254,7 +215,43 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Total Distributed by Chains data pushed to Notion successfully");
         }),
-        // ─── Daily Rewards By Types ──────────────────────────────────
+        // ─── By Protocols ────────────────────────────────────────────
+        CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByProtocol, today).then(async (result) => {
+            const pagesOfTheDay = await getPagesOfTheDay(DAILY_REWARDS_BY_PROTOCOLS_DATABASE_ID);
+            const promises = [];
+            for (const protocol of Object.keys(result)) {
+                const page = pagesOfTheDay.find(page => "properties" in page &&
+                    page.properties.Protocols.title[0].text.content === protocol);
+                if (page) {
+                    promises.push(notion.pages.update({
+                        page_id: page.id,
+                        properties: {
+                            Rewards: {
+                                type: "number",
+                                number: result[page.properties.Protocols.title[0].text.content],
+                            },
+                            Date: { type: "date", date: { start: now.toISOString().split("T")[0] } },
+                        },
+                    }));
+                }
+                else {
+                    promises.push(notion.pages.create({
+                        parent: { type: "database_id", database_id: DAILY_REWARDS_BY_PROTOCOLS_DATABASE_ID },
+                        properties: {
+                            Protocols: { type: "title", title: [{ type: "text", text: { content: protocol } }] },
+                            Rewards: { type: "number", number: result[protocol] },
+                            Date: {
+                                type: "date",
+                                date: { start: now.toISOString().split("T")[0] },
+                            },
+                        },
+                    }));
+                }
+            }
+            await Promise.all(promises);
+            log.info("Total Distributed by Protocols data pushed to Notion successfully");
+        }),
+        // ─── By Types ────────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, RewardService.getTotalDistributedByType, today).then(async (result) => {
             const currentMonthPages = await getPagesOfTheDay(DAILY_REWARDS_BY_TYPES_DATABASE_ID);
             const promises = [];
@@ -294,7 +291,8 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Total Distributed by Types data pushed to Notion successfully");
         }),
-        // ─── Campaigns ───────────────────────────────────────────────
+        // ─── Monthly New Campaigns ───────────────────────────────────────────────────
+        // ─── By Chains ───────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, CampaignService.countByChains, {
             createdAfter: new Date(firstDayOfMonth * 1000),
         }).then(async (result) => {
@@ -337,7 +335,7 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Campaigns by Chains data pushed to Notion successfully");
         }),
-        // ─── Campaigns By Protocols ──────────────────────────────────
+        // ─── By Protocols ────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, CampaignService.countByProtocols, {
             createdAfter: new Date(firstDayOfMonth * 1000),
         }).then(async (result) => {
@@ -376,7 +374,7 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Campaigns by Protocols data pushed to Notion successfully");
         }),
-        // ─── Campaigns By Types ──────────────────────────────────────
+        // ─── By Types ────────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, CampaignService.countByTypes, {
             createdAfter: new Date(firstDayOfMonth * 1000),
         }).then(async (result) => {
@@ -418,7 +416,8 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Campaigns by Types data pushed to Notion successfully");
         }),
-        // ─── Daily Campaigns ─────────────────────────────────────────
+        // ─── Daily New Campaigns ─────────────────────────────────────────────────────
+        // ─── By Chains ───────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, CampaignService.countByChains, {
             createdAfter: new Date(today * 1000),
         }).then(async (result) => {
@@ -457,7 +456,7 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Campaigns by Chains data pushed to Notion successfully");
         }),
-        // ─── Daily New Campaigns By Protocols ────────────────────────
+        // ─── By Protocols ────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, CampaignService.countByProtocols, {
             createdAfter: new Date(today * 1000),
         }).then(async (result) => {
@@ -495,7 +494,7 @@ const main = async () => {
             await Promise.all(promises);
             log.info("Campaigns by Protocols data pushed to Notion successfully");
         }),
-        // ─── Daily Campaigns By Types ────────────────────────────────
+        // ─── By Types ────────────────────────────────────────────────
         CacheService.set(TTLPresets.DAY_1, CampaignService.countByTypes, {
             createdAfter: new Date(today * 1000),
         }).then(async (result) => {
@@ -534,10 +533,15 @@ const main = async () => {
             log.info("Campaigns by Types data pushed to Notion successfully");
         }),
     ];
-    await Promise.all(promises);
+    return await Promise.allSettled(promises);
 };
 main()
-    .then(() => process.exit(0))
+    .then(results => {
+    const rejected = results.find(result => result.status === "rejected");
+    if (rejected)
+        throw new Error(`One or more promises were rejected: ${JSON.stringify(rejected.reason)}`);
+    process.exit(0);
+})
     .catch(err => {
     console.error(err);
     process.exit(1);

package/dist/src/modules/v4/campaign/campaign.controller.d.ts

@@ -441,6 +441,31 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                 };
             };
         };
+    } & {
+        ":id": {
+            timeseries: {
+                get: {
+                    body: unknown;
+                    params: {
+                        id: string;
+                    };
+                    query: unknown;
+                    headers: unknown;
+                    response: {
+                        200: {
+                            tvlRecords: {
+                                total: number;
+                                timestamp: bigint;
+                            }[];
+                            aprRecords: {
+                                timestamp: bigint;
+                                cumulated: number;
+                            }[];
+                        };
+                    };
+                };
+            };
+        };
     } & {
         "campaigns-to-process": {
             index: {

package/dist/src/modules/v4/campaign/campaign.controller.js

@@ -3,6 +3,7 @@ import { BackOfficeGuard } from "@/guards/BackOffice.guard";
 import { AuthorizationHeadersDto, EngineGuard } from "@/guards/Engine.guard";
 import { CacheService } from "@/modules/v4/cache/cache.service";
 import { ChainUniqueDto } from "@/modules/v4/chain/chain.model";
+import { log } from "@/utils/logger";
 import { Campaign } from "@sdk";
 import Elysia, { t } from "elysia";
 import { throwOnUnsupportedChainId } from "src/utils/throw";
@@ -84,7 +85,7 @@ export const CampaignController = new Elysia({ prefix: "/campaigns", detail: { t
         return CampaignService.format(await CampaignService.findUniqueOrThrow({ distributionChain: +distributionChain, campaignId }));
     }
     catch (err) {
-        console.log(err);
+        log.error(`Error getting campaign: ${params.id}`, err);
         throw new NotFoundError("Campaign not found.");
     }
 }, {
@@ -94,6 +95,12 @@ export const CampaignController = new Elysia({ prefix: "/campaigns", detail: { t
         description: `**Retrieve A Campaign**
       <p>This endpoint enables you to retrieve a campaign by providing its unique identifier.</p>`,
     },
+})
+    .get("/:id/timeseries", async ({ params }) => {
+    if (!params.id.includes("-"))
+        return await CampaignService.getTimeSeries(params.id);
+    const [distributionChain, campaignId] = params.id.split("-");
+    return await CampaignService.getTimeSeries({ distributionChain: +distributionChain, campaignId });
 })
     .group("/campaigns-to-process", app => {
     return (app

package/dist/src/modules/v4/campaign/campaign.repository.d.ts

@@ -775,4 +775,20 @@ export declare abstract class CampaignRepository {
         manualOverrides: import("@db/api").$Enums.CampaignManualOverride[];
         createdAt: Date;
     }>;
+    static getTvlRecords(campaign: {
+        opportunityId: string;
+        startTimestamp: bigint;
+        endTimestamp: bigint;
+    }): Promise<{
+        total: number;
+        timestamp: bigint;
+    }[]>;
+    static getAprRecords(campaign: {
+        opportunityId: string;
+        startTimestamp: bigint;
+        endTimestamp: bigint;
+    }): Promise<{
+        timestamp: bigint;
+        cumulated: number;
+    }[]>;
 }

package/dist/src/modules/v4/campaign/campaign.repository.js

@@ -449,4 +449,22 @@ export class CampaignRepository {
         };
         return await apiDbClient.campaign.update({ where: { id }, data: updateData });
     }
+    static async getTvlRecords(campaign) {
+        return await apiDbClient.tVLRecord.findMany({
+            where: {
+                opportunityId: campaign.opportunityId,
+                timestamp: { gte: campaign.startTimestamp, lte: campaign.endTimestamp },
+            },
+            select: { timestamp: true, total: true },
+        });
+    }
+    static async getAprRecords(campaign) {
+        return await apiDbClient.aprRecord.findMany({
+            where: {
+                opportunityId: campaign.opportunityId,
+                timestamp: { gte: campaign.startTimestamp, lte: campaign.endTimestamp },
+            },
+            select: { timestamp: true, cumulated: true },
+        });
+    }
 }

package/dist/src/modules/v4/campaign/campaign.service.d.ts

@@ -914,4 +914,14 @@ export declare abstract class CampaignService {
         endTimestamp: any;
         params: string;
     };
+    static getTimeSeries(campaignId: CampaignUnique | string): Promise<{
+        tvlRecords: {
+            total: number;
+            timestamp: bigint;
+        }[];
+        aprRecords: {
+            timestamp: bigint;
+            cumulated: number;
+        }[];
+    }>;
 }

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

@@ -384,4 +384,11 @@ export class CampaignService {
             params: JSON.stringify(fakeCampaign.campaignParameters),
         };
     }
+    static async getTimeSeries(campaignId) {
+        const id = typeof campaignId === "string" ? campaignId : CampaignService.hashId(campaignId);
+        const campaign = await CampaignRepository.findUniqueOrThrow(id, false);
+        const tvlRecords = await CampaignRepository.getTvlRecords(campaign);
+        const aprRecords = await CampaignRepository.getAprRecords(campaign);
+        return { tvlRecords, aprRecords };
+    }
 }