@merkl/api 0.20.117 → 0.20.119

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

@@ -1,11 +1,11 @@
 import { NotFoundError } from "@/errors";
 import { VoidString } from "@/errors/VoidString.error";
+import { CampaignService } from "@/modules/v4/campaign/campaign.service";
+import { MerklRootService } from "@/modules/v4/merklRoot/merklRoot.service";
 import { log } from "@/utils/logger";
 import { RunStatus } from "@db/api";
 import { HOUR, MAX_COMPUTE_JOB_TIME, NETWORK_LABELS, getMultisigURL, registry } from "@sdk";
 import moment from "moment";
-import { CampaignService } from "../campaign";
-import { MerklRootService } from "../merklRoot";
 import { StatusRepository } from "./status.repository";
 export class StatusService {
     static format(status) {

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

@@ -2,8 +2,7 @@ import { NotFoundError } from "@/errors/NotFound.error";
 import { AuthorizationHeadersDto, BackOfficeGuard } from "@/guards/BackOffice.guard";
 import { getUserAllowance } from "@/libs/tokens/allowances";
 import { throwOnInvalidRequiredAddress, throwOnUnsupportedChainId } from "@/utils/throw";
-import Elysia from "elysia";
-import { ChainDto } from "../accounting";
+import Elysia, { t } from "elysia";
 import { CreateTokenDto, FindUniqueTokenAllowanceDto, FindUniqueTokenDto, GetTokenBalanceDto, GetTokenQueryDto, NotionWebhookAddTokenDto, TokenIdDto, UpdateTokenDto, } from "./token.model";
 import { TokenService } from "./token.service";
 // ─── Tokens Controller ───────────────────────────────────────────────────────
@@ -43,7 +42,9 @@ export const TokenController = new Elysia({ prefix: "/tokens", detail: { tags: [
 })
     // ─── Get Valid Reward Token ───────────────────────────────────────────
     .get("/reward/:chainId", async ({ params }) => TokenService.getValidRewardTokens(params.chainId), {
-    params: ChainDto,
+    params: t.Object({
+        chainId: t.Numeric(),
+    }),
     beforeHandle: ({ params }) => throwOnUnsupportedChainId(params.chainId),
     detail: {
         description: "Get the list of tokens that are accept as reward tokens on a given chain",

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

@@ -1,8 +1,8 @@
 import { HttpError } from "@/errors";
 import { getOnlyUserBalance } from "@/libs/tokens/balances";
 import { BucketService } from "@/modules/v4/bucket/bucket.service";
-import { CacheService } from "@/modules/v4/cache";
 import { TTLPresets } from "@/modules/v4/cache/cache.model";
+import { CacheService } from "@/modules/v4/cache/cache.service";
 import { CoingeckoService } from "@/modules/v4/coingecko/coingecko.service";
 import { IconService } from "@/modules/v4/icon/icon.service";
 import { PriceService } from "@/modules/v4/price/price.service";

package/dist/src/modules/v4/uniswap/uniswap.controller.d.ts

@@ -34,7 +34,7 @@ export declare const UniswapController: Elysia<"uniswap", false, {
                                 pending: string;
                                 reason: string;
                                 rewardToken: import("../token/token.model").Token["model"];
-                                opportunity: import("../opportunity").Opportunity["model"];
+                                opportunity: import("../opportunity/opportunity.model").Opportunity["model"];
                             }[]>>;
                         };
                     };
@@ -63,7 +63,7 @@ export declare const UniswapController: Elysia<"uniswap", false, {
                                 pending: string;
                                 reason: string;
                                 rewardToken: import("../token/token.model").Token["model"];
-                                opportunity: import("../opportunity").Opportunity["model"];
+                                opportunity: import("../opportunity/opportunity.model").Opportunity["model"];
                             }[]>>;
                         };
                     };

package/dist/src/modules/v4/uniswap/uniswap.controller.js

@@ -1,8 +1,8 @@
 import { AuthorizationHeadersDto, BackOfficeGuard } from "@/guards/BackOffice.guard";
+import { CacheService } from "@/modules/v4/cache/cache.service";
 import { UnsupportedNetwork } from "@/utils/error";
 import { throwOnInvalidAddress, throwOnInvalidRequiredAddress, throwOnUnsupportedChainId } from "@/utils/throw";
 import Elysia, { t } from "elysia";
-import { CacheService } from "../cache";
 import { TTLPresets } from "../cache/cache.model";
 import { ChainUniqueDto } from "../chain/chain.model";
 import { Bytes32Dto, RewardsPerPositionDto, UniV4ChainIdArray, UniswapV4PoolDto, } from "./uniswap.model";

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

@@ -1,6 +1,6 @@
+import type { Opportunity } from "@/modules/v4/opportunity/opportunity.model";
+import type { Token } from "@/modules/v4/token/token.model";
 import { type MerklChainId } from "@sdk";
-import { type Opportunity } from "../opportunity";
-import type { Token } from "../token/token.model";
 import { type RewardsPerPositionModel, type UniV4ChainId, type UniswapV4PoolsReturnType } from "./uniswap.model";
 export declare abstract class UniswapService {
     static findRewardsPerPosition(version: "v3" | "v4", query: RewardsPerPositionModel): Promise<Record<number, Record<string, Record<string, {

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

@@ -1,13 +1,13 @@
 import { safeFetchLogs } from "@/engine/deprecated/dynamicData/utils/fetchLogs";
+import { BlacklistService } from "@/modules/v4/blacklist/blacklist.service";
+import { ChainService } from "@/modules/v4/chain/chain.service";
+import { MerklRootService } from "@/modules/v4/merklRoot/merklRoot.service";
+import { OpportunityService } from "@/modules/v4/opportunity/opportunity.service";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { log } from "@/utils/logger";
 import { providers } from "@/utils/providers";
 import { ChainInteractionService, ERC20Interface, NETWORK_LABELS, NULL_ADDRESS, UniswapV4Addresses, UniswapV4PoolManagerInterface, getContractCreationBlock, } from "@sdk";
 import { getAddress } from "viem";
-import { BlacklistService } from "../blacklist";
-import { ChainService } from "../chain/chain.service";
-import { MerklRootService } from "../merklRoot";
-import { OpportunityService } from "../opportunity";
-import { RewardService } from "../reward";
 import { LoggedEntityType, UniV4ChainIdArray, } from "./uniswap.model";
 import { UniswapRepository } from "./uniswap.repository";
 export class UniswapService {

package/dist/src/modules/v4/user/user.controller.d.ts

@@ -1,5 +1,5 @@
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { Elysia } from "elysia";
-import { RewardService } from "../reward";
 export declare const UserController: Elysia<"/users", false, {
     decorator: {};
     store: {};
@@ -208,7 +208,7 @@ export declare const UserController: Elysia<"/users", false, {
                                     proofs: string[];
                                 }, "breakdowns"> & {
                                     breakdowns: {
-                                        opportunity: import("../opportunity").Opportunity["model"];
+                                        opportunity: import("../opportunity/opportunity.model").Opportunity["model"];
                                         claimed: bigint;
                                         amount: bigint;
                                         pending: bigint;

package/dist/src/modules/v4/user/user.controller.js

@@ -1,8 +1,8 @@
 import { AuthorizationHeadersDto, BackOfficeGuard } from "@/guards/BackOffice.guard";
+import { CreatorService } from "@/modules/v4/creator/creator.service";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { throwOnInvalidRequiredAddress, throwOnUnsupportedChainId } from "@/utils/throw";
 import { Elysia, t } from "elysia";
-import { CreatorService } from "../creator";
-import { RewardService } from "../reward";
 import { CheckTerms, GetManyUserQuery, OptionalChainIdDto, UpdateUserTagsDto, UserDto, UserRewardRouteDto, UserRewardsResourceDto, UserUniqueDto, } from "./user.model";
 import { UserService } from "./user.service";
 // ─── Users Controller ────────────────────────────────────────────────────────

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

@@ -1,7 +1,7 @@
+import { OpportunityService } from "@/modules/v4/opportunity/opportunity.service";
 import { log } from "@/utils/logger";
 import { engineDbClient } from "@db";
 import { ChainInteractionService, DistributionCreatorInterface, registry } from "@sdk";
-import { OpportunityService } from "../opportunity";
 import { UserRepository } from "./user.repository";
 // ─── Users Services ──────────────────────────────────────────────────────────
 export class UserService {

package/dist/src/routes/v3/app.js

@@ -1,6 +1,6 @@
 import { getTokensListWithCache } from "@/libs/getTokensList";
-import { CacheService } from "@/modules/v4/cache";
 import { TTLPresets } from "@/modules/v4/cache/cache.model";
+import { CacheService } from "@/modules/v4/cache/cache.service";
 import { TokenService } from "@/modules/v4/token/token.service";
 import { Pricer } from "@/utils/pricer";
 import { t } from "elysia";

package/dist/src/routes/v3/blacklist.js

@@ -1,4 +1,4 @@
-import { BlacklistService } from "@/modules/v4/blacklist";
+import { BlacklistService } from "@/modules/v4/blacklist/blacklist.service";
 import { t } from "elysia";
 import checkQueryAddressValidity from "../../hooks/checkQueryAddressValidity";
 // @dev DEPRECATED - conversion to v4 done

package/dist/src/routes/v3/campaignUnclaimed.js

@@ -1,4 +1,4 @@
-import { RewardService } from "@/modules/v4/reward";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
 /**

package/dist/src/routes/v3/campaigns.js

@@ -1,5 +1,5 @@
 import { Redis } from "@/cache";
-import { CampaignService } from "@/modules/v4/campaign";
+import { CampaignService } from "@/modules/v4/campaign/campaign.service";
 import { OpportunityConvertorService } from "@/modules/v4/opportunity/opportunity.converter";
 import { UnsupportedNetwork } from "@/utils/error";
 import { ANGLE_NETWORKS, Campaign as CampaignType, ChainId, isSupportedChain, registry, } from "@sdk";

package/dist/src/routes/v3/campaignsForMainParameter.js

@@ -1,5 +1,5 @@
 import { NotFoundError } from "@/errors";
-import { OpportunityService } from "@/modules/v4/opportunity";
+import { OpportunityService } from "@/modules/v4/opportunity/opportunity.service";
 import { BN2Number, Campaign as CampaignType } from "@sdk";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";

package/dist/src/routes/v3/campaignsRewardsReport.js

@@ -1,4 +1,4 @@
-import { RewardService } from "@/modules/v4/reward";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { t } from "elysia";
 /**
  * @deprecated - conversion to v4 done

package/dist/src/routes/v3/euler.js

@@ -1,7 +1,7 @@
 import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase, } from "@/engine/deprecated/dynamicData/utils/getEulerV2Vaults";
 import { AuthorizationHeadersDto, BackOfficeGuard } from "@/guards/BackOffice.guard";
-import { CacheService } from "@/modules/v4/cache";
 import { TTLPresets } from "@/modules/v4/cache/cache.model";
+import { CacheService } from "@/modules/v4/cache/cache.service";
 import { ChainUniqueDto } from "@/modules/v4/chain/chain.model";
 import { UnsupportedNetwork } from "@/utils/error";
 import { eulerChainIds } from "@sdk";

package/dist/src/routes/v3/recipients.js

@@ -1,4 +1,4 @@
-import { RewardService } from "@/modules/v4/reward";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
 /**

package/dist/src/routes/v3/rewards.js

@@ -1,5 +1,5 @@
-import { RewardService } from "@/modules/v4/reward";
 import { RewardConvertorService } from "@/modules/v4/reward/reward.converter";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { ChainId, isSupportedChain } from "@sdk";
 import { t } from "elysia";
 import checkQueryAddressValidity from "../../hooks/checkQueryAddressValidity";

package/dist/src/routes/v3/rewardsReport.js

@@ -1,4 +1,4 @@
-import { RewardService } from "@/modules/v4/reward";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { InvalidParameter } from "@/utils/error";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";

package/dist/src/routes/v3/uniswapv4.js

@@ -1,4 +1,4 @@
-import { CacheService } from "@/modules/v4/cache";
+import { CacheService } from "@/modules/v4/cache/cache.service";
 import { ChainUniqueDto } from "@/modules/v4/chain/chain.model";
 import { Bytes32Dto, UniV4ChainIdArray, } from "@/modules/v4/uniswap/uniswap.model";
 import { UniswapService } from "@/modules/v4/uniswap/uniswap.service";

package/dist/src/routes/v3/userRewards.js

@@ -1,6 +1,7 @@
 import checkQueryAddressValidity from "@/hooks/checkQueryAddressValidity";
-import { RewardService, UserRewardV3Dto } from "@/modules/v4/reward";
 import { RewardConvertorService } from "@/modules/v4/reward/reward.converter";
+import { UserRewardV3Dto } from "@/modules/v4/reward/reward.model";
+import { RewardService } from "@/modules/v4/reward/reward.service";
 import { InvalidParameter } from "@/utils/error";
 import { throwOnUnsupportedChainId } from "@/utils/throw";
 import { t } from "elysia";

package/dist/src/scripts/reparse-opportunities.js

@@ -1,6 +1,6 @@
 // One-off script to modify opportunity metadata
 import { metadataBuilderFactory } from "@/engine/metadata/factory";
-import { CampaignService } from "@/modules/v4/campaign";
+import { CampaignService } from "@/modules/v4/campaign/campaign.service";
 import { log } from "@/utils/logger";
 import { apiDbClient } from "@db";
 import { Campaign as CampaignType } from "@sdk";