@merkl/api 0.18.9 → 0.18.10

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

@@ -171,11 +171,11 @@ export declare const StatusController: Elysia<"/campaign-status", false, {
                         200: {
                             delay: number;
                             computedUntil: number;
-                            startTimestamp: bigint;
-                            endTimestamp: bigint;
                             computeChainId: number;
                             distributionChainId: number;
                             campaignId: string;
+                            startTimestamp: bigint;
+                            endTimestamp: bigint;
                             RewardToken: {
                                 symbol: string;
                                 address: string;

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

@@ -77,11 +77,11 @@ export declare abstract class StatusRepository {
         processingStarted: bigint;
     }>;
     static findManyDelay(query: DelayModel): Promise<{
-        startTimestamp: bigint;
-        endTimestamp: bigint;
         computeChainId: number;
         distributionChainId: number;
         campaignId: string;
+        startTimestamp: bigint;
+        endTimestamp: bigint;
         RewardToken: {
             symbol: string;
             address: string;

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

@@ -1,4 +1,4 @@
-import { apiDbClient } from "@/utils/prisma";
+import { apiDbClient } from "@db";
 import moment from "moment";
 import { CampaignService } from "../campaign";
 export class StatusRepository {

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

@@ -61,11 +61,11 @@ export declare abstract class StatusService {
     static findManyDelay(query: DelayModel): Promise<{
         delay: number;
         computedUntil: number;
-        startTimestamp: bigint;
-        endTimestamp: bigint;
         computeChainId: number;
         distributionChainId: number;
         campaignId: string;
+        startTimestamp: bigint;
+        endTimestamp: bigint;
         RewardToken: {
             symbol: string;
             address: string;

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

@@ -27,8 +27,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                         id: string;
                         name: string | null;
                         icon: string;
-                        chainId: number;
                         address: string;
+                        chainId: number;
                         decimals: number;
                         verified: boolean;
                         isTest: boolean;
@@ -59,8 +59,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                                     id: string;
                                     name: string | null;
                                     icon: string;
-                                    chainId: number;
                                     address: string;
+                                    chainId: number;
                                     decimals: number;
                                     verified: boolean;
                                     isTest: boolean;
@@ -90,8 +90,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                             id: string;
                             name: string | null;
                             icon: string;
-                            chainId: number;
                             address: string;
+                            chainId: number;
                             decimals: number;
                             displaySymbol: string;
                             verified: boolean;
@@ -109,8 +109,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                 body: unknown;
                 params: {};
                 query: {
-                    tokenAddress?: string | undefined;
                     verified?: boolean | undefined;
+                    tokenAddress?: string | undefined;
                     additionalTokenAddresses?: string[] | undefined;
                     chainId: number;
                     userAddress: string;
@@ -122,8 +122,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                         id: string;
                         name: string | null;
                         icon: string;
-                        chainId: number;
                         address: string;
+                        chainId: number;
                         decimals: number;
                         verified: boolean;
                         isTest: boolean;
@@ -145,8 +145,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                     symbol?: string | undefined;
                     id?: string[] | undefined;
                     name?: string | undefined;
-                    chainId?: number | undefined;
                     address?: string | undefined;
+                    chainId?: number | undefined;
                     displaySymbol?: string | undefined;
                     verified?: boolean | undefined;
                     isNative?: boolean | undefined;
@@ -160,8 +160,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                         id: string;
                         name: string | null;
                         icon: string;
-                        chainId: number;
                         address: string;
+                        chainId: number;
                         decimals: number;
                         verified: boolean;
                         isTest: boolean;
@@ -181,8 +181,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                     symbol?: string | undefined;
                     id?: string[] | undefined;
                     name?: string | undefined;
-                    chainId?: number | undefined;
                     address?: string | undefined;
+                    chainId?: number | undefined;
                     displaySymbol?: string | undefined;
                     verified?: boolean | undefined;
                     isNative?: boolean | undefined;
@@ -201,8 +201,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                 body: {
                     isTest?: boolean | undefined;
                     icon: string;
-                    chainId: number;
                     address: string;
+                    chainId: number;
                     verified: boolean;
                 };
                 params: {};
@@ -216,8 +216,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                         id: string;
                         name: string | null;
                         icon: string;
-                        chainId: number;
                         address: string;
+                        chainId: number;
                         decimals: number;
                         verified: boolean;
                         isTest: boolean;
@@ -250,8 +250,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                         id: string;
                         name: string | null;
                         icon: string;
-                        chainId: number;
                         address: string;
+                        chainId: number;
                         decimals: number;
                         displaySymbol: string;
                         verified: boolean;
@@ -325,8 +325,8 @@ export declare const TokenController: Elysia<"/tokens", false, {
                             id: string;
                             name: string | null;
                             icon: string;
-                            chainId: number;
                             address: string;
+                            chainId: number;
                             decimals: number;
                             displaySymbol: string;
                             verified: boolean;

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

@@ -6,13 +6,8 @@ export declare abstract class TokenRepository {
      * Fetch token metadata from onchain
      * @param chainId
      * @param address
-     * @returns
      */
-    static getTokenInfo(token: TokenModel): Promise<{
-        name: string;
-        symbol: string;
-        decimals: number;
-    }>;
+    static getTokenInfo(token: TokenModel): Promise<any>;
     /**
      * Read token from database
      * @param chainId
@@ -34,8 +29,8 @@ export declare abstract class TokenRepository {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         displaySymbol: string;
         verified: boolean;
@@ -48,8 +43,8 @@ export declare abstract class TokenRepository {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         displaySymbol: string;
         verified: boolean;
@@ -90,8 +85,8 @@ export declare abstract class TokenRepository {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         displaySymbol: string;
         verified: boolean;

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

@@ -1,7 +1,5 @@
-import { getTokenInfo } from "@/libs/tokens/tokenInfo";
-import { executeSimple } from "@/utils/execute";
-import { apiDbClient } from "@/utils/prisma";
-import { NETWORK_LABELS } from "@sdk";
+import { apiDbClient } from "@db";
+import { NETWORK_LABELS, TokenInteractionService } from "@sdk";
 import axios from "axios";
 export class TokenRepository {
     static #transformQueryToPrismaFilters(query) {
@@ -39,13 +37,9 @@ export class TokenRepository {
      * Fetch token metadata from onchain
      * @param chainId
      * @param address
-     * @returns
      */
     static async getTokenInfo(token) {
-        //TODO: replace with onchain module
-        const calls = getTokenInfo(token.address);
-        //TODO: replace with onchain module
-        return executeSimple(token.chainId, calls);
+        return TokenInteractionService(token.chainId);
     }
     /**
      * Read token from database

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

@@ -21,8 +21,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         verified: boolean;
         isTest: boolean;
@@ -42,8 +42,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         verified: boolean;
         isTest: boolean;
@@ -61,8 +61,8 @@ export declare abstract class TokenService {
             id: string;
             name: string | null;
             icon: string;
-            chainId: number;
             address: string;
+            chainId: number;
             decimals: number;
             verified: boolean;
             isTest: boolean;
@@ -102,8 +102,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         verified: boolean;
         isTest: boolean;
@@ -121,8 +121,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         verified: boolean;
         isTest: boolean;
@@ -135,8 +135,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         verified: boolean;
         isTest: boolean;
@@ -175,8 +175,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         displaySymbol: string;
         verified: boolean;
@@ -189,8 +189,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         displaySymbol: string;
         verified: boolean;
@@ -203,8 +203,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         displaySymbol: string;
         verified: boolean;
@@ -222,8 +222,8 @@ export declare abstract class TokenService {
         id: string;
         name: string | null;
         icon: string;
-        chainId: number;
         address: string;
+        chainId: number;
         decimals: number;
         verified: boolean;
         isTest: boolean;

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

@@ -2,8 +2,8 @@ import { HttpError } from "@/errors";
 import { getTokensListWithCache } from "@/libs/getTokensList";
 import { getOnlyUserBalance } from "@/libs/tokens/balances";
 import { log } from "@/utils/logger";
-import { apiDbClient } from "@/utils/prisma";
 import { throwOnInvalidRequiredAddress, throwOnUnsupportedChainId } from "@/utils/throw";
+import { apiDbClient } from "@db";
 import { Prisma } from "@db/api";
 import { ChainInteractionService, DistributionCreatorService, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
 import { getAddress, parseUnits } from "viem";

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

@@ -125,8 +125,8 @@ export declare const UserController: Elysia<"/users", false, {
                                         id: string;
                                         name: string | null;
                                         icon: string;
-                                        chainId: number;
                                         address: string;
+                                        chainId: number;
                                         decimals: number;
                                         displaySymbol: string;
                                         verified: boolean;
@@ -147,8 +147,8 @@ export declare const UserController: Elysia<"/users", false, {
                                                 id: string;
                                                 name: string | null;
                                                 icon: string;
-                                                chainId: number;
                                                 address: string;
+                                                chainId: number;
                                                 decimals: number;
                                                 displaySymbol: string;
                                                 verified: boolean;
@@ -179,8 +179,8 @@ export declare const UserController: Elysia<"/users", false, {
                                             status: import("@db/api").$Enums.Status;
                                             tags: string[];
                                             identifier: string;
-                                            chainId: number;
                                             action: import("@db/api").$Enums.OpportunityAction;
+                                            chainId: number;
                                             depositUrl: string | null;
                                             mainProtocolId: string | null;
                                             tvl: number;
@@ -240,8 +240,8 @@ export declare const UserController: Elysia<"/users", false, {
                                     id: string;
                                     name: string | null;
                                     icon: string;
-                                    chainId: number;
                                     address: string;
+                                    chainId: number;
                                     decimals: number;
                                     displaySymbol: string;
                                     verified: boolean;
@@ -262,8 +262,8 @@ export declare const UserController: Elysia<"/users", false, {
                                             id: string;
                                             name: string | null;
                                             icon: string;
-                                            chainId: number;
                                             address: string;
+                                            chainId: number;
                                             decimals: number;
                                             displaySymbol: string;
                                             verified: boolean;
@@ -294,8 +294,8 @@ export declare const UserController: Elysia<"/users", false, {
                                         status: import("@db/api").$Enums.Status;
                                         tags: string[];
                                         identifier: string;
-                                        chainId: number;
                                         action: import("@db/api").$Enums.OpportunityAction;
+                                        chainId: number;
                                         depositUrl: string | null;
                                         mainProtocolId: string | null;
                                         tvl: number;

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

@@ -1,4 +1,4 @@
-import { apiDbClient } from "@/utils/prisma";
+import { apiDbClient } from "@db";
 // ─── Users Repository ────────────────────────────────────────────────────────
 export class UserRepository {
     static async findUnique(address) {

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

@@ -1,5 +1,5 @@
 import { log } from "@/utils/logger";
-import { engineDbClient } from "@/utils/prisma";
+import { engineDbClient } from "@db";
 import { OpportunityService } from "../opportunity";
 import { UserRepository } from "./user.repository";
 // ─── Users Services ──────────────────────────────────────────────────────────

package/dist/src/routes/v3/campaign/delay.js

@@ -1,6 +1,6 @@
 import { Redis } from "@/cache";
 import { staticCampaignWithCache } from "@/libs/staticCampaigns";
-import { engineDbClient } from "@/utils/prisma";
+import { engineDbClient } from "@db";
 import { ChainId, isSupportedChain } from "@sdk";
 import { t } from "elysia";
 import moment from "moment";

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

@@ -27,8 +27,8 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
             params: {};
             query: {
                 byReason?: boolean | undefined;
-                chainId: number;
                 campaignId: string;
+                chainId: number;
             };
             headers: unknown;
             response: {

package/dist/src/routes/v3/campaignClaims.js

@@ -1,5 +1,5 @@
 import checkQueryChainIdValidity from "@/hooks/checkQueryChainIdValidity";
-import { engineDbClient } from "@/utils/prisma";
+import { engineDbClient } from "@db";
 import { Prisma } from "@db/engine";
 import { t } from "elysia";
 /**

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

@@ -41,8 +41,9 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
             };
             headers: unknown;
             response: {
-                [x: string]: any;
-                200: any;
+                200: {
+                    [x: string]: Record<string, any>;
+                };
             };
         };
     };

package/dist/src/routes/v3/campaigns.js

@@ -1,5 +1,3 @@
-import { Redis } from "@/cache";
-import { removeTestTokens } from "@/entities/campaign";
 import { CampaignService } from "@/modules/v4/campaign";
 import { OpportunityConvertorService } from "@/modules/v4/opportunity/opportunity.converter";
 import { ANGLE_NETWORKS, Campaign as CampaignEnum, ChainId, isSupportedChain, registry, } from "@sdk";
@@ -70,66 +68,30 @@ export default (app) => app.get("/campaigns", async ({ query }) => {
             throw new UnsupportedNetwork(chainId);
         }
     }
-    if (process.env.FF_OPPORTUNITY === "true") {
-        const campaigns = await CampaignService.findMany({
-            distributionChainIds: chainIds,
-            types: types.map(type => CampaignEnum[type]),
-            status: query.live ? "LIVE" : undefined,
-            creatorTag: query.creatorTag,
-            test: !hideTestTokens,
-            withOpportunity: true,
-        });
-        const res = {};
-        for (const campaign of campaigns) {
-            if (!res[campaign.distributionChainId]) {
-                res[campaign.distributionChainId] = {};
-            }
-            const opportunityIdentifier = campaign.Opportunity.identifier;
-            const campaignType = CampaignEnum[campaign.type];
-            if (!res[campaign.distributionChainId][`${campaignType}_${opportunityIdentifier}`]) {
-                res[campaign.distributionChainId][`${campaignType}_${opportunityIdentifier}`] = {
-                    ...OpportunityConvertorService.convertV4CampaignToV3(campaignType, campaign, opportunityIdentifier),
-                    apr: campaign.Opportunity.apr,
-                    tvl: campaign.Opportunity.tvl,
-                };
-            }
+    const campaigns = await CampaignService.findMany({
+        distributionChainIds: chainIds,
+        types: types.map(type => CampaignEnum[type]),
+        status: query.live ? "LIVE" : undefined,
+        creatorTag: query.creatorTag,
+        test: !hideTestTokens,
+        withOpportunity: true,
+    });
+    const res = {};
+    for (const campaign of campaigns) {
+        if (!res[campaign.distributionChainId]) {
+            res[campaign.distributionChainId] = {};
         }
-        return res;
-    }
-    const campaignCachePrefix = query.live === true ? "LiveCampaigns" : "Campaigns";
-    const dynamicData = (await Redis.getManyWithArgs(campaignCachePrefix, chainIds)).reduce((prev, allData, index) => {
-        if (!!allData) {
-            prev[chainIds[index]] = Object.keys(allData).reduce((acc, curr) => {
-                if ((types.length === 0 || types.includes(Number.parseInt(curr.split("_")[0]))) &&
-                    (!hideTestTokens || removeTestTokens(allData[curr]))) {
-                    acc[curr] = allData[curr];
-                }
-                return acc;
-            }, {});
-        }
-        return prev;
-    }, {});
-    // Remove everything that doesn't contain the creator tag
-    if (!!query.creatorTag) {
-        for (const c of Object.keys(dynamicData)) {
-            for (const type_mainParam of Object.keys(dynamicData[c])) {
-                for (const campaignId of Object.keys(dynamicData[c][type_mainParam])) {
-                    if (!dynamicData[c][type_mainParam][campaignId]?.tags?.includes(query.creatorTag)) {
-                        delete dynamicData[c][type_mainParam][campaignId];
-                    }
-                }
-                // Delete the type_mainParam if it's empty
-                if (Object.keys(dynamicData[c][type_mainParam]).length === 0) {
-                    delete dynamicData[c][type_mainParam];
-                }
-            }
-            // Delete the c if it's empty
-            if (Object.keys(dynamicData[c]).length === 0) {
-                delete dynamicData[c];
-            }
+        const opportunityIdentifier = campaign.Opportunity.identifier;
+        const campaignType = CampaignEnum[campaign.type];
+        if (!res[campaign.distributionChainId][`${campaignType}_${opportunityIdentifier}`]) {
+            res[campaign.distributionChainId][`${campaignType}_${opportunityIdentifier}`] = {
+                ...OpportunityConvertorService.convertV4CampaignToV3(campaignType, campaign, opportunityIdentifier),
+                apr: campaign.Opportunity.apr,
+                tvl: campaign.Opportunity.tvl,
+            };
         }
     }
-    return dynamicData;
+    return res;
 }, {
     query,
     tags: ["Campaigns"],

package/dist/src/routes/v3/multiChainPositions.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { Redis } from "@/cache";
 import { ChainId, isSupportedChain } from "@sdk";
 import { t } from "elysia";

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

@@ -28,8 +28,8 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
             query: {
                 type?: number | undefined;
                 tag?: string | undefined;
-                chainId?: number | undefined;
                 action?: string | undefined;
+                chainId?: number | undefined;
                 campaigns?: boolean | undefined;
                 mainParameter?: string | undefined;
                 testTokens?: boolean | undefined;

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

@@ -23,8 +23,8 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
             params: {};
             query: {
                 index?: number | undefined;
-                chainId: number;
                 campaign: any;
+                chainId: number;
             };
             headers: unknown;
             response: {

package/dist/src/routes/v3/positions.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { Redis } from "@/cache";
 import { Campaign } from "@sdk";
 import { t } from "elysia";

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

@@ -20,8 +20,8 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
             body: unknown;
             params: {};
             query: {
-                chainId: number;
                 campaignId: string;
+                chainId: number;
             };
             headers: unknown;
             response: {

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

@@ -30,8 +30,8 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
                 from?: number | undefined;
                 mainParameter?: string | undefined;
                 to?: number | undefined;
-                chainId: number;
                 campaignId: string;
+                chainId: number;
             };
             headers: unknown;
             response: {