@merkl/api 0.20.135 → 0.20.137

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

@@ -667,13 +667,20 @@ declare const eden: {
                         aprRecord: {
                             cumulated: number;
                             timestamp: bigint;
-                            breakdowns: {
+                            breakdowns: ({
                                 id: string;
-                                type: import("@db/api").$Enums.AprType;
+                                value: number;
+                                aprRecordId: string;
+                                distributionType: import("@db/api").$Enums.DistributionType;
                                 identifier: string;
+                                type: "CAMPAIGN";
+                            } | {
+                                id: string;
                                 value: number;
                                 aprRecordId: string;
-                            }[];
+                                identifier: string;
+                                type: import("@db/api").$Enums.AprType;
+                            })[];
                         };
                         tvlRecord: {
                             id: string;
@@ -3045,7 +3052,7 @@ declare const eden: {
                         query?: Record<string, unknown> | undefined;
                         fetch?: RequestInit | undefined;
                     }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                        200: number | undefined;
+                        200: number;
                     }>>;
                 };
                 symbol: ((params: {
@@ -5712,13 +5719,20 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
-                                breakdowns: {
+                                breakdowns: ({
                                     id: string;
-                                    type: import("@db/api").$Enums.AprType;
+                                    value: number;
+                                    aprRecordId: string;
+                                    distributionType: import("@db/api").$Enums.DistributionType;
                                     identifier: string;
+                                    type: "CAMPAIGN";
+                                } | {
+                                    id: string;
                                     value: number;
                                     aprRecordId: string;
-                                }[];
+                                    identifier: string;
+                                    type: import("@db/api").$Enums.AprType;
+                                })[];
                             };
                             tvlRecord: {
                                 id: string;
@@ -8891,7 +8905,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             authorization: string;
                         };
                         response: {
-                            200: number | undefined;
+                            200: number;
                         };
                     };
                 };
@@ -12354,13 +12368,20 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         aprRecord: {
                             cumulated: number;
                             timestamp: bigint;
-                            breakdowns: {
+                            breakdowns: ({
                                 id: string;
-                                type: import("@db/api").$Enums.AprType;
+                                value: number;
+                                aprRecordId: string;
+                                distributionType: import("@db/api").$Enums.DistributionType;
                                 identifier: string;
+                                type: "CAMPAIGN";
+                            } | {
+                                id: string;
                                 value: number;
                                 aprRecordId: string;
-                            }[];
+                                identifier: string;
+                                type: import("@db/api").$Enums.AprType;
+                            })[];
                         };
                         tvlRecord: {
                             id: string;
@@ -14732,7 +14753,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         query?: Record<string, unknown> | undefined;
                         fetch?: RequestInit | undefined;
                     }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                        200: number | undefined;
+                        200: number;
                     }>>;
                 };
                 symbol: ((params: {

package/dist/src/errors/UnableToFindPrice.error.d.ts

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

package/dist/src/errors/UnableToFindPrice.error.js

@@ -0,0 +1,7 @@
+import { HttpError } from "./HttpError";
+export class UnableToFindPrice extends HttpError {
+    constructor(message = "UnableToFindPrice") {
+        super(message, 422);
+        this.name = "UnableToFindPriceError";
+    }
+}

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

@@ -3,3 +3,4 @@ export * from "./Unauthorized.error";
 export * from "./NotFound.error";
 export * from "./BadRequest.error";
 export * from "./Conflict.error";
+export * from "./UnableToFindPrice.error";

package/dist/src/errors/index.js

@@ -3,3 +3,4 @@ export * from "./Unauthorized.error";
 export * from "./NotFound.error";
 export * from "./BadRequest.error";
 export * from "./Conflict.error";
+export * from "./UnableToFindPrice.error";

package/dist/src/index.d.ts

@@ -484,13 +484,20 @@ declare const app: Elysia<"", false, {
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
-                                breakdowns: {
+                                breakdowns: ({
                                     id: string;
-                                    type: import("@db/api").$Enums.AprType;
+                                    value: number;
+                                    aprRecordId: string;
+                                    distributionType: import("@db/api").$Enums.DistributionType;
                                     identifier: string;
+                                    type: "CAMPAIGN";
+                                } | {
+                                    id: string;
                                     value: number;
                                     aprRecordId: string;
-                                }[];
+                                    identifier: string;
+                                    type: import("@db/api").$Enums.AprType;
+                                })[];
                             };
                             tvlRecord: {
                                 id: string;
@@ -3663,7 +3670,7 @@ declare const app: Elysia<"", false, {
                             authorization: string;
                         };
                         response: {
-                            200: number | undefined;
+                            200: number;
                         };
                     };
                 };

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

@@ -1,4 +1,5 @@
 import type { Resource } from "@/modules/v4/prisma";
+import { type DistributionType } from "@db/api";
 /**
  * Apr Record
  * @description Describes one apr snapshot for an opportunity
@@ -12,7 +13,9 @@ export type AprRecord = Resource<"AprRecord", "id" | "opportunityId", {
  * @description Describes one apr fraction of record
  * @see {@link Resource}
  */
-export type AprBreakdown = Resource<"AprBreakdown", "id" | "aprRecordId">;
+export type AprBreakdown = Resource<"AprBreakdown", "id" | "aprRecordId", {
+    distributionType?: DistributionType;
+}>;
 export declare const AprBreakdownResourceDto: import("@sinclair/typebox").TObject<{
     id: import("@sinclair/typebox").TString;
     type: import("@sinclair/typebox").TEnum<{

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

@@ -339,13 +339,20 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         aprRecord: {
                             cumulated: number;
                             timestamp: bigint;
-                            breakdowns: {
+                            breakdowns: ({
                                 id: string;
-                                type: import("@db/api").$Enums.AprType;
+                                value: number;
+                                aprRecordId: string;
+                                distributionType: import("@db/api").$Enums.DistributionType;
                                 identifier: string;
+                                type: "CAMPAIGN";
+                            } | {
+                                id: string;
                                 value: number;
                                 aprRecordId: string;
-                            }[];
+                                identifier: string;
+                                type: import("@db/api").$Enums.AprType;
+                            })[];
                         };
                         tvlRecord: {
                             id: string;

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

@@ -156,6 +156,7 @@ export declare abstract class OpportunityRepository {
         DailyRewardsRecords: ({
             DailyRewardsBreakdown: ({
                 Campaign: {
+                    campaignId: string;
                     distributionType: import("@db/api").$Enums.DistributionType;
                     amount: string;
                     startTimestamp: bigint;
@@ -302,6 +303,7 @@ export declare abstract class OpportunityRepository {
         DailyRewardsRecords: ({
             DailyRewardsBreakdown: ({
                 Campaign: {
+                    campaignId: string;
                     distributionType: import("@db/api").$Enums.DistributionType;
                     amount: string;
                     startTimestamp: bigint;
@@ -507,6 +509,7 @@ export declare abstract class OpportunityRepository {
         DailyRewardsRecords: ({
             DailyRewardsBreakdown: ({
                 Campaign: {
+                    campaignId: string;
                     distributionType: import("@db/api").$Enums.DistributionType;
                     amount: string;
                     startTimestamp: bigint;
@@ -660,6 +663,7 @@ export declare abstract class OpportunityRepository {
         DailyRewardsRecords: ({
             DailyRewardsBreakdown: ({
                 Campaign: {
+                    campaignId: string;
                     distributionType: import("@db/api").$Enums.DistributionType;
                     amount: string;
                     startTimestamp: bigint;
@@ -867,6 +871,7 @@ export declare abstract class OpportunityRepository {
         DailyRewardsRecords: ({
             DailyRewardsBreakdown: ({
                 Campaign: {
+                    campaignId: string;
                     distributionType: import("@db/api").$Enums.DistributionType;
                     amount: string;
                     startTimestamp: bigint;

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

@@ -127,6 +127,7 @@ export class OpportunityRepository {
                                     RewardToken: true,
                                     CampaignStatus: true,
                                     distributionType: true,
+                                    campaignId: true,
                                 },
                             },
                         },

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

@@ -600,13 +600,20 @@ export declare abstract class OpportunityService {
         aprRecord: {
             cumulated: number;
             timestamp: bigint;
-            breakdowns: {
+            breakdowns: ({
                 id: string;
-                type: import("@db/api").$Enums.AprType;
+                value: number;
+                aprRecordId: string;
+                distributionType: import("@db/api").$Enums.DistributionType;
                 identifier: string;
+                type: "CAMPAIGN";
+            } | {
+                id: string;
                 value: number;
                 aprRecordId: string;
-            }[];
+                identifier: string;
+                type: import("@db/api").$Enums.AprType;
+            })[];
         };
         tvlRecord: {
             id: string;
@@ -778,13 +785,20 @@ export declare abstract class OpportunityService {
         aprRecord: {
             cumulated: number;
             timestamp: bigint;
-            breakdowns: {
+            breakdowns: ({
                 id: string;
-                type: import("@db/api").$Enums.AprType;
+                value: number;
+                aprRecordId: string;
+                distributionType: import("@db/api").$Enums.DistributionType;
                 identifier: string;
+                type: "CAMPAIGN";
+            } | {
+                id: string;
                 value: number;
                 aprRecordId: string;
-            }[];
+                identifier: string;
+                type: import("@db/api").$Enums.AprType;
+            })[];
         };
         tvlRecord: {
             id: string;
@@ -949,13 +963,20 @@ export declare abstract class OpportunityService {
         aprRecord: {
             cumulated: number;
             timestamp: bigint;
-            breakdowns: {
+            breakdowns: ({
                 id: string;
-                type: import("@db/api").$Enums.AprType;
+                value: number;
+                aprRecordId: string;
+                distributionType: import("@db/api").$Enums.DistributionType;
                 identifier: string;
+                type: "CAMPAIGN";
+            } | {
+                id: string;
                 value: number;
                 aprRecordId: string;
-            }[];
+                identifier: string;
+                type: import("@db/api").$Enums.AprType;
+            })[];
         };
         tvlRecord: {
             id: string;

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

@@ -6,7 +6,7 @@ import { CampaignService } from "@/modules/v4/campaign/campaign.service";
 import { TokenService } from "@/modules/v4/token/token.service";
 import { UserService } from "@/modules/v4/user/user.service";
 import { log } from "@/utils/logger";
-import { Status } from "@db/api";
+import { AprType, Status } from "@db/api";
 import { Campaign as CampaignType } from "@sdk";
 import moment from "moment";
 import { metadataBuilderFactory } from "../../../engine/metadata/factory";
@@ -202,7 +202,24 @@ export class OpportunityService {
             ? (AprRecords?.map(({ cumulated, timestamp, AprBreakdown: breakdowns }) => ({
                 cumulated,
                 timestamp,
-                breakdowns,
+                breakdowns: breakdowns.map(({ identifier, type, ...breakdown }) => {
+                    if (type === AprType.CAMPAIGN) {
+                        const campaign = DailyRewardsRecords?.[0]?.DailyRewardsBreakdown?.map(breakdown => breakdown.Campaign).find(c => c.campaignId === identifier);
+                        if (campaign) {
+                            return {
+                                distributionType: campaign.distributionType,
+                                identifier,
+                                type,
+                                ...breakdown,
+                            };
+                        }
+                    }
+                    return {
+                        identifier,
+                        type,
+                        ...breakdown,
+                    };
+                }),
             }))?.[0] ?? undefined)
             : {
                 cumulated: 0,

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

@@ -114,7 +114,7 @@ export declare const PriceController: Elysia<"/prices", false, {
                         authorization: string;
                     };
                     response: {
-                        200: number | undefined;
+                        200: number;
                     };
                 };
             };

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

@@ -30,6 +30,7 @@ export const PriceController = new Elysia({ prefix: "/prices", detail: { tags: [
             if (err && err.code === "P2002") {
                 throw new ConflictError();
             }
+            throw err;
         }
     }, {
         headers: AuthorizationHeadersDto,

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

@@ -1,3 +1,4 @@
+import { UnableToFindPrice } from "@/errors";
 import { Pricer } from "@/utils/pricer";
 import PriceFetcherFactory from "@/utils/prices/priceFetcherFactory";
 import { PriceSourceMethod } from "@db/api";
@@ -33,7 +34,17 @@ export class PriceService {
     }
     static async createPriceSource(priceSource) {
         const created = await PriceRepository.create(priceSource);
-        return await PriceService.fetchPriceBySymbol(created.symbol);
+        try {
+            const price = await PriceService.fetchPriceBySymbol(created.symbol);
+            if (price === undefined || price === null) {
+                throw new Error();
+            }
+            return price;
+        }
+        catch {
+            await PriceRepository.deleteBySymbol(created.symbol);
+            throw new UnableToFindPrice();
+        }
     }
     static async updatePriceSource(symbol, newPriceSource) {
         return await PriceRepository.updateBySymbol(symbol, newPriceSource);

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

@@ -88,7 +88,9 @@ export declare enum swapxCampaigns {
     Swapx_wstkscUSD_bUSDCe20_wstkscUSD_gauge_Swapx = "Swapx wstkscUSD/bUSDC.e-20 wstkscUSD gauge Swapx 0x85279f76f6ce5bb26f721931ba4e3188cd28ad51",
     Swapx_wstkscUSD_bUSDCe20_bUSDCe20_gauge_Swapx = "Swapx wstkscUSD/bUSDC.e-20 bUSDC.e-20 gauge Swapx 0x85279f76f6ce5bb26f721931ba4e3188cd28ad51",
     Swapx_wstkscUSD_aSonUSDC_aSonUSDC_gauge_Swapx = "Swapx wstkscUSD/aSonUSDC aSonUSDC gauge Swapx 0xf248b0EF6d45Aa492C73699B71748b5D1a6770C6",
-    Swapx_wstkscUSD_aSonUSDC_wstkscUSD_gauge_Swapx = "Swapx wstkscUSD/aSonUSDC wstkscUSD gauge Swapx 0xF2a497F783C6bfEe0670757462a31f9429fdE53d"
+    Swapx_wstkscUSD_aSonUSDC_wstkscUSD_gauge_Swapx = "Swapx wstkscUSD/aSonUSDC wstkscUSD gauge Swapx 0xF2a497F783C6bfEe0670757462a31f9429fdE53d",
+    Swapx_beS_OS_beS_gauge_Swapx = "Swapx beS/OS beS gauge Swapx 0xfBA3606310f3d492031176eC85DFbeD67F5799F2",
+    Swapx_beS_OS_OS_gauge_Swapx = "Swapx beS/OS OS gauge Swapx 0x77546B40445d3eca6111944DFe902de0514A4F80"
 }
 export declare enum celoCampaigns {
     UniswapV3_cUSD_USDT_Celo = "UniswapV3 cUSD/USDT Celo 0x5dC631aD6C26BEA1a59fBF2C2680CF3df43d249f",
@@ -501,7 +503,7 @@ declare const RoninInterfaceCampaigns: {
         hooks: never[];
         targetToken: string;
         whitelist: never[];
-        blacklist: never[];
+        blacklist: string[];
         url: string;
         subCampaignType: any;
     };

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

@@ -155,6 +155,8 @@ export var swapxCampaigns;
     swapxCampaigns["Swapx_wstkscUSD_bUSDCe20_bUSDCe20_gauge_Swapx"] = "Swapx wstkscUSD/bUSDC.e-20 bUSDC.e-20 gauge Swapx 0x85279f76f6ce5bb26f721931ba4e3188cd28ad51";
     swapxCampaigns["Swapx_wstkscUSD_aSonUSDC_aSonUSDC_gauge_Swapx"] = "Swapx wstkscUSD/aSonUSDC aSonUSDC gauge Swapx 0xf248b0EF6d45Aa492C73699B71748b5D1a6770C6";
     swapxCampaigns["Swapx_wstkscUSD_aSonUSDC_wstkscUSD_gauge_Swapx"] = "Swapx wstkscUSD/aSonUSDC wstkscUSD gauge Swapx 0xF2a497F783C6bfEe0670757462a31f9429fdE53d";
+    swapxCampaigns["Swapx_beS_OS_beS_gauge_Swapx"] = "Swapx beS/OS beS gauge Swapx 0xfBA3606310f3d492031176eC85DFbeD67F5799F2";
+    swapxCampaigns["Swapx_beS_OS_OS_gauge_Swapx"] = "Swapx beS/OS OS gauge Swapx 0x77546B40445d3eca6111944DFe902de0514A4F80";
 })(swapxCampaigns || (swapxCampaigns = {}));
 export var celoCampaigns;
 (function (celoCampaigns) {
@@ -524,8 +526,8 @@ const RoninInterfaceCampaigns = {
         forwarders: [],
         isOutOfRangeIncentivized: false,
         weightFees: 1500,
-        weightToken0: 1500,
-        weightToken1: 7000,
+        weightToken0: 5500,
+        weightToken1: 3000,
     },
     [roninCampaigns.Katana_AXS_RON_Ronin]: {
         campaignType: Campaign.CLAMM,
@@ -537,9 +539,9 @@ const RoninInterfaceCampaigns = {
         url: "https://app.roninchain.com/liquidity/v3/0x3230b903e8a5d6e46b5a5028470dd33e7b673722",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 1000,
-        weightToken0: 3500,
-        weightToken1: 5500,
+        weightFees: 2000,
+        weightToken0: 500,
+        weightToken1: 7500,
     },
     [roninCampaigns.Katana_USDC_RON_Ronin]: {
         campaignType: Campaign.CLAMM,
@@ -551,9 +553,9 @@ const RoninInterfaceCampaigns = {
         url: "https://app.roninchain.com/liquidity/v3/0x392d372f2a51610e9ac5b741379d5631ca9a1c7f",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 1000,
-        weightToken0: 2500,
-        weightToken1: 6500,
+        weightFees: 3000,
+        weightToken0: 4500,
+        weightToken1: 2500,
     },
     [roninCampaigns.Katana_LRON_RON_Ronin]: {
         campaignType: Campaign.CLAMM,
@@ -566,8 +568,8 @@ const RoninInterfaceCampaigns = {
         forwarders: [],
         isOutOfRangeIncentivized: false,
         weightFees: 1000,
-        weightToken0: 4500,
-        weightToken1: 4500,
+        weightToken0: 6500,
+        weightToken1: 2500,
     },
     [roninCampaigns.Supply_WETH_Compound_Ronin]: {
         campaignType: Campaign.COMPOUND_V3,
@@ -575,8 +577,8 @@ const RoninInterfaceCampaigns = {
         hooks: [],
         targetToken: "0x4006eD4097Ee51c09A04c3B0951D28CCf19e6DFE",
         whitelist: [],
-        blacklist: [],
-        url: "",
+        blacklist: ["0xfeef9d78980083f605c9902c0367df6035d47276"],
+        url: "https://complend.tech/lend/weth-ronin/",
         subCampaignType: CompoundV3SubCampaignType.SUPPLY,
     },
 };
@@ -965,6 +967,34 @@ const EtherlinkInterfaceCampaigns = {
     },
 };
 const SwapxInterfaceCampaigns = {
+    [swapxCampaigns.Swapx_beS_OS_beS_gauge_Swapx]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        poolAddress: "0x97fE831cC56da84321f404a300e2Be81b5bd668A",
+        whitelist: ["0xfBA3606310f3d492031176eC85DFbeD67F5799F2"],
+        blacklist: [],
+        url: "https://swapx.fi/earn?ownerType=pools&filter=conc-liquidity",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 2000,
+        weightToken0: 4000,
+        weightToken1: 4000,
+    },
+    [swapxCampaigns.Swapx_beS_OS_OS_gauge_Swapx]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        poolAddress: "0x97fE831cC56da84321f404a300e2Be81b5bd668A",
+        whitelist: ["0x77546B40445d3eca6111944DFe902de0514A4F80"],
+        blacklist: [],
+        url: "https://swapx.fi/earn?ownerType=pools&filter=conc-liquidity",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 2000,
+        weightToken0: 4000,
+        weightToken1: 4000,
+    },
     [swapxCampaigns.Swapx_wstkscUSD_aSonUSDC_wstkscUSD_gauge_Swapx]: {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.SONIC,

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

@@ -14,13 +14,20 @@ export declare abstract class RewardService {
         aprRecord: {
             cumulated: number;
             timestamp: bigint;
-            breakdowns: {
+            breakdowns: ({
                 id: string;
-                type: import("@db/api").$Enums.AprType;
+                value: number;
+                aprRecordId: string;
+                distributionType: import("@db/api").$Enums.DistributionType;
                 identifier: string;
+                type: "CAMPAIGN";
+            } | {
+                id: string;
                 value: number;
                 aprRecordId: string;
-            }[];
+                identifier: string;
+                type: import("@db/api").$Enums.AprType;
+            })[];
         };
         tvlRecord: {
             id: string;

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

@@ -354,13 +354,20 @@ export declare const v4: Elysia<"/v4", false, {
                             aprRecord: {
                                 cumulated: number;
                                 timestamp: bigint;
-                                breakdowns: {
+                                breakdowns: ({
                                     id: string;
-                                    type: import("@db/api").$Enums.AprType;
+                                    value: number;
+                                    aprRecordId: string;
+                                    distributionType: import("@db/api").$Enums.DistributionType;
                                     identifier: string;
+                                    type: "CAMPAIGN";
+                                } | {
+                                    id: string;
                                     value: number;
                                     aprRecordId: string;
-                                }[];
+                                    identifier: string;
+                                    type: import("@db/api").$Enums.AprType;
+                                })[];
                             };
                             tvlRecord: {
                                 id: string;
@@ -3533,7 +3540,7 @@ export declare const v4: Elysia<"/v4", false, {
                             authorization: string;
                         };
                         response: {
-                            200: number | undefined;
+                            200: number;
                         };
                     };
                 };