From d8382554df0809f8f246fac05153f859dd8559fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 14:52:38 +0200 Subject: [PATCH 01/15] feat: add base supply gho incentive --- src/hooks/useMeritIncentives.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index cf1c6352c2..28363da01e 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -33,6 +33,7 @@ export enum MeritAction { BASE_SUPPLY_WEETH = 'base-supply-weeth', BASE_SUPPLY_EZETH = 'base-supply-ezeth', BASE_SUPPLY_EURC = 'base-supply-eurc', + BASE_SUPPLY_GHO = 'base-supply-gho', BASE_SUPPLY_LBTC_BORROW_CBBTC = 'base-supply-lbtc-borrow-cbbtc', BASE_BORROW_EURC = 'base-borrow-eurc', BASE_BORROW_USDC = 'base-borrow-usdc', @@ -387,6 +388,13 @@ const MERIT_DATA_MAP: Record }, ], GHO: [ + { + action: MeritAction.BASE_SUPPLY_GHO, + rewardTokenAddress: AaveV3Base.ASSETS.GHO.A_TOKEN, + rewardTokenSymbol: 'aBasGHO', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, { action: MeritAction.BASE_BORROW_GHO, rewardTokenAddress: AaveV3Base.ASSETS.GHO.A_TOKEN, From d51ef91e3cdbf2a78912d068d2debd3985b44f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 14:57:38 +0200 Subject: [PATCH 02/15] feat: add base supply wETH incentive --- src/hooks/useMeritIncentives.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 28363da01e..244d6967a2 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -39,6 +39,7 @@ export enum MeritAction { BASE_BORROW_USDC = 'base-borrow-usdc', BASE_BORROW_WSTETH = 'base-borrow-wsteth', BASE_BORROW_GHO = 'base-borrow-gho', + BASE_SUPPLY_WETH = 'base-supply-weth', AVALANCHE_SUPPLY_BTCB = 'avalanche-supply-btcb', AVALANCHE_SUPPLY_USDC = 'avalanche-supply-usdc', AVALANCHE_SUPPLY_USDT = 'avalanche-supply-usdt', @@ -405,6 +406,15 @@ const MERIT_DATA_MAP: Record 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/94', }, ], + WETH: [ + { + action: MeritAction.BASE_SUPPLY_WETH, + rewardTokenAddress: AaveV3Base.ASSETS.WETH.A_TOKEN, + rewardTokenSymbol: 'aBasWETH', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, + ], }, [CustomMarket.proto_avalanche_v3]: { ['BTC.b']: [ From 244ce3548f45012012c4d4951d549459c95a2387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 15:10:58 +0200 Subject: [PATCH 03/15] feat: add base cbBTC campaigns --- src/hooks/useMeritIncentives.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 244d6967a2..b482f135e0 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -35,6 +35,7 @@ export enum MeritAction { BASE_SUPPLY_EURC = 'base-supply-eurc', BASE_SUPPLY_GHO = 'base-supply-gho', BASE_SUPPLY_LBTC_BORROW_CBBTC = 'base-supply-lbtc-borrow-cbbtc', + BASE_SUPPLY_CBBTC_BORROW_MULTIPLE = 'base-supply-cbbtc-borrow-multiple', BASE_BORROW_EURC = 'base-borrow-eurc', BASE_BORROW_USDC = 'base-borrow-usdc', BASE_BORROW_WSTETH = 'base-borrow-wsteth', @@ -98,6 +99,9 @@ const StSLoopIncentiveProgramMessage = const weethUsdcCampaignMessage = 'You must supply weETH and borrow new USDC, while maintaining a health factor of 2 or below, in order to receive merit rewards. Eligibility criteria for this campaign are different from usual, please refer to the forum post for full details.'; +const baseIncentivesCbbtcCampaignsMessage = + 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Some assets or possition on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; @@ -121,6 +125,9 @@ const weethUsdcForumLink = const StSLoopIncentiveProgramForumLink = 'https://governance.aave.com/t/arfc-sts-loop-incentive-program/22368'; +const baseIncentivesForumLink = + 'https://governance.aave.com/t/arfc-base-incentive-campaign-funding/21983?u=nandy.eth'; + const MERIT_DATA_MAP: Record> = { [CustomMarket.proto_mainnet_v3]: { GHO: [ @@ -299,6 +306,14 @@ const MERIT_DATA_MAP: Record rewardTokenSymbol: 'aBasUSDC', protocolAction: ProtocolAction.supply, }, + { + action: MeritAction.BASE_SUPPLY_CBBTC, + rewardTokenAddress: AaveV3Base.ASSETS.cbBTC.A_TOKEN, + rewardTokenSymbol: 'aBasCBBTC', + protocolAction: ProtocolAction.supply, + customMessage: baseIncentivesCbbtcCampaignsMessage, + customForumLink: baseIncentivesForumLink, + }, { action: MeritAction.BASE_SUPPLY_LBTC_BORROW_CBBTC, rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, From b4700a1706c86d9c9055842d8a64953982d4f4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 15:13:12 +0200 Subject: [PATCH 04/15] feat: register aBasCBBTC as aToken --- src/components/incentives/IncentivesTooltipContent.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx index cb5836cf66..a605bbc303 100644 --- a/src/components/incentives/IncentivesTooltipContent.tsx +++ b/src/components/incentives/IncentivesTooltipContent.tsx @@ -23,6 +23,11 @@ const IncentivesSymbolMap: { symbol: 'aUSDC', aToken: true, }, + aBasCBBTC: { + tokenIconSymbol: 'CBBTC', + symbol: 'aCBBTC', + aToken: true, + }, aEthUSDS: { tokenIconSymbol: 'usds', symbol: 'aUSDS', From 1496f380893784fa9ff701db1d85687620537860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 15:25:54 +0200 Subject: [PATCH 05/15] feat: add Base wstETH campaigns --- src/hooks/useMeritIncentives.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index b482f135e0..ef119a9f47 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -36,6 +36,7 @@ export enum MeritAction { BASE_SUPPLY_GHO = 'base-supply-gho', BASE_SUPPLY_LBTC_BORROW_CBBTC = 'base-supply-lbtc-borrow-cbbtc', BASE_SUPPLY_CBBTC_BORROW_MULTIPLE = 'base-supply-cbbtc-borrow-multiple', + BASE_SUPPLY_WSTETH_BORROW_MULTIPLE = 'base-supply-wsteth-borrow-multiple', BASE_BORROW_EURC = 'base-borrow-eurc', BASE_BORROW_USDC = 'base-borrow-usdc', BASE_BORROW_WSTETH = 'base-borrow-wsteth', @@ -102,6 +103,9 @@ const weethUsdcCampaignMessage = const baseIncentivesCbbtcCampaignsMessage = 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Some assets or possition on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; +const baseIncentivesWstETHCampaignsMessage = + 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; @@ -346,6 +350,14 @@ const MERIT_DATA_MAP: Record customMessage: antiLoopMessage, customForumLink: joinedEthCorrelatedIncentiveForumLink, }, + { + action: MeritAction.BASE_SUPPLY_WSTETH_BORROW_MULTIPLE, + rewardTokenAddress: AaveV3Base.ASSETS.wstETH.A_TOKEN, + rewardTokenSymbol: 'aBaswstETH', + protocolAction: ProtocolAction.supply, + customMessage: baseIncentivesWstETHCampaignsMessage, + customForumLink: baseIncentivesForumLink, + }, { action: MeritAction.BASE_BORROW_WSTETH, rewardTokenAddress: AaveV3Base.ASSETS.wstETH.A_TOKEN, From 11de70dcb2974774a2cc68e8bbd3b56deb52d8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 16:51:40 +0200 Subject: [PATCH 06/15] feat: add aBasUSDC as aToken --- src/components/incentives/IncentivesTooltipContent.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx index a605bbc303..28400ae3a1 100644 --- a/src/components/incentives/IncentivesTooltipContent.tsx +++ b/src/components/incentives/IncentivesTooltipContent.tsx @@ -28,6 +28,11 @@ const IncentivesSymbolMap: { symbol: 'aCBBTC', aToken: true, }, + aBasWETH: { + tokenIconSymbol: 'WETH', + symbol: 'aWETH', + aToken: true, + }, aEthUSDS: { tokenIconSymbol: 'usds', symbol: 'aUSDS', From a88d2ce1a3b71f1db11f82641624b4318cfbcdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 16:59:04 +0200 Subject: [PATCH 07/15] feat: update some Merit incentive messages --- src/hooks/useMeritIncentives.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index ef119a9f47..68977cf683 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -86,10 +86,10 @@ const getMeritData = (market: string, symbol: string): MeritReserveIncentiveData MERIT_DATA_MAP[market]?.[symbol]; const antiLoopMessage = - 'Borrowing of some assets may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'Borrowing of some assets or holding of some token may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const antiLoopBorrowMessage = - 'Supplying of some assets may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'Supplying of some assets or holding of some token may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const lbtcCbbtcCampaignMessage = 'You must supply LBTC and borrow cbBTC, while maintaining a health factor of 1.5 or below, in order to receive merit rewards. Please check the forum post for the full eligibility criteria.'; @@ -101,10 +101,10 @@ const weethUsdcCampaignMessage = 'You must supply weETH and borrow new USDC, while maintaining a health factor of 2 or below, in order to receive merit rewards. Eligibility criteria for this campaign are different from usual, please refer to the forum post for full details.'; const baseIncentivesCbbtcCampaignsMessage = - 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Some assets or possition on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Some assets holding or possition on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const baseIncentivesWstETHCampaignsMessage = - 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; @@ -304,12 +304,12 @@ const MERIT_DATA_MAP: Record }, [CustomMarket.proto_base_v3]: { cbBTC: [ - { - action: MeritAction.BASE_SUPPLY_CBBTC, - rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, - rewardTokenSymbol: 'aBasUSDC', - protocolAction: ProtocolAction.supply, - }, + // { + // action: MeritAction.BASE_SUPPLY_CBBTC, + // rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, + // rewardTokenSymbol: 'aBasUSDC', + // protocolAction: ProtocolAction.supply, + // }, { action: MeritAction.BASE_SUPPLY_CBBTC, rewardTokenAddress: AaveV3Base.ASSETS.cbBTC.A_TOKEN, From 9af3dd566a97aa6c99bd9340f1ec3c41335e06f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 22 Jul 2025 00:07:19 +0900 Subject: [PATCH 08/15] feat: improve incentive messages Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/hooks/useMeritIncentives.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 68977cf683..064fa9af31 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -101,10 +101,10 @@ const weethUsdcCampaignMessage = 'You must supply weETH and borrow new USDC, while maintaining a health factor of 2 or below, in order to receive merit rewards. Eligibility criteria for this campaign are different from usual, please refer to the forum post for full details.'; const baseIncentivesCbbtcCampaignsMessage = - 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Some assets holding or possition on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const baseIncentivesWstETHCampaignsMessage = - 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; From 24d3c73e256fb291d6c3e8c0ce7e2dbf2e0b8e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 22 Jul 2025 00:12:15 +0900 Subject: [PATCH 09/15] refactor: typo Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/hooks/useMeritIncentives.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 064fa9af31..e7bc4ffc61 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -101,7 +101,7 @@ const weethUsdcCampaignMessage = 'You must supply weETH and borrow new USDC, while maintaining a health factor of 2 or below, in order to receive merit rewards. Eligibility criteria for this campaign are different from usual, please refer to the forum post for full details.'; const baseIncentivesCbbtcCampaignsMessage = - 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const baseIncentivesWstETHCampaignsMessage = 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; From e9c6c115c2fb01b9e980b74c0c3b8be4156c5dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 17:38:16 +0200 Subject: [PATCH 10/15] feat: details Base supply ETH campaign --- src/hooks/useMeritIncentives.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 68977cf683..a703d68b7e 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -106,6 +106,8 @@ const baseIncentivesCbbtcCampaignsMessage = const baseIncentivesWstETHCampaignsMessage = 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; +const baseIncentivesETHCampaignsMessage = + 'Simple ETH supply is rewarded (1.25%), supply of ETH and USDC, EURC to receive Merit rewards (1.50%), supply ETH and borrow GHO for biggest rewards (1.75%). Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; @@ -439,7 +441,7 @@ const MERIT_DATA_MAP: Record rewardTokenAddress: AaveV3Base.ASSETS.WETH.A_TOKEN, rewardTokenSymbol: 'aBasWETH', protocolAction: ProtocolAction.supply, - customMessage: antiLoopMessage, + customMessage: baseIncentivesETHCampaignsMessage, }, ], }, From 1d3f2c6ed2503159a3ecf592ec42ea2b99eea9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Mon, 21 Jul 2025 19:00:27 +0200 Subject: [PATCH 11/15] feat: apply Martin review recommendations --- src/hooks/useMeritIncentives.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 94b6171c64..b446d44bd7 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -132,7 +132,7 @@ const StSLoopIncentiveProgramForumLink = 'https://governance.aave.com/t/arfc-sts-loop-incentive-program/22368'; const baseIncentivesForumLink = - 'https://governance.aave.com/t/arfc-base-incentive-campaign-funding/21983?u=nandy.eth'; + 'https://governance.aave.com/t/arfc-base-incentive-campaign-funding/21983'; const MERIT_DATA_MAP: Record> = { [CustomMarket.proto_mainnet_v3]: { @@ -306,14 +306,14 @@ const MERIT_DATA_MAP: Record }, [CustomMarket.proto_base_v3]: { cbBTC: [ - // { - // action: MeritAction.BASE_SUPPLY_CBBTC, - // rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, - // rewardTokenSymbol: 'aBasUSDC', - // protocolAction: ProtocolAction.supply, - // }, { action: MeritAction.BASE_SUPPLY_CBBTC, + rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, + rewardTokenSymbol: 'aBasUSDC', + protocolAction: ProtocolAction.supply, + }, + { + action: MeritAction.BASE_SUPPLY_CBBTC_BORROW_MULTIPLE, rewardTokenAddress: AaveV3Base.ASSETS.cbBTC.A_TOKEN, rewardTokenSymbol: 'aBasCBBTC', protocolAction: ProtocolAction.supply, From b0076e28ddf7ba7d18727631602b4c4f313ca0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 22 Jul 2025 22:19:24 +0200 Subject: [PATCH 12/15] feat: update incentive key for better incentive display on ACI dashboard --- src/hooks/useMeritIncentives.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index b446d44bd7..6f4dbf4b0b 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -37,11 +37,11 @@ export enum MeritAction { BASE_SUPPLY_LBTC_BORROW_CBBTC = 'base-supply-lbtc-borrow-cbbtc', BASE_SUPPLY_CBBTC_BORROW_MULTIPLE = 'base-supply-cbbtc-borrow-multiple', BASE_SUPPLY_WSTETH_BORROW_MULTIPLE = 'base-supply-wsteth-borrow-multiple', + BASE_SUPPLY_WETH_BORROW_MULTIPLE = 'base-supply-weth-borrow-multiple', BASE_BORROW_EURC = 'base-borrow-eurc', BASE_BORROW_USDC = 'base-borrow-usdc', BASE_BORROW_WSTETH = 'base-borrow-wsteth', BASE_BORROW_GHO = 'base-borrow-gho', - BASE_SUPPLY_WETH = 'base-supply-weth', AVALANCHE_SUPPLY_BTCB = 'avalanche-supply-btcb', AVALANCHE_SUPPLY_USDC = 'avalanche-supply-usdc', AVALANCHE_SUPPLY_USDT = 'avalanche-supply-usdt', @@ -437,7 +437,7 @@ const MERIT_DATA_MAP: Record ], WETH: [ { - action: MeritAction.BASE_SUPPLY_WETH, + action: MeritAction.BASE_SUPPLY_WETH_BORROW_MULTIPLE, rewardTokenAddress: AaveV3Base.ASSETS.WETH.A_TOKEN, rewardTokenSymbol: 'aBasWETH', protocolAction: ProtocolAction.supply, From 81638e51f07b3da989663218d4601bbfb01b2c47 Mon Sep 17 00:00:00 2001 From: MartinGbz Date: Wed, 23 Jul 2025 10:04:49 +0200 Subject: [PATCH 13/15] fix: weth text --- src/hooks/useMeritIncentives.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 6f4dbf4b0b..c5dab44bd0 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -107,7 +107,8 @@ const baseIncentivesWstETHCampaignsMessage = 'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; const baseIncentivesETHCampaignsMessage = - 'Simple ETH supply is rewarded (1.25%), supply of ETH and USDC, EURC to receive Merit rewards (1.50%), supply ETH and borrow GHO for biggest rewards (1.75%). Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + 'Supplying ETH alone earns 1.25%, supplying ETH and borrowing USDC or EURC earns 1.50%, supplying ETH and borrowing GHO earns 1.75%. Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.'; + const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; From bebe4c27bce954af7c70436b3729464a8fcfb895 Mon Sep 17 00:00:00 2001 From: MartinGbz Date: Wed, 23 Jul 2025 14:06:45 +0200 Subject: [PATCH 14/15] feat: add new eurc campaign mainnet --- src/components/incentives/IncentivesTooltipContent.tsx | 5 +++++ src/hooks/useMeritIncentives.ts | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx index 28400ae3a1..3cbec0de25 100644 --- a/src/components/incentives/IncentivesTooltipContent.tsx +++ b/src/components/incentives/IncentivesTooltipContent.tsx @@ -128,6 +128,11 @@ const IncentivesSymbolMap: { symbol: 'astS', aToken: true, }, + aEthEURC: { + tokenIconSymbol: 'EURC', + symbol: 'aEURC', + aToken: true, + }, }; interface IncentivesTooltipContentProps { diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index c5dab44bd0..2c9c4d5054 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -24,6 +24,7 @@ export enum MeritAction { SUPPLY_CBBTC_BORROW_USDC = 'ethereum-supply-cbbtc-borrow-usdc', SUPPLY_WBTC_BORROW_USDT = 'ethereum-supply-wbtc-borrow-usdt', SUPPLY_WEETH_BORROW_USDC = 'ethereum-supply-weeth-borrow-usdc', + ETHEREUM_BORROW_EURC = 'ethereum-borrow-eurc', ARBITRUM_SUPPLY_ETH = 'arbitrum-supply-weth', ARBITRUM_SUPPLY_WSTETH = 'arbitrum-supply-wsteth', ARBITRUM_SUPPLY_EZETH = 'arbitrum-supply-ezeth', @@ -230,6 +231,15 @@ const MERIT_DATA_MAP: Record customForumLink: weethUsdcForumLink, }, ], + EURC: [ + { + action: MeritAction.ETHEREUM_BORROW_EURC, + rewardTokenAddress: AaveV3Ethereum.ASSETS.EURC.A_TOKEN, + rewardTokenSymbol: 'aEthEURC', + protocolAction: ProtocolAction.borrow, + customMessage: antiLoopBorrowMessage, + }, + ], }, [CustomMarket.proto_lido_v3]: { ETH: [ From 167cc1f2ac08971ebde2153dc3e07bd7825c3c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Wed, 23 Jul 2025 15:32:59 +0200 Subject: [PATCH 15/15] feat: display incentive for ETH as well as they are for wETH --- src/hooks/useMeritIncentives.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 2c9c4d5054..8fba81d546 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -455,6 +455,15 @@ const MERIT_DATA_MAP: Record customMessage: baseIncentivesETHCampaignsMessage, }, ], + ETH: [ + { + action: MeritAction.BASE_SUPPLY_WETH_BORROW_MULTIPLE, + rewardTokenAddress: AaveV3Base.ASSETS.WETH.A_TOKEN, + rewardTokenSymbol: 'aBasWETH', + protocolAction: ProtocolAction.supply, + customMessage: baseIncentivesETHCampaignsMessage, + }, + ], }, [CustomMarket.proto_avalanche_v3]: { ['BTC.b']: [