@merkl/api 0.10.182 → 0.10.184

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

@@ -106,7 +106,7 @@ declare const eden: {
                     tvl: number;
                     apr: number;
                     dailyRewards: number;
-                } | null | undefined;
+                } | undefined;
             }>>;
             campaigns: {
                 get: (options?: {
@@ -317,7 +317,7 @@ declare const eden: {
                     };
                     fetch?: RequestInit | undefined;
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                    200: ({
+                    200: {
                         aprRecord: {
                             cumulated: number;
                             timestamp: bigint;
@@ -403,7 +403,7 @@ declare const eden: {
                         tvl: number;
                         apr: number;
                         dailyRewards: number;
-                    } | null)[];
+                    }[];
                 }>>;
             };
             count: {
@@ -898,6 +898,22 @@ declare const eden: {
                         } | undefined;
                     }>>;
                 };
+                claims: {
+                    post: (body: {
+                        token: string;
+                        chainId: number;
+                        recipient: string;
+                        root: string;
+                    }[], options: {
+                        headers: {
+                            authorization: string;
+                        };
+                        query?: Record<string, unknown> | undefined;
+                        fetch?: RequestInit | undefined;
+                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                        200: void;
+                    }>>;
+                };
                 pendings: {
                     post: (body: {
                         distributionChainId: number;
@@ -2102,7 +2118,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null | undefined;
+                        } | undefined;
                     };
                 };
             };
@@ -2280,7 +2296,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                     headers: unknown;
                     response: {
-                        200: ({
+                        200: {
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
@@ -2366,7 +2382,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null)[];
+                        }[];
                     };
                 };
             };
@@ -3006,6 +3022,27 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
+        } & {
+            engine: {
+                claims: {
+                    post: {
+                        body: {
+                            token: string;
+                            chainId: number;
+                            recipient: string;
+                            root: string;
+                        }[];
+                        params: {};
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 pendings: {
@@ -4456,7 +4493,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     tvl: number;
                     apr: number;
                     dailyRewards: number;
-                } | null | undefined;
+                } | undefined;
             }>>;
             campaigns: {
                 get: (options?: {
@@ -4667,7 +4704,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                     fetch?: RequestInit | undefined;
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                    200: ({
+                    200: {
                         aprRecord: {
                             cumulated: number;
                             timestamp: bigint;
@@ -4753,7 +4790,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         tvl: number;
                         apr: number;
                         dailyRewards: number;
-                    } | null)[];
+                    }[];
                 }>>;
             };
             count: {
@@ -5248,6 +5285,22 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         } | undefined;
                     }>>;
                 };
+                claims: {
+                    post: (body: {
+                        token: string;
+                        chainId: number;
+                        recipient: string;
+                        root: string;
+                    }[], options: {
+                        headers: {
+                            authorization: string;
+                        };
+                        query?: Record<string, unknown> | undefined;
+                        fetch?: RequestInit | undefined;
+                    }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                        200: void;
+                    }>>;
+                };
                 pendings: {
                     post: (body: {
                         distributionChainId: number;

package/dist/src/index.d.ts

@@ -164,7 +164,7 @@ declare const app: Elysia<"", false, {
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null | undefined;
+                        } | undefined;
                     };
                 };
             };
@@ -342,7 +342,7 @@ declare const app: Elysia<"", false, {
                     };
                     headers: unknown;
                     response: {
-                        200: ({
+                        200: {
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
@@ -428,7 +428,7 @@ declare const app: Elysia<"", false, {
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null)[];
+                        }[];
                     };
                 };
             };
@@ -1068,6 +1068,27 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
+        } & {
+            engine: {
+                claims: {
+                    post: {
+                        body: {
+                            token: string;
+                            chainId: number;
+                            recipient: string;
+                            root: string;
+                        }[];
+                        params: {};
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 pendings: {

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/subtypesRound1RefactoFinal.js

@@ -182,10 +182,8 @@ function parseForBalancer(calls, index, targetToken, name) {
 function parseForStaking(campaign, calls, index, targetToken) {
     try {
         const whitelist = campaign.campaignParameters.whitelist;
-        console.log("whitelist", whitelist, whitelist.length);
         if (whitelist.length === 1) {
             const forwarders = campaign.campaignParameters.forwarders;
-            console.log("forwarders", forwarders);
             if (forwarders.length === 1) {
                 if (forwarders[0].sender === whitelist[0]) {
                     const name = decodeCall(calls, index + 2, "name");
@@ -210,7 +208,6 @@ export function getTokenTypeRound1(calls, targetToken, index, campaign) {
     result = parseForMetamorpho(returnValueOfCalls, index, targetToken);
     if (result)
         return result;
-    console.log("parsing for staking");
     result = parseForStaking(campaign, returnValueOfCalls, index, targetToken);
     if (result)
         return result;

package/dist/src/libs/campaigns/campaignsDynamicData.js

@@ -1,4 +1,3 @@
-import { log } from "../../utils/logger";
 import { engineDbClient } from "../../utils/prisma";
 import { Campaign } from "@sdk";
 import { getAddress } from "ethers/lib/utils";
@@ -25,9 +24,7 @@ export async function campaignsDynamicData(chainId, campaigns, type) {
             campaign.tags = tags[getAddress(campaign.creator)] || [];
         }
     }
-    catch (_err) {
-        log.warn("No tags assigned to creator address in database");
-    }
+    catch (_err) { }
     switch (type) {
         case Campaign.ERC20: {
             const switchRefacto = process.env.SWITCH_REFACTO_SUBTYPES_ERC20 !== undefined ? process.env.SWITCH_REFACTO_SUBTYPES_ERC20 : false;

package/dist/src/libs/campaigns/campaignsDynamicDataRefacto.js

@@ -1,7 +1,6 @@
 import { engineDbClient } from "../../utils/prisma";
 import { Campaign } from "@sdk";
 import { getAddress } from "ethers/lib/utils";
-import { log } from "../../utils/logger";
 import { AjnaDynamicData } from "./campaignTypes/AjnaDynamicData";
 import { BadgerDynamicData } from "./campaignTypes/BadgerDynamicData";
 import { CLAMMDynamicData } from "./campaignTypes/CLAMMDynamicData";
@@ -24,9 +23,7 @@ export async function campaignsDynamicDataRefacto(chainId, campaigns, type, next
             campaign.tags = tags[getAddress(campaign.creator)] || [];
         }
     }
-    catch (e) {
-        log.warn("No tags assigned to creator address in database");
-    }
+    catch (e) { }
     switch (type) {
         case Campaign.ERC20: {
             return ERC20DynamicDataRefacto(chainId, campaigns);

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

@@ -137,7 +137,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         tvl: number;
                         apr: number;
                         dailyRewards: number;
-                    } | null | undefined;
+                    } | undefined;
                 };
             };
         };
@@ -315,7 +315,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                 };
                 headers: unknown;
                 response: {
-                    200: ({
+                    200: {
                         aprRecord: {
                             cumulated: number;
                             timestamp: bigint;
@@ -401,7 +401,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         tvl: number;
                         apr: number;
                         dailyRewards: number;
-                    } | null)[];
+                    }[];
                 };
             };
         };

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

@@ -239,13 +239,13 @@ export declare abstract class OpportunityService {
         tvl: number;
         apr: number;
         dailyRewards: number;
-    } | null>;
+    }>;
     /**
      * Get the list of opportunities satisfying the query
      * @param query
      * @returns A list of opportunities
      */
-    static getMany(query: GetOpportunitiesQueryModel): Promise<({
+    static getMany(query: GetOpportunitiesQueryModel): Promise<{
         aprRecord: {
             cumulated: number;
             timestamp: bigint;
@@ -331,7 +331,7 @@ export declare abstract class OpportunityService {
         tvl: number;
         apr: number;
         dailyRewards: number;
-    } | null)[]>;
+    }[]>;
     static findLiveWithFirstCampaign(chainId: MerklChainId): Promise<({
         aprRecord: {
             cumulated: number;
@@ -562,7 +562,7 @@ export declare abstract class OpportunityService {
         tvl: number;
         apr: number;
         dailyRewards: number;
-    } | null;
+    };
     static formatResponseBase(opportunity: LightOpportunityFromDB): {
         id: string;
         tokens: ({

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

@@ -175,8 +175,6 @@ export class OpportunityService {
         return await OpportunityRepository.countMany(query);
     }
     static formatResponse(opportunity) {
-        if (opportunity === null)
-            return null;
         const { DailyRewardsRecords, AprRecords, TvlRecords, ...opp } = opportunity;
         return {
             ...OpportunityService.formatResponseBase(opp),

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

@@ -104,6 +104,27 @@ export declare const RewardController: Elysia<"/rewards", false, {
                 };
             };
         };
+    } & {
+        engine: {
+            claims: {
+                post: {
+                    body: {
+                        token: string;
+                        chainId: number;
+                        recipient: string;
+                        root: string;
+                    }[];
+                    params: {};
+                    query: unknown;
+                    headers: {
+                        authorization: string;
+                    };
+                    response: {
+                        200: void;
+                    };
+                };
+            };
+        };
     } & {
         engine: {
             pendings: {

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

@@ -1,8 +1,8 @@
 import { BackOfficeGuard } from "../../../guards/BackOffice.guard";
 import { AuthorizationHeadersDto, EngineGuard } from "../../../guards/Engine.guard";
-import { throwOnUnsupportedChainId } from "../../../utils/throw";
+import { throwOnInvalidRequiredAddress, throwOnUnsupportedChainId } from "../../../utils/throw";
 import Elysia from "elysia";
-import { CampaignIdDto, CampaignIdWithoutPageDto, CreateManyBreakdownDto, CreateManyRewardDto, UpdatePendingDto, } from "./reward.model";
+import { CampaignIdDto, CampaignIdWithoutPageDto, CreateManyBreakdownDto, CreateManyRewardDto, RegisterClaimsDto, UpdatePendingDto, } from "./reward.model";
 import { RewardService } from "./reward.service";
 // ─── Rewards Controller ──────────────────────────────────────────────────────
 export const RewardController = new Elysia({ prefix: "/rewards", detail: { tags: ["Rewards"] } })
@@ -31,6 +31,19 @@ export const RewardController = new Elysia({ prefix: "/rewards", detail: { tags:
     headers: AuthorizationHeadersDto,
     body: CreateManyBreakdownDto,
     beforeHandle: EngineGuard,
+})
+    // ─── Register new claims ──────────────────────────────────────────────
+    .post("/engine/claims", async ({ body }) => await RewardService.registerClaims(body), {
+    headers: AuthorizationHeadersDto,
+    body: RegisterClaimsDto,
+    beforeHandle: ({ headers, body }) => {
+        EngineGuard({ headers });
+        for (const claim of body) {
+            throwOnUnsupportedChainId(claim.chainId);
+            claim.token = throwOnInvalidRequiredAddress(claim.token);
+            claim.recipient = throwOnInvalidRequiredAddress(claim.recipient);
+        }
+    },
 })
     // ─── Create Many Pending Rewards ─────────────────────────────────────
     .post("/engine/pendings", async ({ body }) => await RewardService.updatePendings(body), {

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

@@ -65,6 +65,12 @@ export declare const CreateManyRewardDto: import("@sinclair/typebox").TArray<imp
     rewardToken: import("@sinclair/typebox").TString;
     proofs: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>;
 }>>;
+export declare const RegisterClaimsDto: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+    chainId: import("@sinclair/typebox").TNumber;
+    recipient: import("@sinclair/typebox").TString;
+    token: import("@sinclair/typebox").TString;
+    root: import("@sinclair/typebox").TString;
+}>>;
 declare const PendingDto: import("@sinclair/typebox").TObject<{
     recipient: import("@sinclair/typebox").TString;
     reason: import("@sinclair/typebox").TString;
@@ -163,6 +169,7 @@ export type CreateManyRewardModel = typeof CreateManyRewardDto.static;
 export type CreateManyBreakdownModel = typeof CreateManyBreakdownDto.static;
 export type RewardEntity = typeof RewardDto.static;
 export type RewardPerChainModel = typeof RewardsPerChainDto.static;
+export type RegisterClaimsModel = typeof RegisterClaimsDto.static;
 export type UpdatePendingModel = typeof UpdatePendingDto.static;
 export type PendingEntity = typeof PendingDto.static;
 export type CampaignIdWithoutPageModel = {

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

@@ -25,6 +25,12 @@ const RewardDto = t.Object({
     proofs: t.Array(t.String()),
 });
 export const CreateManyRewardDto = t.Array(RewardDto);
+export const RegisterClaimsDto = t.Array(t.Object({
+    chainId: t.Numeric(),
+    recipient: t.String(),
+    token: t.String(),
+    root: t.String(),
+}));
 const PendingDto = t.Object({
     recipient: t.String(),
     reason: t.String(),

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

@@ -123,6 +123,7 @@ export declare abstract class RewardRepository {
             _all: number;
         };
     })[]>;
+    static updateClaimed(recipient: string, rewardTokenId: string, campaignId: string, reason: string, amount: string): Promise<Prisma.BatchPayload>;
     static updatePendings(rewardTokenId: string, root: string, campaignId: string, toUpdate: PendingEntity[]): Promise<{
         reason: string;
         pending: string;

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

@@ -118,6 +118,21 @@ export class RewardRepository {
             _count: { _all: true },
         });
     }
+    static async updateClaimed(recipient, rewardTokenId, campaignId, reason, amount) {
+        return await apiDbClient.rewardBreakdown.updateMany({
+            where: {
+                campaignId,
+                reason,
+                Reward: {
+                    recipient,
+                    rewardTokenId,
+                },
+            },
+            data: {
+                claimed: amount,
+            },
+        });
+    }
     static async updatePendings(rewardTokenId, root, campaignId, toUpdate) {
         return await apiDbClient.$transaction(toUpdate.map(x => {
             return apiDbClient.rewardBreakdown.update({

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

@@ -2,7 +2,7 @@ import type { CacheKeys } from "../../../cache/keys";
 import type { Chain } from "../../../../database/api/.generated";
 import { Campaign, type CampaignDynamicData, type ChainId } from "@sdk";
 import { type LightOpportunityFromDB, type Opportunity } from "../opportunity";
-import type { CampaignIdModel, CampaignIdWithoutPageModel, CreateManyBreakdownModel, CreateManyRewardModel, DailyRewardsRecord, RewardBreakdown, UpdatePendingModel } from "./reward.model";
+import type { CampaignIdModel, CampaignIdWithoutPageModel, CreateManyBreakdownModel, CreateManyRewardModel, DailyRewardsRecord, RegisterClaimsModel, RewardBreakdown, UpdatePendingModel } from "./reward.model";
 import { RewardRepository } from "./reward.repository";
 export declare abstract class RewardService {
     static hashId(root: string, recipient: string, rewardTokenId: string): string;
@@ -541,6 +541,7 @@ export declare abstract class RewardService {
         chain: Chain;
         rewards: Awaited<ReturnType<(typeof RewardService)["format"]>>;
     }[]>;
+    static registerClaims(claims: RegisterClaimsModel): Promise<void>;
     static updatePendings(data: UpdatePendingModel): Promise<boolean>;
     static countAllchains(): Promise<Record<string, {
         breakdown: number;

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

@@ -205,6 +205,20 @@ export class RewardService {
         }
         return res;
     }
+    static async registerClaims(claims) {
+        for (const claim of claims) {
+            const tokenId = TokenService.hashId({
+                chainId: claim.chainId,
+                address: claim.token,
+            });
+            const rewards = await RewardRepository.getByChainRecipientToken(claim.recipient, claim.root, tokenId);
+            if (!rewards)
+                continue;
+            for (const breakdown of rewards.Breakdown) {
+                await RewardRepository.updateClaimed(claim.recipient, tokenId, breakdown.campaignId, breakdown.reason, breakdown.amount);
+            }
+        }
+    }
     static async updatePendings(data) {
         const rewardTokenId = await TokenService.hashId({ address: data.rewardToken, chainId: data.distributionChainId });
         const campaignId = await CampaignService.hashId({

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

@@ -146,7 +146,7 @@ export declare const v4: Elysia<"/v4", false, {
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null | undefined;
+                        } | undefined;
                     };
                 };
             };
@@ -324,7 +324,7 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                     headers: unknown;
                     response: {
-                        200: ({
+                        200: {
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
@@ -410,7 +410,7 @@ export declare const v4: Elysia<"/v4", false, {
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null)[];
+                        }[];
                     };
                 };
             };
@@ -1050,6 +1050,27 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                 };
             };
+        } & {
+            engine: {
+                claims: {
+                    post: {
+                        body: {
+                            token: string;
+                            chainId: number;
+                            recipient: string;
+                            root: string;
+                        }[];
+                        params: {};
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 pendings: {

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

@@ -34,8 +34,12 @@ export class TokenRepository {
     static #transformQueryToPrismaFilters(query) {
         return {
             where: {
-                symbol: query.symbol ? { equals: query.symbol, mode: "insensitive" } : undefined,
-                displaySymbol: query.symbol ? { equals: query.symbol, mode: "insensitive" } : undefined,
+                OR: query.symbol
+                    ? [
+                        { symbol: { equals: query.symbol, mode: "insensitive" } },
+                        { displaySymbol: { equals: query.symbol, mode: "insensitive" } },
+                    ]
+                    : undefined,
                 address: query.address ? { equals: query.address, mode: "insensitive" } : undefined,
                 chainId: query.chainId ? { equals: query.chainId } : undefined,
                 name: query.name ? { contains: query.name, mode: "insensitive" } : undefined,

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

@@ -170,7 +170,7 @@ declare const _default: (app: App) => import("elysia").default<"", false, {
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null | undefined;
+                        } | undefined;
                     };
                 };
             };
@@ -348,7 +348,7 @@ declare const _default: (app: App) => import("elysia").default<"", false, {
                     };
                     headers: unknown;
                     response: {
-                        200: ({
+                        200: {
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
@@ -434,7 +434,7 @@ declare const _default: (app: App) => import("elysia").default<"", false, {
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
-                        } | null)[];
+                        }[];
                     };
                 };
             };
@@ -1074,6 +1074,27 @@ declare const _default: (app: App) => import("elysia").default<"", false, {
                     };
                 };
             };
+        } & {
+            engine: {
+                claims: {
+                    post: {
+                        body: {
+                            token: string;
+                            chainId: number;
+                            recipient: string;
+                            root: string;
+                        }[];
+                        params: {};
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 pendings: {