@merkl/api 0.20.144 → 0.20.146

package/dist/src/engine/implementations/Erc20/subTypes/implementations/euler/metadata.d.ts

@@ -6,7 +6,7 @@ type campaignType = CampaignType.EULER;
 export declare class EulerMetadata implements MetadataBuilder<campaignType> {
     build(campaign: Omit<CampaignWithParams<campaignType>, "manualOverrides">): Promise<{
         action: "LEND" | "BORROW";
-        protocol: ProtocolId;
+        mainProtocol: ProtocolId;
         name: string;
         tokens: {
             chainId: number;

package/dist/src/engine/implementations/Erc20/subTypes/implementations/euler/metadata.js

@@ -22,7 +22,7 @@ export class EulerMetadata {
         const name = `${action === OpportunityAction.LEND ? `Supply ${underlyingTokenInfo.symbol} on` : "Borrow from"}${vaultName ? ` ${vaultName}` : ""} vault ${subType === EulerSubCampaignType.BORROW_FROM_COLLATERAL ? `using ${symbolCollateral}` : ""}`;
         return {
             action,
-            protocol: "euler",
+            mainProtocol: "euler",
             name,
             tokens: [
                 { chainId: computeChainId, address: targetToken },

package/dist/src/engine/implementations/Erc20/subTypes/implementations/euler/tvl.js

@@ -6,12 +6,13 @@ export class EulerTVLBuilder {
         const tvls = [];
         const calls = [];
         for (const campaign of campaigns) {
-            const { evkAddress, subCampaignType } = campaign.campaignParameters;
+            const { campaignParameters, campaignId } = campaign;
+            const { evkAddress, subCampaignType } = campaignParameters;
             if (subCampaignType === EulerSubCampaignType.LEND) {
                 calls.push({
                     callData: EulerEVKInterface.encodeFunctionData("totalAssets"),
                     target: evkAddress,
-                    key: "totalUnderlying",
+                    key: `totalUnderlying_${campaignId}`,
                     decoder: (data) => BigInt(EulerEVKInterface.decodeFunctionResult("totalAssets", data)[0].toString()),
                 });
             }
@@ -19,14 +20,15 @@ export class EulerTVLBuilder {
                 calls.push({
                     callData: EulerEVKInterface.encodeFunctionData("totalBorrows"),
                     target: evkAddress,
-                    key: "totalUnderlying",
+                    key: `totalUnderlying_${campaignId}`,
                     decoder: (data) => BigInt(EulerEVKInterface.decodeFunctionResult("totalBorrows", data)[0].toString()),
                 });
             }
         }
         const result = await ChainInteractionService(computeChainId).fetchAndDecodeObject(calls);
         for (const [_, campaign] of campaigns.entries()) {
-            const totalAssets = result.totalUnderlying;
+            const { campaignId } = campaign;
+            const totalAssets = result[`totalUnderlying_${campaignId}`];
             const underlylingTokenAddress = campaign.campaignParameters.addressAsset;
             const underlyingToken = await TokenService.findUniqueFillOrThrow({
                 chainId: computeChainId,

package/dist/src/engine/implementations/Erc20/subTypes/implementations/gearbox/metadata.d.ts

@@ -5,7 +5,7 @@ import type { Erc20LikeCampaignEnum } from "../..";
 export declare class GearboxMetadata implements MetadataBuilder<Erc20LikeCampaignEnum> {
     build(campaign: Omit<CampaignWithParams<Erc20LikeCampaignEnum>, "manualOverrides">): Promise<{
         action: "LEND";
-        protocol: ProtocolId;
+        mainProtocol: ProtocolId;
         name: string;
         tokens: {
             chainId: number;

package/dist/src/engine/implementations/Erc20/subTypes/implementations/gearbox/metadata.js

@@ -8,7 +8,7 @@ export class GearboxMetadata {
         const underlyingTokenSymbol = await TokenInteractionService(computeChainId).symbol(underlyingToken);
         return {
             action: OpportunityAction.LEND,
-            protocol: "gearbox",
+            mainProtocol: "gearbox",
             name: `Gearbox ${underlyingTokenSymbol} Deposit`,
             tokens: [
                 { chainId: computeChainId, address: targetToken },

package/dist/src/engine/implementations/Erc20/subTypes/implementations/superlend/metadata.d.ts

@@ -5,7 +5,7 @@ import type { Erc20LikeCampaignEnum } from "../..";
 export declare class SuperlendMetadata implements MetadataBuilder<Erc20LikeCampaignEnum> {
     build(campaign: Omit<CampaignWithParams<Erc20LikeCampaignEnum>, "manualOverrides">): Promise<{
         action: "LEND" | "BORROW";
-        protocol: ProtocolId;
+        mainProtocol: ProtocolId;
         name: string;
         tokens: {
             chainId: number;

package/dist/src/engine/implementations/Erc20/subTypes/implementations/superlend/metadata.js

@@ -16,7 +16,7 @@ export class SuperlendMetadata {
             : OpportunityAction.LEND;
         return {
             action,
-            protocol: "superlend",
+            mainProtocol: "superlend",
             name: `${action === OpportunityAction.BORROW ? "Borrow" : "Supply"} ${underlyingTokenSymbol} on Superlend`,
             tokens: [
                 { chainId: computeChainId, address: targetToken },

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

@@ -128,7 +128,6 @@ export class DynamicDataService {
                             });
                         }
                         // 2.b.3 APR is obtained from daily rewards and tvl following the distribution type
-                        // TODO: switch on distribution type - dailyRewards can be in token amount
                         let aprCampaignValue;
                         if (rewardToken.isPoint) {
                             aprCampaignValue = campaignDailyValue / record.tvl;