npm - @merkl/api - Versions diffs - 0.17.42 → 0.18.1 - Mend

@merkl/api 0.17.42 → 0.18.1

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 (24) hide show

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

@@ -616,6 +616,13 @@ declare const eden: {
                             price?: number | null | undefined;
                         })[];
                         chain: {
+                            Explorer: {
+                                type: import("../../database/api/.generated").$Enums.ExplorerType;
+                                url: string;
+                                id: string;
+                                chainId: number;
+                            }[];
+                        } & {
                             name: string;
                             id: number;
                             icon: string;
@@ -2935,6 +2942,21 @@ declare const eden: {
                     }>>;
                 };
             };
+            error: ((params: {
+                campaignId: string | number;
+            }) => {
+                put: (body: {
+                    error: string;
+                }, options: {
+                    headers: {
+                        authorization: string;
+                    };
+                    query?: Record<string, unknown> | undefined;
+                    fetch?: RequestInit | undefined;
+                }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                    200: void;
+                }>>;
+            }) & {};
             index: {
                 get: (options: {
                     headers?: Record<string, unknown> | undefined;
@@ -3012,7 +3034,7 @@ declare const eden: {
                                 endOfDisputePeriod: number;
                                 disputer: string;
                                 liveCampaigns: number;
-                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status").StatusService["findManyDelay"]>>;
+                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status/status.service").StatusService["findManyDelay"]>>;
                             };
                         };
                     }>>;
@@ -4033,6 +4055,13 @@ declare const eden: {
                             price?: number | null | undefined;
                         })[];
                         chain: {
+                            Explorer: {
+                                type: import("../../database/api/.generated").$Enums.ExplorerType;
+                                url: string;
+                                id: string;
+                                chainId: number;
+                            }[];
+                        } & {
                             name: string;
                             id: number;
                             icon: string;
@@ -6352,6 +6381,21 @@ declare const eden: {
                     }>>;
                 };
             };
+            error: ((params: {
+                campaignId: string | number;
+            }) => {
+                put: (body: {
+                    error: string;
+                }, options: {
+                    headers: {
+                        authorization: string;
+                    };
+                    query?: Record<string, unknown> | undefined;
+                    fetch?: RequestInit | undefined;
+                }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                    200: void;
+                }>>;
+            }) & {};
             index: {
                 get: (options: {
                     headers?: Record<string, unknown> | undefined;
@@ -6429,7 +6473,7 @@ declare const eden: {
                                 endOfDisputePeriod: number;
                                 disputer: string;
                                 liveCampaigns: number;
-                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status").StatusService["findManyDelay"]>>;
+                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status/status.service").StatusService["findManyDelay"]>>;
                             };
                         };
                     }>>;
@@ -7911,6 +7955,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                                 price?: number | null | undefined;
                             })[];
                             chain: {
+                                Explorer: {
+                                    type: import("../../database/api/.generated").$Enums.ExplorerType;
+                                    url: string;
+                                    id: string;
+                                    chainId: number;
+                                }[];
+                            } & {
                                 name: string;
                                 id: number;
                                 icon: string;
@@ -11018,6 +11069,26 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                 };
             };
+        } & {
+            error: {
+                ":campaignId": {
+                    put: {
+                        body: {
+                            error: string;
+                        };
+                        params: {
+                            campaignId: string;
+                        };
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 overlaps: {
@@ -11152,7 +11223,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                                     endOfDisputePeriod: number;
                                     disputer: string;
                                     liveCampaigns: number;
-                                    delayed: Awaited<ReturnType<typeof import("../modules/v4/status").StatusService["findManyDelay"]>>;
+                                    delayed: Awaited<ReturnType<typeof import("../modules/v4/status/status.service").StatusService["findManyDelay"]>>;
                                 };
                             };
                         };
@@ -13150,6 +13221,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             price?: number | null | undefined;
                         })[];
                         chain: {
+                            Explorer: {
+                                type: import("../../database/api/.generated").$Enums.ExplorerType;
+                                url: string;
+                                id: string;
+                                chainId: number;
+                            }[];
+                        } & {
                             name: string;
                             id: number;
                             icon: string;
@@ -15469,6 +15547,21 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     }>>;
                 };
             };
+            error: ((params: {
+                campaignId: string | number;
+            }) => {
+                put: (body: {
+                    error: string;
+                }, options: {
+                    headers: {
+                        authorization: string;
+                    };
+                    query?: Record<string, unknown> | undefined;
+                    fetch?: RequestInit | undefined;
+                }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                    200: void;
+                }>>;
+            }) & {};
             index: {
                 get: (options: {
                     headers?: Record<string, unknown> | undefined;
@@ -15546,7 +15639,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                                 endOfDisputePeriod: number;
                                 disputer: string;
                                 liveCampaigns: number;
-                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status").StatusService["findManyDelay"]>>;
+                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status/status.service").StatusService["findManyDelay"]>>;
                             };
                         };
                     }>>;
@@ -16567,6 +16660,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             price?: number | null | undefined;
                         })[];
                         chain: {
+                            Explorer: {
+                                type: import("../../database/api/.generated").$Enums.ExplorerType;
+                                url: string;
+                                id: string;
+                                chainId: number;
+                            }[];
+                        } & {
                             name: string;
                             id: number;
                             icon: string;
@@ -18886,6 +18986,21 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     }>>;
                 };
             };
+            error: ((params: {
+                campaignId: string | number;
+            }) => {
+                put: (body: {
+                    error: string;
+                }, options: {
+                    headers: {
+                        authorization: string;
+                    };
+                    query?: Record<string, unknown> | undefined;
+                    fetch?: RequestInit | undefined;
+                }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                    200: void;
+                }>>;
+            }) & {};
             index: {
                 get: (options: {
                     headers?: Record<string, unknown> | undefined;
@@ -18963,7 +19078,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                                 endOfDisputePeriod: number;
                                 disputer: string;
                                 liveCampaigns: number;
-                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status").StatusService["findManyDelay"]>>;
+                                delayed: Awaited<ReturnType<typeof import("../modules/v4/status/status.service").StatusService["findManyDelay"]>>;
                             };
                         };
                     }>>;

package/dist/src/errors/VoidString.error.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { HttpError } from "./HttpError";
+export declare class VoidString extends HttpError {
+    constructor(message?: string);
+}

package/dist/src/errors/VoidString.error.js ADDED Viewed

@@ -0,0 +1,7 @@
+import { HttpError } from "./HttpError";
+export class VoidString extends HttpError {
+    constructor(message = "Void String is invalid") {
+        super(message, 409);
+        this.name = "VoidString";
+    }
+}

package/dist/src/factories/metadataFactory/factory.js CHANGED Viewed

@@ -18,7 +18,7 @@ import { JsonAirdropMetadata } from "./implementations/JsonAirdrop";
 import { MorphoMetadata } from "./implementations/Morpho";
 import { RadiantMetadata } from "./implementations/Radiant";
 import { SiloMetadata } from "./implementations/Silo";
-import { UniswapV4Metadata } from "./implementations/UniswapV4Metadata";
+import { UniswapV4Metadata } from "./implementations/UniswapV4";
 import { VestMetadata } from "./implementations/Vest";
 // @dev Casts are made to enforce type safety
 // @dev A type error must be thrown if a new campaign type is added and the corresponding metadata builder is not implemented
@@ -52,5 +52,6 @@ const map = {
     [Campaign.AMBIENTPROCESSOR]: new AmbientMetadata(),
     [Campaign.ENCOMPASSING]: new EncompassingMetadata(),
     [Campaign.EVENT_BASED]: new EventBasedMetadata(),
+    [Campaign.ERC20REBASEFIXAPR]: new Erc20Metadata(),
 };
 export const metadataBuilderFactory = (campaignType) => map[campaignType];

package/dist/src/factories/metadataFactory/implementations/{UniswapV4Metadata.js → UniswapV4.js} RENAMED Viewed

@@ -16,7 +16,7 @@ export class UniswapV4Metadata {
         //     }
         //   }
         return {
-            name: `Provide liquidity to ${whitelistNameString} UniswapV4 ${params.symbolCurrency0}-${params.symbolCurrency1}${params.lpFee ? ` ${params.lpFee}%` : ""}`,
+            name: `Provide liquidity to ${whitelistNameString} UniswapV4 ${params.symbolCurrency0}-${params.symbolCurrency1}${params.lpFee ? ` ${params.lpFee / 10_000}%` : ""}`,
             action: OpportunityAction.POOL,
             tokens: [
                 { chainId: computeChainId, address: params.currency0 },

package/dist/src/index.d.ts CHANGED Viewed

@@ -408,6 +408,13 @@ declare const app: Elysia<"", false, {
                                 price?: number | null | undefined;
                             })[];
                             chain: {
+                                Explorer: {
+                                    type: import("../database/api/.generated").$Enums.ExplorerType;
+                                    url: string;
+                                    id: string;
+                                    chainId: number;
+                                }[];
+                            } & {
                                 name: string;
                                 id: number;
                                 icon: string;
@@ -3515,6 +3522,26 @@ declare const app: Elysia<"", false, {
                     };
                 };
             };
+        } & {
+            error: {
+                ":campaignId": {
+                    put: {
+                        body: {
+                            error: string;
+                        };
+                        params: {
+                            campaignId: string;
+                        };
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 overlaps: {
@@ -3649,7 +3676,7 @@ declare const app: Elysia<"", false, {
                                     endOfDisputePeriod: number;
                                     disputer: string;
                                     liveCampaigns: number;
-                                    delayed: Awaited<ReturnType<typeof import("./modules/v4/status").StatusService["findManyDelay"]>>;
+                                    delayed: Awaited<ReturnType<typeof import("./modules/v4/status/status.service").StatusService["findManyDelay"]>>;
                                 };
                             };
                         };

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

@@ -263,6 +263,13 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             price?: number | null | undefined;
                         })[];
                         chain: {
+                            Explorer: {
+                                type: import("../../../../database/api/.generated").$Enums.ExplorerType;
+                                url: string;
+                                id: string;
+                                chainId: number;
+                            }[];
+                        } & {
                             name: string;
                             id: number;
                             icon: string;

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

@@ -175,6 +175,13 @@ export declare abstract class OpportunityRepository {
     }) | null>;
     static findUniqueOrThrow(id: string, withTest?: boolean, withCampaigns?: boolean): Promise<{
         Chain: {
+            Explorer: {
+                type: import("../../../../database/api/.generated").$Enums.ExplorerType;
+                url: string;
+                id: string;
+                chainId: number;
+            }[];
+        } & {
             name: string;
             id: number;
             icon: string;

package/dist/src/modules/v4/opportunity/opportunity.repository.js CHANGED Viewed

@@ -197,7 +197,7 @@ export class OpportunityRepository {
             include: {
                 ...OpportunityRepository.#getRecordInclusion(withTest),
                 Campaigns: withCampaigns ? OpportunityRepository.#getCampaignInclusion(withTest) : undefined,
-                Chain: true,
+                Chain: { include: { Explorer: true } },
                 MainProtocol: true,
                 Protocols: true,
                 Tokens: {

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

@@ -551,6 +551,13 @@ export declare abstract class OpportunityService {
             price?: number | null | undefined;
         })[];
         chain: {
+            Explorer: {
+                type: import("../../../../database/api/.generated").$Enums.ExplorerType;
+                url: string;
+                id: string;
+                chainId: number;
+            }[];
+        } & {
             name: string;
             id: number;
             icon: string;
@@ -716,6 +723,13 @@ export declare abstract class OpportunityService {
             price?: number | null | undefined;
         })[];
         chain: {
+            Explorer: {
+                type: import("../../../../database/api/.generated").$Enums.ExplorerType;
+                url: string;
+                id: string;
+                chainId: number;
+            }[];
+        } & {
             name: string;
             id: number;
             icon: string;
@@ -877,6 +891,13 @@ export declare abstract class OpportunityService {
             price?: number | null | undefined;
         })[];
         chain: {
+            Explorer: {
+                type: import("../../../../database/api/.generated").$Enums.ExplorerType;
+                url: string;
+                id: string;
+                chainId: number;
+            }[];
+        } & {
             name: string;
             id: number;
             icon: string;
@@ -917,6 +938,13 @@ export declare abstract class OpportunityService {
             price?: number | null | undefined;
         })[];
         chain: {
+            Explorer: {
+                type: import("../../../../database/api/.generated").$Enums.ExplorerType;
+                url: string;
+                id: string;
+                chainId: number;
+            }[];
+        } & {
             name: string;
             id: number;
             icon: string;

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

@@ -278,6 +278,13 @@ export declare const v4: Elysia<"/v4", false, {
                                 price?: number | null | undefined;
                             })[];
                             chain: {
+                                Explorer: {
+                                    type: import("../../../database/api/.generated").$Enums.ExplorerType;
+                                    url: string;
+                                    id: string;
+                                    chainId: number;
+                                }[];
+                            } & {
                                 name: string;
                                 id: number;
                                 icon: string;
@@ -3385,6 +3392,26 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                 };
             };
+        } & {
+            error: {
+                ":campaignId": {
+                    put: {
+                        body: {
+                            error: string;
+                        };
+                        params: {
+                            campaignId: string;
+                        };
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: void;
+                        };
+                    };
+                };
+            };
         } & {
             engine: {
                 overlaps: {
@@ -3519,7 +3546,7 @@ export declare const v4: Elysia<"/v4", false, {
                                     endOfDisputePeriod: number;
                                     disputer: string;
                                     liveCampaigns: number;
-                                    delayed: Awaited<ReturnType<typeof import("./status").StatusService["findManyDelay"]>>;
+                                    delayed: Awaited<ReturnType<typeof import("./status/status.service").StatusService["findManyDelay"]>>;
                                 };
                             };
                         };

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

@@ -66,6 +66,26 @@ export declare const StatusController: Elysia<"/campaign-status", false, {
                 };
             };
         };
+    } & {
+        error: {
+            ":campaignId": {
+                put: {
+                    body: {
+                        error: string;
+                    };
+                    params: {
+                        campaignId: string;
+                    };
+                    query: unknown;
+                    headers: {
+                        authorization: string;
+                    };
+                    response: {
+                        200: void;
+                    };
+                };
+            };
+        };
     } & {
         engine: {
             overlaps: {

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

@@ -1,7 +1,8 @@
+import { BackOfficeGuard } from "../../../guards/BackOffice.guard";
 import { AuthorizationHeadersDto, EngineGuard } from "../../../guards/Engine.guard";
 import { throwOnUnsupportedChainId } from "../../../utils/throw";
 import Elysia from "elysia";
-import { CampaignUniqueDto, ComputedUntilDto, DelayDto, QueryCampaignStatusDto, UpdateCampaignStatusDto, } from "./status.model";
+import { CampaignUniqueDto, ComputedUntilDto, DelayDto, QueryCampaignStatusDto, StatusErrorDto, UpdateCampaignStatusDto, } from "./status.model";
 import { StatusService } from "./status.service";
 export const StatusController = new Elysia({ prefix: "/campaign-status", detail: { tags: ["Status"], hide: true } })
     // ─── Update a Campaign Status ──────────────────────────────────────
@@ -21,6 +22,15 @@ export const StatusController = new Elysia({ prefix: "/campaign-status", detail:
     beforeHandle: EngineGuard,
     headers: AuthorizationHeadersDto,
     body: ComputedUntilDto,
+})
+    // ─── Updates only the computed until field ───────────────────────────
+    .put("/error/:campaignId", async ({ params, body }) => {
+    const [distributionChain, campaignId] = params.campaignId.split("-");
+    return await StatusService.updateErrorMessage({ distributionChain: +distributionChain, campaignId }, body.error);
+}, {
+    beforeHandle: BackOfficeGuard,
+    headers: AuthorizationHeadersDto,
+    body: StatusErrorDto,
 })
     // ─── Is Safe For Overlaps ───────────────────────────────────────────
     .get("/engine/overlaps", async ({ query }) => await StatusService.isSafeForOverlaps(query), {

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

@@ -41,6 +41,9 @@ export declare const UpdateCampaignStatusDto: import("@sinclair/typebox").TUnion
 export declare const ComputedUntilDto: import("@sinclair/typebox").TObject<{
     computedUntil: import("@sinclair/typebox").TNumber;
 }>;
+export declare const StatusErrorDto: import("@sinclair/typebox").TObject<{
+    error: import("@sinclair/typebox").TString;
+}>;
 export declare const QueryCampaignStatusDto: import("@sinclair/typebox").TObject<{
     computeChainId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
     status: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TArray<import("@sinclair/typebox").TEnum<{

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

@@ -27,6 +27,7 @@ export const UpdateCampaignStatusDto = t.Union([
     t.Object({ value: t.Literal(RunStatus.FAILED), error: t.String(), details: t.String() }),
 ]);
 export const ComputedUntilDto = t.Object({ computedUntil: t.Numeric() });
+export const StatusErrorDto = t.Object({ error: t.String() });
 export const QueryCampaignStatusDto = t.Object({
     computeChainId: t.Optional(t.Numeric()),
     status: t.Optional(t.Union([t.Array(t.Enum(RunStatus)), t.Enum(RunStatus)])),

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

@@ -68,6 +68,14 @@ export declare abstract class StatusRepository {
         computedUntil: bigint;
         processingStarted: bigint;
     }>;
+    static updateErrorMessage(campaignUnique: CampaignUnique, error: string): Promise<{
+        error: string;
+        details: Prisma.JsonValue;
+        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+        campaignId: string;
+        computedUntil: bigint;
+        processingStarted: bigint;
+    }>;
     static findManyDelay(query: DelayModel): Promise<{
         startTimestamp: bigint;
         endTimestamp: bigint;

package/dist/src/modules/v4/status/status.repository.js CHANGED Viewed

@@ -65,7 +65,7 @@ export class StatusRepository {
             },
             data: {
                 status,
-                error,
+                error: error?.length > 0 ? error : undefined,
                 details,
             },
         });
@@ -98,12 +98,22 @@ export class StatusRepository {
             },
         });
     }
+    static async updateErrorMessage(campaignUnique, error) {
+        return await apiDbClient.campaignStatus.update({
+            where: {
+                campaignId: CampaignService.hashId(campaignUnique),
+            },
+            data: {
+                error,
+            },
+        });
+    }
     static async findManyDelay(query) {
         return await apiDbClient.campaign.findMany({
             where: {
                 distributionChainId: !!query.chainId ? query.chainId : undefined,
                 endTimestamp: {
-                    gte: !!query.endTimestampLowerBound ? query.endTimestampLowerBound : moment().subtract(1, "week").unix(),
+                    gte: !!query.endTimestampLowerBound ? query.endTimestampLowerBound : moment().subtract(2, "week").unix(),
                 },
             },
             select: {

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

@@ -43,6 +43,7 @@ export declare abstract class StatusService {
     } | null>;
     static update(campaignUnique: CampaignUnique, status: UpdateStatusModel): Promise<void>;
     static updateComputedUntil(campaignUnique: CampaignUnique, computedUntil: number): Promise<void>;
+    static updateErrorMessage(campaignUnique: CampaignUnique, error: string): Promise<void>;
     static isSafeForOverlaps(campaignUnique: CampaignUnique): Promise<boolean>;
     static findUpdatesAndDelays(): Promise<Record<number, {
         live: string;

package/dist/src/modules/v4/status/status.service.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { NotFoundError } from "../../../errors";
+import { VoidString } from "../../../errors/VoidString.error";
 import { log } from "../../../utils/logger";
 import { RunStatus } from "../../../../database/api/.generated";
 import { HOUR, MAX_COMPUTE_JOB_TIME, NETWORK_LABELS, getMultisigURL, registry } from "@sdk";
@@ -66,6 +68,17 @@ export class StatusService {
         }
         await StatusRepository.updateComputedUntil(campaignUnique, computedUntil);
     }
+    static async updateErrorMessage(campaignUnique, error) {
+        // Check if the status exists already, otherwise thros
+        const campaignStatus = await StatusRepository.findUnique(campaignUnique);
+        if (!(error?.length > 0)) {
+            throw new VoidString("Error message is empty");
+        }
+        if (!campaignStatus) {
+            throw new NotFoundError("CampaignStatus not found");
+        }
+        await StatusRepository.updateErrorMessage(campaignUnique, error);
+    }
     static async isSafeForOverlaps(campaignUnique) {
         const status = await StatusRepository.findUnique(campaignUnique);
         if (!status) {
@@ -106,7 +119,6 @@ export class StatusService {
                 delayed: delayedCampaigns,
             };
         }
-        console.log(res[146]);
         return res;
     }
     static async findManyDelay(query) {