@merkl/api 0.20.151 → 0.20.153

package/dist/src/engine/deprecated/erc20SubTypeProcessors/helpers/treasuryFinder.d.ts

@@ -0,0 +1,2 @@
+import { Erc20SubType } from "@/engine/implementations/Erc20/subTypes";
+export declare function getTypeFromTreasuryAddress(address: string): Erc20SubType;

package/dist/src/engine/deprecated/erc20SubTypeProcessors/helpers/treasuryFinder.js

@@ -0,0 +1,10 @@
+import { Erc20SubType } from "@/engine/implementations/Erc20/subTypes";
+const treasuryAddresses = {
+    "0x3E965117A51186e41c2BB58b729A1e518A715e5F": Erc20SubType.gearbox, // Gearbox ETH Treasury
+};
+export function getTypeFromTreasuryAddress(address) {
+    if (treasuryAddresses[address]) {
+        return treasuryAddresses[address];
+    }
+    return Erc20SubType.unknown;
+}

package/dist/src/engine/implementations/Erc20/subTypes/detect.js

@@ -1,10 +1,11 @@
 import { getTypeFromFactoryAddress } from "@/engine/deprecated/erc20SubTypeProcessors/helpers/factoryFinder";
 import { getTypeFromAddressChain } from "@/engine/deprecated/erc20SubTypeProcessors/helpers/hardcoded";
 import { getTypeFromOwnerAddress } from "@/engine/deprecated/erc20SubTypeProcessors/helpers/ownerFinder";
+import { getTypeFromTreasuryAddress } from "@/engine/deprecated/erc20SubTypeProcessors/helpers/treasuryFinder";
 import { processNamingConditionsInOrder } from "@/engine/deprecated/erc20SubTypeProcessors/subtypesRound1";
 import { Erc20SubType } from "@/engine/implementations/Erc20/subTypes";
 import { decodeReturnValue } from "@/utils/decodeCalls";
-import { BalancerPoolInterface, BalancerV3StablePoolInterface, ChainInteractionService, ERC20Interface, EnzymeInterface, FactoryInterface, LayerBankERC20Interface, MetamorphoInterface, } from "@sdk";
+import { BalancerPoolInterface, BalancerV3StablePoolInterface, ChainInteractionService, ERC20Interface, EnzymeInterface, FactoryInterface, IonPoolInterface, LayerBankERC20Interface, MetamorphoInterface, } from "@sdk";
 /**
  * @notice Compute the subtypes of the campaigns
  * @warning
@@ -12,7 +13,7 @@ import { BalancerPoolInterface, BalancerV3StablePoolInterface, ChainInteractionS
  */
 export const detectSubType = async (chainId, campaigns) => {
     // 1. Do a generic multicall per campaign to see which functions are supported
-    const callsPerCampaign = 7;
+    const callsPerCampaign = 8;
     const calls = [];
     for (const [index, campaign] of campaigns.entries()) {
         const { targetToken } = campaign.campaignParameters;
@@ -44,6 +45,10 @@ export const detectSubType = async (chainId, campaigns) => {
             allowFailure: true,
             callData: BalancerV3StablePoolInterface.encodeFunctionData("getVault"),
             target: targetToken,
+        }, {
+            allowFailure: true,
+            callData: IonPoolInterface.encodeFunctionData("treasury"),
+            target: targetToken,
         });
         if (calls.length !== callsPerCampaign * (index + 1))
             throw new Error("computeSubTypes: calls.length !== callsPerCampaign * index");
@@ -63,6 +68,7 @@ export const detectSubType = async (chainId, campaigns) => {
             creator: callResult[index + 4].returnData,
             owner: callResult[index + 5].returnData,
             vault: callResult[index + 6].returnData,
+            treasury: callResult[index + 7].returnData,
         };
         // Get erc20SubType from factory address
         try {
@@ -74,6 +80,16 @@ export const detectSubType = async (chainId, campaigns) => {
             }
         }
         catch { }
+        // Get erc20SubType from treasury address
+        try {
+            const treasury = decodeReturnValue(values.treasury, "treasury");
+            const type = getTypeFromTreasuryAddress(treasury);
+            if (type !== Erc20SubType.unknown) {
+                res.push(type);
+                continue;
+            }
+        }
+        catch { }
         // Get erc20SubType from owner address
         try {
             const owner = decodeReturnValue(values.owner, "owner");

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

@@ -5,6 +5,7 @@ export declare class DynamicDataService {
      *
      * @dev The list must ONLY contain campaigns of the same type and the same computeChainId
      */
+    static checkValidUpdate(opportunityId: string, newApr: number): Promise<boolean>;
     static update(chainId: ChainId, type: CampaignType, campaigns: CampaignParameters<CampaignType>[], dryRun?: boolean): Promise<unknown[]>;
     /**
      * @dev Test function used to create mock ERC20 static campaigns and check tvl and metadata

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

@@ -14,7 +14,7 @@ import bigintToString from "@/utils/bigintToString";
 import { log } from "@/utils/logger";
 import { parseDistributionType } from "@/utils/parseDistributionType";
 import { AprType, DistributionType } from "@db/api";
-import { Campaign as CampaignType, DAY, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
+import { Campaign as CampaignType, DAY, HOUR, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
 import moment from "moment";
 export class DynamicDataService {
     /**
@@ -22,6 +22,16 @@ export class DynamicDataService {
      *
      * @dev The list must ONLY contain campaigns of the same type and the same computeChainId
      */
+    static async checkValidUpdate(opportunityId, newApr) {
+        const previousRecords = await OpportunityRepository.findUnique(opportunityId);
+        const previousApr = previousRecords?.apr;
+        const lastUpdate = previousRecords?.AprRecords.reduce((acc, record) => Math.max(acc, Number(record.timestamp)), 0);
+        if (previousApr && lastUpdate && moment.now() / 1000 - lastUpdate < HOUR) {
+            if (newApr / previousApr < 0.5 || newApr / previousApr > 2)
+                return false;
+        }
+        return true;
+    }
     static async update(chainId, type, campaigns, dryRun = false) {
         // 1 - Safety check
         for (const campaign of campaigns) {
@@ -172,7 +182,9 @@ export class DynamicDataService {
             if (!dryRun) {
                 for (const update of updates) {
                     try {
-                        await OpportunityRepository.updateDynamicData(update.opportunityId, update.apr, update.tvl, update.dailyRewards);
+                        if (await DynamicDataService.checkValidUpdate(update.opportunityId, update.apr.cumulated)) {
+                            await OpportunityRepository.updateDynamicData(update.opportunityId, update.apr, update.tvl, update.dailyRewards);
+                        }
                     }
                     catch (err) {
                         throw new HttpError("Failed to update dynamic data", 500, {
@@ -211,7 +223,9 @@ export class DynamicDataService {
             });
             try {
                 if (!dryRun)
-                    await OpportunityRepository.updateDynamicData(opportunityId, apr, tvl, dailyRewards);
+                    if (await DynamicDataService.checkValidUpdate(opportunityId, apr.cumulated)) {
+                        await OpportunityRepository.updateDynamicData(opportunityId, apr, tvl, dailyRewards);
+                    }
             }
             catch (err) {
                 log.error(`failed to update dynamic data for ${opportunityId}`, err);

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

@@ -221,7 +221,7 @@ export class RewardService {
                     if (!lastTreeRewardsBreakdown)
                         continue;
                     breakdown.claimed = lastTreeRewardsBreakdown.amount;
-                    await RewardRepository.updateBreakdownClaimed(user, tokenId, breakdown.campaignId, breakdown.reason, breakdown.amount);
+                    await RewardRepository.updateBreakdownClaimed(user, tokenId, breakdown.campaignId, breakdown.reason, breakdown.claimed);
                 }
             }
         }

package/dist/src/utils/decodeCalls.js

@@ -1,5 +1,5 @@
 import { Erc20SubType } from "@/engine/implementations/Erc20/subTypes";
-import { AaveInterface, AccountantWithRateProvidersInterface, AuraInterface, AuraOperatorInterface, BalancerGaugeInterface, BalancerPoolInterface, BalancerV3StablePoolInterface, BalancerVaultInterface, BeefyInterface, BunniV2HubInterface, BunniV2TokenInterface, CPMMGammaPoolMainInterface, CompoundInterface, CurveInterface, CurveLPTokenInterface, CurveStableSwapNGInterface, DefutureVaultInterface, ERC20Interface, ERC4626Interface, EnzymeInterface, EulerInterface, FactoryInterface, FluidInterface, FraxlendInterface, GearboxVaultInterface, HourglassERC20TBTInterface, HourglassVedaLockDepositorV2Interface, IonicInterface, LPManagerHelperInterface, LPManagerInterface, LayerBankERC20Interface, LayerBankInterface, LendleInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxInterface, RswEthStrategyInterface, SpectraYTInterface, StabilityVaultInterface, SturdyInterface, SymetricAmbientStrategyInterface, SyncSwapClassicPoolInterface, TorosInterface, UniswapV2PoolInterface, UniswapV3PoolInterface, VePufferInterface, ZFStableLPINterface, ZFStableSwapThreePoolInterface, } from "@sdk";
+import { AaveInterface, AccountantWithRateProvidersInterface, AuraInterface, AuraOperatorInterface, BalancerGaugeInterface, BalancerPoolInterface, BalancerV3StablePoolInterface, BalancerVaultInterface, BeefyInterface, BunniV2HubInterface, BunniV2TokenInterface, CPMMGammaPoolMainInterface, CompoundInterface, CurveInterface, CurveLPTokenInterface, CurveStableSwapNGInterface, DefutureVaultInterface, ERC20Interface, ERC4626Interface, EnzymeInterface, EulerInterface, FactoryInterface, FluidInterface, FraxlendInterface, GearboxVaultInterface, HourglassERC20TBTInterface, HourglassVedaLockDepositorV2Interface, IonPoolInterface, IonicInterface, LPManagerHelperInterface, LPManagerInterface, LayerBankERC20Interface, LayerBankInterface, LendleInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxInterface, RswEthStrategyInterface, SpectraYTInterface, StabilityVaultInterface, SturdyInterface, SymetricAmbientStrategyInterface, SyncSwapClassicPoolInterface, TorosInterface, UniswapV2PoolInterface, UniswapV3PoolInterface, VePufferInterface, ZFStableLPINterface, ZFStableSwapThreePoolInterface, } from "@sdk";
 import { BigNumber } from "ethers";
 export function decodeCall(calls, index, key, type) {
     const returnData = calls[index];
@@ -7,6 +7,8 @@ export function decodeCall(calls, index, key, type) {
 }
 export function decodeReturnValue(returnData, key, type) {
     switch (key) {
+        case "treasury":
+            return IonPoolInterface.decodeFunctionResult("treasury", returnData)[0];
         case "sqrtPriceX96":
             return UniswapV3PoolInterface.decodeFunctionResult("slot0", returnData)[0];
         case "tokens":