@merkl/api 0.10.248 → 0.10.250

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

@@ -406,6 +406,7 @@ declare const eden: {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -516,6 +517,7 @@ declare const eden: {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -541,6 +543,7 @@ declare const eden: {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -2929,6 +2932,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -3044,6 +3048,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -3340,6 +3345,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             page?: number | undefined;
                             chainId?: string | undefined;
                             action?: string | undefined;
+                            creatorAddress?: string | undefined;
                             mainProtocolId?: string | undefined;
                             order?: string | undefined;
                             test?: boolean | undefined;
@@ -6598,6 +6604,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -6708,6 +6715,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -6733,6 +6741,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;

package/dist/src/entities/opportunity.js

@@ -217,6 +217,7 @@ export const extractOpportunities = {
                     "maverickBoostedPosition",
                     "zkSwapThreePool",
                     "syncswap",
+                    "rfx",
                 ],
                 borrow: ["radiant_borrow", "aave_borrowing", "euler_borrow", "zerolend_borrowing"],
                 lend: [
@@ -247,6 +248,12 @@ export const extractOpportunities = {
                             .filter(tkn => tkn);
                     if (["curve"].includes(campaign.type ?? ""))
                         return Object.values(typeInfo.poolTokens ?? {}).filter(tkn => tkn);
+                    if (["rfx"].includes(campaign.type ?? "")) {
+                        return [typeInfo.symbolShortToken, typeInfo.symbolLongToken];
+                    }
+                    if (["maverickBoostedPosition"].includes(campaign.type ?? "")) {
+                        return [typeInfo.symbolTokenA, typeInfo.symbolTokenB];
+                    }
                     return [typeInfo.symbolToken0, typeInfo.symbolToken1];
                 },
                 lend: () => (campaign.type === "compound" ? [typeInfo.symbolBaseToken] : [typeInfo.symbolUnderlyingToken]),

package/dist/src/index.d.ts

@@ -187,6 +187,7 @@ declare const app: Elysia<"", false, {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -302,6 +303,7 @@ declare const app: Elysia<"", false, {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -598,6 +600,7 @@ declare const app: Elysia<"", false, {
                             page?: number | undefined;
                             chainId?: string | undefined;
                             action?: string | undefined;
+                            creatorAddress?: string | undefined;
                             mainProtocolId?: string | undefined;
                             order?: string | undefined;
                             test?: boolean | undefined;

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

@@ -147,7 +147,7 @@ export async function ERC20DynamicData(chainId, campaigns) {
                             campaign.campaignParameters.duration /
                             (whitelistedSupplyTargetToken * priceTargetToken),
                         totalSupplyTargetToken,
-                        tvl: getTVL(tokenTypesByCampaign[campaign.campaignId].typeInfo.type, totalSupplyTargetToken, whitelistedSupplyTargetToken, priceTargetToken),
+                        tvl: getTVL(tokenTypesByCampaign[campaign.campaignId].typeInfo.type, tokenTypesByCampaign[campaign.campaignId].typeInfo.totalSupply, whitelistedSupplyTargetToken, priceTargetToken),
                         type: tokenTypesByCampaign[campaign.campaignId].type,
                         typeInfo: tokenTypesByCampaign[campaign.campaignId].typeInfo,
                         priceRewardToken: priceRewardToken,

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/RfxProcessor.d.ts

@@ -23,7 +23,10 @@ type callKeysRfx = mandatoryCallKeys & {
     metaDataLong: string;
 };
 type dataRawTemplate = callKeysRfx & {};
-type dataTypeRfx = dataType & {};
+type dataTypeRfx = dataType & {
+    symbolShortToken: string;
+    symbolLongToken: string;
+};
 export declare class RfxProcessor extends GenericProcessor<callKeysRfx, dataRawTemplate, dataTypeRfx> {
     rounds: {
         round1: callType[];

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/RfxProcessor.js

@@ -59,6 +59,8 @@ export class RfxProcessor extends GenericProcessor {
             cardName: generateCardName(type, typeInfo, campaign),
             priceTargetToken: priceTargetToken, // Add the appropriate value here
             tvl,
+            symbolShortToken: typeInfo.symbolShortToken,
+            symbolLongToken: typeInfo.symbolLongToken,
         };
     }
 }

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/WoofiProcessor.d.ts

@@ -13,7 +13,7 @@ type callKeysBeefy = mandatoryCallKeys & {
     underlying: string;
     pricePerShare: string;
     totalSupplyUnderlying: string;
-    symbolUnderlying: string;
+    symbolUnderlyingToken: string;
 };
 type dataRawBeefy = callKeysBeefy & {};
 type dataTypeBeefy = dataType & {

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/WoofiProcessor.js

@@ -8,7 +8,7 @@ export class WoofiProcessor extends GenericProcessor {
             { key: "underlying", call: "want", target: "tokenAddress" },
         ],
         round2: [
-            { key: "symbolUnderlying", call: "symbol", target: "underlying" },
+            { key: "symbolUnderlyingToken", call: "symbol", target: "underlying" },
             { key: "totalSupply", call: "totalSupply", target: "tokenAddress" },
             { key: "decimalsToken", call: "decimals", target: "underlying" },
         ],
@@ -18,7 +18,7 @@ export class WoofiProcessor extends GenericProcessor {
     // override computeRound1(): void {}
     async processingRound5(index, type, typeInfo, calls, campaign, pricer) {
         const { whitelistedSupplyTargetToken, totalSupply, blacklistedSupply } = this.handleWhiteListBlacklistRound5(typeInfo, campaign);
-        const priceToken = (await pricer.get({ symbol: typeInfo.symbolUnderlying })) ?? 0;
+        const priceToken = (await pricer.get({ symbol: typeInfo.symbolUnderlyingToken })) ?? 0;
         let normalizedFactor = 1;
         if (Number(typeInfo.decimalsToken) < campaign.campaignParameters.decimalsTargetToken) {
             normalizedFactor = 10 ** (campaign.campaignParameters.decimalsTargetToken - Number(typeInfo.decimalsToken));

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

@@ -5,7 +5,7 @@ export class ClaimService {
     // ─── Get Historical Claims ─────────────────────────────────────────────────
     static async getHistoricalClaims(params, chainFilter = []) {
         const roots = (await MerklRootService.fetchAll()).map(r => r.live);
-        const rewards = await RewardService.getByRecipient(params.address, roots, true, chainFilter);
+        const rewards = await RewardService.getByRecipient(params.address, roots, true, true, chainFilter);
         const filteredRewards = chainFilter.length
             ? rewards.filter(reward => chainFilter.includes(reward.RewardToken.chainId))
             : rewards;

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

@@ -56,6 +56,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                     page?: number | undefined;
                     chainId?: string | undefined;
                     action?: string | undefined;
+                    creatorAddress?: string | undefined;
                     mainProtocolId?: string | undefined;
                     order?: string | undefined;
                     test?: boolean | undefined;
@@ -171,6 +172,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                     page?: number | undefined;
                     chainId?: string | undefined;
                     action?: string | undefined;
+                    creatorAddress?: string | undefined;
                     mainProtocolId?: string | undefined;
                     order?: string | undefined;
                     test?: boolean | undefined;
@@ -467,6 +469,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;

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

@@ -278,6 +278,7 @@ export declare const GetOpportunitiesQueryDto: import("@sinclair/typebox").TObje
     name: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     chainId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRegExp>;
     action: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRegExp>;
+    creatorAddress: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     tags: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     test: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
     minimumTvl: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;

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

@@ -51,6 +51,7 @@ export const GetOpportunitiesQueryDto = t.Object({
     action: t.Optional(t.RegExp(/^(POOL|HOLD|DROP|LEND|BORROW)(,(POOL|HOLD|DROP|LEND|BORROW)){0,4}$/, {
         description: "A comma seprated list actions. Legal values are: `POOL`, `HOLD`, `DROP`, `LEND`, `BORROW`",
     })),
+    creatorAddress: t.Optional(t.String({ description: "Filter by creator address" })),
     tags: t.Optional(t.String({ description: "Filter by tag" })),
     test: t.Optional(t.Boolean({ description: "Include opportunities with test campaigns" })),
     minimumTvl: t.Optional(t.Number({ description: "Minimum TVL threshhold in USD" })),

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

@@ -137,6 +137,7 @@ export class OpportunityRepository {
         const sort = (query.sort === "rewards" ? "dailyRewards" : query.sort) ?? "dailyRewards";
         const order = query.order ?? "desc";
         const test = query.test ?? false;
+        const creatorAddress = query.creatorAddress ?? null;
         const noFilters = Object.values(filters).every(v => v === undefined);
         const tokensFilters = tokens?.map(symbol => ({
             Tokens: { some: { symbol: { equals: symbol, mode: "insensitive" } } },
@@ -162,7 +163,16 @@ export class OpportunityRepository {
                             status: !status ? undefined : { in: status },
                         },
                         { mainProtocolId: !protocols ? undefined : { in: protocols } },
-                        { Campaigns: test ? undefined : { some: { RewardToken: { isTest: false } } } },
+                        {
+                            Campaigns: test || !creatorAddress
+                                ? undefined
+                                : {
+                                    some: {
+                                        RewardToken: !test ? { isTest: false } : undefined,
+                                        creatorAddress: creatorAddress ? creatorAddress : undefined,
+                                    },
+                                },
+                        },
                     ],
                 },
         };
@@ -172,6 +182,7 @@ export class OpportunityRepository {
         const { page: _page, items: _items } = query;
         const page = _page ? _page : 0;
         const items = _items ? _items : 20;
+        const test = query.test ?? false;
         const args = OpportunityRepository.#transformQueryToPrismaFilters(query);
         return await apiDbClient.opportunity.findMany({
             take: items,
@@ -181,7 +192,9 @@ export class OpportunityRepository {
                 MainProtocol: true,
                 Chain: true,
                 Protocols: true,
-                Tokens: true,
+                Tokens: {
+                    where: !test ? { isTest: false } : undefined,
+                },
             },
             ...args,
         });

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

@@ -35,6 +35,7 @@ export const getErc20Metadata = async (chainId, campaignId, rewardToken, amount,
                     "maverickBoostedPosition",
                     "zkSwapThreePool",
                     "syncswap",
+                    "rfx",
                 ],
                 BORROW: ["radiant_borrow", "aave_borrowing", "euler_borrow", "zerolend_borrowing"],
                 LEND: [

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

@@ -5,7 +5,7 @@ import type { Resource } from "../prisma";
  * @see {@link Resource}
  */
 export type Protocol = Resource<"Protocol">;
-declare const protocolTypes: readonly ["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", "aura", "akron", "beefy", "dragonswap", "poolside", "koi", "syncswap-v3", "neptune", "zkSwapThreePool", "syncswap", "radiant", "aave", "euler", "gearbox", "compound", "sturdy", "frax", "ionic", "moonwell", "fluid", "silo", "morpho", "coumpound", "dolomite", "badger", "ajna", "layerbank", "ion", "venus", "woofi", "reactor_fusion", "eigenlayer"];
+declare const protocolTypes: readonly ["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", "aura", "akron", "beefy", "dragonswap", "poolside", "koi", "syncswap-v3", "neptune", "zkSwapThreePool", "syncswap", "rfx", "radiant", "aave", "euler", "gearbox", "compound", "sturdy", "frax", "ionic", "moonwell", "fluid", "silo", "morpho", "coumpound", "dolomite", "badger", "ajna", "layerbank", "ion", "venus", "woofi", "reactor_fusion", "eigenlayer"];
 export type ProtocolId = (typeof protocolTypes)[number];
 export declare const ProtocolResourceDto: import("@sinclair/typebox").TObject<{
     id: import("@sinclair/typebox").TString;

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

@@ -43,6 +43,7 @@ const protocolTypes = [
     "neptune",
     "zkSwapThreePool",
     "syncswap",
+    "rfx",
     // ─── LP Lending ──────────────────────────────────────────────────────
     "radiant",
     "aave",

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

@@ -65,6 +65,7 @@ export declare const v4: Elysia<"/v4", false, {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -180,6 +181,7 @@ export declare const v4: Elysia<"/v4", false, {
                         page?: number | undefined;
                         chainId?: string | undefined;
                         action?: string | undefined;
+                        creatorAddress?: string | undefined;
                         mainProtocolId?: string | undefined;
                         order?: string | undefined;
                         test?: boolean | undefined;
@@ -476,6 +478,7 @@ export declare const v4: Elysia<"/v4", false, {
                             page?: number | undefined;
                             chainId?: string | undefined;
                             action?: string | undefined;
+                            creatorAddress?: string | undefined;
                             mainProtocolId?: string | undefined;
                             order?: string | undefined;
                             test?: boolean | undefined;

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

@@ -64,7 +64,10 @@ export const UserController = new Elysia({ prefix: "/users", detail: { tags: ["U
     detail: { hide: true },
 })
     // ─── Sync Creator Tags with Engine DB ─────────────────────────────────
-    .post("/sync", async () => await UserService.syncTags(), {
+    .post("/sync", async () => {
+    await UserService.syncTags();
+    await UserService.syncOpportunityTags();
+}, {
     headers: AuthorizationHeadersDto,
     beforeHandle: BackOfficeGuard,
     detail: { hide: true },

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

@@ -22,4 +22,5 @@ export declare abstract class UserService {
         address: string;
     }>;
     static syncTags(): Promise<void>;
+    static syncOpportunityTags(): Promise<void>;
 }

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

@@ -1,5 +1,6 @@
 import { log } from "../../../utils/logger";
 import { engineDbClient } from "../../../utils/prisma";
+import { OpportunityService } from "../opportunity";
 import { UserRepository } from "./user.repository";
 // ─── Users Services ──────────────────────────────────────────────────────────
 export class UserService {
@@ -19,6 +20,9 @@ export class UserService {
         return await UserRepository.createMany(users);
     }
     static async updateTags(user, tags) {
+        if (!(await UserRepository.findUnique(user))) {
+            await UserRepository.create({ address: user, tags: [] });
+        }
         return await UserRepository.updateTags(user, tags);
     }
     static async syncTags() {
@@ -47,4 +51,16 @@ export class UserService {
             }
         }
     }
+    static async syncOpportunityTags() {
+        const users = await UserRepository.findManyWithTags();
+        for (const user of users) {
+            const opportunities = await OpportunityService.getMany({ creatorAddress: user.address });
+            for (const opportunity of opportunities) {
+                if (!user.tags.every(tag => opportunity.tags.includes(tag))) {
+                    log.local(`updating tags for opportunity ${opportunity.id}: adding ${user.tags.join(",")}`);
+                    await OpportunityService.update(opportunity.id, { tags: [...opportunity.tags, ...user.tags] });
+                }
+            }
+        }
+    }
 }

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

@@ -27,7 +27,7 @@ export default (app) => app.use(checkQueryAddressValidity()).get("/rewards", asy
     }
     const user = query.user;
     // @Warning: this is not taking into account the creator tag filter
-    const v4Res = await RewardService.getUserRewardsByChain(user, false, chainIds);
+    const v4Res = await RewardService.getUserRewardsByChain(user, false, chainIds, null, true);
     const v3Res = RewardConvertorService.convertV4toRewardV3(v4Res);
     return v3Res;
 }, { query, tags: ["Rewards"] });

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

@@ -45,7 +45,7 @@ export default (app) => app
         }
     }
     // @Warning: this is not taking into account the mainParameter filter
-    const v4Res = await RewardService.getUserRewardsByChain(user, false, [chainId], query.reloadChainId ?? null);
+    const v4Res = await RewardService.getUserRewardsByChain(user, false, [chainId], query.reloadChainId ?? null, true);
     const v3Res = RewardConvertorService.convertV4toUserRewardV3(v4Res, proof);
     return v3Res;
 }, {

package/dist/src/utils/generateCardName.js

@@ -42,7 +42,7 @@ export function generateCardName(type, typeInfo, campaign, symbols = [""]) {
             return `Lend ${cardToken} on ${typeInfo.protocol}`;
         }
         case tokenType.rfx:
-            return `Supply ${typeInfo.symbolShortToken}/${typeInfo.symbolLongToken} on ${typeInfo.protocol}`;
+            return `${typeInfo.protocol} ${typeInfo.symbolShortToken}/${typeInfo.symbolLongToken}`;
         case tokenType.radiant_borrow:
         case tokenType.aave_borrowing:
         case tokenType.yei_borrowing:
@@ -87,7 +87,7 @@ export function generateCardName(type, typeInfo, campaign, symbols = [""]) {
         case tokenType.ironcladStaking:
             return `Stake ${campaign.campaignParameters.symbolTargetToken} on ${typeInfo.protocol}`;
         case tokenType.woofi:
-            return `Supercharge ${typeInfo.symbolUnderlying} on ${typeInfo.protocol}`;
+            return `Supercharge ${typeInfo.symbolUnderlyingToken} on ${typeInfo.protocol}`;
         case tokenType.maverickBoostedPosition:
             return `Maverick Boosted Position ${campaign.campaignParameters.symbolTargetToken}`;
         case tokenType.zkSwapThreePool: