@merkl/api 0.10.388 → 0.10.390

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

@@ -2320,7 +2320,13 @@ declare const eden: {
                     fetch?: RequestInit | undefined;
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
-                        totalAmount: number;
+                        total: number;
+                        breakdown: {
+                            [key: number]: {
+                                chainAmount: number;
+                                percentage: number;
+                            };
+                        };
                     };
                 }>>;
                 "per-month": ((params: {
@@ -3832,6 +3838,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 post: {
                     body: unknown;
                     params: {
+                        campaignId?: string | undefined;
                         id: string;
                     };
                     query: unknown;
@@ -6467,7 +6474,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     };
                     response: {
                         200: {
-                            totalAmount: number;
+                            total: number;
+                            breakdown: {
+                                [key: number]: {
+                                    chainAmount: number;
+                                    percentage: number;
+                                };
+                            };
                         };
                     };
                 };
@@ -10495,7 +10508,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     fetch?: RequestInit | undefined;
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
-                        totalAmount: number;
+                        total: number;
+                        breakdown: {
+                            [key: number]: {
+                                chainAmount: number;
+                                percentage: number;
+                            };
+                        };
                     };
                 }>>;
                 "per-month": ((params: {

package/dist/src/index.d.ts

@@ -193,6 +193,7 @@ declare const app: Elysia<"", false, {
                 post: {
                     body: unknown;
                     params: {
+                        campaignId?: string | undefined;
                         id: string;
                     };
                     query: unknown;
@@ -2828,7 +2829,13 @@ declare const app: Elysia<"", false, {
                     };
                     response: {
                         200: {
-                            totalAmount: number;
+                            total: number;
+                            breakdown: {
+                                [key: number]: {
+                                    chainAmount: number;
+                                    percentage: number;
+                                };
+                            };
                         };
                     };
                 };

package/dist/src/libs/campaigns/campaignTypes/CLAMMDynamicData.js

@@ -599,16 +599,13 @@ export async function CLAMMDynamicData(chainId, campaigns) {
                                         blacklistedBalance1 = poolBalanceToken1;
                                         blacklistedLiquidity = poolTotalLiquidity;
                                         // Get all beefy staker is whitelisted, get a list of all senders
-                                        const beefyStakerCount = almDetails.filter(a => a.type === ALM.BeefyStaker).length;
-                                        const beefyCount = almDetails.filter(a => a.type === ALM.Beefy).length;
-                                        if (c.campaignParameters.whitelist.length === beefyStakerCount + beefyCount ||
-                                            c.campaignParameters.whitelist.length === beefyStakerCount) {
-                                            let targetToMatch = "";
-                                            for (const alm of almDetails.filter(a => a.type === ALM.BeefyStaker)) {
-                                                if (alm.sender === c.campaignParameters.whitelist[0]) {
-                                                    targetToMatch = alm.target;
-                                                }
+                                        let targetToMatch = "";
+                                        for (const alm of almDetails.filter(a => a.type === ALM.BeefyStaker)) {
+                                            if (c.campaignParameters.whitelist.includes(alm.sender)) {
+                                                targetToMatch = alm.target;
                                             }
+                                        }
+                                        if (targetToMatch !== "") {
                                             for (const alm of almDetails.filter(a => a.type === ALM.Beefy)) {
                                                 if (targetToMatch === alm.sender.toLowerCase()) {
                                                     c.campaignParameters.whitelist.push(alm.owner);

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

@@ -51,7 +51,13 @@ export declare const AccountingController: Elysia<"/accounting", false, {
                 };
                 response: {
                     200: {
-                        totalAmount: number;
+                        total: number;
+                        breakdown: {
+                            [key: number]: {
+                                chainAmount: number;
+                                percentage: number;
+                            };
+                        };
                     };
                 };
             };

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

@@ -12,7 +12,7 @@ export const AccountingController = new Elysia({ prefix: "/accounting", detail:
 })
     .group("/revenues", app => {
     return app
-        .get("", async () => await AccountingService.getRevenue(), {
+        .get("", async () => await AccountingService.getAllRevenueBreakdownByChain(), {
         headers: AuthorizationHeadersDto,
         beforeHandle: async ({ headers }) => {
             await BackOfficeGuard({ headers });

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

@@ -1,5 +1,5 @@
 import type { GetTransactionsQueryModel } from "./";
-import type { ChainId } from "@sdk";
+import { ChainId } from "@sdk";
 export declare class AccountingService {
     static hashId(chainId: ChainId, fromTokenId: string, toTokenId: string, timestamp: number): string;
     static getTokenId(chainId: number, address: string): string;
@@ -21,6 +21,15 @@ export declare class AccountingService {
     static getRevenueByChain(chainId: number): Promise<{
         totalAmount: number;
     }>;
+    static getAllRevenueBreakdownByChain(): Promise<{
+        total: number;
+        breakdown: {
+            [key: number]: {
+                chainAmount: number;
+                percentage: number;
+            };
+        };
+    }>;
     static getMonthlyRevenue(year: number, month: number): Promise<{
         totalAmount: number;
         from: string;

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

@@ -1,5 +1,6 @@
 import { AccountingRepository } from "./accounting.repository";
 import { TokenService } from "../token";
+import { ChainId } from "@sdk";
 export class AccountingService {
     static hashId(chainId, fromTokenId, toTokenId, timestamp) {
         return Bun.hash(`${chainId}${fromTokenId}${toTokenId}${timestamp}`).toString();
@@ -26,6 +27,24 @@ export class AccountingService {
         }
         return { totalAmount };
     }
+    static async getAllRevenueBreakdownByChain() {
+        const breakdown = {};
+        let consolidatedAmount = 0;
+        for (const chainId of Object.values(ChainId).filter(id => typeof id === "number")) {
+            const data = await AccountingRepository.getForMultisigByChain(chainId);
+            let totalAmount = 0;
+            for (const tx of data) {
+                totalAmount += Number(tx.amountIn);
+            }
+            breakdown[chainId] = { chainAmount: totalAmount, percentage: 0 };
+            consolidatedAmount += totalAmount;
+        }
+        for (const chainId of Object.values(ChainId).filter(id => typeof id === "number")) {
+            const totalAmount = breakdown[chainId].chainAmount;
+            breakdown[chainId] = { chainAmount: totalAmount, percentage: (totalAmount * 100) / consolidatedAmount };
+        }
+        return { total: consolidatedAmount, breakdown };
+    }
     static async getMonthlyRevenue(year, month) {
         const startDate = new Date(year, month - 1, 1);
         const endDate = new Date(year, month, 0, 23, 59, 59);

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

@@ -92,6 +92,10 @@ export class CampaignService {
                     await OpportunityService.createFromCampaign(campaign);
                     campaignsToInsert.push({ id, ...campaign });
                 }
+                // } else {
+                //   console.log("Updating status from campaign");
+                //   await OpportunityService.updateStatusFromCampaign(campaign);
+                // }
             }
             catch (err) {
                 log.error(`Cannot get Opportunity metadata for campaign ${campaign.campaignId} of type ${campaign.type}`, err);

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

@@ -62,6 +62,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
             post: {
                 body: unknown;
                 params: {
+                    campaignId?: string | undefined;
                     id: string;
                 };
                 query: unknown;

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

@@ -3,7 +3,7 @@ import { BackOfficeGuard } from "../../../guards/BackOffice.guard";
 import { AuthorizationHeadersDto, TokenAuthGuard } from "../../../guards/TokenAuth.guard";
 import Elysia, { t } from "elysia";
 import { GetCampaignQueryDto } from "../campaign";
-import { CreateOpportunityDto, GetOpportunitiesQueryDto, GetOpportunityQueryDto, OpportunityAggregateFieldDto, OpportunityIdDto, OpportunityResourceDto, OpportunityUniqueDto, OpportunityWithCampaignsResourceDto, UpdateOpportunityDto, } from "./opportunity.model";
+import { CreateOpportunityDto, GetOpportunitiesQueryDto, GetOpportunityQueryDto, OpportunityAggregateFieldDto, OpportunityIdDto, OpportunityResourceDto, OpportunityUniqueDto, OpportunityUniqueUpdateDto, OpportunityWithCampaignsResourceDto, UpdateOpportunityDto, } from "./opportunity.model";
 import { OpportunityService } from "./opportunity.service";
 import { transformId } from "./transform-id.pipe";
 import { validateId } from "./validate-id.pipe";
@@ -41,7 +41,7 @@ export const OpportunityController = new Elysia({
 }, {
     beforeHandle: BackOfficeGuard,
     headers: AuthorizationHeadersDto,
-    params: OpportunityUniqueDto,
+    params: OpportunityUniqueUpdateDto,
     detail: { hide: true },
 })
     // ─── Get All Opportunities ───────────────────────────────────────────

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

@@ -272,6 +272,10 @@ export declare const OpportunityWithCampaignsResourceDto: import("@sinclair/type
 export declare const OpportunityUniqueDto: import("@sinclair/typebox").TObject<{
     id: import("@sinclair/typebox").TString;
 }>;
+export declare const OpportunityUniqueUpdateDto: import("@sinclair/typebox").TObject<{
+    id: import("@sinclair/typebox").TString;
+    campaignId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+}>;
 export declare const AggregationResourceDto: import("@sinclair/typebox").TObject<{
     sum: import("@sinclair/typebox").TNumber;
 }>;

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

@@ -38,6 +38,13 @@ export const OpportunityUniqueDto = t.Object({
         description: "The id of the opportunity. You can find opportunities including their id at [GET /v4/opportunities](#tag/opportunities/GET/v4/opportunities/)",
     }),
 });
+export const OpportunityUniqueUpdateDto = t.Object({
+    id: t.String({
+        pattern: "(([0-9]*)-([0-9A-Z]*)-(0x([0-9A-Za-z])*))|([0-9]{1,20})",
+        description: "The id of the opportunity. You can find opportunities including their id at [GET /v4/opportunities](#tag/opportunities/GET/v4/opportunities/)",
+    }),
+    campaignId: t.Optional(t.String({ description: "The id of the campaign you want to reparse with" })),
+});
 export const AggregationResourceDto = t.Object({
     sum: t.Number(),
 });

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

@@ -63,10 +63,34 @@ export declare abstract class OpportunityService {
         depositUrl: any;
         tags: string[];
     }>;
+    static updateStatusFromCampaign(campaign: Omit<CreateCampaignModel, "id">, upsert?: boolean): Promise<{
+        id: string;
+        chainId: number;
+        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        identifier: string;
+        name: string;
+        status: "PAST" | "LIVE" | "SOON";
+        action: import("../../../../database/api/.generated").$Enums.OpportunityAction;
+        tokens: {
+            price?: number | null | undefined;
+            symbol: string;
+            name: string | null;
+            id: string;
+            icon: string;
+            chainId: number;
+            address: string;
+            decimals: number;
+            verified: boolean;
+            isTest: boolean;
+        }[];
+        mainProtocol: "morpho" | "arthswap" | "baseswap" | "camelot" | "crust" | "fenix" | "horiza" | "izumi" | "kim" | "pancakeswap-v3" | "quickswap-algebra" | "quickswap-uni" | "ramses" | "retro" | "stryke" | "stryke-pcs" | "stryke-sushi" | "sushiswap-v3" | "swapr" | "thruster" | "uniswap-v3" | "voltage" | "zero" | "koi" | "supswap-v3" | "zkswap" | "thirdtrade" | "uniswap-v2" | "velodrome" | "aerodrome" | "balancer" | "curve" | "cross_curve" | "curveNPool" | "aura" | "akron" | "beefy" | "dragonswap" | "poolside" | "syncswap-v3" | "neptune" | "zkSwapThreePool" | "syncswap" | "rfx" | "radiant" | "aave" | "euler" | "gearbox" | "compound" | "sturdy" | "frax" | "ionic" | "moonwell" | "fluid" | "silo" | "coumpound" | "dolomite" | "badger" | "ajna" | "layerbank" | "ion" | "venus" | "woofi" | "reactor_fusion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | undefined;
+        depositUrl: string | undefined;
+        tags: string[];
+    }>;
     /**
      * deletes and recreates an opportunity with fresh data
      */
-    static recreate(opportunityId: string | OpportunityUnique): Promise<{
+    static recreate(opportunityId: string | OpportunityUnique, campaignId?: string): Promise<{
         id: string;
         chainId: number;
         type: import("../../../../database/api/.generated").$Enums.CampaignType;

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

@@ -152,15 +152,45 @@ export class OpportunityService {
         await OpportunityRepository.create(opportunity, upsert);
         return opportunity;
     }
+    static async updateStatusFromCampaign(campaign, upsert = true) {
+        const campaignType = CampaignService.getTypeFromV3(campaign.type);
+        const metadata = await OpportunityService.#getMetadata(campaign);
+        const opportunityId = OpportunityService.hashId({
+            chainId: campaign.computeChainId,
+            identifier: campaign.opportunityIdentifier,
+            type: campaignType,
+        });
+        const currentOpportunity = await OpportunityService.getUniqueOrThrow(opportunityId, true);
+        const now = moment().unix();
+        const opportunity = {
+            id: opportunityId,
+            chainId: campaign.computeChainId,
+            type: campaignType,
+            identifier: campaign.opportunityIdentifier, // mainParameter
+            name: currentOpportunity.name,
+            status: now >= +campaign.startTimestamp && now < +campaign.endTimestamp
+                ? Status.LIVE
+                : now > +campaign.endTimestamp
+                    ? Status.PAST
+                    : Status.SOON,
+            action: metadata.action,
+            tokens: currentOpportunity.tokens,
+            mainProtocol: metadata.mainProtocol,
+            depositUrl: currentOpportunity.depositUrl,
+            tags: currentOpportunity.tags,
+        };
+        await OpportunityRepository.create(opportunity, upsert);
+        return opportunity;
+    }
     /**
      * deletes and recreates an opportunity with fresh data
      */
-    static async recreate(opportunityId) {
+    static async recreate(opportunityId, campaignId) {
         const id = typeof opportunityId === "string" ? opportunityId : OpportunityService.hashId(opportunityId);
         const opportunity = await OpportunityRepository.findUnique(id);
         if (!opportunity)
             throw new NotFoundError();
-        const firstCampaign = opportunity?.Campaigns[0];
+        const firstCampaign = opportunity?.Campaigns.filter(campaign => campaignId ? campaign.campaignId === campaignId : true)[0];
         return await OpportunityService.createFromCampaign({
             ...firstCampaign,
             type: campaignTypeToEnumMap[firstCampaign.type],

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

@@ -26,13 +26,13 @@ export const getClammMetadata = (chainId, params) => {
     if (params.whitelist.length > 0) {
         for (const whitelist of params.whitelist) {
             if (whitelistNameString.length > 0) {
-                whitelistNameString += "or ";
+                whitelistNameString += "or";
             }
             const forwarder = params.forwarders.find(x => getAddress(x.sender) === getAddress(whitelist));
             const forwarderType = forwarder?.type;
             const forwarderName = !!forwarderType ? almName(forwarderType) : null;
             if (!!forwarderName) {
-                whitelistNameString += ` ${forwarderName}`;
+                whitelistNameString += ` ${forwarderName} `;
             }
         }
     }

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

@@ -361,6 +361,8 @@ export class RewardService {
             return { timestamp, total: 0, breakdowns: [] };
         const breakdowns = [];
         for (const { amount, rewardToken: address, chainId, startTimestamp: start, endTimestamp: end, campaignId, } of dynamicData) {
+            if (end < moment().unix())
+                continue;
             const timespan = Math.abs(end - start);
             const isWithinTimespan = moment().unix() > start && moment().unix() < end;
             const dayspan = Math.max(1, Math.floor(timespan / DAY));

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

@@ -71,6 +71,7 @@ export declare const v4: Elysia<"/v4", false, {
                 post: {
                     body: unknown;
                     params: {
+                        campaignId?: string | undefined;
                         id: string;
                     };
                     query: unknown;
@@ -2706,7 +2707,13 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                     response: {
                         200: {
-                            totalAmount: number;
+                            total: number;
+                            breakdown: {
+                                [key: number]: {
+                                    chainAmount: number;
+                                    percentage: number;
+                                };
+                            };
                         };
                     };
                 };

package/dist/src/utils/generateCardName.js

@@ -129,6 +129,14 @@ export function generateCardName(type, typeInfo, campaign, symbols = [""]) {
         case tokenType.cian:
             return `Deposit ${typeInfo.symbolAsset} into ${typeInfo.name.replace("Ether.Fi", "Veda")}`;
         default:
-            return `Hold ${typeInfo.name} (${campaign.campaignParameters.symbolTargetToken})`;
+            // OVERRIDE
+            switch (typeInfo.tokenAddress) {
+                case "0x3a8099D8FE5C072bB035381003993393072D3ec7":
+                    return `Hold pufETH on DeSyn (dpufETH)`;
+                case "0x1f2aa9680910aC5a4527FA72001dC249943f60b4 ":
+                    return `Hold pufETH on Karak (pufETH)`;
+                default:
+                    return `Hold ${typeInfo.name} (${campaign.campaignParameters.symbolTargetToken})`;
+            }
     }
 }