@merkl/api 0.10.393 → 0.10.396

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

@@ -1,9 +1,8 @@
-import type { Prisma } from "../../../../database/api/.generated";
 import type { ChainId } from "@sdk";
-import type { BreakdownForCampaignsRaw, BreakdownForTokenRaw, CampaignIdModel, CampaignIdWithoutPageModel, CreateManyBreakdownModel, CreateManyRewardModel, PendingEntity, TokenIdModel } from "./reward.model";
+import type { BreakdownForCampaignsRaw, CampaignIdModel, CampaignIdWithoutPageModel, CreateManyBreakdownModel, CreateManyRewardModel, PendingEntity, TokenIdModel } from "./reward.model";
 export declare abstract class RewardRepository {
-    static createManyReward(rewards: CreateManyRewardModel): Promise<Prisma.BatchPayload>;
-    static createManyBreakdown(data: CreateManyBreakdownModel): Promise<Prisma.BatchPayload>;
+    static createManyReward(rewards: CreateManyRewardModel): Promise<import("database/api/.generated/runtime/library").GetBatchResult>;
+    static createManyBreakdown(data: CreateManyBreakdownModel): Promise<import("database/api/.generated/runtime/library").GetBatchResult>;
     static getByRecipient(recipient: string, roots: string[], withToken: boolean, withTestTokens: boolean, chainFilter?: ChainId[]): Promise<({
         RewardToken: {
             symbol: string;
@@ -20,7 +19,6 @@ export declare abstract class RewardRepository {
         };
         Breakdown: ({
             Campaign: {
-                campaignId: string;
                 Opportunity: {
                     Chain: {
                         name: string;
@@ -71,6 +69,7 @@ export declare abstract class RewardRepository {
                     apr: number;
                     dailyRewards: number;
                 };
+                campaignId: string;
             };
         } & {
             reason: string;
@@ -80,8 +79,6 @@ export declare abstract class RewardRepository {
             amount: string;
             claimed: string;
             protocolId: string | null;
-            auxiliaryData1: string | null;
-            auxiliaryData2: string | null;
             rewardId: string;
         })[];
     } & {
@@ -107,8 +104,6 @@ export declare abstract class RewardRepository {
             amount: string;
             claimed: string;
             protocolId: string | null;
-            auxiliaryData1: string | null;
-            auxiliaryData2: string | null;
             rewardId: string;
         })[];
     } & {
@@ -125,8 +120,8 @@ export declare abstract class RewardRepository {
         rewardCount: number;
         breakdownCount: number;
     }>;
-    static updateRewardClaimed(recipient: string, rewardTokenId: string, amount: string): Promise<Prisma.BatchPayload>;
-    static updateBreakdownClaimed(recipient: string, rewardTokenId: string, campaignId: string, reason: string, amount: string): Promise<Prisma.BatchPayload>;
+    static updateRewardClaimed(recipient: string, rewardTokenId: string, amount: string): Promise<import("database/api/.generated/runtime/library").GetBatchResult>;
+    static updateBreakdownClaimed(recipient: string, rewardTokenId: string, campaignId: string, reason: string, amount: string): Promise<import("database/api/.generated/runtime/library").GetBatchResult>;
     static findManyBreakdownUniques(uniques: {
         rewardId: string;
         campaignId: string;
@@ -158,8 +153,6 @@ export declare abstract class RewardRepository {
         amount: string;
         claimed: string;
         protocolId: string | null;
-        auxiliaryData1: string | null;
-        auxiliaryData2: string | null;
         rewardId: string;
     }[]>;
     static createRewardPendings(rewardTokenId: string, root: string, toCreate: {
@@ -183,8 +176,6 @@ export declare abstract class RewardRepository {
         amount: string;
         claimed: string;
         protocolId: string | null;
-        auxiliaryData1: string | null;
-        auxiliaryData2: string | null;
         rewardId: string;
     }[]>;
     static findManyRootsWithRewardOnChain(chainId: number): Promise<string[]>;
@@ -196,7 +187,12 @@ export declare abstract class RewardRepository {
     static countForCampaign(campaignId: string, root: string): Promise<{
         count: number;
     }>;
-    static breakdownForToken(root: string, id: string, query: TokenIdModel): Promise<BreakdownForTokenRaw[]>;
+    static breakdownForToken(root: string, id: string, query: TokenIdModel): Promise<{
+        amount: string;
+        claimed: string;
+        pending: string;
+        recipient: string;
+    }[]>;
     static totalForToken(tokenId: string, root: string): Promise<{
         tokenId: string;
         amount: bigint;

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

@@ -1,4 +1,6 @@
+import { Campaign, Reward, RewardBreakdown } from "../../../../database/api/.generated/drizzle/schema.ts";
 import { apiDbClient } from "../../../utils/prisma";
+import { and, eq, inArray, sql } from "drizzle-orm";
 import { CampaignService } from "../campaign";
 import { TokenService } from "../token";
 import { UserService } from "../user";
@@ -46,8 +48,6 @@ export class RewardRepository {
                     amount: breakdown.amount,
                     claimed: breakdown.claimed,
                     pending: breakdown.pending,
-                    auxiliaryData1: breakdown.auxiliaryData1 ?? "",
-                    auxiliaryData2: breakdown.auxiliaryData2 ?? "",
                 });
             });
         }
@@ -211,8 +211,6 @@ export class RewardRepository {
                 },
                 data: {
                     pending: x.pending,
-                    auxiliaryData1: x.auxiliaryData1,
-                    auxiliaryData2: x.auxiliaryData2,
                 },
             });
         }));
@@ -329,24 +327,19 @@ export class RewardRepository {
         return { count };
     }
     static async breakdownForToken(root, id, query) {
-        const { page: _page, items: _items } = query;
+        const { page: _page, items: _items, campaignIds } = query;
         const page = _page || 0;
         const items = _items || 50;
-        const result = await apiDbClient.$queryRawUnsafe(`
-      SELECT 
-        r."amount",
-        r."claimed",
-        r."pending",
-        r."recipient"
-      FROM 
-        "Reward" r
-      WHERE 
-        r."root" = $1 AND r."rewardTokenId" = $2
-      ORDER BY 
-        (r."amount"::numeric + r."pending"::numeric) DESC
-      LIMIT $3
-      OFFSET $4
-    `, root, id, items, items * page);
+        const ids = typeof campaignIds === "string" ? [campaignIds] : (campaignIds ?? []);
+        const result = await apiDbClient.$drizzle
+            .select({ amount: Reward.amount, claimed: Reward.claimed, pending: Reward.pending, recipient: Reward.recipient })
+            .from(Reward)
+            .innerJoin(RewardBreakdown, eq(RewardBreakdown.rewardId, Reward.id))
+            .innerJoin(Campaign, eq(RewardBreakdown.campaignId, Campaign.id))
+            .where(and(eq(Reward.root, root), eq(Reward.rewardTokenId, id), ids.length > 0 ? inArray(Campaign.campaignId, ids) : sql `TRUE`))
+            .orderBy(sql `(${Reward.amount}::numeric + ${Reward.pending}::numeric) desc`)
+            .limit(items)
+            .offset(items * page);
         return result;
     }
     static async totalForToken(tokenId, root) {

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

@@ -7,7 +7,7 @@ import { RewardRepository } from "./reward.repository";
 export declare abstract class RewardService {
     static hashId(root: string, recipient: string, rewardTokenId: string): string;
     static hashDailyRewardsRecordId(opportunityId: string, timestamp: bigint): string;
-    static createManyReward(rewards: CreateManyRewardModel): Promise<import("../../../../database/api/.generated").Prisma.BatchPayload>;
+    static createManyReward(rewards: CreateManyRewardModel): Promise<import("database/api/.generated/runtime/library").GetBatchResult>;
     /**
      * Format the reward breakdown to conform to its resource model declaration
      * @param breakdown straight from db
@@ -69,8 +69,6 @@ export declare abstract class RewardService {
         pending: string;
         amount: string;
         claimed: string;
-        auxiliaryData1: string | null;
-        auxiliaryData2: string | null;
     };
     /**
      * Format the reward to conform to its resource model declaration
@@ -147,8 +145,6 @@ export declare abstract class RewardService {
             pending: string;
             amount: string;
             claimed: string;
-            auxiliaryData1: string | null;
-            auxiliaryData2: string | null;
         }[];
         claimed: bigint;
         amount: bigint;
@@ -157,7 +153,7 @@ export declare abstract class RewardService {
         root: string;
         proofs: string[];
     }[];
-    static createManyBreakdown(data: CreateManyBreakdownModel): Promise<import("../../../../database/api/.generated").Prisma.BatchPayload | undefined>;
+    static createManyBreakdown(data: CreateManyBreakdownModel): Promise<import("database/api/.generated/runtime/library").GetBatchResult | undefined>;
     static getByRecipient(recipient: string, roots: string[], withToken?: boolean, withTestTokens?: boolean, chainFilter?: ChainId[]): Promise<({
         RewardToken: {
             symbol: string;
@@ -174,7 +170,6 @@ export declare abstract class RewardService {
         };
         Breakdown: ({
             Campaign: {
-                campaignId: string;
                 Opportunity: {
                     Chain: {
                         name: string;
@@ -225,6 +220,7 @@ export declare abstract class RewardService {
                     apr: number;
                     dailyRewards: number;
                 };
+                campaignId: string;
             };
         } & {
             reason: string;
@@ -234,8 +230,6 @@ export declare abstract class RewardService {
             amount: string;
             claimed: string;
             protocolId: string | null;
-            auxiliaryData1: string | null;
-            auxiliaryData2: string | null;
             rewardId: string;
         })[];
     } & {
@@ -260,8 +254,6 @@ export declare abstract class RewardService {
         claimed: bigint;
         amount: bigint;
         pending: bigint;
-        auxiliaryData1: string | null;
-        auxiliaryData2: string | null;
     }[];
     /**
      * Applies the splitBreakdownByOpportunity function to each rewards in the array
@@ -342,8 +334,6 @@ export declare abstract class RewardService {
                 pending: string;
                 amount: string;
                 claimed: string;
-                auxiliaryData1: string | null;
-                auxiliaryData2: string | null;
             }[];
             claimed: bigint;
             amount: bigint;
@@ -357,8 +347,6 @@ export declare abstract class RewardService {
                 claimed: bigint;
                 amount: bigint;
                 pending: bigint;
-                auxiliaryData1: string | null;
-                auxiliaryData2: string | null;
             }[];
         })[];
         distributor: string;
@@ -437,8 +425,6 @@ export declare abstract class RewardService {
                 pending: string;
                 amount: string;
                 claimed: string;
-                auxiliaryData1: string | null;
-                auxiliaryData2: string | null;
             }[];
             claimed: bigint;
             amount: bigint;
@@ -453,8 +439,6 @@ export declare abstract class RewardService {
                 pending: string;
                 amount: string;
                 claimed: string;
-                auxiliaryData1: string | null;
-                auxiliaryData2: string | null;
             }[];
         })[];
     })[];
@@ -475,7 +459,6 @@ export declare abstract class RewardService {
         };
         Breakdown: ({
             Campaign: {
-                campaignId: string;
                 Opportunity: {
                     Chain: {
                         name: string;
@@ -526,6 +509,7 @@ export declare abstract class RewardService {
                     apr: number;
                     dailyRewards: number;
                 };
+                campaignId: string;
             };
         } & {
             reason: string;
@@ -535,8 +519,6 @@ export declare abstract class RewardService {
             amount: string;
             claimed: string;
             protocolId: string | null;
-            auxiliaryData1: string | null;
-            auxiliaryData2: string | null;
             rewardId: string;
         })[];
     } & {
@@ -572,7 +554,12 @@ export declare abstract class RewardService {
         campaignId: string;
         amount: bigint;
     }>;
-    static breakdownForToken(query: TokenIdModel): Promise<import("./reward.model").BreakdownForTokenRaw[]>;
+    static breakdownForToken(query: TokenIdModel): Promise<{
+        amount: string;
+        claimed: string;
+        pending: string;
+        recipient: string;
+    }[]>;
     static countForToken(query: TokenIdModel): Promise<{
         count: number;
     }>;

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

@@ -106,8 +106,6 @@ export class RewardService {
                 claimed: relatedBreakdowns.reduce((total, { claimed }) => total + BigInt(claimed), 0n),
                 amount: relatedBreakdowns.reduce((total, { amount }) => total + BigInt(amount), 0n),
                 pending: relatedBreakdowns.reduce((total, { pending }) => total + BigInt(pending), 0n),
-                auxiliaryData1: relatedBreakdowns[0]?.auxiliaryData1,
-                auxiliaryData2: relatedBreakdowns[0]?.auxiliaryData2,
             };
         });
     }

package/dist/src/modules/v4/reward/subservices/converter.js

@@ -77,8 +77,6 @@ export class RewardConvertorService {
                             accumulated: "0",
                             unclaimed: "0",
                             pending: "0",
-                            auxiliaryData1: breakdown.auxiliaryData1 === "" ? "0" : (breakdown.auxiliaryData1 ?? "0"),
-                            auxiliaryData2: breakdown.auxiliaryData2 === "" ? "0" : (breakdown.auxiliaryData2 ?? "0"),
                             decimals: token.decimals,
                             mainParameter: breakdown.opportunity.identifier,
                             symbol: token.symbol,

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

@@ -312,7 +312,6 @@ export declare const v4: Elysia<"/v4", {
                                 tags: string[];
                                 icon: string;
                             } | null | undefined;
-                            depositUrl?: string | undefined;
                             aprRecord?: {
                                 timestamp: string | bigint;
                                 cumulated: number;
@@ -324,6 +323,7 @@ export declare const v4: Elysia<"/v4", {
                                     aprRecordId: string;
                                 }[];
                             } | undefined;
+                            depositUrl?: string | undefined;
                             tvlRecord?: {
                                 total: number;
                                 timestamp: string | bigint;
@@ -445,7 +445,6 @@ export declare const v4: Elysia<"/v4", {
                                 tags: string[];
                                 icon: string;
                             } | null | undefined;
-                            depositUrl?: string | undefined;
                             aprRecord?: {
                                 timestamp: string | bigint;
                                 cumulated: number;
@@ -457,6 +456,7 @@ export declare const v4: Elysia<"/v4", {
                                     aprRecordId: string;
                                 }[];
                             } | undefined;
+                            depositUrl?: string | undefined;
                             tvlRecord?: {
                                 total: number;
                                 timestamp: string | bigint;
@@ -613,7 +613,6 @@ export declare const v4: Elysia<"/v4", {
                                     tags: string[];
                                     icon: string;
                                 } | null | undefined;
-                                depositUrl?: string | undefined;
                                 aprRecord?: {
                                     timestamp: string | bigint;
                                     cumulated: number;
@@ -625,6 +624,7 @@ export declare const v4: Elysia<"/v4", {
                                         aprRecordId: string;
                                     }[];
                                 } | undefined;
+                                depositUrl?: string | undefined;
                                 tvlRecord?: {
                                     total: number;
                                     timestamp: string | bigint;
@@ -1195,10 +1195,10 @@ export declare const v4: Elysia<"/v4", {
                         response: {
                             200: {
                                 endTimestamp: bigint;
-                                campaignId: string;
                                 CampaignStatus: {
                                     computedUntil: bigint;
                                 }[];
+                                campaignId: string;
                             }[];
                             422: {
                                 type: "validation";
@@ -1873,6 +1873,106 @@ export declare const v4: Elysia<"/v4", {
                     };
                 };
             };
+        } & {
+            campaign: {
+                ":campaignId": {
+                    index: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                campaignId: string;
+                            };
+                            query: {
+                                items?: number | undefined;
+                                page?: number | undefined;
+                            };
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    amount: string;
+                                    claimed: string;
+                                    pending: string;
+                                    recipient: string;
+                                }[];
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        } & {
+            campaign: {
+                ":campaignId": {
+                    total: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                campaignId: string;
+                            };
+                            query: {
+                                items?: number | undefined;
+                                page?: number | undefined;
+                            };
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    tokenId: string;
+                                    amount: bigint;
+                                };
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        } & {
+            campaign: {
+                ":campaignId": {
+                    count: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                campaignId: string;
+                            };
+                            query: {
+                                items?: number | undefined;
+                                page?: number | undefined;
+                            };
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    count: number;
+                                };
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
         } & {
             token: {
                 index: {
@@ -1882,12 +1982,18 @@ export declare const v4: Elysia<"/v4", {
                         query: {
                             items?: number | undefined;
                             page?: number | undefined;
+                            campaignIds?: string[] | undefined;
                             chainId: number;
                             address: string;
                         };
                         headers: unknown;
                         response: {
-                            200: import("./reward").BreakdownForTokenRaw[];
+                            200: {
+                                amount: string;
+                                claimed: string;
+                                pending: string;
+                                recipient: string;
+                            }[];
                             422: {
                                 type: "validation";
                                 on: string;
@@ -1910,6 +2016,7 @@ export declare const v4: Elysia<"/v4", {
                         query: {
                             items?: number | undefined;
                             page?: number | undefined;
+                            campaignIds?: string[] | undefined;
                             chainId: number;
                             address: string;
                         };
@@ -1941,6 +2048,7 @@ export declare const v4: Elysia<"/v4", {
                         query: {
                             items?: number | undefined;
                             page?: number | undefined;
+                            campaignIds?: string[] | undefined;
                             chainId: number;
                             address: string;
                         };
@@ -2009,8 +2117,6 @@ export declare const v4: Elysia<"/v4", {
                             rewardToken: string;
                             breakdowns: {
                                 protocolId?: string | undefined;
-                                auxiliaryData1?: string | undefined;
-                                auxiliaryData2?: string | undefined;
                                 reason: string;
                                 pending: string;
                                 recipient: string;
@@ -2076,8 +2182,6 @@ export declare const v4: Elysia<"/v4", {
                     post: {
                         body: {
                             data: {
-                                auxiliaryData1?: string | undefined;
-                                auxiliaryData2?: string | undefined;
                                 reason: string;
                                 pending: string;
                                 recipient: string;
@@ -2856,8 +2960,6 @@ export declare const v4: Elysia<"/v4", {
                                             pending: string;
                                             amount: string;
                                             claimed: string;
-                                            auxiliaryData1: string | null;
-                                            auxiliaryData2: string | null;
                                         }[];
                                         claimed: bigint;
                                         amount: bigint;
@@ -2871,8 +2973,6 @@ export declare const v4: Elysia<"/v4", {
                                             claimed: bigint;
                                             amount: bigint;
                                             pending: bigint;
-                                            auxiliaryData1: string | null;
-                                            auxiliaryData2: string | null;
                                         }[];
                                     })[];
                                     distributor: string;
@@ -2982,8 +3082,6 @@ export declare const v4: Elysia<"/v4", {
                                         pending: string;
                                         amount: string;
                                         claimed: string;
-                                        auxiliaryData1: string | null;
-                                        auxiliaryData2: string | null;
                                     }[];
                                     claimed: bigint;
                                     amount: bigint;
@@ -2998,8 +3096,6 @@ export declare const v4: Elysia<"/v4", {
                                         pending: string;
                                         amount: string;
                                         claimed: string;
-                                        auxiliaryData1: string | null;
-                                        auxiliaryData2: string | null;
                                     }[];
                                 })[];
                             })[];
@@ -3603,13 +3699,13 @@ export declare const v4: Elysia<"/v4", {
                         chainId?: number | undefined;
                         startTimestamp?: string | undefined;
                         endTimestamp?: string | undefined;
+                        campaignStatus?: {} | undefined;
                         distributionChainId?: number | undefined;
                         campaignId?: string | undefined;
                         rewardTokenId?: string | undefined;
                         amount?: string | undefined;
                         opportunityId?: string | undefined;
                         creatorAddress?: string | undefined;
-                        campaignStatus?: {} | undefined;
                         rewardToken?: {} | undefined;
                         rewardTokenAddress?: string | undefined;
                         distributionChain?: {} | undefined;
@@ -3837,12 +3933,6 @@ export declare const v4: Elysia<"/v4", {
                                 delayFormatted: string;
                                 startTimestamp: bigint;
                                 endTimestamp: bigint;
-                                computeChainId: number;
-                                distributionChainId: number;
-                                campaignId: string;
-                                Opportunity: {
-                                    name: string;
-                                };
                                 CampaignStatus: {
                                     error: string;
                                     details: import("database/api/.generated/runtime/library").JsonValue;
@@ -3851,6 +3941,12 @@ export declare const v4: Elysia<"/v4", {
                                     computedUntil: bigint;
                                     processingStarted: bigint;
                                 }[];
+                                Opportunity: {
+                                    name: string;
+                                };
+                                computeChainId: number;
+                                distributionChainId: number;
+                                campaignId: string;
                             }[];
                             422: {
                                 type: "validation";

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

@@ -167,12 +167,6 @@ export declare const StatusController: Elysia<"/campaign-status", {
                             delayFormatted: string;
                             startTimestamp: bigint;
                             endTimestamp: bigint;
-                            computeChainId: number;
-                            distributionChainId: number;
-                            campaignId: string;
-                            Opportunity: {
-                                name: string;
-                            };
                             CampaignStatus: {
                                 error: string;
                                 details: import("database/api/.generated/runtime/library").JsonValue;
@@ -181,6 +175,12 @@ export declare const StatusController: Elysia<"/campaign-status", {
                                 computedUntil: bigint;
                                 processingStarted: bigint;
                             }[];
+                            Opportunity: {
+                                name: string;
+                            };
+                            computeChainId: number;
+                            distributionChainId: number;
+                            campaignId: string;
                         }[];
                         422: {
                             type: "validation";

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

@@ -70,12 +70,6 @@ export declare class StatusRepository {
     static findManyDelay(query: DelayModel): Promise<{
         startTimestamp: bigint;
         endTimestamp: bigint;
-        computeChainId: number;
-        distributionChainId: number;
-        campaignId: string;
-        Opportunity: {
-            name: string;
-        };
         CampaignStatus: {
             error: string;
             details: Prisma.JsonValue;
@@ -84,5 +78,11 @@ export declare class StatusRepository {
             computedUntil: bigint;
             processingStarted: bigint;
         }[];
+        Opportunity: {
+            name: string;
+        };
+        computeChainId: number;
+        distributionChainId: number;
+        campaignId: string;
     }[]>;
 }

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

@@ -40,12 +40,6 @@ export declare class StatusService {
         delayFormatted: string;
         startTimestamp: bigint;
         endTimestamp: bigint;
-        computeChainId: number;
-        distributionChainId: number;
-        campaignId: string;
-        Opportunity: {
-            name: string;
-        };
         CampaignStatus: {
             error: string;
             details: import("database/api/.generated/runtime/library").JsonValue;
@@ -54,5 +48,11 @@ export declare class StatusService {
             computedUntil: bigint;
             processingStarted: bigint;
         }[];
+        Opportunity: {
+            name: string;
+        };
+        computeChainId: number;
+        distributionChainId: number;
+        campaignId: string;
     }[]>;
 }