@merkl/api 0.20.139 → 0.20.140

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

@@ -4148,6 +4148,7 @@ declare const eden: {
                         forwarders?: (string | {})[] | undefined;
                         targetToken?: string | undefined;
                         evkAddress?: string | undefined;
+                        subCampaignType?: number | undefined;
                         whitelist?: string[] | undefined;
                         isOutOfRangeIncentivized?: boolean | undefined;
                         weightFees?: number | undefined;
@@ -4157,7 +4158,6 @@ declare const eden: {
                         snapshotTimestamp?: number | undefined;
                         snapshotBlockNumber?: number | undefined;
                         jsonUrl?: string | undefined;
-                        subCampaignType?: number | undefined;
                         repository?: string | undefined;
                         capInUSD?: string | undefined;
                         compFork?: number | undefined;
@@ -10288,6 +10288,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             forwarders?: (string | {})[] | undefined;
                             targetToken?: string | undefined;
                             evkAddress?: string | undefined;
+                            subCampaignType?: number | undefined;
                             whitelist?: string[] | undefined;
                             isOutOfRangeIncentivized?: boolean | undefined;
                             weightFees?: number | undefined;
@@ -10297,7 +10298,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             snapshotTimestamp?: number | undefined;
                             snapshotBlockNumber?: number | undefined;
                             jsonUrl?: string | undefined;
-                            subCampaignType?: number | undefined;
                             repository?: string | undefined;
                             capInUSD?: string | undefined;
                             compFork?: number | undefined;
@@ -15849,6 +15849,7 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         forwarders?: (string | {})[] | undefined;
                         targetToken?: string | undefined;
                         evkAddress?: string | undefined;
+                        subCampaignType?: number | undefined;
                         whitelist?: string[] | undefined;
                         isOutOfRangeIncentivized?: boolean | undefined;
                         weightFees?: number | undefined;
@@ -15858,7 +15859,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         snapshotTimestamp?: number | undefined;
                         snapshotBlockNumber?: number | undefined;
                         jsonUrl?: string | undefined;
-                        subCampaignType?: number | undefined;
                         repository?: string | undefined;
                         capInUSD?: string | undefined;
                         compFork?: number | undefined;

package/dist/src/engine/deprecated/dynamicData/utils/fetchLogs.d.ts

@@ -7,4 +7,8 @@ export type LogType = {
     blockHash: string;
     logIndex: string;
 };
+export declare function fetchLogs(chainId: MerklChainId, topics: string[], addresses: string[], fromBlock: number, toBlock: number): Promise<{
+    logs: LogType[];
+    block: number;
+}>;
 export declare function safeFetchLogs(chainId: MerklChainId, topics: string[], addresses: string[], fromBlock: number, toBlock: number): Promise<LogType[]>;

package/dist/src/engine/deprecated/dynamicData/utils/fetchLogs.js

@@ -1,7 +1,7 @@
 import { log } from "@/utils/logger";
 import { ChainId, ChainInteractionService, getContractCreationBlock } from "@sdk";
 import axios from "axios";
-async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
+export async function fetchLogs(chainId, topics, addresses, fromBlock, toBlock) {
     const url = ChainInteractionService(chainId).provider().connection.url;
     if (fromBlock === undefined || fromBlock === null || !toBlock || fromBlock > toBlock) {
         throw new Error(`fromBlock and toBlock are required and fromBlock must be less than toBlock - fromBlock: ${fromBlock} - toBlock:${toBlock}`);

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

@@ -1,5 +1,6 @@
 import { Erc20SubType } from ".";
 import { EulerMetadata } from "./implementations/euler/metadata";
+import { EulerTVLBuilder } from "./implementations/euler/tvl";
 import { GearboxMetadata } from "./implementations/gearbox/metadata";
 import { GearboxTVLBuilder } from "./implementations/gearbox/tvl";
 import { SuperlendMetadata } from "./implementations/superlend/metadata";
@@ -14,6 +15,8 @@ const tvlMap = {
     [Erc20SubType.gearbox]: new GearboxTVLBuilder(),
     [Erc20SubType.superlend_borrowing]: new SuperlendTVLBuilder(),
     [Erc20SubType.superlend_lending]: new SuperlendTVLBuilder(),
+    [Erc20SubType.euler_borrow]: new EulerTVLBuilder(),
+    [Erc20SubType.euler_lend]: new EulerTVLBuilder(),
 };
 export const erc20SubTypeTVLBuilderFactory = (erc20Subtype) => {
     if (!tvlMap[erc20Subtype]) {

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

@@ -0,0 +1,5 @@
+import type { TVLBuilder, TVLData } from "@/engine/tvl/interface";
+import { type CampaignParameters, type Campaign as CampaignType, type MerklChainId } from "@sdk";
+export declare class EulerTVLBuilder implements TVLBuilder<CampaignType.EULER> {
+    build(computeChainId: MerklChainId, campaigns: CampaignParameters<CampaignType.EULER>[]): Promise<TVLData<CampaignType.EULER>>;
+}

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

@@ -0,0 +1,50 @@
+import { TokenService } from "@/modules/v4/token/token.service";
+import { TvlType } from "@db/api";
+import { BN2Number, ChainInteractionService, EulerEVKInterface, EulerSubCampaignType, bigIntToNumber, } from "@sdk";
+export class EulerTVLBuilder {
+    async build(computeChainId, campaigns) {
+        const tvls = [];
+        const calls = [];
+        for (const campaign of campaigns) {
+            const { evkAddress, subCampaignType } = campaign.campaignParameters;
+            if (subCampaignType === EulerSubCampaignType.LEND) {
+                calls.push({
+                    callData: EulerEVKInterface.encodeFunctionData("totalAssets"),
+                    target: evkAddress,
+                    key: "totalUnderlying",
+                    decoder: (data) => BigInt(EulerEVKInterface.decodeFunctionResult("totalAssets", data)[0].toString()),
+                });
+            }
+            else {
+                calls.push({
+                    callData: EulerEVKInterface.encodeFunctionData("totalBorrows"),
+                    target: evkAddress,
+                    key: "totalUnderlying",
+                    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 underlylingTokenAddress = campaign.campaignParameters.addressAsset;
+            const underlyingToken = await TokenService.findUniqueFillOrThrow({
+                chainId: computeChainId,
+                address: underlylingTokenAddress,
+            });
+            const tvl = (bigIntToNumber(totalAssets, underlyingToken.decimals) ?? 0) * (underlyingToken.price ?? 0);
+            tvls.push({
+                campaign,
+                tvl,
+                tvlBreakdown: [
+                    {
+                        identifier: underlyingToken.id,
+                        type: TvlType.TOKEN,
+                        value: BN2Number(totalAssets, underlyingToken.decimals),
+                    },
+                ],
+            });
+        }
+        return tvls;
+    }
+}

package/dist/src/index.d.ts

@@ -5053,6 +5053,7 @@ declare const app: Elysia<"", false, {
                             forwarders?: (string | {})[] | undefined;
                             targetToken?: string | undefined;
                             evkAddress?: string | undefined;
+                            subCampaignType?: number | undefined;
                             whitelist?: string[] | undefined;
                             isOutOfRangeIncentivized?: boolean | undefined;
                             weightFees?: number | undefined;
@@ -5062,7 +5063,6 @@ declare const app: Elysia<"", false, {
                             snapshotTimestamp?: number | undefined;
                             snapshotBlockNumber?: number | undefined;
                             jsonUrl?: string | undefined;
-                            subCampaignType?: number | undefined;
                             repository?: string | undefined;
                             capInUSD?: string | undefined;
                             compFork?: number | undefined;

package/dist/src/modules/v4/coingecko/coingecko.repository.d.ts

@@ -1,4 +1,4 @@
-export declare class CoingeckoRepository {
+export declare abstract class CoingeckoRepository {
     static findList(): Promise<{
         id: string;
         symbol: string;

package/dist/src/modules/v4/opportunity/opportunity.model.js

@@ -59,7 +59,6 @@ export const GetOpportunitiesQueryDto = t.Object({
     chainId: t.Optional(t.RegExp(/^\d+(,\d+)*$/, {
         description: "A comma separated list of chain ids. Example: ?chainId=1,42161<br>You can get the list of all supported chains by calling [GET /v4/chains](#tag/chains/GET/v4/chains/)",
     })),
-    //TODO: find a systemic way of handling query param arrays
     action: t.Optional(t.Enum(OpportunityAction, {
         description: `A comma seprated list actions. Legal values are: ${Object.values(OpportunityAction).join(", ")}`,
     })),

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

@@ -202,6 +202,7 @@ export declare const ProgramPayloadController: Elysia<"/program-payload", false,
                         forwarders?: (string | {})[] | undefined;
                         targetToken?: string | undefined;
                         evkAddress?: string | undefined;
+                        subCampaignType?: number | undefined;
                         whitelist?: string[] | undefined;
                         isOutOfRangeIncentivized?: boolean | undefined;
                         weightFees?: number | undefined;
@@ -211,7 +212,6 @@ export declare const ProgramPayloadController: Elysia<"/program-payload", false,
                         snapshotTimestamp?: number | undefined;
                         snapshotBlockNumber?: number | undefined;
                         jsonUrl?: string | undefined;
-                        subCampaignType?: number | undefined;
                         repository?: string | undefined;
                         capInUSD?: string | undefined;
                         compFork?: number | undefined;

package/dist/src/modules/v4/programPayload/programPayload.repository.d.ts

@@ -94,6 +94,8 @@ export declare enum swapxCampaigns {
 }
 export declare enum celoCampaigns {
     UniswapV3_cUSD_USDT_Celo = "UniswapV3 cUSD/USDT Celo 0x5dC631aD6C26BEA1a59fBF2C2680CF3df43d249f",
+    UniswapV3_USDT_WETH_Celo = "UniswapV3 USDT/WETH Celo 0xF55791AfBB35aD42984f18D6Fe3e1fF73D81900c",
+    UniswapV3_USDT_cGHS_Celo = "UniswapV3 USDT/cGHS Celo 0x6BAB3AfA6d0c42d539bcbc33Ffb68C0406913413",
     UniswapV3_USDC_USDT_Celo = "UniswapV3 USDC/USDT Celo 0x1a810e0B6c2dd5629AFa2f0c898b9512C6F78846",
     UniswapV3_cUSD_USDC_Celo = "UniswapV3 cUSD/USDC Celo 0x34757893070B0FC5de37AaF2844255fF90F7F1E0",
     UniswapV3_cEUR_USDT_Celo = "UniswapV3 cEUR/USDT Celo 0x628Cb3a5a206956423D158009612813B64B19dab",
@@ -106,7 +108,7 @@ export declare enum celoCampaigns {
     UniswapV3_PUSO_USDC_Celo = "UniswapV3 PUSO/USDC Celo 0xb466d5429D6AD9999Bf112C225d9D7b15e96c658",
     UniswapV3_PUSO_USDT_Celo = "UniswapV3 PUSO/USDT Celo 0x87deC9a2589d9e6511Df84C193561b3A16cF6238",
     UniswapV3_cEUR_CELO_Celo = "UniswapV3 cEUR/CELO Celo 0xf130F72F8190f662522774C3367E6e8814f5e219",
-    UniswapV3_cCOP_USDT_Celo = "UniswapV3 cCOP/USDT Celo 0x40b3737B8984D14a2E8f96D8c680B2d475719fdF",
+    UniswapV3_cCOP_USDT_Celo = "UniswapV3 cCOP/USDT Celo 0x2ac5baa668a8a58fd0e302b9896717484fd217b0",
     UniswapV3_cREAL_cUSD_Celo = "UniswapV3 cREAL/cUSD Celo 0x72Dd8fe09B5b493012e5816068Dfc6Fb26a2A9e6",
     UniswapV3_cEUR_cREAL_Celo = "UniswapV3 cEUR/cREAL Celo 0xb6c8f9490314394CFc6EDacb8717bFDC1EB8dab5",
     UniswapV3_BRLA_USDT_Celo = "UniswapV3 BRLA/USDT Celo 0x14E577e42d45Fd2200A9B0e31D87Fe826467111a",
@@ -528,7 +530,11 @@ export declare enum tacCampaigns {
     TAC_Supply_ylxSolvBTC = "TAC Supply ylxSolvBTC 0x76f31800eFdE39A5f98189447c7a514d974f4364",
     TAC_Supply_ctTACUSDB = "TAC Supply ctTACUSDB 0x729fcddf4cbbc9dce721a8378c25a726fe7e43d3",
     TAC_Supply_ylFBTC = "TAC Supply ylFBTC 0x6945f516413cB2d7311297e8A39E7D004dEB5566",
-    TAC_Supply_ylMBTC = "TAC Supply ylMBTC 0x2B11527e1fab84a5382D20efD198BF3d332f7E73"
+    TAC_Supply_ylMBTC = "TAC Supply ylMBTC 0x2B11527e1fab84a5382D20efD198BF3d332f7E73",
+    TAC_Supply_tacUSN = "TAC Supply tacUSN 0x7895A046b26CC07272B022a0C9BAFC046E6F6396",
+    TAC_Supply_TACyUSD = "TAC Supply TACyUSD 0x2799dE2E1e769fA58dd3787F70BcD839AF3a1F39",
+    TAC_Supply_tacETH9s = "TAC Supply tacETH9s 0xDe7CFf032D453Ce6B0a796043E75d380Df258812",
+    TAC_Supply_ylSolvBTCtac = "TAC Supply ylSolvBTC.tac 0x34d16e4fB8757A88D986f9EfE2484F0badBF22C1"
 }
 declare const AnglesInterfaceCampaigns: {
     "0x15E96CDecA34B9DE1B31586c1206206aDb92E69D": {
@@ -1445,6 +1451,66 @@ declare const TACInterfaceCampaigns: {
         targetTokenPricing: boolean;
         apr: string;
     };
+    "TAC Supply tacUSN 0x7895A046b26CC07272B022a0C9BAFC046E6F6396": {
+        campaignType: any;
+        computeChainId: any;
+        distributionChainId: any;
+        targetToken: string;
+        rewardToken: string;
+        creator: string;
+        hooks: never[];
+        whitelist: never[];
+        blacklist: never[];
+        forwarders: never[];
+        rewardTokenPricing: boolean;
+        targetTokenPricing: boolean;
+        apr: string;
+    };
+    "TAC Supply TACyUSD 0x2799dE2E1e769fA58dd3787F70BcD839AF3a1F39": {
+        campaignType: any;
+        computeChainId: any;
+        distributionChainId: any;
+        targetToken: string;
+        rewardToken: string;
+        creator: string;
+        hooks: never[];
+        whitelist: never[];
+        blacklist: never[];
+        forwarders: never[];
+        rewardTokenPricing: boolean;
+        targetTokenPricing: boolean;
+        apr: string;
+    };
+    "TAC Supply tacETH9s 0xDe7CFf032D453Ce6B0a796043E75d380Df258812": {
+        campaignType: any;
+        computeChainId: any;
+        distributionChainId: any;
+        targetToken: string;
+        rewardToken: string;
+        creator: string;
+        hooks: never[];
+        whitelist: never[];
+        blacklist: never[];
+        forwarders: never[];
+        rewardTokenPricing: boolean;
+        targetTokenPricing: boolean;
+        apr: string;
+    };
+    "TAC Supply ylSolvBTC.tac 0x34d16e4fB8757A88D986f9EfE2484F0badBF22C1": {
+        campaignType: any;
+        computeChainId: any;
+        distributionChainId: any;
+        targetToken: string;
+        rewardToken: string;
+        creator: string;
+        hooks: never[];
+        whitelist: never[];
+        blacklist: never[];
+        forwarders: never[];
+        rewardTokenPricing: boolean;
+        targetTokenPricing: boolean;
+        apr: string;
+    };
 };
 export declare const MerklInterfaceCampaigns: {
     [key in program]: typeof PufferInterfaceCampaigns | typeof ZkSyncInterfaceCampaigns | typeof ModeInterfaceCampaigns | typeof VicunaInterfaceCampaigns | typeof SonicmarketInterfaceCampaigns | typeof ReserveInterfaceCampaigns | typeof BeetsInterfaceCampaigns | typeof CeloInterfaceCampaigns | typeof EtherlinkInterfaceCampaigns | typeof SwapxInterfaceCampaigns | typeof AnglesInterfaceCampaigns | typeof RoninInterfaceCampaigns | typeof TACInterfaceCampaigns;

package/dist/src/modules/v4/programPayload/programPayload.repository.js

@@ -161,6 +161,8 @@ export var swapxCampaigns;
 export var celoCampaigns;
 (function (celoCampaigns) {
     celoCampaigns["UniswapV3_cUSD_USDT_Celo"] = "UniswapV3 cUSD/USDT Celo 0x5dC631aD6C26BEA1a59fBF2C2680CF3df43d249f";
+    celoCampaigns["UniswapV3_USDT_WETH_Celo"] = "UniswapV3 USDT/WETH Celo 0xF55791AfBB35aD42984f18D6Fe3e1fF73D81900c";
+    celoCampaigns["UniswapV3_USDT_cGHS_Celo"] = "UniswapV3 USDT/cGHS Celo 0x6BAB3AfA6d0c42d539bcbc33Ffb68C0406913413";
     celoCampaigns["UniswapV3_USDC_USDT_Celo"] = "UniswapV3 USDC/USDT Celo 0x1a810e0B6c2dd5629AFa2f0c898b9512C6F78846";
     celoCampaigns["UniswapV3_cUSD_USDC_Celo"] = "UniswapV3 cUSD/USDC Celo 0x34757893070B0FC5de37AaF2844255fF90F7F1E0";
     celoCampaigns["UniswapV3_cEUR_USDT_Celo"] = "UniswapV3 cEUR/USDT Celo 0x628Cb3a5a206956423D158009612813B64B19dab";
@@ -173,7 +175,7 @@ export var celoCampaigns;
     celoCampaigns["UniswapV3_PUSO_USDC_Celo"] = "UniswapV3 PUSO/USDC Celo 0xb466d5429D6AD9999Bf112C225d9D7b15e96c658";
     celoCampaigns["UniswapV3_PUSO_USDT_Celo"] = "UniswapV3 PUSO/USDT Celo 0x87deC9a2589d9e6511Df84C193561b3A16cF6238";
     celoCampaigns["UniswapV3_cEUR_CELO_Celo"] = "UniswapV3 cEUR/CELO Celo 0xf130F72F8190f662522774C3367E6e8814f5e219";
-    celoCampaigns["UniswapV3_cCOP_USDT_Celo"] = "UniswapV3 cCOP/USDT Celo 0x40b3737B8984D14a2E8f96D8c680B2d475719fdF";
+    celoCampaigns["UniswapV3_cCOP_USDT_Celo"] = "UniswapV3 cCOP/USDT Celo 0x2ac5baa668a8a58fd0e302b9896717484fd217b0";
     celoCampaigns["UniswapV3_cREAL_cUSD_Celo"] = "UniswapV3 cREAL/cUSD Celo 0x72Dd8fe09B5b493012e5816068Dfc6Fb26a2A9e6";
     celoCampaigns["UniswapV3_cEUR_cREAL_Celo"] = "UniswapV3 cEUR/cREAL Celo 0xb6c8f9490314394CFc6EDacb8717bFDC1EB8dab5";
     celoCampaigns["UniswapV3_BRLA_USDT_Celo"] = "UniswapV3 BRLA/USDT Celo 0x14E577e42d45Fd2200A9B0e31D87Fe826467111a";
@@ -604,6 +606,10 @@ export var tacCampaigns;
     tacCampaigns["TAC_Supply_ctTACUSDB"] = "TAC Supply ctTACUSDB 0x729fcddf4cbbc9dce721a8378c25a726fe7e43d3";
     tacCampaigns["TAC_Supply_ylFBTC"] = "TAC Supply ylFBTC 0x6945f516413cB2d7311297e8A39E7D004dEB5566";
     tacCampaigns["TAC_Supply_ylMBTC"] = "TAC Supply ylMBTC 0x2B11527e1fab84a5382D20efD198BF3d332f7E73";
+    tacCampaigns["TAC_Supply_tacUSN"] = "TAC Supply tacUSN 0x7895A046b26CC07272B022a0C9BAFC046E6F6396";
+    tacCampaigns["TAC_Supply_TACyUSD"] = "TAC Supply TACyUSD 0x2799dE2E1e769fA58dd3787F70BcD839AF3a1F39";
+    tacCampaigns["TAC_Supply_tacETH9s"] = "TAC Supply tacETH9s 0xDe7CFf032D453Ce6B0a796043E75d380Df258812";
+    tacCampaigns["TAC_Supply_ylSolvBTCtac"] = "TAC Supply ylSolvBTC.tac 0x34d16e4fB8757A88D986f9EfE2484F0badBF22C1";
 })(tacCampaigns || (tacCampaigns = {}));
 const AnglesInterfaceCampaigns = {
     [anglesCampaigns.Angles_supply_in_angles_liquid]: {
@@ -1553,6 +1559,34 @@ const CeloInterfaceCampaigns = {
         weightToken0: 500,
         weightToken1: 500,
     },
+    [celoCampaigns.UniswapV3_USDT_WETH_Celo]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.CELO,
+        hooks: [],
+        poolAddress: "0xF55791AfBB35aD42984f18D6Fe3e1fF73D81900c",
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.uniswap.org/explore/pools/celo/0xF55791AfBB35aD42984f18D6Fe3e1fF73D81900c",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 5000,
+        weightToken0: 2500,
+        weightToken1: 2500,
+    },
+    [celoCampaigns.UniswapV3_USDT_cGHS_Celo]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.CELO,
+        hooks: [],
+        poolAddress: "0x6BAB3AfA6d0c42d539bcbc33Ffb68C0406913413",
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.uniswap.org/explore/pools/celo/0x6BAB3AfA6d0c42d539bcbc33Ffb68C0406913413",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 5000,
+        weightToken0: 2500,
+        weightToken1: 2500,
+    },
     [celoCampaigns.UniswapV3_USDC_USDT_Celo]: {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.CELO,
@@ -1619,9 +1653,9 @@ const CeloInterfaceCampaigns = {
         url: "https://app.uniswap.org/explore/pools/celo/0x61Ef8708fc240DC7f9F2c0d81c3124Df2fd8829F",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 6000,
-        weightToken0: 2000,
-        weightToken1: 2000,
+        weightFees: 5000,
+        weightToken0: 2500,
+        weightToken1: 2500,
     },
     [celoCampaigns.UniswapV3_USDGLO_cUSD_Celo]: {
         campaignType: Campaign.CLAMM,
@@ -1725,10 +1759,10 @@ const CeloInterfaceCampaigns = {
         campaignType: Campaign.CLAMM,
         computeChainId: ChainId.CELO,
         hooks: [],
-        poolAddress: "0x40b3737B8984D14a2E8f96D8c680B2d475719fdF",
+        poolAddress: "0x2ac5baa668a8a58fd0e302b9896717484fd217b0",
         whitelist: [],
         blacklist: [],
-        url: "https://app.uniswap.org/explore/pools/celo/0x40b3737B8984D14a2E8f96D8c680B2d475719fdF",
+        url: "https://app.uniswap.org/explore/pools/celo/0x2ac5baa668a8a58fd0e302b9896717484fd217b0",
         forwarders: [],
         isOutOfRangeIncentivized: false,
         weightFees: 5000,
@@ -1801,9 +1835,9 @@ const CeloInterfaceCampaigns = {
         url: "https://app.uniswap.org/explore/pools/celo/0x1625fE58Cdb3726e5841Fb2bb367Dde9AAa009B3",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 6000,
-        weightToken0: 2000,
-        weightToken1: 2000,
+        weightFees: 5000,
+        weightToken0: 2500,
+        weightToken1: 2500,
     },
     [celoCampaigns.UniswapV3_cKES_cREAL_Celo]: {
         campaignType: Campaign.CLAMM,
@@ -5967,6 +6001,10 @@ const ylxSolvBTCMultiplier = 1.5;
 const ctTACUSDBMultiplier = 1.5;
 const ylFBTCMultiplier = 1.5;
 const ylMBTCMultiplier = 1.5;
+const tacUSNMultiplier = 2.5;
+const tacyUSDMultiplier = 2.5;
+const tacETH9sMultiplier = 1.75;
+const tacylSolvBTCMultiplier = 1.5;
 const TACInterfaceCampaigns = {
     [tacCampaigns.TAC_Supply_TACETH]: {
         campaignType: Campaign.ERC20_FIX_APR,
@@ -6268,6 +6306,66 @@ const TACInterfaceCampaigns = {
         targetTokenPricing: true,
         apr: ((BaseTACREWARDS * ylMBTCMultiplier * 365) / DAILYREWARDSINDOLLAR).toFixed(2).toString(),
     },
+    [tacCampaigns.TAC_Supply_tacUSN]: {
+        campaignType: Campaign.ERC20_FIX_APR,
+        computeChainId: ChainId.MAINNET,
+        distributionChainId: ChainId.GNOSIS,
+        targetToken: "0x7895A046b26CC07272B022a0C9BAFC046E6F6396",
+        rewardToken: "0xf2401de511DC0D1ad4762588722f5B0574A56b60",
+        creator: "0xA9DdD91249DFdd450E81E1c56Ab60E1A62651701",
+        hooks: [],
+        whitelist: [],
+        blacklist: [],
+        forwarders: [],
+        rewardTokenPricing: false,
+        targetTokenPricing: true,
+        apr: ((BaseTACREWARDS * tacUSNMultiplier * 365) / DAILYREWARDSINDOLLAR).toFixed(2).toString(),
+    },
+    [tacCampaigns.TAC_Supply_TACyUSD]: {
+        campaignType: Campaign.ERC20_FIX_APR,
+        computeChainId: ChainId.MAINNET,
+        distributionChainId: ChainId.GNOSIS,
+        targetToken: "0x2799dE2E1e769fA58dd3787F70BcD839AF3a1F39",
+        rewardToken: "0xf2401de511DC0D1ad4762588722f5B0574A56b60",
+        creator: "0xA9DdD91249DFdd450E81E1c56Ab60E1A62651701",
+        hooks: [],
+        whitelist: [],
+        blacklist: [],
+        forwarders: [],
+        rewardTokenPricing: false,
+        targetTokenPricing: true,
+        apr: ((BaseTACREWARDS * tacyUSDMultiplier * 365) / DAILYREWARDSINDOLLAR).toFixed(2).toString(),
+    },
+    [tacCampaigns.TAC_Supply_tacETH9s]: {
+        campaignType: Campaign.ERC20_FIX_APR,
+        computeChainId: ChainId.MAINNET,
+        distributionChainId: ChainId.GNOSIS,
+        targetToken: "0xDe7CFf032D453Ce6B0a796043E75d380Df258812",
+        rewardToken: "0xf2401de511DC0D1ad4762588722f5B0574A56b60",
+        creator: "0xA9DdD91249DFdd450E81E1c56Ab60E1A62651701",
+        hooks: [],
+        whitelist: [],
+        blacklist: [],
+        forwarders: [],
+        rewardTokenPricing: false,
+        targetTokenPricing: true,
+        apr: ((BaseTACREWARDS * tacETH9sMultiplier * 365) / DAILYREWARDSINDOLLAR).toFixed(2).toString(),
+    },
+    [tacCampaigns.TAC_Supply_ylSolvBTCtac]: {
+        campaignType: Campaign.ERC20_FIX_APR,
+        computeChainId: ChainId.MAINNET,
+        distributionChainId: ChainId.GNOSIS,
+        targetToken: "0x34d16e4fB8757A88D986f9EfE2484F0badBF22C1",
+        rewardToken: "0xf2401de511DC0D1ad4762588722f5B0574A56b60",
+        creator: "0xA9DdD91249DFdd450E81E1c56Ab60E1A62651701",
+        hooks: [],
+        whitelist: [],
+        blacklist: [],
+        forwarders: [],
+        rewardTokenPricing: false,
+        targetTokenPricing: true,
+        apr: ((BaseTACREWARDS * tacylSolvBTCMultiplier * 365) / DAILYREWARDSINDOLLAR).toFixed(2).toString(),
+    },
 };
 export const MerklInterfaceCampaigns = {
     [program.Puffer]: PufferInterfaceCampaigns,

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

@@ -34,7 +34,7 @@ export class ProtocolService {
     }
     static async upsert(data) {
         const env = process.env.ENV === "prod" ? "production" : process.env.ENV;
-        const iconUri = await IconService.pullPush(data.icon, new BucketService(`merkl-${env}-tokens`, `angle-${env}-1`), {
+        const iconUri = await IconService.pullPush(data.icon, new BucketService("merkl-static-assets", `angle-${env}-1`), {
             name: `protocols/${data.id}`,
         });
         return await ProtocolRepository.upsert({

package/dist/src/modules/v4/router.d.ts

@@ -4923,6 +4923,7 @@ export declare const v4: Elysia<"/v4", false, {
                             forwarders?: (string | {})[] | undefined;
                             targetToken?: string | undefined;
                             evkAddress?: string | undefined;
+                            subCampaignType?: number | undefined;
                             whitelist?: string[] | undefined;
                             isOutOfRangeIncentivized?: boolean | undefined;
                             weightFees?: number | undefined;
@@ -4932,7 +4933,6 @@ export declare const v4: Elysia<"/v4", false, {
                             snapshotTimestamp?: number | undefined;
                             snapshotBlockNumber?: number | undefined;
                             jsonUrl?: string | undefined;
-                            subCampaignType?: number | undefined;
                             repository?: string | undefined;
                             capInUSD?: string | undefined;
                             compFork?: number | undefined;

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

@@ -354,10 +354,10 @@ export class TokenService {
         if (!token || !token.name)
             throw new HttpError(`Failed to fetch on-chain data for token ${token?.symbol} (${address} on chainId ${chainId}).`);
         try {
-            await IconService.pullPush(iconURL, new BucketService(`merkl-${env}-tokens`, `angle-${env}-1`), {
+            await IconService.pullPush(iconURL, new BucketService("merkl-static-assets", `angle-${env}-1`), {
                 name: `${chainId}/${address}`,
             });
-            token.icon = `${process.env.GCS_ENDPOINT}/merkl-${env}-tokens/${chainId}/${address}.${extension}`;
+            token.icon = `${process.env.GCS_ENDPOINT}/merkl-static-assets/tokens/${chainId}/${address}.${extension}`;
         }
         catch (err) {
             log.error(`[${token.id} (${chainId} | ${address})] Failed to pull / push from Notion to GCP. Using Notion URI for now.`, err);