@merkl/api 0.20.64 → 0.20.65

package/dist/database/index.js

@@ -2,7 +2,11 @@ import { PrismaClient as ApiPrismaClient } from "@db/api";
 import { PrismaClient as EnginePrismaClient } from "@db/engine";
 import { drizzle } from "drizzle-orm/prisma/pg";
 export const apiDbClient = new ApiPrismaClient({
-    datasources: { db: { url: `${process.env.DATABASE_API_URL}&connection_limit=100&pool_timeout=60` } },
+    datasources: {
+        db: {
+            url: `${process.env.DATABASE_API_URL}&connection_limit=${!!process.env.BACKOFFICE_SECRET ? "100" : "10"}&pool_timeout=60`,
+        },
+    },
 }).$extends(drizzle());
 export const engineDbClient = new EnginePrismaClient({
     datasources: {

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

@@ -140,20 +140,31 @@ declare const eden: {
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
                         id: string;
-                        name: string;
+                        chainId: number;
                         type: string;
-                        status: import("@db/api").$Enums.Status;
-                        tags: string[];
                         identifier: string;
-                        action: import("@db/api").$Enums.OpportunityAction;
-                        manualOverrides: import("@db/api").$Enums.OpportunityManualOverride[];
-                        chainId: number;
-                        depositUrl: string | null;
-                        explorerAddress: string | null;
-                        mainProtocolId: string | null;
-                        tvl: number;
-                        apr: number;
-                        dailyRewards: number;
+                        name: string;
+                        status: "PAST" | "LIVE" | "SOON";
+                        action: any;
+                        tokens: ({
+                            symbol: string;
+                            id: string;
+                            name: string | null;
+                            icon: string;
+                            address: string;
+                            chainId: number;
+                            decimals: number;
+                            verified: boolean;
+                            isTest: boolean;
+                            isPoint: boolean;
+                            isNative: boolean;
+                        } & {
+                            price?: number | null | undefined;
+                        })[];
+                        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "fenix" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "koi" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "velodrome" | "aerodrome" | "balancer" | "curve" | "cross_curve" | "curveNPool" | "aura" | "akron" | "beefy" | "dragonswap" | "poolside" | "syncswap" | "neptune" | "zkSwapThreePool" | "rfx" | "ra" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "fraxlend" | "ironclad" | "gearbox" | "compound" | "sturdy" | "frax" | "ionic" | "moonwell" | "fluid" | "silo" | "dolomite" | "badger" | "ajna" | "layerbank" | "ion" | "venus" | "woofi" | "reactor_fusion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "gamma" | "oku" | "hourglass" | "veda" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "angles" | "enzyme" | "toros" | "vicuna" | "bunni" | "beratrax" | "concrete" | "cian" | "pendle" | "yei" | "filament" | "gammaswap" | "maha" | "tempest" | "uranium" | "holdstation" | "katana" | "satlayer" | undefined;
+                        depositUrl: any;
+                        explorerAddress: string | undefined;
+                        tags: string[];
                     };
                 }>>;
             };
@@ -4144,20 +4155,31 @@ declare const eden: {
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
                         id: string;
-                        name: string;
+                        chainId: number;
                         type: string;
-                        status: import("@db/api").$Enums.Status;
-                        tags: string[];
                         identifier: string;
-                        action: import("@db/api").$Enums.OpportunityAction;
-                        manualOverrides: import("@db/api").$Enums.OpportunityManualOverride[];
-                        chainId: number;
-                        depositUrl: string | null;
-                        explorerAddress: string | null;
-                        mainProtocolId: string | null;
-                        tvl: number;
-                        apr: number;
-                        dailyRewards: number;
+                        name: string;
+                        status: "PAST" | "LIVE" | "SOON";
+                        action: any;
+                        tokens: ({
+                            symbol: string;
+                            id: string;
+                            name: string | null;
+                            icon: string;
+                            address: string;
+                            chainId: number;
+                            decimals: number;
+                            verified: boolean;
+                            isTest: boolean;
+                            isPoint: boolean;
+                            isNative: boolean;
+                        } & {
+                            price?: number | null | undefined;
+                        })[];
+                        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "fenix" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "koi" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "velodrome" | "aerodrome" | "balancer" | "curve" | "cross_curve" | "curveNPool" | "aura" | "akron" | "beefy" | "dragonswap" | "poolside" | "syncswap" | "neptune" | "zkSwapThreePool" | "rfx" | "ra" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "fraxlend" | "ironclad" | "gearbox" | "compound" | "sturdy" | "frax" | "ionic" | "moonwell" | "fluid" | "silo" | "dolomite" | "badger" | "ajna" | "layerbank" | "ion" | "venus" | "woofi" | "reactor_fusion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "gamma" | "oku" | "hourglass" | "veda" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "angles" | "enzyme" | "toros" | "vicuna" | "bunni" | "beratrax" | "concrete" | "cian" | "pendle" | "yei" | "filament" | "gammaswap" | "maha" | "tempest" | "uranium" | "holdstation" | "katana" | "satlayer" | undefined;
+                        depositUrl: any;
+                        explorerAddress: string | undefined;
+                        tags: string[];
                     };
                 }>>;
             };
@@ -8984,20 +9006,31 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         response: {
                             200: {
                                 id: string;
-                                name: string;
+                                chainId: number;
                                 type: string;
-                                status: import("@db/api").$Enums.Status;
-                                tags: string[];
                                 identifier: string;
-                                action: import("@db/api").$Enums.OpportunityAction;
-                                manualOverrides: import("@db/api").$Enums.OpportunityManualOverride[];
-                                chainId: number;
-                                depositUrl: string | null;
-                                explorerAddress: string | null;
-                                mainProtocolId: string | null;
-                                tvl: number;
-                                apr: number;
-                                dailyRewards: number;
+                                name: string;
+                                status: "PAST" | "LIVE" | "SOON";
+                                action: any;
+                                tokens: ({
+                                    symbol: string;
+                                    id: string;
+                                    name: string | null;
+                                    icon: string;
+                                    address: string;
+                                    chainId: number;
+                                    decimals: number;
+                                    verified: boolean;
+                                    isTest: boolean;
+                                    isPoint: boolean;
+                                    isNative: boolean;
+                                } & {
+                                    price?: number | null | undefined;
+                                })[];
+                                mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "fenix" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "koi" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "velodrome" | "aerodrome" | "balancer" | "curve" | "cross_curve" | "curveNPool" | "aura" | "akron" | "beefy" | "dragonswap" | "poolside" | "syncswap" | "neptune" | "zkSwapThreePool" | "rfx" | "ra" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "fraxlend" | "ironclad" | "gearbox" | "compound" | "sturdy" | "frax" | "ionic" | "moonwell" | "fluid" | "silo" | "dolomite" | "badger" | "ajna" | "layerbank" | "ion" | "venus" | "woofi" | "reactor_fusion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "gamma" | "oku" | "hourglass" | "veda" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "angles" | "enzyme" | "toros" | "vicuna" | "bunni" | "beratrax" | "concrete" | "cian" | "pendle" | "yei" | "filament" | "gammaswap" | "maha" | "tempest" | "uranium" | "holdstation" | "katana" | "satlayer" | undefined;
+                                depositUrl: any;
+                                explorerAddress: string | undefined;
+                                tags: string[];
                             };
                         };
                     };
@@ -14804,20 +14837,31 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
                         id: string;
-                        name: string;
+                        chainId: number;
                         type: string;
-                        status: import("@db/api").$Enums.Status;
-                        tags: string[];
                         identifier: string;
-                        action: import("@db/api").$Enums.OpportunityAction;
-                        manualOverrides: import("@db/api").$Enums.OpportunityManualOverride[];
-                        chainId: number;
-                        depositUrl: string | null;
-                        explorerAddress: string | null;
-                        mainProtocolId: string | null;
-                        tvl: number;
-                        apr: number;
-                        dailyRewards: number;
+                        name: string;
+                        status: "PAST" | "LIVE" | "SOON";
+                        action: any;
+                        tokens: ({
+                            symbol: string;
+                            id: string;
+                            name: string | null;
+                            icon: string;
+                            address: string;
+                            chainId: number;
+                            decimals: number;
+                            verified: boolean;
+                            isTest: boolean;
+                            isPoint: boolean;
+                            isNative: boolean;
+                        } & {
+                            price?: number | null | undefined;
+                        })[];
+                        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "fenix" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "koi" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "velodrome" | "aerodrome" | "balancer" | "curve" | "cross_curve" | "curveNPool" | "aura" | "akron" | "beefy" | "dragonswap" | "poolside" | "syncswap" | "neptune" | "zkSwapThreePool" | "rfx" | "ra" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "fraxlend" | "ironclad" | "gearbox" | "compound" | "sturdy" | "frax" | "ionic" | "moonwell" | "fluid" | "silo" | "dolomite" | "badger" | "ajna" | "layerbank" | "ion" | "venus" | "woofi" | "reactor_fusion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "gamma" | "oku" | "hourglass" | "veda" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "angles" | "enzyme" | "toros" | "vicuna" | "bunni" | "beratrax" | "concrete" | "cian" | "pendle" | "yei" | "filament" | "gammaswap" | "maha" | "tempest" | "uranium" | "holdstation" | "katana" | "satlayer" | undefined;
+                        depositUrl: any;
+                        explorerAddress: string | undefined;
+                        tags: string[];
                     };
                 }>>;
             };
@@ -18808,20 +18852,31 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
                         id: string;
-                        name: string;
+                        chainId: number;
                         type: string;
-                        status: import("@db/api").$Enums.Status;
-                        tags: string[];
                         identifier: string;
-                        action: import("@db/api").$Enums.OpportunityAction;
-                        manualOverrides: import("@db/api").$Enums.OpportunityManualOverride[];
-                        chainId: number;
-                        depositUrl: string | null;
-                        explorerAddress: string | null;
-                        mainProtocolId: string | null;
-                        tvl: number;
-                        apr: number;
-                        dailyRewards: number;
+                        name: string;
+                        status: "PAST" | "LIVE" | "SOON";
+                        action: any;
+                        tokens: ({
+                            symbol: string;
+                            id: string;
+                            name: string | null;
+                            icon: string;
+                            address: string;
+                            chainId: number;
+                            decimals: number;
+                            verified: boolean;
+                            isTest: boolean;
+                            isPoint: boolean;
+                            isNative: boolean;
+                        } & {
+                            price?: number | null | undefined;
+                        })[];
+                        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "fenix" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "koi" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "velodrome" | "aerodrome" | "balancer" | "curve" | "cross_curve" | "curveNPool" | "aura" | "akron" | "beefy" | "dragonswap" | "poolside" | "syncswap" | "neptune" | "zkSwapThreePool" | "rfx" | "ra" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "fraxlend" | "ironclad" | "gearbox" | "compound" | "sturdy" | "frax" | "ionic" | "moonwell" | "fluid" | "silo" | "dolomite" | "badger" | "ajna" | "layerbank" | "ion" | "venus" | "woofi" | "reactor_fusion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "gamma" | "oku" | "hourglass" | "veda" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "angles" | "enzyme" | "toros" | "vicuna" | "bunni" | "beratrax" | "concrete" | "cian" | "pendle" | "yei" | "filament" | "gammaswap" | "maha" | "tempest" | "uranium" | "holdstation" | "katana" | "satlayer" | undefined;
+                        depositUrl: any;
+                        explorerAddress: string | undefined;
+                        tags: string[];
                     };
                 }>>;
             };

package/dist/src/engine/dynamicData/implementations/Erc20.js

@@ -1,9 +1,6 @@
-import { tokenType } from "@/engine/erc20SubTypeProcessors/helpers/tokenType";
-import { getTokenPricesInfo } from "@/engine/erc20SubTypeProcessors/subtypesPrices";
+import { tokenType } from "@/engine/erc20SubTypeProcessors/constants";
+import { erc20ProcessorFactory } from "@/engine/erc20SubTypeProcessors/factory";
 import { getTokenTypeRound1 } from "@/engine/erc20SubTypeProcessors/subtypesRound1";
-import { getTokenTypeRound2 } from "@/engine/erc20SubTypeProcessors/subtypesRound2";
-import { getTokenTypeRound3 } from "@/engine/erc20SubTypeProcessors/subtypesRound3";
-import { getTokenTypeRound4 } from "@/engine/erc20SubTypeProcessors/subtypesRound4";
 import { ComputedValueService } from "@/modules/v4/computedValue";
 import { TokenRepository } from "@/modules/v4/token/token.repository";
 import { TokenService } from "@/modules/v4/token/token.service";
@@ -16,12 +13,13 @@ export class Erc20DynamicData {
         const pricer = await Pricer.load();
         // Round 1: Get the high level type for each token (will need to be refined lated with more calls)
         const callsRounds1 = [];
-        const tokenTypesByCampaign = {};
+        const tokenTypeDataByCampaign = {};
         for (const campaign of campaigns) {
             const typeStruct = {
                 type: tokenType.unknown,
                 calls: [],
                 typeInfo: {},
+                processor: erc20ProcessorFactory(tokenType.unknown, campaign),
             };
             const targetToken = campaign.campaignParameters.targetToken;
             typeStruct.calls = [
@@ -62,74 +60,114 @@ export class Erc20DynamicData {
                 },
             ];
             callsRounds1.push(...typeStruct.calls);
-            tokenTypesByCampaign[campaign.campaignId] = typeStruct;
+            tokenTypeDataByCampaign[campaign.campaignId] = typeStruct;
         }
-        const resultRound1 = await ChainInteractionService(chainId).fetchState(callsRounds1);
+        const resultRound1 = (await ChainInteractionService(chainId).fetchState(callsRounds1)).map(x => x.returnData);
         // Round 2: Decode result from round 1 and get some additional info for the types before the final calls
         const callsRounds2 = [];
         let i = 0;
         for (const campaign of campaigns) {
-            const callsForCampaign = tokenTypesByCampaign[campaign.campaignId].calls.length;
-            tokenTypesByCampaign[campaign.campaignId] = getTokenTypeRound1(resultRound1, campaign.campaignParameters.targetToken, i, campaign);
+            const tokenTypeData = tokenTypeDataByCampaign[campaign.campaignId];
+            const callsForCampaign = tokenTypeData.calls.length;
+            const res = getTokenTypeRound1(resultRound1, i, campaign); // TODO use processor
+            tokenTypeData.calls = res.calls;
+            tokenTypeData.typeInfo = res.typeInfo;
+            tokenTypeData.processor = erc20ProcessorFactory(res.type, campaign);
             i += callsForCampaign;
-            callsRounds2.push(...tokenTypesByCampaign[campaign.campaignId].calls);
+            callsRounds2.push(...tokenTypeDataByCampaign[campaign.campaignId].calls);
         }
-        const resultRound2 = await ChainInteractionService(chainId).fetchState(callsRounds2);
+        const resultRound2 = (await ChainInteractionService(chainId).fetchState(callsRounds2)).map(x => x.returnData);
         // Round 3: Decode result from round 2 and get some additional info for the types before the final calls
         const callsRounds3 = [];
         let j = 0;
         for (const campaign of campaigns) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const callsForCampaign = tokenTypesByCampaign[campaign.campaignId].calls.length;
-            tokenTypesByCampaign[campaign.campaignId] = getTokenTypeRound2(j, tokenTypesByCampaign[campaign.campaignId].type, tokenTypesByCampaign[campaign.campaignId].typeInfo, resultRound2, campaign);
+            const { processor, typeInfo } = tokenTypeDataByCampaign[campaign.campaignId];
+            const tokenTypeData = tokenTypeDataByCampaign[campaign.campaignId];
+            const callsForCampaign = tokenTypeData.calls.length;
+            try {
+                const res = await processor.computeRound2(j, processor.type, typeInfo, resultRound2, campaign);
+                tokenTypeData.calls = res.calls;
+                tokenTypeData.typeInfo = res.typeInfo;
+            }
+            catch {
+                // In case something goes wrong, we set following calls to void an move on
+                tokenTypeData.calls = [];
+                tokenTypeData.typeInfo = typeInfo;
+            }
             j += callsForCampaign;
-            callsRounds3.push(...tokenTypesByCampaign[campaign.campaignId].calls);
+            callsRounds3.push(...tokenTypeDataByCampaign[campaign.campaignId].calls);
         }
-        const resultRound3 = await ChainInteractionService(chainId).fetchState(callsRounds3);
+        const resultRound3 = (await ChainInteractionService(chainId).fetchState(callsRounds3)).map(x => x.returnData);
         // Final round before execute
-        let callsFinal = [];
+        let callsRounds4 = [];
         j = 0;
         for (const campaign of campaigns) {
-            const callsForCampaign = tokenTypesByCampaign[campaign.campaignId].calls.length;
-            tokenTypesByCampaign[campaign.campaignId] = getTokenTypeRound3(j, tokenTypesByCampaign[campaign.campaignId].type, tokenTypesByCampaign[campaign.campaignId].typeInfo, resultRound3);
+            const { processor, typeInfo } = tokenTypeDataByCampaign[campaign.campaignId];
+            const tokenTypeData = tokenTypeDataByCampaign[campaign.campaignId];
+            const callsForCampaign = tokenTypeData.calls.length;
+            try {
+                const res = await processor.computeRound3(j, processor.type, typeInfo, resultRound3);
+                tokenTypeData.calls = res.calls;
+                tokenTypeData.typeInfo = res.typeInfo;
+            }
+            catch {
+                // In case something goes wrong, we set following calls to void an move on
+                tokenTypeData.calls = [];
+                tokenTypeData.typeInfo = typeInfo;
+            }
             j += callsForCampaign;
-            callsFinal = callsFinal.concat(tokenTypesByCampaign[campaign.campaignId].calls);
+            callsRounds4 = callsRounds4.concat(tokenTypeDataByCampaign[campaign.campaignId].calls);
         }
         // Round 4: Get the final data
-        const resultsFinal = await ChainInteractionService(chainId).fetchState(callsFinal);
+        const resultRound4 = (await ChainInteractionService(chainId).fetchState(callsRounds4)).map(x => x.returnData);
         j = 0;
         let calls = [];
         for (const campaign of campaigns) {
-            const callsForCampaign = tokenTypesByCampaign[campaign.campaignId].calls.length;
-            tokenTypesByCampaign[campaign.campaignId] = getTokenTypeRound4(j, tokenTypesByCampaign[campaign.campaignId].type, tokenTypesByCampaign[campaign.campaignId].typeInfo, resultsFinal, campaign);
+            const { processor, typeInfo } = tokenTypeDataByCampaign[campaign.campaignId];
+            const tokenTypeData = tokenTypeDataByCampaign[campaign.campaignId];
+            const callsForCampaign = tokenTypeData.calls.length;
+            try {
+                const res = await processor.computeRound4(j, processor.type, typeInfo, resultRound4, campaign);
+                tokenTypeData.calls = res.calls;
+                tokenTypeData.typeInfo = res.typeInfo;
+            }
+            catch {
+                // In case something goes wrong, we set following calls to void an move on
+                tokenTypeData.calls = [];
+                tokenTypeData.typeInfo = typeInfo;
+            }
             j += callsForCampaign;
-            calls = calls.concat(tokenTypesByCampaign[campaign.campaignId].calls);
+            calls = calls.concat(tokenTypeDataByCampaign[campaign.campaignId].calls);
         }
-        const result = await ChainInteractionService(chainId).fetchState(calls);
+        const resultFinal = (await ChainInteractionService(chainId).fetchState(calls)).map(x => x.returnData);
         i = 0;
         const dynamicData = [];
         for (const campaign of campaigns) {
-            // const priceRewardToken =
-            //   (await pricer.get({
-            //     address: campaign.rewardToken,
-            //     chainId,
-            //     symbol: campaign.campaignParameters.symbolRewardToken,
-            //   })) ?? 0;
             const priceRewardToken = await TokenService.getRewardTokenPrice(campaign);
-            // Get the data from the final round and process it to get the price of the target token and some extra info
-            const callsForCampaign = tokenTypesByCampaign[campaign.campaignId].calls.length;
-            tokenTypesByCampaign[campaign.campaignId] = await getTokenPricesInfo(i, tokenTypesByCampaign[campaign.campaignId].type, tokenTypesByCampaign[campaign.campaignId].typeInfo, result.map(r => r.returnData), campaign, pricer);
+            const { processor, typeInfo } = tokenTypeDataByCampaign[campaign.campaignId];
+            const tokenTypeData = tokenTypeDataByCampaign[campaign.campaignId];
+            const callsForCampaign = tokenTypeData.calls.length;
+            try {
+                const res = await processor.computeRound5(j, processor.type, typeInfo, resultFinal, campaign, pricer);
+                tokenTypeData.calls = res.calls;
+                tokenTypeData.typeInfo = res.typeInfo;
+            }
+            catch {
+                // In case something goes wrong, we set following calls to void an move on
+                tokenTypeData.calls = [];
+                tokenTypeData.typeInfo = typeInfo;
+            }
             try {
-                if (!!tokenTypesByCampaign[campaign.campaignId]?.typeInfo.priceTargetToken && getEnv() === "prod")
-                    await TokenRepository.updateAddressPrices(campaign.campaignParameters.targetToken, tokenTypesByCampaign[campaign.campaignId]?.typeInfo.priceTargetToken);
+                if (!!tokenTypeDataByCampaign[campaign.campaignId]?.typeInfo.priceTargetToken && getEnv() === "prod")
+                    await TokenRepository.updateAddressPrices(campaign.campaignParameters.targetToken, tokenTypeDataByCampaign[campaign.campaignId]?.typeInfo.priceTargetToken);
             }
             catch (e) {
                 log.warn(`failed to update target token price: ${e}`);
             }
             i += callsForCampaign;
-            let whitelistedSupplyTargetToken = tokenTypesByCampaign[campaign.campaignId].typeInfo.whitelistedSupplyTargetToken;
+            let whitelistedSupplyTargetToken = tokenTypeDataByCampaign[campaign.campaignId].typeInfo.whitelistedSupplyTargetToken;
             const totalSupplyTargetToken = whitelistedSupplyTargetToken;
-            const priceTargetToken = tokenTypesByCampaign[campaign.campaignId].typeInfo.priceTargetToken;
+            const priceTargetToken = tokenTypeDataByCampaign[campaign.campaignId].typeInfo.priceTargetToken;
             let lastEligibilityRatio = 1;
             if (!!campaign.campaignParameters.hooks?.length) {
                 lastEligibilityRatio =
@@ -165,15 +203,15 @@ export class Erc20DynamicData {
                 apr = getFixedApr(campaign, priceRewardToken, priceTargetToken);
             }
             if (campaign.chainId === ChainId.ETHERLINK) {
-                whitelistedSupplyTargetToken = tokenTypesByCampaign[campaign.campaignId].typeInfo.totalSupply;
+                whitelistedSupplyTargetToken = tokenTypeDataByCampaign[campaign.campaignId].typeInfo.totalSupply;
             }
             dynamicData.push({
                 ...campaign,
                 apr,
                 totalSupplyTargetToken,
                 tvl: whitelistedSupplyTargetToken * priceTargetToken,
-                type: tokenTypesByCampaign[campaign.campaignId].type,
-                typeInfo: tokenTypesByCampaign[campaign.campaignId].typeInfo,
+                type: processor.type,
+                typeInfo,
                 priceRewardToken: priceRewardToken,
                 lastEligibilityRatio,
             });

package/dist/src/engine/erc20SubTypeProcessors/GenericProcessor.d.ts

@@ -1,7 +1,8 @@
 import type { Pricer } from "@/utils/pricer";
-import { type CallDto, type Campaign, type CampaignParameters } from "@sdk";
+import { type CallDto, type CampaignParameters } from "@sdk";
 import type { ERC20SupportedCampaignType } from "../dynamicData/implementations/Erc20";
-import { type tokenType, type tokenTypeStruct } from "./helpers/tokenType";
+import { type tokenType } from "./constants";
+import type { tokenTypeStruct } from "./interface";
 export declare enum Round {
     one = "round1",
     two = "round2",
@@ -9,14 +10,13 @@ export declare enum Round {
     four = "round4"
 }
 export type callType = {
-    key: any;
-    call: any;
-    target: any;
-    metaData?: any;
+    key: string;
+    call: string;
+    target: string;
+    callArgs?: string;
     optional?: boolean;
 };
 export type mandatoryCallKeys = {
-    type: tokenType;
     protocol: string;
     tokenAddress: string;
     blacklistedSupply: string;
@@ -28,11 +28,8 @@ export type stakingKeys = {
     eip712DomainName: string;
     stakingName: string;
     stakingSymbol: string;
-    isStaking: string;
-};
-export type callKeys = mandatoryCallKeys & {
-    [key: string]: string;
 };
+export type callKeys = mandatoryCallKeys & Record<string, string>;
 export type dataRaw = {
     protocol: string;
     tokenAddress: string;
@@ -42,7 +39,6 @@ export type dataRaw = {
 } & stakingKeys;
 export type dataType = {
     protocol: string;
-    type: tokenType;
     tokenAddress: string;
     totalSupply: number;
     blacklistedSupply: number;
@@ -63,6 +59,11 @@ export type dataType = {
  * @params Output - Final output of the processor
  */
 export declare class GenericProcessor<Input extends callKeys, DataRaw extends dataRaw, Output extends dataType> {
+    debug: boolean;
+    type: tokenType;
+    isStaking: boolean;
+    campaign: CampaignParameters<ERC20SupportedCampaignType>;
+    constructor(type: tokenType, campaign: CampaignParameters<ERC20SupportedCampaignType>, debug?: boolean);
     rounds: {
         round1: callType[];
         round2: callType[];
@@ -75,24 +76,23 @@ export declare class GenericProcessor<Input extends callKeys, DataRaw extends da
         round3: callType[];
         round4: callType[];
     };
-    debug: boolean;
     processingRound1(_typeInfo: DataRaw): void;
     processingRound2(_typeInfo: DataRaw, _campaign?: CampaignParameters<ERC20SupportedCampaignType>): void;
     processingRound3(_typeInfo: DataRaw): void;
     processingRound4(_typeInfo: DataRaw): void;
-    handleWhiteListBlacklistRound5(typeInfo: DataRaw, campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>): {
+    handleWhiteListBlacklistRound5(typeInfo: DataRaw, campaign: CampaignParameters<ERC20SupportedCampaignType>): {
         whitelistedSupplyTargetToken: any;
         totalSupply: any;
         blacklistedSupply: any;
     };
-    processingRound5(_index: number, type: tokenType, typeInfo: DataRaw, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<Output>;
-    computeRound1(type: tokenType, typeInfo: DataRaw): tokenTypeStruct;
+    processingRound5(_index: number, type: tokenType, typeInfo: DataRaw, _calls: string[], campaign: CampaignParameters<ERC20SupportedCampaignType>, pricer: Pricer): Promise<Output>;
+    computeRound1(typeInfo: DataRaw): tokenTypeStruct;
     computeRound2(index: number, type: tokenType, typeInfo: DataRaw, calls: string[], campaign?: CampaignParameters<ERC20SupportedCampaignType>): tokenTypeStruct;
     computeRound3(index: number, type: tokenType, typeInfo: DataRaw, calls: string[]): tokenTypeStruct;
     computeRound4(index: number, type: tokenType, typeInfo: DataRaw, calls: string[], campaign: CampaignParameters<ERC20SupportedCampaignType>): tokenTypeStruct;
     computeRound5(index: number, type: tokenType, typeInfo: DataRaw, calls: string[], campaign: CampaignParameters<ERC20SupportedCampaignType>, pricer: Pricer): Promise<tokenTypeStruct>;
-    generateWhitelistCall(type: tokenType, typeInfo: DataRaw, campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>): CallDto[];
-    generateBlackListCall(type: tokenType, typeInfo: DataRaw, campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>): CallDto[];
+    generateWhitelistCall(type: tokenType, typeInfo: DataRaw, campaign: CampaignParameters<ERC20SupportedCampaignType>): CallDto[];
+    generateBlackListCall(type: tokenType, typeInfo: DataRaw, campaign: CampaignParameters<ERC20SupportedCampaignType>): CallDto[];
     decodeListedSupply(index: number, list: string[], calls: string[]): string;
     decodeRound(round: callType[], index: number, calls: string[], type: tokenType, data: DataRaw): void;
     decodePreviousRound(round: Round, calls: string[], data: DataRaw, type: tokenType, index: number): void;