@merkl/api 0.15.45 → 0.15.46

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

@@ -1643,28 +1643,6 @@ declare const eden: {
                         200: void;
                     }>>;
                 };
-                pendings: {
-                    post: (body: {
-                        data: {
-                            reason: string;
-                            pending: string;
-                            recipient: string;
-                        }[];
-                        distributionChainId: number;
-                        campaignId: string;
-                        root: string;
-                        rewardToken: string;
-                    }, options: {
-                        headers: {
-                            authorization: string;
-                        };
-                        query?: Record<string, unknown> | undefined;
-                        fetch?: RequestInit | undefined;
-                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                        [x: string]: any;
-                        200: any;
-                    }>>;
-                };
             };
             unclaim: {
                 index: {
@@ -4765,28 +4743,6 @@ declare const eden: {
                         200: void;
                     }>>;
                 };
-                pendings: {
-                    post: (body: {
-                        data: {
-                            reason: string;
-                            pending: string;
-                            recipient: string;
-                        }[];
-                        distributionChainId: number;
-                        campaignId: string;
-                        root: string;
-                        rewardToken: string;
-                    }, options: {
-                        headers: {
-                            authorization: string;
-                        };
-                        query?: Record<string, unknown> | undefined;
-                        fetch?: RequestInit | undefined;
-                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                        [x: string]: any;
-                        200: any;
-                    }>>;
-                };
             };
             unclaim: {
                 index: {
@@ -8886,33 +8842,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
-        } & {
-            engine: {
-                pendings: {
-                    post: {
-                        body: {
-                            data: {
-                                reason: string;
-                                pending: string;
-                                recipient: string;
-                            }[];
-                            distributionChainId: number;
-                            campaignId: string;
-                            root: string;
-                            rewardToken: string;
-                        };
-                        params: {};
-                        query: unknown;
-                        headers: {
-                            authorization: string;
-                        };
-                        response: {
-                            [x: string]: any;
-                            200: any;
-                        };
-                    };
-                };
-            };
         } & {
             count: {
                 chain: {
@@ -13365,28 +13294,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         200: void;
                     }>>;
                 };
-                pendings: {
-                    post: (body: {
-                        data: {
-                            reason: string;
-                            pending: string;
-                            recipient: string;
-                        }[];
-                        distributionChainId: number;
-                        campaignId: string;
-                        root: string;
-                        rewardToken: string;
-                    }, options: {
-                        headers: {
-                            authorization: string;
-                        };
-                        query?: Record<string, unknown> | undefined;
-                        fetch?: RequestInit | undefined;
-                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                        [x: string]: any;
-                        200: any;
-                    }>>;
-                };
             };
             unclaim: {
                 index: {
@@ -16487,28 +16394,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         200: void;
                     }>>;
                 };
-                pendings: {
-                    post: (body: {
-                        data: {
-                            reason: string;
-                            pending: string;
-                            recipient: string;
-                        }[];
-                        distributionChainId: number;
-                        campaignId: string;
-                        root: string;
-                        rewardToken: string;
-                    }, options: {
-                        headers: {
-                            authorization: string;
-                        };
-                        query?: Record<string, unknown> | undefined;
-                        fetch?: RequestInit | undefined;
-                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                        [x: string]: any;
-                        200: any;
-                    }>>;
-                };
             };
             unclaim: {
                 index: {

package/dist/src/index.d.ts

@@ -1944,33 +1944,6 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
-        } & {
-            engine: {
-                pendings: {
-                    post: {
-                        body: {
-                            data: {
-                                reason: string;
-                                pending: string;
-                                recipient: string;
-                            }[];
-                            distributionChainId: number;
-                            campaignId: string;
-                            root: string;
-                            rewardToken: string;
-                        };
-                        params: {};
-                        query: unknown;
-                        headers: {
-                            authorization: string;
-                        };
-                        response: {
-                            [x: string]: any;
-                            200: any;
-                        };
-                    };
-                };
-            };
         } & {
             count: {
                 chain: {

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

@@ -3,7 +3,7 @@ if (!process.env.ENV || !process.env.FILENAME)
     throw new Error("[ENV]: missing variable");
 import { log } from "../../utils/logger";
 import { apiDbClient } from "../../utils/prisma";
-import { withRetry } from "@sdk";
+import { NETWORK_LABELS, withRetry } from "@sdk";
 import { S3Client } from "bun";
 import moment from "moment";
 // ─── Constants ───────────────────────────────────────────────
@@ -36,12 +36,14 @@ const extract = async () => {
         }
         if (data.length < MAX_BATCH_SIZE)
             continue;
+        // Retry up to 5 times with a 10s delay
         const promise = withRetry(load, [data], 5, 10_000);
         loadPromises.push(promise);
         await promise;
         data = [];
     }
     // Final batch
+    // Retry up to 5 times with a 10s delay
     const promise = withRetry(load, [data], 5, 10_000);
     loadPromises.push(promise);
     await promise;
@@ -61,7 +63,7 @@ const extract = async () => {
 };
 // ─── Transform & Load ────────────────────────────────────────────────────────
 const load = async (pendings) => {
-    log.info(`pushing ${pendings.length} pendings`);
+    log.info(`pushing ${pendings.length} pendings for token ${pendings[0].rewardToken} on ${NETWORK_LABELS[chainId]}`);
     const { updated, created } = await updatePendings({
         distributionChainId: chainId,
         rewardToken: pendings[0].rewardToken, // sometimes undefined
@@ -75,25 +77,12 @@ const load = async (pendings) => {
 const updatePendings = async (data) => {
     const rewardTokenId = Bun.hash(`${data.distributionChainId}${data.rewardToken}`).toString();
     const campaignId = Bun.hash(`${data.distributionChainId}${data.campaignId}`).toString();
-    const rewardUniques = {};
-    // Adds a record to the Reward row where pendings need to be updated
-    const updateRewardUniques = (recipient, pending, previousPending) => {
-        Bun.hash(`${root}${recipient}${rewardTokenId}`).toString();
-        const rewardId = Bun.hash(`${data.root}${recipient}${rewardTokenId}`).toString();
-        if (!rewardUniques[rewardId]) {
-            rewardUniques[rewardId] = { pending: "0", recipient: recipient };
-        }
-        rewardUniques[rewardId].pending = (BigInt(rewardUniques[rewardId].pending) +
-            BigInt(pending) -
-            BigInt(previousPending ?? "0")) // Store the delta
-            .toString();
-    };
+    // List of identifiers of breakdowns that will be touched by this jobd
     const breakdownUniques = await data.data.map(({ recipient, reason }) => {
         const rewardId = Bun.hash(`${data.root}${recipient}${rewardTokenId}`).toString();
         return { rewardId, reason, campaignId };
     });
-    const breakdownToUpdate = [];
-    const breakdownToCreate = [];
+    // Check if these breakdowns already exist or not
     const breakdownExists = await apiDbClient.$transaction(breakdownUniques.map(x => apiDbClient.rewardBreakdown.findUnique({
         select: {
             pending: true,
@@ -106,20 +95,35 @@ const updatePendings = async (data) => {
             },
         },
     })));
+    // We want to get all current pendings for the rewardIds that will be modified
+    // Should contain rewardId => { pendingIncrease, recipient }
+    const rewardIdToPendingIncrease = {};
+    const breakdownToUpdate = [];
+    const breakdownToCreate = [];
+    let totalBreakdownIncrease = 0n;
+    // For all point to update
+    //  - compute the delta with what's in database, add it to rewardIdToPendingIncrease
+    //  - add the point to breakdownToUpdate or breakdownToCreate
     for (const [pointIndex, point] of data.data.entries()) {
-        updateRewardUniques(point.recipient, point.pending, breakdownExists[pointIndex]?.pending);
-        if (!!breakdownExists[pointIndex]) {
-            if (point.pending !== breakdownExists[pointIndex].pending) {
+        const rewardId = Bun.hash(`${data.root}${point.recipient}${rewardTokenId}`).toString();
+        if (!rewardIdToPendingIncrease[rewardId]) {
+            rewardIdToPendingIncrease[rewardId] = { pendingIncrease: 0n, recipient: point.recipient };
+        }
+        const delta = BigInt(point.pending) - BigInt(breakdownExists[pointIndex]?.pending ?? "0");
+        totalBreakdownIncrease += delta;
+        if (delta > 0n) {
+            rewardIdToPendingIncrease[rewardId].pendingIncrease += delta; // Store the delta
+            if (!!breakdownExists[pointIndex]) {
                 breakdownToUpdate.push(point);
             }
-        }
-        else {
-            breakdownToCreate.push(point);
+            else {
+                breakdownToCreate.push(point);
+            }
         }
     }
-    const toUpdate = [];
-    const toCreate = [];
-    const exists = await apiDbClient.$transaction(Object.keys(rewardUniques).map(x => apiDbClient.reward.findUnique({
+    const rewardToUpdate = [];
+    const rewardToCreate = [];
+    const RewardExists = await apiDbClient.$transaction(Object.keys(rewardIdToPendingIncrease).map(x => apiDbClient.reward.findUnique({
         select: {
             pending: true,
         },
@@ -127,25 +131,29 @@ const updatePendings = async (data) => {
             id: x,
         },
     })));
-    for (const [pointIndex, point] of Object.values(rewardUniques).entries()) {
-        if (!!exists[pointIndex]) {
-            if (point.pending !== "0") {
-                toUpdate.push({
-                    ...point,
-                    pending: (BigInt(exists[pointIndex].pending) + BigInt(point.pending)).toString(), // Store the delta
+    for (const [pointIndex, point] of Object.values(rewardIdToPendingIncrease).entries()) {
+        if (BigInt(point.pendingIncrease) > 0n) {
+            if (!!RewardExists[pointIndex]) {
+                rewardToUpdate.push({
+                    recipient: point.recipient,
+                    pending: BigInt(RewardExists[pointIndex].pending) + BigInt(point.pendingIncrease),
+                });
+            }
+            else {
+                rewardToCreate.push({
+                    recipient: point.recipient,
+                    pending: BigInt(point.pendingIncrease),
                 });
             }
-        }
-        else {
-            toCreate.push(point);
         }
     }
-    console.log(`rewards to create: ${toCreate.length}, to update: ${toUpdate.length}`);
-    if (toCreate.length > 0) {
-        const users = toCreate.map(x => x.recipient);
+    const totalRewardIncrease = Object.values(rewardIdToPendingIncrease).reduce((prev, current) => prev + BigInt(current.pendingIncrease), 0n);
+    log.info(`rewards to create: ${rewardToCreate.length}, to update: ${rewardToUpdate.length}, total reward increase: ${totalRewardIncrease.toString()}`);
+    if (rewardToCreate.length > 0) {
+        const users = rewardToCreate.map(x => x.recipient);
         await apiDbClient.user.createMany({ data: users.map(x => ({ address: x, tags: [] })), skipDuplicates: true });
         await apiDbClient.reward.createMany({
-            data: toCreate.map(x => {
+            data: rewardToCreate.map(x => {
                 const rewardId = Bun.hash(`${root}${x.recipient}${rewardTokenId}`).toString();
                 return {
                     id: rewardId,
@@ -154,26 +162,26 @@ const updatePendings = async (data) => {
                     rewardTokenId,
                     proofs: [],
                     amount: "0",
-                    pending: x.pending,
+                    pending: x.pending.toString(),
                     claimed: "0",
                 };
             }),
         });
     }
-    if (toUpdate.length > 0) {
-        await apiDbClient.$transaction(toUpdate.map(x => {
+    if (rewardToUpdate.length > 0) {
+        await apiDbClient.$transaction(rewardToUpdate.map(x => {
             const rewardId = Bun.hash(`${data.root}${x.recipient}${rewardTokenId}`).toString();
             return apiDbClient.reward.update({
                 where: {
                     id: rewardId,
                 },
                 data: {
-                    pending: x.pending,
+                    pending: x.pending.toString(),
                 },
             });
         }));
     }
-    console.log(`breakdowns to create: ${breakdownToCreate.length}, to update: ${breakdownToUpdate.length}`);
+    log.info(`breakdowns to create: ${breakdownToCreate.length}, to update: ${breakdownToUpdate.length}, total breakdown increase: ${totalBreakdownIncrease.toString()}`);
     if (breakdownToUpdate.length > 0) {
         await apiDbClient.$transaction(breakdownToUpdate.map(x => {
             return apiDbClient.rewardBreakdown.update({

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

@@ -284,33 +284,6 @@ export declare const RewardController: Elysia<"/rewards", false, {
                 };
             };
         };
-    } & {
-        engine: {
-            pendings: {
-                post: {
-                    body: {
-                        data: {
-                            reason: string;
-                            pending: string;
-                            recipient: string;
-                        }[];
-                        distributionChainId: number;
-                        campaignId: string;
-                        root: string;
-                        rewardToken: string;
-                    };
-                    params: {};
-                    query: unknown;
-                    headers: {
-                        authorization: string;
-                    };
-                    response: {
-                        [x: string]: any;
-                        200: any;
-                    };
-                };
-            };
-        };
     } & {
         count: {
             chain: {

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

@@ -5,7 +5,7 @@ import Elysia from "elysia";
 import { ChainDto } from "../accounting";
 import { CampaignService } from "../campaign";
 import { TokenService } from "../token";
-import { CampaignIdDto, CampaignIdWithoutPageDto, CampaignRewardsDto, CreateManyBreakdownDto, CreateManyRewardDto, RegisterClaimsDto, TokenIdDto, UpdatePendingDto, } from "./reward.model";
+import { CampaignIdDto, CampaignIdWithoutPageDto, CampaignRewardsDto, CreateManyBreakdownDto, CreateManyRewardDto, RegisterClaimsDto, TokenIdDto, } from "./reward.model";
 import { RewardService } from "./reward.service";
 // ─── Rewards Controller ──────────────────────────────────────────────────────
 export const RewardController = new Elysia({ prefix: "/rewards", detail: { tags: ["Rewards"] } })
@@ -100,13 +100,6 @@ export const RewardController = new Elysia({ prefix: "/rewards", detail: { tags:
             }
         },
         detail: { hide: true },
-    })
-        // ─── Create Many Pending Rewards ─────────────────────────────────────
-        .post("/pendings", async ({ body }) => await RewardService.updatePendings(body), {
-        headers: AuthorizationHeadersDto,
-        body: UpdatePendingDto,
-        beforeHandle: EngineGuard,
-        detail: { hide: true },
     }));
 })
     // ─── Get Reward Count By Chain And Root ──────────────────────────────

package/dist/src/modules/v4/router.d.ts

@@ -1814,33 +1814,6 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                 };
             };
-        } & {
-            engine: {
-                pendings: {
-                    post: {
-                        body: {
-                            data: {
-                                reason: string;
-                                pending: string;
-                                recipient: string;
-                            }[];
-                            distributionChainId: number;
-                            campaignId: string;
-                            root: string;
-                            rewardToken: string;
-                        };
-                        params: {};
-                        query: unknown;
-                        headers: {
-                            authorization: string;
-                        };
-                        response: {
-                            [x: string]: any;
-                            200: any;
-                        };
-                    };
-                };
-            };
         } & {
             count: {
                 chain: {