@merkl/api 0.15.23 → 0.15.25

package/dist/src/backgroundJobs/jobs/campaignsCacheUpdater.js

@@ -113,15 +113,20 @@ export const campaignsCacheUpdater = new Elysia().get("/v3/update", async ({ que
                     distributionChain: chainId,
                 })));
                 const [type, mainParameter] = entry[0].split("_");
-                const apr = AprService.extractFromDynamicData(+type, Object.values(entry[1]));
-                const tvl = TvlService.extractFromDynamicData(+type, Object.values(entry[1]));
-                const dailyRewards = await RewardService.extractDailyRewardsRecordFromDynamicData(+type, Object.values(entry[1]));
-                const opportunityId = OpportunityService.hashId({
-                    chainId,
-                    identifier: mainParameter,
-                    type: CampaignService.getTypeFromV3(+type),
-                });
-                await OpportunityRepository.updateRecords(opportunityId, apr, tvl, dailyRewards);
+                try {
+                    const apr = AprService.extractFromDynamicData(+type, Object.values(entry[1]));
+                    const tvl = TvlService.extractFromDynamicData(+type, Object.values(entry[1]));
+                    const dailyRewards = await RewardService.extractDailyRewardsRecordFromDynamicData(+type, Object.values(entry[1]));
+                    const opportunityId = OpportunityService.hashId({
+                        chainId,
+                        identifier: mainParameter,
+                        type: CampaignService.getTypeFromV3(+type),
+                    });
+                    await OpportunityRepository.updateRecords(opportunityId, apr, tvl, dailyRewards);
+                }
+                catch (error) {
+                    // console.log(mainParameter);
+                }
             }
             await OpportunityService.updateMetadata(chainId);
             // ─── Refresh Cache For GET /opportunities ────

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

@@ -2948,14 +2948,12 @@ declare const eden: {
                     post: (body: {
                         chainId: number;
                         startTimestamp: number;
-                        endTimestamp: number;
                         computeChainId: number;
                         amount: string;
                         rewardToken: string;
                         campaignType: number;
+                        duration: number;
                         campaignData: string;
-                        symbolRewardToken: string;
-                        decimalsRewardToken: number;
                     }, options: {
                         headers: {
                             authorization: string;
@@ -5995,14 +5993,12 @@ declare const eden: {
                     post: (body: {
                         chainId: number;
                         startTimestamp: number;
-                        endTimestamp: number;
                         computeChainId: number;
                         amount: string;
                         rewardToken: string;
                         campaignType: number;
+                        duration: number;
                         campaignData: string;
-                        symbolRewardToken: string;
-                        decimalsRewardToken: number;
                     }, options: {
                         headers: {
                             authorization: string;
@@ -10427,14 +10423,12 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         body: {
                             chainId: number;
                             startTimestamp: number;
-                            endTimestamp: number;
                             computeChainId: number;
                             amount: string;
                             rewardToken: string;
                             campaignType: number;
+                            duration: number;
                             campaignData: string;
-                            symbolRewardToken: string;
-                            decimalsRewardToken: number;
                         };
                         params: {};
                         query: unknown;
@@ -14424,14 +14418,12 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     post: (body: {
                         chainId: number;
                         startTimestamp: number;
-                        endTimestamp: number;
                         computeChainId: number;
                         amount: string;
                         rewardToken: string;
                         campaignType: number;
+                        duration: number;
                         campaignData: string;
-                        symbolRewardToken: string;
-                        decimalsRewardToken: number;
                     }, options: {
                         headers: {
                             authorization: string;
@@ -17471,14 +17463,12 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     post: (body: {
                         chainId: number;
                         startTimestamp: number;
-                        endTimestamp: number;
                         computeChainId: number;
                         amount: string;
                         rewardToken: string;
                         campaignType: number;
+                        duration: number;
                         campaignData: string;
-                        symbolRewardToken: string;
-                        decimalsRewardToken: number;
                     }, options: {
                         headers: {
                             authorization: string;

package/dist/src/index.d.ts

@@ -3635,14 +3635,12 @@ declare const app: Elysia<"", false, {
                         body: {
                             chainId: number;
                             startTimestamp: number;
-                            endTimestamp: number;
                             computeChainId: number;
                             amount: string;
                             rewardToken: string;
                             campaignType: number;
+                            duration: number;
                             campaignData: string;
-                            symbolRewardToken: string;
-                            decimalsRewardToken: number;
                         };
                         params: {};
                         query: unknown;

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/helpers/tokenType.d.ts

@@ -49,6 +49,7 @@ export declare enum tokenType {
     baseswap = "baseswap",
     zkswap = "zkswap",
     ironcladStaking = "ironcladStaking",
+    rfx_slv = "rfx_slv",
     rfx = "rfx",
     woofi = "woofi",
     pendle = "pendle",

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/helpers/tokenType.js

@@ -50,6 +50,7 @@ export var tokenType;
     tokenType["baseswap"] = "baseswap";
     tokenType["zkswap"] = "zkswap";
     tokenType["ironcladStaking"] = "ironcladStaking";
+    tokenType["rfx_slv"] = "rfx_slv";
     tokenType["rfx"] = "rfx";
     tokenType["woofi"] = "woofi";
     tokenType["pendle"] = "pendle";
@@ -174,4 +175,5 @@ export const tokenTypeToProtocol = {
     [tokenType.vicuna_borrowing]: { protocol: "Vicuna", action: OpportunityAction.BORROW },
     [tokenType.spectra_lpt]: { protocol: "Spectra", action: OpportunityAction.POOL },
     [tokenType.spectra_yt]: { protocol: "Spectra", action: OpportunityAction.POOL },
+    [tokenType.rfx_slv]: { protocol: "RFX", action: OpportunityAction.POOL },
 };

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

@@ -126,4 +126,5 @@ export const processorMapping = {
     [tokenType.anglesLiquid]: AnglesLiquidProcessor,
     [tokenType.spectra_lpt]: SpectraProcessor,
     [tokenType.spectra_yt]: SpectraYTProcessor,
+    [tokenType.rfx_slv]: ERC4626Processor,
 };

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

@@ -46,6 +46,8 @@ function satisfiesNameConditions(name, type) {
             return lowerCaseName.startsWith("reactorfusion");
         case tokenType.rfx:
             return lowerCaseName.includes("rfx");
+        case tokenType.rfx_slv:
+            return lowerCaseName.includes("rfx") && lowerCaseName.includes("shared liquidity vault");
         case tokenType.layerbank:
             return lowerCaseName.includes("layerbank");
         case tokenType.moonwell:

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

@@ -23,46 +23,59 @@ export async function HyperdriveDynamicData(chainId, campaigns) {
                 let i = 0;
                 const dynamicData = [];
                 for (const campaign of campaigns) {
-                    const poolInfo = HyperdriveTargetInterface.decodeFunctionResult("getPoolInfo", result[i++])[0];
-                    const poolConfig = HyperdriveTargetInterface.decodeFunctionResult("getPoolConfig", result[i++])[0];
-                    const priceRewardToken = (await pricer.get({
-                        address: campaign.rewardToken,
-                        chainId,
-                        symbol: campaign.campaignParameters.symbolRewardToken,
-                    })) ?? 0;
-                    const lpSupply = BN2Number(poolInfo.lpTotalSupply, 18);
-                    const longSupply = BN2Number(poolInfo.longsOutstanding, 18);
-                    const shortSupply = BN2Number(poolInfo.shortsOutstanding, 18);
-                    const marketSupply = lpSupply * BN2Number(poolInfo.lpSharePrice, 18);
-                    const priceBaseToken = (poolConfig.baseToken === ETH_ADDRESS
-                        ? await pricer.get({
+                    try {
+                        const poolInfo = HyperdriveTargetInterface.decodeFunctionResult("getPoolInfo", result[i])[0];
+                        const poolConfig = HyperdriveTargetInterface.decodeFunctionResult("getPoolConfig", result[i + 1])[0];
+                        const priceRewardToken = (await pricer.get({
+                            address: campaign.rewardToken,
                             chainId,
-                            symbol: "ETH",
-                        })
-                        : await pricer.get({
-                            address: campaign.campaignParameters.baseToken,
-                            chainId,
-                            symbol: campaign.campaignParameters.baseTokenSymbol,
+                            symbol: campaign.campaignParameters.symbolRewardToken,
                         })) ?? 0;
-                    const tvl = campaign.campaignSubType === HyperDriveSubCampaignType.LP
-                        ? priceBaseToken * marketSupply
-                        : campaign.campaignSubType === HyperDriveSubCampaignType.LONG
-                            ? priceBaseToken * longSupply
-                            : priceBaseToken * shortSupply;
-                    dynamicData.push({
-                        ...campaign,
-                        totalSupplyTargetToken: marketSupply,
-                        tvl: tvl,
-                        apr: priceRewardToken !== 0
-                            ? (priceRewardToken *
-                                BN2Number(campaign.amount, campaign.campaignParameters.decimalsRewardToken) *
-                                YEAR *
-                                100) /
-                                campaign.campaignParameters.duration /
-                                tvl
-                            : 0,
-                        priceRewardToken: priceRewardToken,
-                    });
+                        const lpSupply = BN2Number(poolInfo.lpTotalSupply, 18);
+                        const longSupply = BN2Number(poolInfo.longsOutstanding, 18);
+                        const shortSupply = BN2Number(poolInfo.shortsOutstanding, 18);
+                        const marketSupply = lpSupply * BN2Number(poolInfo.lpSharePrice, 18);
+                        const priceBaseToken = (poolConfig.baseToken === ETH_ADDRESS
+                            ? await pricer.get({
+                                chainId,
+                                symbol: "ETH",
+                            })
+                            : await pricer.get({
+                                address: campaign.campaignParameters.baseToken,
+                                chainId,
+                                symbol: campaign.campaignParameters.baseTokenSymbol,
+                            })) ?? 0;
+                        const tvl = campaign.campaignSubType === HyperDriveSubCampaignType.LP
+                            ? priceBaseToken * marketSupply
+                            : campaign.campaignSubType === HyperDriveSubCampaignType.LONG
+                                ? priceBaseToken * longSupply
+                                : priceBaseToken * shortSupply;
+                        dynamicData.push({
+                            ...campaign,
+                            totalSupplyTargetToken: marketSupply,
+                            tvl: tvl,
+                            apr: priceRewardToken !== 0
+                                ? (priceRewardToken *
+                                    BN2Number(campaign.amount, campaign.campaignParameters.decimalsRewardToken) *
+                                    YEAR *
+                                    100) /
+                                    campaign.campaignParameters.duration /
+                                    tvl
+                                : 0,
+                            priceRewardToken: priceRewardToken,
+                        });
+                    }
+                    catch (e) {
+                        dynamicData.push({
+                            ...campaign,
+                            totalSupplyTargetToken: 0,
+                            tvl: 0,
+                            apr: 0,
+                            priceRewardToken: 0,
+                        });
+                        console.error(e);
+                    }
+                    i += 2;
                 }
                 return dynamicData;
             },

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

@@ -88,13 +88,20 @@ export class DynamicDataService {
             parsedParams = campaign.params;
             targetToken = parsedParams.poolId;
         }
+        else if (campaign.type === Campaign[Campaign.UNISWAP_V4]) {
+            parsedParams = campaign.params;
+            targetToken = `0x${parsedParams.poolId.slice(-40)}`;
+        }
         else {
             parsedParams = campaign.params;
             targetToken = parsedParams.targetToken;
         }
-        return utils
-            .keccak256(utils.defaultAbiCoder.encode(["string", "address[]"], [targetToken, parsedParams.whitelist.sort()]))
-            .slice(0, 42);
+        if (parsedParams.whitelist.length > 0) {
+            return utils
+                .keccak256(utils.defaultAbiCoder.encode(["string", "address[]"], [targetToken, parsedParams.whitelist.sort()]))
+                .slice(0, 42);
+        }
+        return targetToken;
     }
     static async queryDynamicData(campaign) {
         const campaignParameters = DynamicDataService.generateDummyData(campaign);

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

@@ -90,7 +90,7 @@ export class OpportunityService {
                 return getEulerMetadata(chainId, campaign.campaignId, campaign.subType, campaign.rewardTokenAddress, campaign.amount, campaignParams);
             case "HYPERDRIVELOGPROCESSOR":
             case "HYPERDRIVELOGFIXPROCESSOR":
-                return getHyperdriveMetadata(chainId, campaignParams.subCampaignType, campaignParams);
+                return getHyperdriveMetadata(chainId, campaign.subType, campaignParams);
             case "AMBIENTPROCESSOR":
                 return getAmbientMetadata(chainId, campaignParams);
             case "UNISWAP_V4":

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

@@ -250,14 +250,12 @@ export declare const ProgramPayloadController: Elysia<"/program-payload", false,
                     body: {
                         chainId: number;
                         startTimestamp: number;
-                        endTimestamp: number;
                         computeChainId: number;
                         amount: string;
                         rewardToken: string;
                         campaignType: number;
+                        duration: number;
                         campaignData: string;
-                        symbolRewardToken: string;
-                        decimalsRewardToken: number;
                     };
                     params: {};
                     query: unknown;

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

@@ -15,11 +15,9 @@ export declare const CampaignDataDto: import("@sinclair/typebox").TObject<{
     amount: import("@sinclair/typebox").TString;
     chainId: import("@sinclair/typebox").TNumber;
     computeChainId: import("@sinclair/typebox").TNumber;
-    endTimestamp: import("@sinclair/typebox").TNumber;
+    duration: import("@sinclair/typebox").TNumber;
     rewardToken: import("@sinclair/typebox").TString;
     startTimestamp: import("@sinclair/typebox").TNumber;
-    symbolRewardToken: import("@sinclair/typebox").TString;
-    decimalsRewardToken: import("@sinclair/typebox").TNumber;
 }>;
 export declare const SinglePayloadInputDto: import("@sinclair/typebox").TObject<{
     distributionChainId: import("@sinclair/typebox").TNumber;

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

@@ -16,11 +16,9 @@ export const CampaignDataDto = t.Object({
     amount: t.String({ description: "Amount of the reward token to be distributed" }),
     chainId: t.Numeric({ description: "Chain ID where the reward tokens will be distributed" }),
     computeChainId: t.Numeric({ description: "Chain ID used for computation" }),
-    endTimestamp: t.Numeric({ description: "End timestamp for the campaign" }),
+    duration: t.Numeric({ description: "Duration for the campaign" }),
     rewardToken: t.String({ description: "Address of the reward token to be distributed" }),
     startTimestamp: t.Numeric({ description: "Start timestamp for the campaign" }),
-    symbolRewardToken: t.String({ description: "Symbol of the reward token" }),
-    decimalsRewardToken: t.Numeric({ description: "Decimals of the reward token" }),
 });
 export const SinglePayloadInputDto = t.Object({
     distributionChainId: t.Numeric({ description: "Chain ID where the reward tokens will be distributed" }),

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

@@ -90,7 +90,9 @@ export declare enum pufferCampaigns {
     venus_pufeth = "0xE0ee5dDeBFe0abe0a4Af50299D68b74Cec31668e",
     unifiBTC = "0x170D847A8320F3B6A77eE15B0CAE430e3eC933a0",
     unifiUSD = "0x82c40e07277eBb92935f79cE92268F80dDc7caB4",
-    CARROT_USDC = "0xf00032d0F95e8f43E750C51d0188DCa33cC5a8eA"
+    CARROT_USDC = "0xf00032d0F95e8f43E750C51d0188DCa33cC5a8eA",
+    sonex_pufETH_USDCe_1 = "0x4A0e0E8d5DF4AEC0a08359e599720628b179F7eD",
+    sonex_pufETH_USDCe_5 = "0x2646FAD13ef9BD063790d2719De1da290865D58f"
 }
 export declare enum zkSyncCampaigns {
     Izumi_Finance_Zk_Weth = "Izumi Finance ZK/WETH 0xd62bc9f19bd94fde9c41df4b6eb6419ea6b8e25c",

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

@@ -95,6 +95,8 @@ export var pufferCampaigns;
     pufferCampaigns["unifiBTC"] = "0x170D847A8320F3B6A77eE15B0CAE430e3eC933a0";
     pufferCampaigns["unifiUSD"] = "0x82c40e07277eBb92935f79cE92268F80dDc7caB4";
     pufferCampaigns["CARROT_USDC"] = "0xf00032d0F95e8f43E750C51d0188DCa33cC5a8eA";
+    pufferCampaigns["sonex_pufETH_USDCe_1"] = "0x4A0e0E8d5DF4AEC0a08359e599720628b179F7eD";
+    pufferCampaigns["sonex_pufETH_USDCe_5"] = "0x2646FAD13ef9BD063790d2719De1da290865D58f";
 })(pufferCampaigns || (pufferCampaigns = {}));
 export var zkSyncCampaigns;
 (function (zkSyncCampaigns) {
@@ -3337,6 +3339,32 @@ const PufferInterfaceCampaigns = {
         weightToken0: 5000,
         weightToken1: 5000,
     },
+    [pufferCampaigns.sonex_pufETH_USDCe_1]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.SONEIUM,
+        poolAddress: "0x4A0e0E8d5DF4AEC0a08359e599720628b179F7eD",
+        hooks: [],
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.sonex.so/explore/pools/0x4A0e0E8d5DF4AEC0a08359e599720628b179F7eD",
+        isOutOfRangeIncentivized: false,
+        weightFees: 0,
+        weightToken0: 5000,
+        weightToken1: 5000,
+    },
+    [pufferCampaigns.sonex_pufETH_USDCe_5]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.SONEIUM,
+        poolAddress: "0x2646FAD13ef9BD063790d2719De1da290865D58f",
+        hooks: [],
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.sonex.so/explore/pools/0x2646FAD13ef9BD063790d2719De1da290865D58f",
+        isOutOfRangeIncentivized: false,
+        weightFees: 0,
+        weightToken0: 5000,
+        weightToken1: 5000,
+    },
     [pufferCampaigns.uniswapv3_weth_PUFFER]: {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.MAINNET,

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

@@ -1,4 +1,4 @@
-import { CampaignTypeConfigResourceMapping, ChainId, NULL_ADDRESS, NULL_ROOT, ParserService, buildCampaignPayload, encodeForwarderData, registry, } from "@sdk";
+import { CampaignTypeConfigResourceMapping, ChainId, NULL_ADDRESS, NULL_ROOT, buildCampaignPayload, encodeForwarderData, parseCampaign, registry, } from "@sdk";
 import _ from "lodash";
 import { safeTemplate, } from "./programPayload.model";
 import { MerklInterfaceCampaigns } from "./programPayload.repository";
@@ -176,24 +176,19 @@ export class ProgramPayloadService {
         return campaignPayloads;
     }
     static async buildConfigFromCampaignData(body) {
-        const parser = ParserService(body.campaignType);
         const base = {
-            amount: body.amount,
             campaignId: "0xdefaultId",
-            campaignSubType: 0,
-            campaignType: body.campaignType,
-            chainId: body.chainId,
-            computeChainId: body.computeChainId,
             creator: "Oxcreator",
-            endTimestamp: body.endTimestamp,
-            index: 0,
-            mainParameter: " ".repeat(42),
             rewardToken: body.rewardToken,
+            amount: body.amount,
+            campaignType: body.campaignType,
             startTimestamp: body.startTimestamp,
+            duration: body.duration,
+            campaignData: body.campaignData,
         };
         try {
             console.log("Parsing campaign data");
-            const res = await parser.parse(body.chainId, body.symbolRewardToken, body.decimalsRewardToken, base, body.campaignData);
+            const res = await parseCampaign(body.chainId, base, 0);
             if (res.success) {
                 return res;
             }

package/dist/src/modules/v4/reward/subservices/converter.js

@@ -34,11 +34,6 @@ export class RewardConvertorService {
                             BigInt(claimed)).toString();
                         res[rewardToken].reasons[reason].pending = (BigInt(res[rewardToken].reasons[reason].pending ?? "0") + BigInt(pending)).toString();
                     }
-                    res[rewardToken].accumulated = (BigInt(res[rewardToken].accumulated) + BigInt(amount)).toString();
-                    res[rewardToken].unclaimed = (BigInt(res[rewardToken].unclaimed) +
-                        BigInt(amount) -
-                        BigInt(claimed)).toString();
-                    res[rewardToken].pending = (BigInt(res[rewardToken].pending ?? "0") + BigInt(pending)).toString();
                 }
             }
         }

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

@@ -3505,14 +3505,12 @@ export declare const v4: Elysia<"/v4", false, {
                         body: {
                             chainId: number;
                             startTimestamp: number;
-                            endTimestamp: number;
                             computeChainId: number;
                             amount: string;
                             rewardToken: string;
                             campaignType: number;
+                            duration: number;
                             campaignData: string;
-                            symbolRewardToken: string;
-                            decimalsRewardToken: number;
                         };
                         params: {};
                         query: unknown;

package/dist/src/utils/decodeCalls.js

@@ -191,6 +191,7 @@ export function decodeReturnValue(returnData, key, type) {
             switch (type) {
                 case tokenType.anglesLiquid:
                 case tokenType.cian:
+                case tokenType.rfx_slv:
                     return ERC4626Interface.decodeFunctionResult("totalAssets", returnData)[0];
                 case tokenType.concrete:
                     return ERC4626Interface.decodeFunctionResult("totalAssets", returnData)[0];

package/dist/src/utils/encodeCalls.js

@@ -247,6 +247,7 @@ export function createCall(target, key, type, metaData) {
             switch (type) {
                 case tokenType.anglesLiquid:
                 case tokenType.cian:
+                case tokenType.rfx_slv:
                     return {
                         allowFailure: true,
                         callData: ERC4626Interface.encodeFunctionData("totalAssets"),

package/dist/src/utils/generateCardName.js

@@ -134,6 +134,8 @@ export function generateCardName(type, typeInfo, campaign, symbols = [""], displ
         case tokenType.concrete:
         case tokenType.cian:
             return `Deposit ${typeInfo.symbolAsset} into ${typeInfo.name.replace("Ether.Fi", "Veda")}`;
+        case tokenType.rfx_slv:
+            return `Deposit ${typeInfo.symbolAsset} into ${typeInfo.name}`;
         case tokenType.equalizer_gauge:
             return `${displayName}`;
         case tokenType.anglesLiquid: