@merkl/api 0.16.15 → 0.16.17

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

@@ -999,6 +999,7 @@ declare const eden: {
                             endTimestamp: bigint;
                             campaignId: string;
                             CampaignStatus: {
+                                status: import("../../database/api/.generated").$Enums.RunStatus;
                                 computedUntil: bigint;
                                 processingStarted: bigint;
                             }[];
@@ -4100,6 +4101,7 @@ declare const eden: {
                             endTimestamp: bigint;
                             campaignId: string;
                             CampaignStatus: {
+                                status: import("../../database/api/.generated").$Enums.RunStatus;
                                 computedUntil: bigint;
                                 processingStarted: bigint;
                             }[];
@@ -8055,6 +8057,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                                 endTimestamp: bigint;
                                 campaignId: string;
                                 CampaignStatus: {
+                                    status: import("../../database/api/.generated").$Enums.RunStatus;
                                     computedUntil: bigint;
                                     processingStarted: bigint;
                                 }[];
@@ -12668,6 +12671,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             endTimestamp: bigint;
                             campaignId: string;
                             CampaignStatus: {
+                                status: import("../../database/api/.generated").$Enums.RunStatus;
                                 computedUntil: bigint;
                                 processingStarted: bigint;
                             }[];
@@ -15769,6 +15773,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             endTimestamp: bigint;
                             campaignId: string;
                             CampaignStatus: {
+                                status: import("../../database/api/.generated").$Enums.RunStatus;
                                 computedUntil: bigint;
                                 processingStarted: bigint;
                             }[];

package/dist/src/entities/opportunity.js

@@ -123,7 +123,11 @@ export const extractOpportunities = {
             tokenIcons: [params.baseToken, params.quoteToken],
             rewardTokenIcons: getRewardTokenIcons(campaigns.active),
             dailyRewardTokens: getRewardTokens(campaigns.active),
-            campaigns: { ...campaigns, type: Campaign.AMBIENTPROCESSOR, ids: campaigns.all.map(c => c.campaignId) },
+            campaigns: {
+                ...campaigns,
+                type: Campaign.AMBIENTPROCESSOR,
+                ids: campaigns.all.map(c => c.campaignId),
+            },
         };
         return opportunity;
     },
@@ -244,97 +248,6 @@ export const extractOpportunities = {
     [Campaign.ERC20]: (campaign, campaigns, prices) => {
         const { chainId, tvl, campaignParameters: params, typeInfo, computeChainId, mainParameter } = campaign;
         const { active, all } = campaigns;
-        // DEPRECATED!!!!
-        const map = {
-            actions: {
-                pool: [
-                    "uniswapv2",
-                    "velodrome",
-                    "aerodrome",
-                    "balancerGauge",
-                    "balancerPool",
-                    "curve",
-                    "aura",
-                    "akron",
-                    "beefy",
-                    "dragonswap",
-                    "poolside",
-                    "koi",
-                    "pancakeswap",
-                    "tempest",
-                    "cross_curve",
-                    "curve",
-                    "curve_2",
-                    "curveNPool",
-                    "zkswap",
-                    "maverickBoostedPosition",
-                    "zkSwapThreePool",
-                    "syncswap",
-                    "rfx",
-                ],
-                borrow: [
-                    "radiant_borrow",
-                    "aave_borrowing",
-                    "euler_borrow",
-                    "zerolend_borrowing",
-                    "vicuna_borrowing",
-                    "takotako_borrowing",
-                    "lendle_borrowing",
-                ],
-                lend: [
-                    "gearbox",
-                    "compound",
-                    "radiant_lend",
-                    "aave_lending",
-                    "vicuna_lending",
-                    "takotako_lending",
-                    "lendle_lending",
-                    "vicuna_lending",
-                    "sturdy_aggregator",
-                    "sturdy_silo",
-                    "fraxlend",
-                    "moonwell",
-                    "ionic",
-                    "fluid",
-                    "silostaking",
-                    "euler_lend",
-                    "layerbank",
-                    "zerolend_lending",
-                    "venus",
-                    "reactor_fusion",
-                    "woofi",
-                ],
-            },
-            icons: {
-                pool: () => {
-                    if (["balancerGauge", "balancerPool"].includes(campaign.type ?? ""))
-                        return Object.values(typeInfo.poolTokens ?? {})
-                            .map(tkn => tkn?.symbol)
-                            .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]),
-                borrow: () => [typeInfo.symbolUnderlyingToken],
-                hold: () => {
-                    if (["toros", "enzyme"].includes(campaign.type))
-                        return [typeInfo.symbolUnderlyingToken];
-                    return [campaign.campaignParameters.symbolTargetToken];
-                },
-            },
-        };
-        const action = typeInfo.action.toLowerCase() ?? "hold";
-        // (Object.entries(map.actions).find(([_action, _types]) =>
-        //   _types.includes(campaign.type ?? "")
-        // )?.[0] as ERC20Actions) ?? "hold";
-        const icons = map.icons[action]();
         const opportunity = {
             id: `${Campaign.ERC20}_${mainParameter}`,
             platform: params.symbolTargetToken,
@@ -342,12 +255,12 @@ export const extractOpportunities = {
             chainId: !computeChainId ? chainId : computeChainId,
             distributionChainId: chainId,
             tvl,
-            action,
+            action: typeInfo.action ? typeInfo.action.toLowerCase() : "hold",
             apr: getApr(active),
             status: getStatus(all),
             tags: getTags(campaigns.all),
             dailyrewards: getDailyRewards(active, prices),
-            tokenIcons: icons,
+            tokenIcons: typeInfo.icons,
             campaigns: { ...campaigns, type: Campaign.ERC20, ids: campaigns.all.map(c => c.campaignId) },
             rewardTokenIcons: getRewardTokenIcons(campaigns.active),
             dailyRewardTokens: getRewardTokens(campaigns.active),
@@ -651,112 +564,6 @@ export const extractOpportunities = {
         };
         return opportunity;
     },
-    [Campaign.ERC20]: (campaign, campaigns, prices) => {
-        const { chainId, tvl, campaignParameters: params, typeInfo, computeChainId, mainParameter } = campaign;
-        const { active, all } = campaigns;
-        // DEPRECATED!!!!
-        const map = {
-            actions: {
-                pool: [
-                    "uniswapv2",
-                    "velodrome",
-                    "aerodrome",
-                    "balancerGauge",
-                    "balancerPool",
-                    "curve",
-                    "aura",
-                    "akron",
-                    "beefy",
-                    "dragonswap",
-                    "poolside",
-                    "koi",
-                    "pancakeswap",
-                    "tempest",
-                    "cross_curve",
-                    "zkswap",
-                    "maverickBoostedPosition",
-                    "zkSwapThreePool",
-                    "syncswap",
-                    "rfx",
-                ],
-                borrow: [
-                    "radiant_borrow",
-                    "aave_borrowing",
-                    "euler_borrow",
-                    "zerolend_borrowing",
-                    "takotako_borrowing",
-                    "lendle_borrowing",
-                    "vicuna_borrowing",
-                ],
-                lend: [
-                    "gearbox",
-                    "compound",
-                    "radiant_lend",
-                    "aave_lending",
-                    "vicuna_lending",
-                    "takotako_lending",
-                    "lendle_lending",
-                    "sturdy_aggregator",
-                    "sturdy_silo",
-                    "fraxlend",
-                    "moonwell",
-                    "ionic",
-                    "fluid",
-                    "silostaking",
-                    "euler_lend",
-                    "layerbank",
-                    "zerolend_lending",
-                    "venus",
-                    "reactor_fusion",
-                    "woofi",
-                ],
-            },
-            icons: {
-                pool: () => {
-                    if (["balancerGauge", "balancerPool", "aura"].includes(campaign.type ?? ""))
-                        return Object.values(typeInfo.poolTokens ?? {})
-                            .map(tkn => tkn?.symbol)
-                            .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]),
-                borrow: () => [typeInfo.symbolUnderlyingToken],
-                hold: () => {
-                    if (["toros", "enzyme"].includes(campaign.type))
-                        return [typeInfo.symbolUnderlyingToken];
-                    return [campaign.campaignParameters.symbolTargetToken];
-                },
-            },
-        };
-        const action = Object.entries(map.actions).find(([_action, _types]) => _types.includes(campaign.type ?? ""))?.[0] ?? "hold";
-        const icons = map.icons[action]();
-        const opportunity = {
-            id: `${Campaign.ERC20}_${mainParameter}`,
-            platform: params.symbolTargetToken,
-            name: typeInfo?.cardName,
-            chainId: !computeChainId ? chainId : computeChainId,
-            distributionChainId: chainId,
-            tvl,
-            action,
-            apr: getApr(active),
-            status: getStatus(all),
-            tags: getTags(campaigns.all),
-            dailyrewards: getDailyRewards(active, prices),
-            tokenIcons: icons,
-            campaigns: { ...campaigns, type: Campaign.ERC20, ids: campaigns.all.map(c => c.campaignId) },
-            rewardTokenIcons: getRewardTokenIcons(campaigns.active),
-            dailyRewardTokens: getRewardTokens(campaigns.active),
-        };
-        return opportunity;
-    },
     [Campaign.ERC20LOGPROCESSOR]: (campaign, campaigns, prices) => {
         const { chainId, tvl, campaignParameters: params, typeInfo, computeChainId, mainParameter } = campaign;
         const { active, all } = campaigns;

package/dist/src/index.d.ts

@@ -1155,6 +1155,7 @@ declare const app: Elysia<"", false, {
                                 endTimestamp: bigint;
                                 campaignId: string;
                                 CampaignStatus: {
+                                    status: import("../database/api/.generated").$Enums.RunStatus;
                                     computedUntil: bigint;
                                     processingStarted: bigint;
                                 }[];

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

@@ -156,7 +156,7 @@ export const tokenTypeToProtocol = {
     [tokenType.holdstation]: { protocol: "HoldStation", action: OpportunityAction.HOLD },
     [tokenType.staking]: { protocol: "Staking", action: OpportunityAction.HOLD },
     [tokenType.noLinkVault]: { protocol: "NoLinkVault", action: OpportunityAction.HOLD },
-    [tokenType.cpmmGamma]: { protocol: "GammaSwap", action: OpportunityAction.HOLD },
+    [tokenType.cpmmGamma]: { protocol: "GammaSwap", action: OpportunityAction.POOL },
     [tokenType.crosscurve]: { protocol: "CrossCurve", action: OpportunityAction.POOL },
     [tokenType.curveNPool]: { protocol: "Curve", action: OpportunityAction.POOL },
     [tokenType.vicuna]: { protocol: "Vicuna", action: OpportunityAction.HOLD },

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

@@ -28,6 +28,10 @@ type dataRawAura = callKeysAura & {
     poolTokens: Array<{
         token: string;
         balance: string;
+        amountInPool: number;
+        symbol: string;
+        decimals: number;
+        price: number;
     }>;
 };
 type dataTypeAura = dataType & {
@@ -46,6 +50,10 @@ type dataTypeAura = dataType & {
     poolTokens: Array<{
         token: string;
         balance: string;
+        amountInPool: number;
+        symbol: string;
+        decimals: number;
+        price: number;
     }>;
 };
 export declare class AuraProcessor extends GenericProcessor<callKeysAura, dataRawAura, dataTypeAura> {

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

@@ -38,6 +38,10 @@ export class AuraProcessor extends GenericProcessor {
                 poolTokens.push({
                     token: token,
                     balance: balances[i].toString(),
+                    amountInPool: 0,
+                    symbol: "",
+                    decimals: 0,
+                    price: 0,
                 });
                 i++;
                 typeInfo.poolTokens = poolTokens;
@@ -57,21 +61,16 @@ export class AuraProcessor extends GenericProcessor {
         const gaugeBalance = BN2Number(typeInfo.gaugeBalance, 18);
         const auraBalance = BN2Number(typeInfo.auraBalance, 18);
         const totalSupplyGauge = BN2Number(typeInfo.totalSupplyGauge, 18);
-        const poolTokensinfo = {};
         let poolTvl = 0;
         const symbols = [];
         let indexUpdated = index + this.rounds.round4.length;
         for (const poolToken of typeInfo.poolTokens) {
-            const symbol = decodeCall(calls, indexUpdated++, "symbol");
-            const decimals = decodeCall(calls, indexUpdated++, "decimals");
-            poolTokensinfo[poolToken.token] = {
-                symbol: symbol,
-                decimals: decimals,
-                amountInPool: BN2Number(poolToken.balance, decimals),
-                price: (await pricer.get({ symbol: symbol })) ?? 0,
-            };
-            poolTvl += poolTokensinfo[poolToken.token].price * poolTokensinfo[poolToken.token].amountInPool;
-            symbols.push(symbol);
+            poolToken.symbol = decodeCall(calls, indexUpdated++, "symbol");
+            poolToken.decimals = decodeCall(calls, indexUpdated++, "decimals");
+            poolToken.amountInPool = BN2Number(poolToken.balance, poolToken.decimals);
+            poolToken.price = (await pricer.get({ symbol: poolToken.symbol })) ?? 0;
+            poolTvl += poolToken.price * poolToken.amountInPool;
+            symbols.push(poolToken.symbol);
         }
         const percentageOfSupplyInAura = (auraBalance / totalSupplyGauge) * (gaugeBalance / totalSupplyBalancerPool);
         const tvl = poolTvl * percentageOfSupplyInAura;
@@ -85,7 +84,6 @@ export class AuraProcessor extends GenericProcessor {
             totalSupply,
             whitelistedSupplyTargetToken,
             blacklistedSupply,
-            poolTokens: poolTokensinfo,
             tvl: tvl,
             priceTargetToken: priceTargetToken,
             cardName: generateCardName(type, typeInfo, campaign, symbols),

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

@@ -22,6 +22,10 @@ type dataRawBP = callKeysBP & {
     poolTokens: Array<{
         token: string;
         balance: string;
+        amountInPool: number;
+        symbol: string;
+        decimals: number;
+        price: number;
     }>;
 };
 type dataTypeBP = dataType & {
@@ -30,7 +34,10 @@ type dataTypeBP = dataType & {
     vault: string;
     poolTokens: Array<{
         token: string;
-        balance: string;
+        amountInPool: number;
+        symbol: string;
+        decimals: number;
+        price: number;
     }>;
     totalSupply: number;
     blacklistedSupply: number;

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

@@ -25,7 +25,6 @@ export class BalancerPoolProcessor extends GenericProcessor {
         const vaultBalanceBN = BigNumber.from(typeInfo.vaultBalance);
         const totalSupplyUpdated = BN2Number(totalSupplyBN.sub(vaultBalanceBN), campaign.campaignParameters.decimalsTargetToken);
         const vaultBalance = BN2Number(vaultBalanceBN, campaign.campaignParameters.decimalsTargetToken);
-        const poolTokensinfo = {};
         let tvl = 0;
         const symbols = [];
         let indexUpdated = index + this.rounds.round4.length;
@@ -36,23 +35,16 @@ export class BalancerPoolProcessor extends GenericProcessor {
             blacklistedSupply -= BN2Number(decodeCall(calls, index + vaultIndex, "balanceOf"), campaign.campaignParameters.decimalsTargetToken); // The vault balance was already removed from the total supply
         }
         for (const poolToken of typeInfo.poolTokens) {
-            const symbol = decodeCall(calls, indexUpdated++, "symbol");
-            const decimals = decodeCall(calls, indexUpdated++, "decimals");
-            poolTokensinfo[poolToken.token] = {
-                symbol: symbol,
-                decimals: decimals,
-                amountInPool: BN2Number(poolToken.balance, decimals),
-                price: (await pricer.get({ symbol: symbol })) ?? 0,
-            };
-            tvl += poolTokensinfo[poolToken.token].price * poolTokensinfo[poolToken.token].amountInPool;
-            symbols.push(symbol);
+            poolToken.symbol = decodeCall(calls, indexUpdated++, "symbol");
+            poolToken.decimals = decodeCall(calls, indexUpdated++, "decimals");
+            poolToken.amountInPool = BN2Number(poolToken.balance, poolToken.decimals);
+            poolToken.price = (await pricer.get({ symbol: poolToken.symbol })) ?? 0;
+            tvl += poolToken.price * poolToken.amountInPool;
+            symbols.push(poolToken.symbol);
         }
         const priceTargetToken = tvl / totalSupplyUpdated;
         return {
-            tokenAddress: typeInfo.tokenAddress,
-            poolId: typeInfo.poolId,
-            vault: typeInfo.vault,
-            poolTokens: poolTokensinfo,
+            ...typeInfo,
             totalSupply: totalSupplyUpdated,
             whitelistedSupplyTargetToken,
             blacklistedSupply,
@@ -72,6 +64,10 @@ export class BalancerPoolProcessor extends GenericProcessor {
                 poolTokens.push({
                     token: token,
                     balance: balances[i].toString(),
+                    amountInPool: 0,
+                    symbol: "",
+                    decimals: 0,
+                    price: 0,
                 });
             }
             i++;

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

@@ -40,8 +40,10 @@ export class BalancerV3PoolProcessor extends GenericProcessor {
         const { whitelistedSupplyTargetToken, totalSupply, blacklistedSupply } = this.handleWhiteListBlacklistRound5(typeInfo, campaign);
         let tvl = 0;
         for (let i = 0; i < typeInfo.numberTokens; i++) {
-            const symbol = typeInfo[`symbolToken${i}`];
+            let symbol = typeInfo[`symbolToken${i}`];
             const price = (await pricer.get({ symbol: symbol })) ?? 0;
+            symbol = symbol.replace("wmooSiloV2Sonic", "");
+            typeInfo[`symbolToken${i}`] = symbol.replace(" (wS Market)", "");
             const decimals = Number(typeInfo[`decimalsToken${i}`]);
             const amount = BN2Number(typeInfo[`balanceToken${i}`], decimals);
             tvl += amount * price;
@@ -58,10 +60,7 @@ export class BalancerV3PoolProcessor extends GenericProcessor {
         }
         const symbols = [];
         for (let i = 0; i < typeInfo.numberTokens; i++) {
-            let symbolToClean = typeInfo[`symbolToken${i}`];
-            symbolToClean = symbolToClean.replace("wmooSiloV2Sonic", "");
-            symbolToClean = symbolToClean.replace(" (wS Market)", "");
-            symbols.push(symbolToClean);
+            symbols.push(typeInfo[`symbolToken${i}`]);
         }
         return {
             ...typeInfo,

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

@@ -1,6 +1,7 @@
 import { decodeCall } from "../../../../../utils/decodeCalls";
 import { createCall } from "../../../../../utils/encodeCalls";
 import { generateCardName } from "../../../../../utils/generateCardName";
+import { generateIcons } from "../../../../../utils/generateIcons";
 import { BN2Number } from "@sdk";
 import { tokenTypeToProtocol } from "../helpers/tokenType";
 export var roundType;
@@ -130,7 +131,10 @@ export class GenericProcessor {
             console.log("Round 5", {
                 type: type,
                 calls: [],
-                outputInfo,
+                typeInfo: {
+                    ...outputInfo,
+                    icons: generateIcons(type, typeInfo, campaign),
+                },
             });
         }
         return {
@@ -138,6 +142,7 @@ export class GenericProcessor {
             calls: [],
             typeInfo: {
                 ...outputInfo,
+                icons: generateIcons(type, typeInfo, campaign),
             },
         };
     }

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

@@ -5,6 +5,7 @@ export class StakingProcessor extends GenericProcessor {
         round1: [
             { key: "lockNFT", call: "lockNFT", target: "stakingContract", optional: true },
             { key: "eip712DomainName", call: "eip712DomainName", target: "stakingContract", optional: true },
+            { key: "stakingSymbol", call: "symbol", target: "stakingContract", optional: true },
         ],
         round2: [{ key: "stakingSymbol", call: "symbol", target: "lockNFT", optional: true }],
         round3: [],

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

@@ -21,7 +21,6 @@ export class VicunaProcessor extends GenericProcessor {
         const vicunaTVL = (await axios("https://vicuna.orthae.xyz/tvl/details")).data;
         // find the entry that matches the vault address
         const tvl = findTvlByVaultAddress(vicunaTVL[campaign.chainId], typeInfo.tokenAddress) ?? 0;
-        console.log("tvl", tvl);
         const priceTargetToken = tvl / totalSupply;
         return {
             ...typeInfo,

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

@@ -22,8 +22,10 @@ type dataRawCurve = callKeysCurve & {
     poolTokens: {
         [key: string]: string;
     };
+    numberTokens: number;
 };
 type dataTypeCurve = dataType & {
+    numberTokens: number;
     lp_price: number;
     token0: string;
     token1: string;

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

@@ -29,12 +29,14 @@ export class CurveProcessor extends GenericProcessor {
                 [typeInfo.token1]: typeInfo.symbolToken1,
                 [typeInfo.token2]: typeInfo.symbolToken2,
             };
+            typeInfo.numberTokens = 3;
         }
         else {
             typeInfo.poolTokens = {
                 [typeInfo.token0]: typeInfo.symbolToken0,
                 [typeInfo.token1]: typeInfo.symbolToken1,
             };
+            typeInfo.numberTokens = 2;
         }
         if (type === tokenType.curve_2) {
             const prices = [];

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

@@ -217,6 +217,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                             endTimestamp: bigint;
                             campaignId: string;
                             CampaignStatus: {
+                                status: import("../../../../database/api/.generated").$Enums.RunStatus;
                                 computedUntil: bigint;
                                 processingStarted: bigint;
                             }[];

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

@@ -142,6 +142,7 @@ export declare abstract class CampaignRepository {
         endTimestamp: bigint;
         campaignId: string;
         CampaignStatus: {
+            status: import("../../../../database/api/.generated").$Enums.RunStatus;
             computedUntil: bigint;
             processingStarted: bigint;
         }[];

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

@@ -256,6 +256,7 @@ export class CampaignRepository {
                     // To be able to filter out campaigns that are already fully computed
                     take: 1,
                     select: {
+                        status: true,
                         computedUntil: true,
                         processingStarted: true,
                     },

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

@@ -133,6 +133,7 @@ export declare abstract class CampaignService {
         endTimestamp: bigint;
         campaignId: string;
         CampaignStatus: {
+            status: import("../../../../database/api/.generated").$Enums.RunStatus;
             computedUntil: bigint;
             processingStarted: bigint;
         }[];

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

@@ -1025,6 +1025,7 @@ export declare const v4: Elysia<"/v4", false, {
                                 endTimestamp: bigint;
                                 campaignId: string;
                                 CampaignStatus: {
+                                    status: import("../../../database/api/.generated").$Enums.RunStatus;
                                     computedUntil: bigint;
                                     processingStarted: bigint;
                                 }[];

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

@@ -72,13 +72,23 @@ export class StatusRepository {
     }
     static async updateProcessing(campaignUnique) {
         const campaignId = CampaignService.hashId(campaignUnique);
+        const now = moment().unix();
         return await apiDbClient.$transaction([
             apiDbClient.campaignStatus.findUniqueOrThrow({
                 where: {
                     campaignId,
-                    status: {
-                        not: "PROCESSING",
-                    },
+                    OR: [
+                        {
+                            status: {
+                                not: "PROCESSING",
+                            },
+                        },
+                        {
+                            processingStarted: {
+                                lte: now - 60, // The job wasn't already updated in the last minute
+                            },
+                        },
+                    ],
                 },
             }),
             apiDbClient.campaignStatus.update({

package/dist/src/utils/generateIcons.d.ts

@@ -0,0 +1,3 @@
+import { tokenType } from "../libs/campaigns/campaignTypes/ERC20SubTypes/helpers/tokenType";
+import type { Campaign, CampaignParameters } from "@sdk";
+export declare function generateIcons(type: tokenType, typeInfo: any, campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>, symbols?: string[]): string[];