@merkl/api 0.13.12 → 0.13.14

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

@@ -13,7 +13,35 @@ export class VicunaProcessor extends GenericProcessor {
         const vicunaTVL = (await axios("https://vicuna.orthae.xyz/tvl")).data;
         const parsedName = typeInfo.name.toLowerCase().split(" ");
         parsedName.shift();
-        const parsedNameForAPI = parsedName.join("-");
+        let parsedNameForAPI = parsedName.join("-");
+        const mapping = {
+            "swapx-os-ws": "swapx-ichi-ws-os-ws",
+            "swapx-scusd-usdc": "swapx-ichi-usdc-scusd-usdc",
+            "swapx-sts-ws": "swapx-ichi-ws-sts-ws",
+            "swapx-sacra-ws": "swapx-ichi-ws-sacra-sacra",
+            "solidly-swapx-ws-eco": "swapx-ws-eco",
+            "solidly-swapx-ws-goglz": "swapx-ws-goglz",
+            "solidly-swapx-ws-hedgy": "swapx-ws-hedgy",
+            "solidly-swapx-ws-tysg": "swapx-ws-tysg",
+            "solidly-swapx-ws-sdog": "swapx-ws-sdog",
+            "solidly-swapx-ws-shiba": "swapx-ws-shiba",
+            "balancer-ws-sts": "beets-ws-sts",
+            "balancer-scusd-sts": "beets-usdc-scusd",
+            "swapx-ws-swpx": "swapx-ichi-ws-swapx-ws",
+            "swapx-ws-usdc": "swapx-ichi-ws-usdc-ws",
+            "swapx-ws-sceth": "swapx-ichi-ws-sceth-ws",
+            "swapx-ws-sts": "swapx-ichi-ws-sts-sts",
+            "swapx-ws-weth": "swapx-ichi-ws-weth-ws",
+            "swapx-ws-os": "swapx-ichi-ws-os-os",
+            "swapx-usdc-swpx": "swapx-ichi-usdc-swapx-usdc",
+            "swapx-usdc-weth": "swapx-ichi-usdc-weth-weth",
+            "swapx-usdc-scusd": "swapx-ichi-usdc-scusd-usdc",
+            "swapx-usdc-sts": "swapx-ichi-usdc-sts-usdc",
+            "swapx-weth-usdc": "swapx-ichi-usdc-weth-usdc",
+        };
+        if (!!mapping[parsedNameForAPI]) {
+            parsedNameForAPI = mapping[parsedNameForAPI];
+        }
         const tvl = vicunaTVL[campaign.computeChainId][parsedNameForAPI];
         const priceTargetToken = tvl / totalSupply;
         return {

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

@@ -19,7 +19,9 @@ function satisfiesNameConditions(name, type) {
         case tokenType.poolside:
             return lowerCaseName.includes("poolside");
         case tokenType.balancerGauge:
-            return lowerCaseName.includes("balancer") && !lowerCaseName.includes("aura deposit vault");
+            return (lowerCaseName.includes("balancer") &&
+                !lowerCaseName.includes("aura deposit vault") &&
+                !lowerCaseName.startsWith("vifi"));
         case tokenType.gearbox:
             return lowerCaseName.includes("farming of") || lowerCaseName.startsWith("trade");
         case tokenType.euler_borrow:

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

@@ -51,7 +51,7 @@ export class AccountingService {
         const breakdown = {};
         let consolidatedAmount = 0;
         for (const chainId of Object.values(ChainId).filter(id => typeof id === "number")) {
-            const monthlyData = await AccountingRepository.getForMultisigBetweenDates(startDate, endDate);
+            const monthlyData = await AccountingRepository.getForMultisigByChainBetweenDates(chainId, startDate, endDate);
             let totalAmount = 0;
             for (const tx of monthlyData) {
                 totalAmount += Number(tx.amountIn);

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

@@ -6,7 +6,6 @@ import { OpportunityService } from "../opportunity";
 import { InvalidParameter } from "../../../utils/error";
 import { executeSimple } from "../../../utils/execute";
 import { log } from "../../../utils/logger";
-import { apiDbClient } from "../../../utils/prisma";
 import { NETWORK_LABELS, } from "@sdk";
 import { utils } from "ethers";
 import moment from "moment";
@@ -152,22 +151,11 @@ export class CampaignService {
         return await CampaignRepository.findUniqueOrThrow(id);
     }
     static async findCampaignsToProcess(distributionChainId) {
-        await apiDbClient.campaignStatus.updateMany({
-            data: {
-                status: "SUCCESS",
-            },
-            where: {
-                Campaign: {
-                    distributionChainId: 1,
-                },
-                status: "PROCESSING",
-            },
-        });
         return (await CampaignRepository.findCampaignsToProcess(distributionChainId)).filter(campaign => campaign.endTimestamp > campaign?.CampaignStatus?.[0]?.computedUntil);
     }
     static async findNextCampaignToProcess(chainId) {
         const campaigns = await CampaignService.findCampaignsToProcess(chainId);
-        return { campaignId: campaigns[0].campaignId };
+        return { campaignId: campaigns?.[0]?.campaignId };
     }
     static async pickCampaignToProcess(chainId) {
         const campaigns = await CampaignService.findCampaignsToProcess(chainId);