npm - @merkl/api - Versions diffs - 0.10.393 → 0.10.396 - Mend

@merkl/api 0.10.393 → 0.10.396

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

package/dist/src/modules/v4/opportunity/opportunity.repository.d.ts CHANGED Viewed

@@ -119,6 +119,14 @@ export declare abstract class OpportunityRepository {
                 Campaign: {
                     startTimestamp: bigint;
                     endTimestamp: bigint;
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
                     amount: string;
                     RewardToken: {
                         symbol: string;
@@ -133,14 +141,6 @@ export declare abstract class OpportunityRepository {
                         isTest: boolean;
                         price: number | null;
                     };
-                    CampaignStatus: {
-                        error: string;
-                        details: Prisma.JsonValue;
-                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                        campaignId: string;
-                        computedUntil: bigint;
-                        processingStarted: bigint;
-                    }[];
                 };
             } & {
                 id: number;
@@ -237,6 +237,14 @@ export declare abstract class OpportunityRepository {
                 Campaign: {
                     startTimestamp: bigint;
                     endTimestamp: bigint;
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
                     amount: string;
                     RewardToken: {
                         symbol: string;
@@ -251,14 +259,6 @@ export declare abstract class OpportunityRepository {
                         isTest: boolean;
                         price: number | null;
                     };
-                    CampaignStatus: {
-                        error: string;
-                        details: Prisma.JsonValue;
-                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                        campaignId: string;
-                        computedUntil: bigint;
-                        processingStarted: bigint;
-                    }[];
                 };
             } & {
                 id: number;
@@ -301,6 +301,14 @@ export declare abstract class OpportunityRepository {
             icon: string;
         };
         Campaigns: ({
+            CampaignStatus: {
+                error: string;
+                details: Prisma.JsonValue;
+                status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                campaignId: string;
+                computedUntil: bigint;
+                processingStarted: bigint;
+            }[];
             ComputeChain: {
                 name: string;
                 id: number;
@@ -331,14 +339,6 @@ export declare abstract class OpportunityRepository {
                 isTest: boolean;
                 price: number | null;
             };
-            CampaignStatus: {
-                error: string;
-                details: Prisma.JsonValue;
-                status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                campaignId: string;
-                computedUntil: bigint;
-                processingStarted: bigint;
-            }[];
         } & {
             params: Prisma.JsonValue;
             type: import("../../../../database/api/.generated").$Enums.CampaignType;
@@ -416,6 +416,14 @@ export declare abstract class OpportunityRepository {
                 Campaign: {
                     startTimestamp: bigint;
                     endTimestamp: bigint;
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
                     amount: string;
                     RewardToken: {
                         symbol: string;
@@ -430,14 +438,6 @@ export declare abstract class OpportunityRepository {
                         isTest: boolean;
                         price: number | null;
                     };
-                    CampaignStatus: {
-                        error: string;
-                        details: Prisma.JsonValue;
-                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                        campaignId: string;
-                        computedUntil: bigint;
-                        processingStarted: bigint;
-                    }[];
                 };
             } & {
                 id: number;
@@ -485,6 +485,14 @@ export declare abstract class OpportunityRepository {
             icon: string;
         };
         Campaigns: ({
+            CampaignStatus: {
+                error: string;
+                details: Prisma.JsonValue;
+                status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                campaignId: string;
+                computedUntil: bigint;
+                processingStarted: bigint;
+            }[];
             ComputeChain: {
                 name: string;
                 id: number;
@@ -515,14 +523,6 @@ export declare abstract class OpportunityRepository {
                 isTest: boolean;
                 price: number | null;
             };
-            CampaignStatus: {
-                error: string;
-                details: Prisma.JsonValue;
-                status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                campaignId: string;
-                computedUntil: bigint;
-                processingStarted: bigint;
-            }[];
         } & {
             params: Prisma.JsonValue;
             type: import("../../../../database/api/.generated").$Enums.CampaignType;
@@ -600,6 +600,14 @@ export declare abstract class OpportunityRepository {
                 Campaign: {
                     startTimestamp: bigint;
                     endTimestamp: bigint;
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
                     amount: string;
                     RewardToken: {
                         symbol: string;
@@ -614,14 +622,6 @@ export declare abstract class OpportunityRepository {
                         isTest: boolean;
                         price: number | null;
                     };
-                    CampaignStatus: {
-                        error: string;
-                        details: Prisma.JsonValue;
-                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                        campaignId: string;
-                        computedUntil: bigint;
-                        processingStarted: bigint;
-                    }[];
                 };
             } & {
                 id: number;
@@ -763,6 +763,14 @@ export declare abstract class OpportunityRepository {
                 Campaign: {
                     startTimestamp: bigint;
                     endTimestamp: bigint;
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
                     amount: string;
                     RewardToken: {
                         symbol: string;
@@ -777,14 +785,6 @@ export declare abstract class OpportunityRepository {
                         isTest: boolean;
                         price: number | null;
                     };
-                    CampaignStatus: {
-                        error: string;
-                        details: Prisma.JsonValue;
-                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                        campaignId: string;
-                        computedUntil: bigint;
-                        processingStarted: bigint;
-                    }[];
                 };
             } & {
                 id: number;
@@ -820,6 +820,14 @@ export declare abstract class OpportunityRepository {
             icon: string;
         };
         Campaigns: ({
+            CampaignStatus: {
+                error: string;
+                details: Prisma.JsonValue;
+                status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                campaignId: string;
+                computedUntil: bigint;
+                processingStarted: bigint;
+            }[];
             ComputeChain: {
                 name: string;
                 id: number;
@@ -843,14 +851,6 @@ export declare abstract class OpportunityRepository {
                 isTest: boolean;
                 price: number | null;
             };
-            CampaignStatus: {
-                error: string;
-                details: Prisma.JsonValue;
-                status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                campaignId: string;
-                computedUntil: bigint;
-                processingStarted: bigint;
-            }[];
         } & {
             params: Prisma.JsonValue;
             type: import("../../../../database/api/.generated").$Enums.CampaignType;
@@ -928,6 +928,14 @@ export declare abstract class OpportunityRepository {
                 Campaign: {
                     startTimestamp: bigint;
                     endTimestamp: bigint;
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
                     amount: string;
                     RewardToken: {
                         symbol: string;
@@ -942,14 +950,6 @@ export declare abstract class OpportunityRepository {
                         isTest: boolean;
                         price: number | null;
                     };
-                    CampaignStatus: {
-                        error: string;
-                        details: Prisma.JsonValue;
-                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-                        campaignId: string;
-                        computedUntil: bigint;
-                        processingStarted: bigint;
-                    }[];
                 };
             } & {
                 id: number;

package/dist/src/modules/v4/opportunity/opportunity.service.d.ts CHANGED Viewed

@@ -131,7 +131,6 @@ export declare abstract class OpportunityService {
             tags: string[];
             icon: string;
         } | null | undefined;
-        depositUrl?: string | undefined;
         aprRecord?: {
             timestamp: string | bigint;
             cumulated: number;
@@ -143,6 +142,7 @@ export declare abstract class OpportunityService {
                 aprRecordId: string;
             }[];
         } | undefined;
+        depositUrl?: string | undefined;
         tvlRecord?: {
             total: number;
             timestamp: string | bigint;

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

@@ -96,6 +96,106 @@ export declare const RewardController: Elysia<"/rewards", {
                 };
             };
         };
+    } & {
+        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: {
@@ -105,12 +205,18 @@ export declare const RewardController: Elysia<"/rewards", {
                     query: {
                         items?: number | undefined;
                         page?: number | undefined;
+                        campaignIds?: string[] | undefined;
                         chainId: number;
                         address: string;
                     };
                     headers: unknown;
                     response: {
-                        200: import("./reward.model").BreakdownForTokenRaw[];
+                        200: {
+                            amount: string;
+                            claimed: string;
+                            pending: string;
+                            recipient: string;
+                        }[];
                         422: {
                             type: "validation";
                             on: string;
@@ -133,6 +239,7 @@ export declare const RewardController: Elysia<"/rewards", {
                     query: {
                         items?: number | undefined;
                         page?: number | undefined;
+                        campaignIds?: string[] | undefined;
                         chainId: number;
                         address: string;
                     };
@@ -164,6 +271,7 @@ export declare const RewardController: Elysia<"/rewards", {
                     query: {
                         items?: number | undefined;
                         page?: number | undefined;
+                        campaignIds?: string[] | undefined;
                         chainId: number;
                         address: string;
                     };
@@ -232,8 +340,6 @@ export declare const RewardController: Elysia<"/rewards", {
                         rewardToken: string;
                         breakdowns: {
                             protocolId?: string | undefined;
-                            auxiliaryData1?: string | undefined;
-                            auxiliaryData2?: string | undefined;
                             reason: string;
                             pending: string;
                             recipient: string;
@@ -299,8 +405,6 @@ export declare const RewardController: Elysia<"/rewards", {
                 post: {
                     body: {
                         data: {
-                            auxiliaryData1?: string | undefined;
-                            auxiliaryData2?: string | undefined;
                             reason: string;
                             pending: string;
                             recipient: string;

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

@@ -3,7 +3,9 @@ import { AuthorizationHeadersDto, EngineGuard } from "../../../guards/Engine.gua
 import { throwOnInvalidRequiredAddress, throwOnUnsupportedChainId } from "../../../utils/throw";
 import Elysia from "elysia";
 import { ChainDto } from "../accounting";
-import { CampaignIdDto, CampaignIdWithoutPageDto, CreateManyBreakdownDto, CreateManyRewardDto, RegisterClaimsDto, TokenIdDto, UpdatePendingDto, } from "./reward.model";
+import { CampaignService } from "../campaign";
+import { TokenService } from "../token";
+import { CampaignIdDto, CampaignIdWithoutPageDto, CampaignRewardsDto, CreateManyBreakdownDto, CreateManyRewardDto, RegisterClaimsDto, TokenIdDto, UpdatePendingDto, } from "./reward.model";
 import { RewardService } from "./reward.service";
 // ─── Rewards Controller ──────────────────────────────────────────────────────
 export const RewardController = new Elysia({ prefix: "/rewards", detail: { tags: ["Rewards"] } })
@@ -33,35 +35,41 @@ export const RewardController = new Elysia({ prefix: "/rewards", detail: { tags:
     },
     detail: { hide: true },
 })
-    .group("/token", app => {
-    return (app
-        // ─── Get Reward Breakdowns For Token ───────────────────────────────
-        .get("/", async ({ query }) => await RewardService.breakdownForToken(query), {
-        query: TokenIdDto,
-        beforeHandle: ({ query }) => {
-            query.address = throwOnInvalidRequiredAddress(query.address);
-            throwOnUnsupportedChainId(query.chainId);
-        },
-        detail: { hide: true },
+    // ─── Get Reward by campaign ─────────────
+    .group("/campaign/:campaignId", app => {
+    return app
+        .resolve(async ({ params: { campaignId } }) => {
+        const campaign = await CampaignService.findUniqueOrThrow(CampaignService.splitIdOrThrow(campaignId));
+        const token = await TokenService.findUniqueOrThrow(campaign.rewardTokenId);
+        const rewardQuery = {
+            chainId: token.chainId,
+            address: token.address,
+            campaignIds: [campaign.campaignId],
+        };
+        return { campaign, token, rewardQuery };
     })
-        // ─── Get Total Amount Rewarded For Token ───────────────────────────
-        .get("/total", async ({ query }) => await RewardService.totalForToken(query), {
-        query: TokenIdDto,
-        beforeHandle: ({ query }) => {
-            query.address = throwOnInvalidRequiredAddress(query.address);
-            throwOnUnsupportedChainId(query.chainId);
-        },
+        .guard({
+        query: CampaignRewardsDto,
         detail: { hide: true },
     })
-        // ─── Get Reward Count By Chain And Root For Token ───────────────────
-        .get("/count", async ({ query }) => await RewardService.countForToken(query), {
+        .get("/", async ({ query, rewardQuery }) => await RewardService.breakdownForToken({ ...query, ...rewardQuery }))
+        .get("/total", async ({ query, rewardQuery }) => await RewardService.totalForToken({ ...query, ...rewardQuery }))
+        .get("/count", async ({ query, rewardQuery }) => await RewardService.countForToken({ ...query, ...rewardQuery }));
+})
+    // ─── Get Reward Breakdowns For Token ───────────────────────────────
+    .group("/token", app => {
+    return app
+        .guard({
         query: TokenIdDto,
         beforeHandle: ({ query }) => {
             query.address = throwOnInvalidRequiredAddress(query.address);
             throwOnUnsupportedChainId(query.chainId);
         },
         detail: { hide: true },
-    }));
+    })
+        .get("/", async ({ query }) => await RewardService.breakdownForToken(query))
+        .get("/total", async ({ query }) => await RewardService.totalForToken(query))
+        .get("/count", async ({ query }) => await RewardService.countForToken(query));
 })
     .group("/engine", app => {
     return (app

package/dist/src/modules/v4/reward/reward.model.d.ts CHANGED Viewed

@@ -90,8 +90,6 @@ export declare const CreateManyBreakdownDto: import("@sinclair/typebox").TArray<
         amount: import("@sinclair/typebox").TString;
         claimed: import("@sinclair/typebox").TString;
         pending: import("@sinclair/typebox").TString;
-        auxiliaryData1: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        auxiliaryData2: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>>;
 }>>;
 declare const RewardDto: import("@sinclair/typebox").TObject<{
@@ -124,8 +122,6 @@ declare const PendingDto: import("@sinclair/typebox").TObject<{
     recipient: import("@sinclair/typebox").TString;
     reason: import("@sinclair/typebox").TString;
     pending: import("@sinclair/typebox").TString;
-    auxiliaryData1: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    auxiliaryData2: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
 }>;
 export declare const UpdatePendingDto: import("@sinclair/typebox").TObject<{
     distributionChainId: import("@sinclair/typebox").TNumber;
@@ -136,8 +132,6 @@ export declare const UpdatePendingDto: import("@sinclair/typebox").TObject<{
         recipient: import("@sinclair/typebox").TString;
         reason: import("@sinclair/typebox").TString;
         pending: import("@sinclair/typebox").TString;
-        auxiliaryData1: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        auxiliaryData2: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>>;
 }>;
 export declare const RewardsByUser: import("@sinclair/typebox").TObject<{
@@ -176,6 +170,11 @@ export declare const CampaignIdDto: import("@sinclair/typebox").TObject<{
 export declare const TokenIdDto: import("@sinclair/typebox").TObject<{
     chainId: import("@sinclair/typebox").TNumber;
     address: import("@sinclair/typebox").TString;
+    campaignIds: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>]>, string[]>>;
+    page: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+    items: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+}>;
+export declare const CampaignRewardsDto: import("@sinclair/typebox").TObject<{
     page: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
     items: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
 }>;
@@ -197,8 +196,6 @@ export declare const RewardV3Dto: import("@sinclair/typebox").TRecord<import("@s
         accumulated: import("@sinclair/typebox").TString;
         unclaimed: import("@sinclair/typebox").TString;
         pending: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        auxiliaryData1: import("@sinclair/typebox").TString;
-        auxiliaryData2: import("@sinclair/typebox").TString;
         decimals: import("@sinclair/typebox").TNumber;
         mainParameter: import("@sinclair/typebox").TString;
         symbol: import("@sinclair/typebox").TString;

package/dist/src/modules/v4/reward/reward.model.js CHANGED Viewed

@@ -22,8 +22,6 @@ const BreakdownDto = t.Object({
     amount: t.String(),
     claimed: t.String(),
     pending: t.String(),
-    auxiliaryData1: t.Optional(t.String()),
-    auxiliaryData2: t.Optional(t.String()),
 });
 export const CreateManyBreakdownDto = t.Array(t.Object({
     distributionChainId: t.Numeric(),
@@ -53,8 +51,6 @@ const PendingDto = t.Object({
     recipient: t.String(),
     reason: t.String(),
     pending: t.String(),
-    auxiliaryData1: t.Optional(t.String()),
-    auxiliaryData2: t.Optional(t.String()),
 });
 export const UpdatePendingDto = t.Object({
     distributionChainId: t.Numeric(),
@@ -122,6 +118,14 @@ export const TokenIdDto = t.Object({
     address: t.String({
         description: "Token Address",
     }),
+    campaignIds: t.Optional(t
+        .Transform(t.Union([t.String(), t.Array(t.String())]))
+        .Decode(value => (typeof value === "string" ? value.split(",") : value))
+        .Encode(value => [...value])),
+    page: t.Optional(t.Numeric({ description: "Page number", default: 0 })), // 0-indexed
+    items: t.Optional(t.Numeric({ description: "Number of returned rows", default: 20 })), // items per page
+});
+export const CampaignRewardsDto = t.Object({
     page: t.Optional(t.Numeric({ description: "Page number", default: 0 })), // 0-indexed
     items: t.Optional(t.Numeric({ description: "Number of returned rows", default: 20 })), // items per page
 });
@@ -139,8 +143,6 @@ export const RewardV3Dto = t.Record(t.String({ title: "Chain" }), t.Object({
         accumulated: t.String(),
         unclaimed: t.String(),
         pending: t.Optional(t.String()),
-        auxiliaryData1: t.String(),
-        auxiliaryData2: t.String(),
         decimals: t.Numeric(),
         mainParameter: t.String(),
         symbol: t.String(),