npm - @merkl/api - Versions diffs - 0.13.14 → 0.14.0 - Mend

@merkl/api 0.13.14 → 0.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

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

@@ -455,6 +455,7 @@ declare const eden: {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -566,6 +567,7 @@ declare const eden: {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -758,6 +760,7 @@ declare const eden: {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -786,6 +789,7 @@ declare const eden: {
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -814,6 +818,7 @@ declare const eden: {
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -3497,6 +3502,7 @@ declare const eden: {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -3608,6 +3614,7 @@ declare const eden: {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -3800,6 +3807,7 @@ declare const eden: {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -3828,6 +3836,7 @@ declare const eden: {
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -3856,6 +3865,7 @@ declare const eden: {
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -7026,6 +7036,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -7142,6 +7153,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -7614,6 +7626,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -7650,6 +7663,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             query: {
                                 sort?: string | undefined;
                                 name?: string | undefined;
+                                type?: string | undefined;
                                 tokens?: string | undefined;
                                 status?: string | undefined;
                                 items?: number | undefined;
@@ -7687,6 +7701,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             query: {
                                 sort?: string | undefined;
                                 name?: string | undefined;
+                                type?: string | undefined;
                                 tokens?: string | undefined;
                                 status?: string | undefined;
                                 items?: number | undefined;
@@ -11895,6 +11910,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -12006,6 +12022,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -12198,6 +12215,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -12226,6 +12244,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -12254,6 +12273,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -14937,6 +14957,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -15048,6 +15069,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -15240,6 +15262,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -15268,6 +15291,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -15296,6 +15320,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;

package/dist/src/index.d.ts CHANGED Viewed

@@ -253,6 +253,7 @@ declare const app: Elysia<"", false, {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -369,6 +370,7 @@ declare const app: Elysia<"", false, {
                     query: {
                         sort?: string | undefined;
                         name?: string | undefined;
+                        type?: string | undefined;
                         tokens?: string | undefined;
                         status?: string | undefined;
                         items?: number | undefined;
@@ -841,6 +843,7 @@ declare const app: Elysia<"", false, {
                         query: {
                             sort?: string | undefined;
                             name?: string | undefined;
+                            type?: string | undefined;
                             tokens?: string | undefined;
                             status?: string | undefined;
                             items?: number | undefined;
@@ -877,6 +880,7 @@ declare const app: Elysia<"", false, {
                             query: {
                                 sort?: string | undefined;
                                 name?: string | undefined;
+                                type?: string | undefined;
                                 tokens?: string | undefined;
                                 status?: string | undefined;
                                 items?: number | undefined;
@@ -914,6 +918,7 @@ declare const app: Elysia<"", false, {
                             query: {
                                 sort?: string | undefined;
                                 name?: string | undefined;
+                                type?: string | undefined;
                                 tokens?: string | undefined;
                                 status?: string | undefined;
                                 items?: number | undefined;

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 () => {
@@ -99,8 +101,7 @@ export const main = async () => {
         log.error("rewards", `${failedBatches.length} batches failed.`);
         process.exit(1);
     }
-    if (failedBatches.length === 0) {
+    if (failedBatches.length === 0)
         await file.delete();
-    }
 };
 main();

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

@@ -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 CHANGED Viewed

@@ -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/processor/EulerBorrowProcessor.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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,
         };
     }
 }

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/GenericProcessor.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { Pricer } from "../../../../../utils/pricer";
 import { type CallDto, type Campaign, type CampaignParameters } from "@sdk";
+import type { ERC20SupportedCampaignType } from "../../ERC20DynamicData";
 import { type tokenType, type tokenTypeStruct } from "../helpers/tokenType";
 export declare enum roundType {
     one = "round1",
@@ -51,8 +52,8 @@ export declare class GenericProcessor<Input extends callKeys, DataRaw extends da
         round4: callType[];
     };
     debug: boolean;
-    processingRound1(typeInfo: DataRaw, type?: tokenType): void;
-    processingRound2(typeInfo: DataRaw): void;
+    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>): {
@@ -62,10 +63,10 @@ export declare class GenericProcessor<Input extends callKeys, DataRaw extends da
     };
     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;
-    computeRound2(index: number, type: tokenType, typeInfo: DataRaw, calls: string[]): 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<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>): tokenTypeStruct;
-    computeRound5(index: number, type: tokenType, typeInfo: DataRaw, calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.ERC20LOGPROCESSOR> | CampaignParameters<Campaign.ERC20REBASELOGPROCESSOR> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<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[];
     decodeListedSupply(index: number, decimals: number, list: string[], calls: string[]): string;

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

@@ -18,8 +18,8 @@ export class GenericProcessor {
         round4: [{ key: "totalSupply", call: "totalSupply", target: "tokenAddress" }],
     };
     debug = false;
-    processingRound1(typeInfo, type) { }
-    processingRound2(typeInfo) { }
+    processingRound1(typeInfo) { }
+    processingRound2(typeInfo, campaign) { }
     processingRound3(typeInfo) { }
     processingRound4(typeInfo) { }
     handleWhiteListBlacklistRound5(typeInfo, campaign) {
@@ -65,9 +65,9 @@ export class GenericProcessor {
             typeInfo,
         };
     }
-    computeRound2(index, type, typeInfo, calls) {
+    computeRound2(index, type, typeInfo, calls, campaign) {
         this.decodePreviousRound(roundType.one, calls, typeInfo, type, index);
-        this.processingRound2(typeInfo);
+        this.processingRound2(typeInfo, campaign);
         if (this.debug) {
             console.log("Round 2", {
                 type: type,

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/MaverickBPProcessor.d.ts CHANGED Viewed

@@ -43,7 +43,7 @@ export declare class MaverickBPProcessor extends GenericProcessor<callKeysMaveri
         round3: callType[];
         round4: callType[];
     };
-    processingRound1(typeInfo: dataRawMaverickBP, type: tokenType): void;
+    processingRound1(typeInfo: dataRawMaverickBP): void;
     processingRound2(typeInfo: dataRawMaverickBP): void;
     processingRound5(_index: number, type: tokenType, typeInfo: dataRawMaverickBP, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeMaverickBP>;
 }

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/MaverickBPProcessor.js CHANGED Viewed

@@ -37,7 +37,7 @@ export class MaverickBPProcessor extends GenericProcessor {
         round3: [],
         round4: [{ key: "totalSupply", call: "totalSupply", target: "tokenAddress" }],
     };
-    processingRound1(typeInfo, type) {
+    processingRound1(typeInfo) {
         typeInfo.lensAddress = MAVERICK_ZKSYNC_BP_LENS_ADDRESS;
     }
     processingRound2(typeInfo) {

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/NoLinkVaultProcessor.d.ts CHANGED Viewed

@@ -27,7 +27,7 @@ export declare class NoLinkVaultProcessor extends GenericProcessor<callKeysNoLin
         round3: callType[];
         round4: callType[];
     };
-    processingRound1(typeInfo: dataRawNoLinkVault, type: tokenType): void;
+    processingRound1(typeInfo: dataRawNoLinkVault): void;
     processingRound5(index: number, type: tokenType, typeInfo: dataRawNoLinkVault, calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeNoLinkVault>;
     computeRound1(type: tokenType, typeInfo: dataRawNoLinkVault): tokenTypeStruct;
     computeRound2(index: number, type: tokenType, typeInfo: dataRawNoLinkVault, calls: string[]): tokenTypeStruct;

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/NoLinkVaultProcessor.js CHANGED Viewed

@@ -12,7 +12,7 @@ export class NoLinkVaultProcessor extends GenericProcessor {
         round3: [{ key: "baseSymbol", call: "symbol", target: "base" }],
         round4: [{ key: "totalSupply", call: "totalSupply", target: "tokenAddress" }],
     };
-    processingRound1(typeInfo, type) {
+    processingRound1(typeInfo) {
         if (typeInfo.tokenAddress === "0x196ead472583Bc1e9aF7A05F860D9857e1Bd3dCc") {
             typeInfo.protocol = "Unifi";
             typeInfo.rateAccountant = "0xA9fB7e2922216deBE3Fd5E1bBE7591eE446Dc21c";
@@ -25,7 +25,7 @@ export class NoLinkVaultProcessor extends GenericProcessor {
             typeInfo.protocol = "Unifi";
             typeInfo.rateAccountant = "0xe0bDb7b9225A2CeB42998dc2E51D4D3CDeb7e3Be";
         }
-        if (type === tokenType.veda) {
+        if (typeInfo.type === tokenType.veda) {
             // To retrieve the rateAccountant, look at a transaction, find the teller, then find the accountant.
             if (typeInfo.tokenAddress === "0x08c6F91e2B681FaF5e17227F2a44C307b3C1364C")
                 typeInfo.rateAccountant = "0xc315D6e14DDCDC7407784e2Caf815d131Bc1D3E7";

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/RfxProcessor.d.ts CHANGED Viewed

@@ -34,7 +34,7 @@ export declare class RfxProcessor extends GenericProcessor<callKeysRfx, dataRawT
         round3: callType[];
         round4: callType[];
     };
-    processingRound1(typeInfo: dataRawTemplate, type: tokenType): void;
+    processingRound1(typeInfo: dataRawTemplate): void;
     processingRound5(index: number, type: tokenType, typeInfo: dataRawTemplate, calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeRfx>;
 }
 export {};

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/RfxProcessor.js CHANGED Viewed

@@ -32,7 +32,7 @@ export class RfxProcessor extends GenericProcessor {
         round4: [{ key: "totalSupply", call: "totalSupply", target: "tokenAddress" }],
     };
     // override computeRound1(): void {}
-    processingRound1(typeInfo, type) {
+    processingRound1(typeInfo) {
         const hexShortToken = ethers.utils.keccak256(ethers.utils.defaultAbiCoder.encode(["string"], ["SHORT_TOKEN"]));
         const hexLongToken = ethers.utils.keccak256(ethers.utils.defaultAbiCoder.encode(["string"], ["LONG_TOKEN"]));
         typeInfo.RFX_DATASTORE = RFX_DATASTORE;