@merkl/api 0.21.13 → 0.21.15

package/dist/src/engine/deprecated/dynamicData/factory.js

@@ -63,6 +63,6 @@ const map = {
     [Campaign.MULTILOG]: new DefaultDynamicData(),
     [Campaign.LOCKER]: new DefaultDynamicData(), // TODO
     [Campaign.CONVEX]: new DefaultDynamicData(), // TODO
-    [Campaign.CURVEVAULT]: new DefaultDynamicData(), // TODO
+    [Campaign.STAKEDAO_CURVEVAULT]: new DefaultDynamicData(), // TODO
 };
 export const dynamicDataBuilderFactory = (campaignType) => map[campaignType];

package/dist/src/engine/metadata/factory.js

@@ -70,6 +70,6 @@ const map = {
     [Campaign.MULTILOG]: new MultiLogMetaData(),
     [Campaign.LOCKER]: new LockerMetadata(),
     [Campaign.CONVEX]: new DefaultMetadata(), // TODO
-    [Campaign.CURVEVAULT]: new DefaultMetadata(), // TODO
+    [Campaign.STAKEDAO_CURVEVAULT]: new DefaultMetadata(), // TODO
 };
 export const metadataBuilderFactory = (campaignType) => map[campaignType];

package/dist/src/jobs/update-dynamic-data.js

@@ -2,7 +2,7 @@ import { CampaignService } from "@/modules/v4/campaign/campaign.service";
 import { DynamicDataService } from "@/modules/v4/dynamicData/dynamicData.service";
 import { OpportunityConvertorService } from "@/modules/v4/opportunity/opportunity.converter";
 import { OpportunityService } from "@/modules/v4/opportunity/opportunity.service";
-import { logger } from "@/utils/logger";
+import { log } from "@/utils/logger";
 import { Campaign as CampaignType } from "@sdk";
 import moment from "moment";
 // ─── Required Env Variables ──────────────────────────────────────────────────
@@ -12,20 +12,20 @@ if (!chainId)
 // ─── Update Dynamic Data (APR / TVL / Daily Rewards) ─────────────────────────
 const main = async () => {
     // Update status of opportunities
-    // 1. Get current live opportunities or opportunities with live campaigns
+    // 1. Get current live opportunities or opportunities with campaigns ending in the future
     const liveOpportunities = await OpportunityService.findLiveWithCampaigns(chainId);
     // 2. For each currently live opportunities, infer its updated status by looping through its campaigns
     // This should handle:
     // - Opportunities flagged as "SOON" once they turn live
     // - Opportunities flagged as "LIVE" once they are not live anymore
+    // - Opportunities flagged as "PAST" that are now "LIVE"
+    // - Opportunities flagged as "SOON" if they were missed and should now be "PAST"
     const now = moment().unix();
     for (const opportunity of liveOpportunities) {
         let status = "PAST";
         const campaigns = opportunity.campaigns;
         for (const campaign of campaigns) {
-            if (status !== "LIVE" && status !== "SOON" && campaign.endTimestamp < now)
-                status = "PAST";
-            else if (campaign.startTimestamp < now && campaign.endTimestamp > now)
+            if (campaign.startTimestamp < now && campaign.endTimestamp > now)
                 status = "LIVE";
             else if (status !== "LIVE" && campaign.startTimestamp > now)
                 status = "SOON";
@@ -34,24 +34,10 @@ const main = async () => {
             await OpportunityService.update(opportunity.id, { apr: 0, dailyRewards: 0 });
         if (opportunity.status !== status) {
             await OpportunityService.update(opportunity.id, { status });
+            log.info(`opportunity ${opportunity.id} status updated from ${opportunity.status} to ${status}`);
         }
     }
-    // 3. Update the status of the opportunities associated to future campaigns
-    const futureOpportunities = await CampaignService.getFutureCampaigns({ computeChainId: chainId });
-    const liveOpportunityIds = (await CampaignService.getLiveCampaigns({ computeChainId: chainId })).map(c => c.Opportunity.id);
-    const idToUpdate = futureOpportunities
-        ?.filter(c => !liveOpportunityIds.includes(c.Opportunity.id) && c.Opportunity.status !== "SOON")
-        .map(c => c.Opportunity.id);
-    if (idToUpdate.length > 0) {
-        await OpportunityService.updateMany(idToUpdate, { status: "SOON" });
-        if (idToUpdate.length === 1)
-            logger.info(`updated opportunity ${idToUpdate[0]} to SOON status.`);
-        else
-            logger.info(`updated ${idToUpdate.length} opportunities to SOON status.`);
-    }
-    // 4. Update the status of the opportunities associated to live campaigns
-    await OpportunityService.updateMany(liveOpportunityIds, { status: "LIVE" });
-    // 5. Update records for all live campaigns
+    // 3. Update records for all live campaigns
     const liveCampaigns = (await CampaignService.findMany({ chainId, status: "LIVE", test: true, withOpportunity: true, items: 0 }))
         .concat(await CampaignService.findMany({ chainId, status: "SOON", test: true, withOpportunity: true, items: 0 }))
         .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignType[campaign.type], campaign, campaign.Opportunity.identifier));

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

@@ -72,7 +72,8 @@ export class CampaignService {
             if (dryRun)
                 return opportunity;
         }
-        catch (_err) {
+        catch (e) {
+            console.error(e);
             throw new CannotParseOpportunity(campaign.campaignId, campaign.distributionChainId, campaign.type);
         }
         return await CampaignRepository.upsert(campaign, body.opportunityIdentifier);

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

@@ -41,7 +41,7 @@ export class CreatorService {
         return await CreatorRepository.delete(id);
     }
     static async getCreatorIdFromAddress(address) {
-        return await CacheService.wrap(TTLPresets.MIN_30, async () => (await UserService.findUnique(address)).creatorId);
+        return await CacheService.wrap(TTLPresets.MIN_30, async () => (await UserService.findUniqueOrThrow(address)).creatorId);
     }
     static async getCreatorAddresses(id) {
         const creator = await CreatorRepository.findUnique(id);

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

@@ -382,6 +382,7 @@ export class OpportunityRepository {
                     orderBy: { endTimestamp: "desc" },
                     where: {
                         RewardToken: { isTest: false },
+                        endTimestamp: { gte: now },
                     },
                 },
                 MainProtocol: true,
@@ -393,9 +394,10 @@ export class OpportunityRepository {
                 Chain: { id: chainId },
                 OR: [
                     { status: "LIVE" },
+                    { status: "SOON" },
                     {
                         Campaigns: {
-                            some: { RewardToken: { isTest: false }, startTimestamp: { lte: now }, endTimestamp: { gte: now } },
+                            some: { RewardToken: { isTest: false }, endTimestamp: { gte: now } },
                         },
                     },
                 ],

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

@@ -39,7 +39,7 @@ export const UserController = new Elysia({ prefix: "/users", detail: { tags: ["U
     // ─── Get Many Users ──────────────────────────────────────────────────
     .get("/", async ({ query }) => await UserService.findMany(query), { query: GetManyUserQuery })
     // ─── Get A User By Address ───────────────────────────────────────────
-    .get("/:address", async ({ params }) => await UserService.findUnique(params.address))
+    .get("/:address", async ({ params }) => await UserService.findUniqueOrThrow(params.address))
     // ─── Get User's Rewards With Breakdown And Details for our FE ────────
     .get("/:address/rewards/breakdowns", async ({ params, query }) => {
     const rewardsByChain = await RewardService.getUserRewardsByChain(params.address, true, query?.chainIds, query.reloadChainId ?? null, !!query.test ? query.test : false, !!query.claimableOnly);

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

@@ -4,6 +4,11 @@ export declare abstract class UserRepository {
         tags: string[];
         address: string;
         creatorId: string | null;
+    } | null>;
+    static findUniqueOrThrow(address: string): Promise<{
+        tags: string[];
+        address: string;
+        creatorId: string | null;
     }>;
     static findMany(query: GetManyUserModel): Promise<{
         tags: string[];

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

@@ -2,6 +2,9 @@ import { apiDbClient } from "@db";
 // ─── Users Repository ────────────────────────────────────────────────────────
 export class UserRepository {
     static async findUnique(address) {
+        return await apiDbClient.user.findUnique({ where: { address } });
+    }
+    static async findUniqueOrThrow(address) {
         return await apiDbClient.user.findUniqueOrThrow({ where: { address } });
     }
     static async findMany(query) {

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

@@ -4,6 +4,11 @@ export declare abstract class UserService {
         tags: string[];
         address: string;
         creatorId: string | null;
+    } | null>;
+    static findUniqueOrThrow(address: string): Promise<{
+        tags: string[];
+        address: string;
+        creatorId: string | null;
     }>;
     static findMany(query: GetManyUserModel): Promise<{
         tags: string[];

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

@@ -8,6 +8,9 @@ export class UserService {
     static async findUnique(address) {
         return await UserRepository.findUnique(address);
     }
+    static async findUniqueOrThrow(address) {
+        return await UserRepository.findUniqueOrThrow(address);
+    }
     static async findMany(query) {
         return await UserRepository.findMany(query);
     }