@merkl/api 0.13.15 → 0.14.1

package/dist/src/backgroundJobs/index.js

@@ -1,6 +1,6 @@
 import { Redis } from "../cache";
 import { redisClient } from "../cache/redis";
-import { getEulerV2Vaults } from "../libs/campaigns/utils/getEulerV2Vaults";
+import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase } from "../libs/campaigns/utils/getEulerV2Vaults";
 import { getUniswapV4Pools } from "../libs/campaigns/utils/getUniswapV4Pools";
 import { DungeonKeeperController } from "../modules/v4/dungeonKeeper";
 import { log } from "../utils/logger";
@@ -30,6 +30,7 @@ new Elysia({
     .use(sync) // GET /jobs/api/sync-with-engine
     .get("/eulerUpdate", async () => {
     log.info("🔃 updating Euler vaults...");
+    await updateEulerVaultsCollatInDatabase();
     await Redis.safeSet("EulerV2Vaults", await getEulerV2Vaults());
 })
     .get("/uniswapv4Update", async () => {

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

@@ -6372,7 +6372,16 @@ declare const eden: {
                 query: {};
                 fetch?: RequestInit | undefined;
             }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                200: import("../libs/campaigns/utils/getEulerV2Vaults").EulerVaultType[];
+                200: EulerVaultType[];
+            }>>;
+        };
+        "euler-update-collat": {
+            get: (options: {
+                headers?: Record<string, unknown> | undefined;
+                query: {};
+                fetch?: RequestInit | undefined;
+            }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                200: void;
             }>>;
         };
         fetch: {
@@ -10930,7 +10939,19 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 query: {};
                 headers: unknown;
                 response: {
-                    200: import("../libs/campaigns/utils/getEulerV2Vaults").EulerVaultType[];
+                    200: EulerVaultType[];
+                };
+            };
+        };
+    } & {
+        "euler-update-collat": {
+            get: {
+                body: unknown;
+                params: {};
+                query: {};
+                headers: unknown;
+                response: {
+                    200: void;
                 };
             };
         };
@@ -17827,7 +17848,16 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 query: {};
                 fetch?: RequestInit | undefined;
             }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
-                200: import("../libs/campaigns/utils/getEulerV2Vaults").EulerVaultType[];
+                200: EulerVaultType[];
+            }>>;
+        };
+        "euler-update-collat": {
+            get: (options: {
+                headers?: Record<string, unknown> | undefined;
+                query: {};
+                fetch?: RequestInit | undefined;
+            }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                200: void;
             }>>;
         };
         fetch: {

package/dist/src/entities/opportunity.js

@@ -328,7 +328,10 @@ export const extractOpportunities = {
                 },
             },
         };
-        const action = Object.entries(map.actions).find(([_action, _types]) => _types.includes(campaign.type ?? ""))?.[0] ?? "hold";
+        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}`,

package/dist/src/index.d.ts

@@ -4147,7 +4147,19 @@ declare const app: Elysia<"", false, {
                 query: {};
                 headers: unknown;
                 response: {
-                    200: import("./libs/campaigns/utils/getEulerV2Vaults").EulerVaultType[];
+                    200: EulerVaultType[];
+                };
+            };
+        };
+    } & {
+        "euler-update-collat": {
+            get: {
+                body: unknown;
+                params: {};
+                query: {};
+                headers: unknown;
+                response: {
+                    200: void;
                 };
             };
         };

package/dist/src/jobs/etl/pendings.js

@@ -17,7 +17,9 @@ const gcsClient = new S3Client({
     endpoint: process.env.GCS_ENDPOINT,
     bucket: `merkl-rewards-lake-${process.env.ENV}`,
 });
-const file = gcsClient.file(`pendings/${process.env.FILENAME}`);
+let file = gcsClient.file(`pendings/${process.env.FILENAME}`);
+if (!(await file.exists))
+    file = gcsClient.file(`pendings/${process.env.FILENAME}.gz`);
 // ─── Extract ─────────────────────────────────────────────────────────────────
 const extract = async () => {
     if (!file.exists())

package/dist/src/jobs/etl/reward-breakdowns.js

@@ -13,7 +13,9 @@ const gcsClient = new S3Client({
     endpoint: process.env.GCS_ENDPOINT,
     bucket: `merkl-rewards-lake-${process.env.ENV}`,
 });
-const file = gcsClient.file(`breakdowns/${process.env.CHAIN_ID}-${process.env.ROOT}.gz`);
+let file = gcsClient.file(`breakdowns/${process.env.CHAIN_ID}-${process.env.ROOT}`);
+if (!(await file.exists()))
+    file = gcsClient.file(`breakdowns/${process.env.CHAIN_ID}-${process.env.ROOT}.gz`);
 const failedBatches = [];
 // ─── Extract ─────────────────────────────────────────────────────────────────
 const extract = async () => {

package/dist/src/jobs/etl/rewards.js

@@ -13,7 +13,9 @@ const gcsClient = new S3Client({
     endpoint: process.env.GCS_ENDPOINT,
     bucket: `merkl-rewards-lake-${process.env.ENV}`,
 });
-const file = gcsClient.file(`rewards/${process.env.CHAIN_ID}-${process.env.ROOT}.gz`);
+let file = gcsClient.file(`rewards/${process.env.CHAIN_ID}-${process.env.ROOT}`);
+if (!(await file.exists()))
+    file = gcsClient.file(`rewards/${process.env.CHAIN_ID}-${process.env.ROOT}.gz`);
 const failedBatches = [];
 // ─── Extract ─────────────────────────────────────────────────────────────────
 const extract = async () => {

package/dist/src/libs/campaigns/campaignTypes/ERC20DynamicData.d.ts

@@ -1,3 +1,4 @@
 import { type Campaign, type CampaignDynamicData, type CampaignParameters, type MerklChainId } from "@sdk";
 import type { UncachedResult } from "../../../utils/execute";
-export declare function ERC20DynamicData(chainId: MerklChainId, campaigns: CampaignParameters<Campaign.ERC20>[] | CampaignParameters<Campaign.ERC20LOGPROCESSOR>[] | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR>[]): Promise<UncachedResult<Partial<CampaignDynamicData<Campaign.ERC20 | Campaign.ERC20LOGPROCESSOR | Campaign.ERC20REBASELOGPROCESSOR>[]>>>;
+export type ERC20SupportedCampaignType = Campaign.ERC20 | Campaign.ERC20LOGPROCESSOR | Campaign.ERC20REBASELOGPROCESSOR | Campaign.EULER;
+export declare function ERC20DynamicData(chainId: MerklChainId, campaigns: CampaignParameters<ERC20SupportedCampaignType>[]): Promise<UncachedResult<Partial<CampaignDynamicData<ERC20SupportedCampaignType>[]>>>;

package/dist/src/libs/campaigns/campaignTypes/ERC20DynamicData.js

@@ -76,7 +76,7 @@ export async function ERC20DynamicData(chainId, campaigns) {
     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);
+        tokenTypesByCampaign[campaign.campaignId] = getTokenTypeRound2(j, tokenTypesByCampaign[campaign.campaignId].type, tokenTypesByCampaign[campaign.campaignId].typeInfo, resultRound2, campaign);
         j += callsForCampaign;
         callsRounds3.push(...tokenTypesByCampaign[campaign.campaignId].calls);
     }

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/helpers/tokenType.d.ts

@@ -1,3 +1,4 @@
+import { OpportunityAction } from "../../../../../../database/api/.generated";
 import type { CallDto } from "@sdk";
 export declare enum tokenType {
     aura = "aura",
@@ -85,7 +86,7 @@ export declare enum tokenType {
 }
 export declare const tokenTypeToProtocol: {
     [key in tokenType]: {
-        [key: string]: string;
+        [key: string]: string | OpportunityAction;
     };
 };
 export type tokenTypeStruct = {

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

@@ -1,3 +1,4 @@
+import { OpportunityAction } from "../../../../../../database/api/.generated";
 // This enum's order is important, do not change it unless you know what you are doing
 export var tokenType;
 (function (tokenType) {
@@ -85,116 +86,86 @@ export var tokenType;
     tokenType["vicuna_borrowing"] = "vicuna_borrowing";
 })(tokenType || (tokenType = {}));
 export const tokenTypeToProtocol = {
-    [tokenType.aave_borrowing]: { protocol: "Aave" },
-    [tokenType.aave_lending]: { protocol: "Aave" },
-    [tokenType.aerodrome]: { protocol: "Aerodrome V2" },
-    [tokenType.akron]: { protocol: "Akron V2" },
-    [tokenType.aura]: { protocol: "Aura" },
-    [tokenType.balancerGauge]: { protocol: "Balancer Gauge" },
-    [tokenType.balancerPool]: { protocol: "Balancer Pool" },
-    [tokenType.baseswap]: { protocol: "Baseswap V2" },
-    [tokenType.beefy]: { protocol: "Moo Velodrome V2" },
-    [tokenType.compound]: { protocol: "Compound" },
-    [tokenType.curve]: { protocol: "Curve" },
-    [tokenType.curve_2]: { protocol: "Curve" },
-    [tokenType.dragonswap]: { protocol: "Dragonswap V2" },
-    [tokenType.enzyme]: { protocol: "Enzyme" },
-    [tokenType.euler_borrow]: { protocol: "Euler V2" },
-    [tokenType.euler_lend]: { protocol: "Euler V2" },
-    [tokenType.fenix]: { protocol: "Fenix V2" },
-    [tokenType.filament]: { protocol: "Filament" },
-    [tokenType.fluid]: { protocol: "Fluid" },
-    [tokenType.fraxlend]: { protocol: "Fraxlend" },
-    [tokenType.gearbox]: { protocol: "Gearbox" },
-    [tokenType.ionic]: { protocol: "Ionic" },
-    [tokenType.ironclad_borrowing]: { protocol: "Ironclad" },
-    [tokenType.ironclad_lending]: { protocol: "Ironclad" },
-    [tokenType.koi]: { protocol: "Koi" },
-    [tokenType.layerbank]: { protocol: "Layerbank" },
-    [tokenType.metamorpho]: { protocol: "Metamorpho" },
-    [tokenType.moonwell]: { protocol: "Moonwell" },
-    [tokenType.pendle]: { protocol: "Pendle" },
-    [tokenType.poolside]: { protocol: "Poolside" },
-    [tokenType.ra]: { protocol: "Ra" },
-    [tokenType.radiant_borrow]: { protocol: "Radiant" },
-    [tokenType.radiant_lend]: { protocol: "Radiant" },
-    [tokenType.reactor_fusion]: { protocol: "Reactor Fusion" },
-    [tokenType.silostaking]: { protocol: "Silo Staking", symbolUnderlyingToken: "SEI" },
-    [tokenType.splice]: { protocol: "Splice" },
-    [tokenType.sturdy_aggregator]: { protocol: "Sturdy" },
-    [tokenType.sturdy_silo]: { protocol: "Sturdy" },
-    [tokenType.syncswap]: { protocol: "SyncSwap" },
-    [tokenType.toros]: { protocol: "Toros" },
-    [tokenType.uniswapv2]: { protocol: "Uniswap V2" },
-    [tokenType.velodrome]: { protocol: "Velodrome V2" },
-    [tokenType.venus]: { protocol: "Venus" },
-    [tokenType.unknown]: { protocol: "Unknown" },
-    [tokenType.yei_borrowing]: { protocol: "Yei Finance" },
-    [tokenType.yei_lending]: { protocol: "Yei Finance" },
-    [tokenType.zerolend_borrowing]: { protocol: "ZeroLend" },
-    [tokenType.zerolend_lending]: { protocol: "ZeroLend" },
-    [tokenType.zkswap]: { protocol: "ZKSwap" },
-    [tokenType.rfx]: { protocol: "RFX" },
-    [tokenType.woofi]: {
-        protocol: "Woofi",
-    },
-    [tokenType.ironcladStaking]: {
-        protocol: "Ironclad",
-    },
-    [tokenType.maverickBoostedPosition]: {
-        protocol: "Maverick",
-    },
-    [tokenType.zkSwapThreePool]: {
-        protocol: "ZKSwap",
-    },
-    [tokenType.maha]: {
-        protocol: "Maha",
-    },
-    [tokenType.tempest]: {
-        protocol: "Tempest",
-    },
-    [tokenType.pendleYT]: {
-        protocol: "Pendle",
-    },
-    [tokenType.pancakeswap]: {
-        protocol: "PancakeSwap V2",
-    },
-    [tokenType.tempestStaking]: {
-        protocol: "Tempest",
-    },
-    [tokenType.holdstation]: {
-        protocol: "HoldStation",
-    },
-    [tokenType.staking]: {
-        protocol: "Staking",
-    },
-    [tokenType.noLinkVault]: {
-        protocol: "NoLinkVault",
-    },
-    [tokenType.cpmmGamma]: {
-        protocol: "GammaSwap",
-    },
-    [tokenType.crosscurve]: {
-        protocol: "CrossCurve",
-    },
-    [tokenType.curveNPool]: {
-        protocol: "Curve",
-    },
-    [tokenType.vicuna]: { protocol: "Vicuna" },
-    [tokenType.traderJoe]: { protocol: "Trader Joe" },
-    [tokenType.avalon_lending]: { protocol: "Avalon" },
-    [tokenType.avalon_borrowing]: { protocol: "Avalon" },
-    [tokenType.satlayer]: { protocol: "Satlayer" },
-    [tokenType.veda]: { protocol: "Veda" },
-    [tokenType.superlend_borrowing]: { protocol: "Superlend" },
-    [tokenType.superlend_lending]: { protocol: "Superlend" },
-    [tokenType.cian]: { protocol: "Cian" },
-    [tokenType.concrete]: { protocol: "Concrete" },
-    [tokenType.lendle_borrowing]: { protocol: "Lendle" },
-    [tokenType.lendle_lending]: { protocol: "Lendle" },
-    [tokenType.takotako_borrowing]: { protocol: "TakoTako" },
-    [tokenType.takotako_lending]: { protocol: "TakoTako" },
-    [tokenType.equalizer_gauge]: { protocol: "Equalizer" },
-    [tokenType.vicuna_lending]: { protocol: "Vicuna" },
-    [tokenType.vicuna_borrowing]: { protocol: "Vicuna" },
+    [tokenType.aave_borrowing]: { protocol: "Aave", action: OpportunityAction.BORROW },
+    [tokenType.aave_lending]: { protocol: "Aave", action: OpportunityAction.LEND },
+    [tokenType.aerodrome]: { protocol: "Aerodrome V2", action: OpportunityAction.POOL },
+    [tokenType.akron]: { protocol: "Akron V2", action: OpportunityAction.POOL },
+    [tokenType.aura]: { protocol: "Aura", action: OpportunityAction.POOL },
+    [tokenType.balancerGauge]: { protocol: "Balancer Gauge", action: OpportunityAction.POOL },
+    [tokenType.balancerPool]: { protocol: "Balancer Pool", action: OpportunityAction.POOL },
+    [tokenType.baseswap]: { protocol: "Baseswap V2", action: OpportunityAction.HOLD },
+    [tokenType.beefy]: { protocol: "Moo Velodrome V2", action: OpportunityAction.POOL },
+    [tokenType.compound]: { protocol: "Compound", action: OpportunityAction.LEND },
+    [tokenType.curve]: { protocol: "Curve", action: OpportunityAction.POOL },
+    [tokenType.curve_2]: { protocol: "Curve", action: OpportunityAction.POOL },
+    [tokenType.dragonswap]: { protocol: "Dragonswap V2", action: OpportunityAction.POOL },
+    [tokenType.enzyme]: { protocol: "Enzyme", action: OpportunityAction.HOLD },
+    [tokenType.euler_borrow]: { protocol: "Euler V2", action: OpportunityAction.BORROW },
+    [tokenType.euler_lend]: { protocol: "Euler V2", action: OpportunityAction.LEND },
+    [tokenType.fenix]: { protocol: "Fenix V2", action: OpportunityAction.HOLD },
+    [tokenType.filament]: { protocol: "Filament", action: OpportunityAction.HOLD },
+    [tokenType.fluid]: { protocol: "Fluid", action: OpportunityAction.LEND },
+    [tokenType.fraxlend]: { protocol: "Fraxlend", action: OpportunityAction.LEND },
+    [tokenType.gearbox]: { protocol: "Gearbox", action: OpportunityAction.LEND },
+    [tokenType.ionic]: { protocol: "Ionic", action: OpportunityAction.LEND },
+    [tokenType.ironclad_borrowing]: { protocol: "Ironclad", action: OpportunityAction.HOLD },
+    [tokenType.ironclad_lending]: { protocol: "Ironclad", action: OpportunityAction.HOLD },
+    [tokenType.koi]: { protocol: "Koi", action: OpportunityAction.POOL },
+    [tokenType.layerbank]: { protocol: "Layerbank", action: OpportunityAction.LEND },
+    [tokenType.metamorpho]: { protocol: "Metamorpho", action: OpportunityAction.HOLD },
+    [tokenType.moonwell]: { protocol: "Moonwell", action: OpportunityAction.LEND },
+    [tokenType.pendle]: { protocol: "Pendle", action: OpportunityAction.HOLD },
+    [tokenType.poolside]: { protocol: "Poolside", action: OpportunityAction.POOL },
+    [tokenType.ra]: { protocol: "Ra", action: OpportunityAction.HOLD },
+    [tokenType.radiant_borrow]: { protocol: "Radiant", action: OpportunityAction.BORROW },
+    [tokenType.radiant_lend]: { protocol: "Radiant", action: OpportunityAction.LEND },
+    [tokenType.reactor_fusion]: { protocol: "Reactor Fusion", action: OpportunityAction.LEND },
+    [tokenType.silostaking]: { protocol: "Silo Staking", action: OpportunityAction.LEND },
+    [tokenType.splice]: { protocol: "Splice", action: OpportunityAction.HOLD },
+    [tokenType.sturdy_aggregator]: { protocol: "Sturdy", action: OpportunityAction.LEND },
+    [tokenType.sturdy_silo]: { protocol: "Sturdy", action: OpportunityAction.LEND },
+    [tokenType.syncswap]: { protocol: "SyncSwap", action: OpportunityAction.POOL },
+    [tokenType.toros]: { protocol: "Toros", action: OpportunityAction.HOLD },
+    [tokenType.uniswapv2]: { protocol: "Uniswap V2", action: OpportunityAction.POOL },
+    [tokenType.velodrome]: { protocol: "Velodrome V2", action: OpportunityAction.POOL },
+    [tokenType.venus]: { protocol: "Venus", action: OpportunityAction.LEND },
+    [tokenType.unknown]: { protocol: "Unknown", action: OpportunityAction.HOLD },
+    [tokenType.yei_borrowing]: { protocol: "Yei Finance", action: OpportunityAction.HOLD },
+    [tokenType.yei_lending]: { protocol: "Yei Finance", action: OpportunityAction.HOLD },
+    [tokenType.zerolend_borrowing]: { protocol: "ZeroLend", action: OpportunityAction.BORROW },
+    [tokenType.zerolend_lending]: { protocol: "ZeroLend", action: OpportunityAction.LEND },
+    [tokenType.zkswap]: { protocol: "ZKSwap", action: OpportunityAction.POOL },
+    [tokenType.rfx]: { protocol: "RFX", action: OpportunityAction.POOL },
+    [tokenType.woofi]: { protocol: "Woofi", action: OpportunityAction.LEND },
+    [tokenType.ironcladStaking]: { protocol: "Ironclad", action: OpportunityAction.HOLD },
+    [tokenType.maverickBoostedPosition]: { protocol: "Maverick", action: OpportunityAction.POOL },
+    [tokenType.zkSwapThreePool]: { protocol: "ZKSwap", action: OpportunityAction.POOL },
+    [tokenType.maha]: { protocol: "Maha", action: OpportunityAction.HOLD },
+    [tokenType.tempest]: { protocol: "Tempest", action: OpportunityAction.POOL },
+    [tokenType.pendleYT]: { protocol: "Pendle", action: OpportunityAction.HOLD },
+    [tokenType.pancakeswap]: { protocol: "PancakeSwap V2", action: OpportunityAction.POOL },
+    [tokenType.tempestStaking]: { protocol: "Tempest", action: OpportunityAction.HOLD },
+    [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.crosscurve]: { protocol: "CrossCurve", action: OpportunityAction.POOL },
+    [tokenType.curveNPool]: { protocol: "Curve", action: OpportunityAction.POOL },
+    [tokenType.vicuna]: { protocol: "Vicuna", action: OpportunityAction.HOLD },
+    [tokenType.traderJoe]: { protocol: "Trader Joe", action: OpportunityAction.HOLD },
+    [tokenType.avalon_lending]: { protocol: "Avalon", action: OpportunityAction.HOLD },
+    [tokenType.avalon_borrowing]: { protocol: "Avalon", action: OpportunityAction.HOLD },
+    [tokenType.satlayer]: { protocol: "Satlayer", action: OpportunityAction.HOLD },
+    [tokenType.veda]: { protocol: "Veda", action: OpportunityAction.HOLD },
+    [tokenType.superlend_borrowing]: { protocol: "Superlend", action: OpportunityAction.BORROW },
+    [tokenType.superlend_lending]: { protocol: "Superlend", action: OpportunityAction.LEND },
+    [tokenType.cian]: { protocol: "Cian", action: OpportunityAction.HOLD },
+    [tokenType.concrete]: { protocol: "Concrete", action: OpportunityAction.HOLD },
+    [tokenType.lendle_borrowing]: { protocol: "Lendle", action: OpportunityAction.BORROW },
+    [tokenType.lendle_lending]: { protocol: "Lendle", action: OpportunityAction.LEND },
+    [tokenType.takotako_borrowing]: { protocol: "TakoTako", action: OpportunityAction.BORROW },
+    [tokenType.takotako_lending]: { protocol: "TakoTako", action: OpportunityAction.LEND },
+    [tokenType.equalizer_gauge]: { protocol: "Equalizer", action: OpportunityAction.HOLD },
+    [tokenType.vicuna_lending]: { protocol: "Vicuna", action: OpportunityAction.LEND },
+    [tokenType.vicuna_borrowing]: { protocol: "Vicuna", action: OpportunityAction.BORROW },
 };

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

@@ -9,22 +9,17 @@ type callType = {
     metaData?: keyof callKeysEuler;
 };
 type callKeysEuler = mandatoryCallKeys & {
-    vault: string;
-    underlying: string;
-    symbolUnderlyingToken: string;
-    decimalsUnderlyingToken: string;
-    targetTotalAsset: string;
+    addressVault: string;
     totalAssets: string;
 };
 type dataRawEuler = callKeysEuler & {};
 type dataTypeEuler = dataType & {
-    vault: string;
-    underlying: string;
-    symbolUnderlyingToken: string;
-    decimalsUnderlyingToken: string;
+    addressVault: string;
+    asset: string;
+    symbolAsset: string;
+    decimalsAsset: number;
     totalSupply: number;
-    targetTotalAsset: string;
-    totalAssets: string;
+    totalBorrows: string;
 };
 export declare class EulerBorrowProcessor extends GenericProcessor<callKeysEuler, dataRawEuler, dataTypeEuler> {
     rounds: {
@@ -33,6 +28,7 @@ export declare class EulerBorrowProcessor extends GenericProcessor<callKeysEuler
         round3: callType[];
         round4: callType[];
     };
-    processingRound5(_index: number, type: tokenType, typeInfo: dataRawEuler, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeEuler>;
+    processingRound2(typeInfo: dataRawEuler, campaign: CampaignParameters<Campaign.EULER>): void;
+    processingRound5(_index: number, type: tokenType, typeInfo: dataRawEuler, _calls: string[], campaign: CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeEuler>;
 }
 export {};

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

@@ -1,46 +1,50 @@
 import { generateCardName } from "../../../../../utils/generateCardName";
-import { BN2Number } from "@sdk";
+import { BN2Number, EulerSubCampaignType } from "@sdk";
 import { fetchEulerVaultName } from "../helpers/eulerVaultNames";
 import { GenericProcessor } from "./GenericProcessor";
 export class EulerBorrowProcessor extends GenericProcessor {
     rounds = {
-        round1: [{ key: "vault", call: "eVault", target: "tokenAddress" }],
-        round2: [{ key: "underlying", call: "underlying", target: "tokenAddress" }],
-        round3: [
-            { key: "decimalsUnderlyingToken", call: "decimals", target: "underlying" },
-            { key: "symbolUnderlyingToken", call: "symbol", target: "underlying" },
-        ],
+        round1: [],
+        round2: [],
+        round3: [],
         round4: [
             { key: "totalSupply", call: "totalSupply", target: "tokenAddress" },
-            { key: "totalAssets", call: "totalAssets", target: "vault" },
+            { key: "totalAssets", call: "totalAssets", target: "addressVault" },
         ],
     };
-    // override computeRound1(): void {}
+    processingRound2(typeInfo, campaign) {
+        typeInfo.addressVault = campaign.campaignParameters.evkAddress;
+    }
     async processingRound5(_index, type, typeInfo, _calls, campaign, pricer) {
         const { whitelistedSupplyTargetToken, totalSupply, blacklistedSupply } = this.handleWhiteListBlacklistRound5(typeInfo, campaign);
-        const priceUnderlying = (await pricer.get({ symbol: typeInfo.symbolUnderlyingToken })) ?? 1;
-        let totalAssetsOrBorrows = 0;
-        let cardName = "";
-        const decimalsUnderlyingToken = Number(typeInfo.decimalsUnderlyingToken);
-        totalAssetsOrBorrows = BN2Number(
-        // eulerInterface.decodeFunctionResult("totalBorrows", calls[index++])[0],
-        typeInfo.totalAssets, decimalsUnderlyingToken);
-        cardName = generateCardName(type, typeInfo, campaign);
-        const vaultName = await fetchEulerVaultName(typeInfo.vault, campaign.chainId);
+        const symbolAsset = campaign.campaignParameters.symbolAsset;
+        const decimalsAsset = Number(campaign.campaignParameters.decimalsAsset);
+        const priceAsset = (await pricer.get({ symbol: symbolAsset })) ?? 1;
+        const totalBorrows = BN2Number(typeInfo.totalAssets, decimalsAsset);
+        let cardName = generateCardName(type, typeInfo, campaign);
+        const vaultName = await fetchEulerVaultName(campaign.campaignParameters.evkAddress, campaign.chainId);
         if (!!vaultName) {
             cardName = `Borrow from ${vaultName} vault`;
         }
-        const tvl = priceUnderlying * totalAssetsOrBorrows;
+        if (campaign.campaignSubType === EulerSubCampaignType.BORROW_FROM_COLLATERAL) {
+            cardName = `${cardName} using ${campaign.campaignParameters.symbolCollateral}`;
+            // TODO
+        }
+        const tvl = priceAsset * totalBorrows;
         const priceTargetToken = tvl / totalSupply;
         return {
             ...typeInfo,
-            totalSupply,
+            asset: campaign.campaignParameters.addressAsset,
+            addressVault: typeInfo.addressVault,
             blacklistedSupply,
-            whitelistedSupplyTargetToken,
-            tvl,
-            priceTargetToken,
             cardName: cardName,
-            totalAssets: typeInfo.totalAssets,
+            decimalsAsset,
+            priceTargetToken,
+            symbolAsset,
+            totalBorrows: typeInfo.totalAssets.toString(),
+            totalSupply,
+            tvl,
+            whitelistedSupplyTargetToken,
         };
     }
 }

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

@@ -9,21 +9,16 @@ type callType = {
     metaData?: keyof callKeysEuler;
 };
 type callKeysEuler = mandatoryCallKeys & {
-    vault: string;
-    underlying: string;
-    symbolUnderlyingToken: string;
-    decimalsUnderlyingToken: string;
-    targetTotalAsset: string;
+    addressVault: string;
     totalAssets: string;
 };
 type dataRawEuler = callKeysEuler & {};
 type dataTypeEuler = dataType & {
-    vault: string;
-    underlying: string;
-    symbolUnderlyingToken: string;
-    decimalsUnderlyingToken: string;
+    addressVault: string;
+    asset: string;
+    symbolAsset: string;
+    decimalsAsset: number;
     totalSupply: number;
-    targetTotalAsset: string;
     totalAssets: string;
 };
 export declare class EulerLendProcessor extends GenericProcessor<callKeysEuler, dataRawEuler, dataTypeEuler> {
@@ -33,6 +28,7 @@ export declare class EulerLendProcessor extends GenericProcessor<callKeysEuler,
         round3: callType[];
         round4: callType[];
     };
-    processingRound5(index: number, type: tokenType, typeInfo: dataRawEuler, calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeEuler>;
+    processingRound2(typeInfo: dataRawEuler, campaign: CampaignParameters<Campaign.EULER>): void;
+    processingRound5(index: number, type: tokenType, typeInfo: dataRawEuler, calls: string[], campaign: CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeEuler>;
 }
 export {};

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

@@ -1,4 +1,3 @@
-import { decodeCall } from "../../../../../utils/decodeCalls";
 import { generateCardName } from "../../../../../utils/generateCardName";
 import { BN2Number } from "@sdk";
 import { fetchEulerVaultName } from "../helpers/eulerVaultNames";
@@ -6,42 +5,42 @@ import { GenericProcessor } from "./GenericProcessor";
 export class EulerLendProcessor extends GenericProcessor {
     rounds = {
         round1: [],
-        round2: [{ key: "underlying", call: "underlying", target: "tokenAddress" }],
-        round3: [
-            { key: "decimalsUnderlyingToken", call: "decimals", target: "underlying" },
-            { key: "symbolUnderlyingToken", call: "symbol", target: "underlying" },
-        ],
+        round2: [],
+        round3: [],
         round4: [
             { key: "totalSupply", call: "totalSupply", target: "tokenAddress" },
             { key: "totalAssets", call: "totalAssets", target: "tokenAddress" },
         ],
     };
-    // override computeRound1(): void {}
+    processingRound2(typeInfo, campaign) {
+        typeInfo.addressVault = campaign.campaignParameters.evkAddress;
+    }
     async processingRound5(index, type, typeInfo, calls, campaign, pricer) {
         const { whitelistedSupplyTargetToken, totalSupply, blacklistedSupply } = this.handleWhiteListBlacklistRound5(typeInfo, campaign);
-        const priceUnderlying = (await pricer.get({ symbol: typeInfo.symbolUnderlyingToken })) ?? 1;
-        let totalAssetsOrBorrows = 0;
-        let cardName = "";
-        const decimalsUnderlyingToken = Number(typeInfo.decimalsUnderlyingToken);
-        totalAssetsOrBorrows = BN2Number(
-        // eulerInterface.decodeFunctionResult("totalAssets", calls[index++])[0],
-        decodeCall(calls, index++, "totalAssets", type), decimalsUnderlyingToken);
-        cardName = generateCardName(type, typeInfo, campaign);
+        const symbolAsset = campaign.campaignParameters.symbolAsset;
+        const decimalsAsset = Number(campaign.campaignParameters.decimalsAsset);
+        const priceAsset = (await pricer.get({ symbol: symbolAsset })) ?? 1;
+        const totalAssets = BN2Number(typeInfo.totalAssets, decimalsAsset);
+        let cardName = generateCardName(type, typeInfo, campaign);
         const vaultName = await fetchEulerVaultName(typeInfo.tokenAddress, campaign.chainId);
         if (!!vaultName) {
-            cardName = `Supply ${typeInfo.symbolUnderlyingToken} on ${vaultName} vault`;
+            cardName = `Supply ${symbolAsset} on ${vaultName} vault`;
         }
-        const tvl = priceUnderlying * totalAssetsOrBorrows;
+        const tvl = priceAsset * totalAssets;
         const priceTargetToken = tvl / totalSupply;
         return {
             ...typeInfo,
-            totalSupply,
+            asset: campaign.campaignParameters.addressAsset,
+            addressVault: typeInfo.addressVault,
             blacklistedSupply,
+            cardName: cardName,
+            decimalsAsset,
+            priceTargetToken,
+            symbolAsset,
+            totalAssets: typeInfo.totalAssets.toString(),
+            totalSupply,
             tvl,
             whitelistedSupplyTargetToken,
-            priceTargetToken,
-            cardName: cardName,
-            totalAssets: typeInfo.totalAssets,
         };
     }
 }