@merkl/api 0.20.35 → 0.20.37

package/dist/src/engine/erc20SubTypeProcessors/implementations/xU308Processor.d.ts

@@ -1,5 +1,5 @@
 import type { Pricer } from "@/utils/pricer";
-import { type Campaign, type CampaignParameters } from "@sdk";
+import type { Campaign, CampaignParameters } from "@sdk";
 import { GenericProcessor, type dataType, type mandatoryCallKeys } from "../GenericProcessor";
 import type { tokenType } from "../helpers/tokenType";
 type callType = {
@@ -10,6 +10,7 @@ type callType = {
 };
 type callKeysxU308 = mandatoryCallKeys & {
     pool: string;
+    sqrtPriceX96: string;
     _token0: string;
     _token1: string;
     symbolToken0: string;
@@ -32,6 +33,6 @@ export declare class xU308Processor extends GenericProcessor<callKeysxU308, data
         round4: callType[];
     };
     processingRound2(typeInfo: dataRawxU308): void;
-    processingRound5(_index: number, type: tokenType, typeInfo: dataRawxU308, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypexU308>;
+    processingRound5(_index: number, type: tokenType, typeInfo: dataRawxU308, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, _pricer: Pricer): Promise<dataTypexU308>;
 }
 export {};

package/dist/src/engine/erc20SubTypeProcessors/implementations/xU308Processor.js

@@ -1,5 +1,4 @@
 import { generateCardName } from "@/utils/generateCardName";
-import { BN2Number } from "@sdk";
 import { GenericProcessor } from "../GenericProcessor";
 export class xU308Processor extends GenericProcessor {
     rounds = {
@@ -7,6 +6,7 @@ export class xU308Processor extends GenericProcessor {
         round2: [
             { key: "_token0", call: "token0", target: "pool" },
             { key: "_token1", call: "token1", target: "pool" },
+            { key: "sqrtPriceX96", call: "sqrtPriceX96", target: "pool" },
         ],
         round3: [
             { key: "symbolToken0", call: "symbol", target: "_token0" },
@@ -22,19 +22,11 @@ export class xU308Processor extends GenericProcessor {
     processingRound2(typeInfo) {
         typeInfo.pool = "0xB387D0A73619791420De4a1e5e710023Cb0f49c0";
     }
-    async processingRound5(_index, type, typeInfo, _calls, campaign, pricer) {
+    async processingRound5(_index, type, typeInfo, _calls, campaign, _pricer) {
         const { whitelistedSupplyTargetToken, totalSupply, blacklistedSupply } = this.handleWhiteListBlacklistRound5(typeInfo, campaign);
-        let priceTargetToken = 0;
-        if (typeInfo._token0 !== typeInfo.tokenAddress) {
-            const priceToken0 = (await pricer.get({ symbol: typeInfo.symbolToken0 })) ?? 0;
-            priceTargetToken =
-                (priceToken0 * BN2Number(typeInfo.balanceToken0, Number(typeInfo.decimalsToken0))) /
-                    BN2Number(typeInfo.balanceToken1, Number(typeInfo.decimalsToken1));
-        }
-        const priceToken1 = (await pricer.get({ symbol: typeInfo.symbolToken1 })) ?? 0;
-        priceTargetToken =
-            (priceToken1 * BN2Number(typeInfo.balanceToken1, Number(typeInfo.decimalsToken1))) /
-                BN2Number(typeInfo.balanceToken0, Number(typeInfo.decimalsToken0));
+        const srtPrice = BigInt(typeInfo.sqrtPriceX96);
+        const price = Number(srtPrice) ** 2 / 2 ** 192;
+        const priceTargetToken = price * 10 ** 12;
         const tvl = priceTargetToken * totalSupply;
         return {
             ...typeInfo,

package/dist/src/engine/opportunityMetadata/implementations/Radiant.d.ts

@@ -1,5 +1,5 @@
 import type { ProtocolId } from "@/modules/v4/protocol/protocol.model";
-import type { Campaign as CampaignEnum, CampaignParameters, ChainId } from "@sdk";
+import { type Campaign as CampaignEnum, type CampaignParameters, type ChainId } from "@sdk";
 import type { MetadataBuilder } from "../interface";
 type campaignType = CampaignEnum.RADIANT;
 export declare class RadiantMetadata implements MetadataBuilder<campaignType> {

package/dist/src/engine/opportunityMetadata/implementations/Radiant.js

@@ -1,11 +1,28 @@
+import { log } from "@/utils/logger";
 import { OpportunityAction } from "@db/api";
+import { ChainInteractionService, NETWORK_LABELS, RadiantInterface, } from "@sdk";
 import { getAddress } from "viem";
 export class RadiantMetadata {
     async build(computeChainId, params, subType) {
+        const tokens = [{ chainId: computeChainId, address: params.targetToken }];
+        try {
+            const result = await ChainInteractionService(computeChainId).fetchState([
+                {
+                    target: params.targetToken,
+                    allowFailure: true,
+                    callData: RadiantInterface.encodeFunctionData("UNDERLYING_ASSET_ADDRESS"),
+                },
+            ]);
+            const underlyingAddress = getAddress(RadiantInterface.decodeFunctionResult("UNDERLYING_ASSET_ADDRESS", result[0].returnData)[0]);
+            tokens.push({ chainId: computeChainId, address: underlyingAddress });
+        }
+        catch {
+            log.warn(`failed to fetch underlying asset address on ${NETWORK_LABELS[computeChainId]} for radiant token ${params.targetToken}`);
+        }
         return {
             action: subType <= 1 ? OpportunityAction.LEND : OpportunityAction.BORROW,
             name: [subType <= 1 ? "Lend" : "Borrow", params.symbolTargetToken].join(" "),
-            tokens: [{ chainId: computeChainId, address: params.targetToken }],
+            tokens,
             mainProtocol: "radiant",
             explorerAddress: getAddress(params.targetToken),
         };

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

@@ -8,8 +8,6 @@ import { Prisma } from "@db/api";
 import { ChainInteractionService, DistributionCreatorService, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
 import { getAddress, parseUnits } from "viem";
 import { BucketService } from "../bucket/bucket.service";
-import { CacheService } from "../cache";
-import { TTLPresets } from "../cache/cache.model";
 import { IconService } from "../icon/icon.service";
 import { PriceService } from "../price";
 import { TokenRepository } from "./token.repository";
@@ -272,17 +270,15 @@ export class TokenService {
         }));
     }
     static async getValidRewardTokens(chainId) {
-        return await CacheService.wrap(TTLPresets.MIN_5, async (chainId) => {
-            const validRewardTokens = await DistributionCreatorService(chainId).validRewardTokens();
-            return (await TokenRepository.findList(chainId, validRewardTokens.map(t => getAddress(t.token)))).map(x => {
-                return {
-                    ...x,
-                    minimumAmountPerHour: validRewardTokens
-                        .find(t => getAddress(t.token) === x.address)
-                        ?.minimumAmountPerEpoch.toString(),
-                };
-            });
-        }, chainId);
+        const validRewardTokens = await DistributionCreatorService(chainId).validRewardTokens();
+        return (await TokenRepository.findList(chainId, validRewardTokens.map(t => getAddress(t.token)))).map(x => {
+            return {
+                ...x,
+                minimumAmountPerHour: validRewardTokens
+                    .find(t => getAddress(t.token) === x.address)
+                    ?.minimumAmountPerEpoch.toString(),
+            };
+        });
     }
     static async update(id, data) {
         return await TokenRepository.update(id, data);

package/dist/src/utils/decodeCalls.js

@@ -1,11 +1,13 @@
 import { tokenType } from "@/engine/erc20SubTypeProcessors/helpers/tokenType";
-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, SturdyInterface, SymetricAmbientStrategyInterface, SyncSwapClassicPoolInterface, TorosInterface, UniswapV2PoolInterface, 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, IonicInterface, LPManagerHelperInterface, LPManagerInterface, LayerBankERC20Interface, LayerBankInterface, LendleInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxInterface, RswEthStrategyInterface, SpectraYTInterface, SturdyInterface, SymetricAmbientStrategyInterface, SyncSwapClassicPoolInterface, TorosInterface, UniswapV2PoolInterface, UniswapV3PoolInterface, VePufferInterface, ZFStableLPINterface, ZFStableSwapThreePoolInterface, } from "@sdk";
 export function decodeCall(calls, index, key, type) {
     const returnData = calls[index];
     return decodeReturnValue(returnData, key, type);
 }
 export function decodeReturnValue(returnData, key, type) {
     switch (key) {
+        case "sqrtPriceX96":
+            return UniswapV3PoolInterface.decodeFunctionResult("slot0", returnData)[0];
         case "tokens":
             return LPManagerInterface.decodeFunctionResult("tokens", returnData)[0];
         case "getTokensCount":

package/dist/src/utils/encodeCalls.js

@@ -1,7 +1,9 @@
 import { tokenType } from "@/engine/erc20SubTypeProcessors/helpers/tokenType";
-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, LayerBankInterface, LendleInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxDatastoreInterface, RswEthStrategyInterface, SpectraYTInterface, SturdyInterface, SymetricAmbientStrategyInterface, SyncSwapClassicPoolInterface, TorosInterface, UniswapV2PoolInterface, VePufferInterface, ZFStableLPINterface, } 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, IonicInterface, LPManagerHelperInterface, LPManagerInterface, LayerBankInterface, LendleInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxDatastoreInterface, RswEthStrategyInterface, SpectraYTInterface, SturdyInterface, SymetricAmbientStrategyInterface, SyncSwapClassicPoolInterface, TorosInterface, UniswapV2PoolInterface, UniswapV3PoolInterface, VePufferInterface, ZFStableLPINterface, } from "@sdk";
 export function createCall(target, key, type, metaData) {
     switch (key) {
+        case "sqrtPriceX96":
+            return { allowFailure: true, callData: UniswapV3PoolInterface.encodeFunctionData("slot0"), target };
         case "tokens":
             return { allowFailure: true, callData: LPManagerInterface.encodeFunctionData("tokens", [metaData]), target };
         case "getTokensCount":