From a7e914386e26ee86290c95b3de12cbbbadd7aba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 25 Mar 2025 16:16:06 +0100 Subject: [PATCH 1/4] feat: add Merit Base borrow wstETH campaign --- src/hooks/useMeritIncentives.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 6a411b08e3..e73828e5af 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -27,6 +27,7 @@ export enum MeritAction { BASE_SUPPLY_WSTETH = 'base-supply-wsteth', BASE_SUPPLY_EZETH = 'base-supply-ezeth', BASE_BORROW_USDC = 'base-borrow-usdc', + BASE_BORROW_WSTETH = 'base-borrow-wsteth', AVALANCHE_SUPPLY_BTCB = 'avalanche-supply-btcb', AVALANCHE_SUPPLY_USDC = 'avalanche-supply-usdc', AVALANCHE_SUPPLY_USDT = 'avalanche-supply-usdt', @@ -61,9 +62,16 @@ const getMeritData = (market: string, symbol: string): MeritReserveIncentiveData 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.'; + +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.'; + const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; +const joinedEthCorrelatedIncentivePhase2ForumLink = + 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/70'; + const MERIT_DATA_MAP: Record> = { [CustomMarket.proto_mainnet_v3]: { GHO: [ @@ -237,6 +245,14 @@ const MERIT_DATA_MAP: Record customMessage: antiLoopMessage, customForumLink: joinedEthCorrelatedIncentiveForumLink, }, + { + action: MeritAction.BASE_BORROW_WSTETH, + rewardTokenAddress: AaveV3Base.ASSETS.wstETH.UNDERLYING, + rewardTokenSymbol: 'aBaswstETH', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopBorrowMessage, + customForumLink: joinedEthCorrelatedIncentivePhase2ForumLink, + }, ], ezETH: [ { From 2bb58be20ff35b668f907fb4328090a42a2fa560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 25 Mar 2025 16:25:48 +0100 Subject: [PATCH 2/4] fix: reward addresses --- src/hooks/useMeritIncentives.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index e73828e5af..57dc0ae7a2 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -217,7 +217,7 @@ const MERIT_DATA_MAP: Record cbBTC: [ { action: MeritAction.BASE_SUPPLY_CBBTC, - rewardTokenAddress: AaveV3Base.ASSETS.USDC.UNDERLYING, + rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, rewardTokenSymbol: 'aBasUSDC', protocolAction: ProtocolAction.supply, }, @@ -225,13 +225,13 @@ const MERIT_DATA_MAP: Record USDC: [ { action: MeritAction.BASE_SUPPLY_USDC, - rewardTokenAddress: AaveV3Base.ASSETS.USDC.UNDERLYING, + rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, rewardTokenSymbol: 'aBasUSDC', protocolAction: ProtocolAction.supply, }, { action: MeritAction.BASE_BORROW_USDC, - rewardTokenAddress: AaveV3Base.ASSETS.USDC.UNDERLYING, + rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN, rewardTokenSymbol: 'aBasUSDC', protocolAction: ProtocolAction.borrow, }, @@ -239,7 +239,7 @@ const MERIT_DATA_MAP: Record wstETH: [ { action: MeritAction.BASE_SUPPLY_WSTETH, - rewardTokenAddress: AaveV3Base.ASSETS.wstETH.UNDERLYING, + rewardTokenAddress: AaveV3Base.ASSETS.wstETH.A_TOKEN, rewardTokenSymbol: 'aBaswstETH', protocolAction: ProtocolAction.supply, customMessage: antiLoopMessage, @@ -247,7 +247,7 @@ const MERIT_DATA_MAP: Record }, { action: MeritAction.BASE_BORROW_WSTETH, - rewardTokenAddress: AaveV3Base.ASSETS.wstETH.UNDERLYING, + rewardTokenAddress: AaveV3Base.ASSETS.wstETH.A_TOKEN, rewardTokenSymbol: 'aBaswstETH', protocolAction: ProtocolAction.supply, customMessage: antiLoopBorrowMessage, From 765ab024191da82c4ed893abb430b0233435598d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 25 Mar 2025 16:26:59 +0100 Subject: [PATCH 3/4] fix: new incentive protocol action --- 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 57dc0ae7a2..efc6eeb617 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -249,7 +249,7 @@ const MERIT_DATA_MAP: Record action: MeritAction.BASE_BORROW_WSTETH, rewardTokenAddress: AaveV3Base.ASSETS.wstETH.A_TOKEN, rewardTokenSymbol: 'aBaswstETH', - protocolAction: ProtocolAction.supply, + protocolAction: ProtocolAction.borrow, customMessage: antiLoopBorrowMessage, customForumLink: joinedEthCorrelatedIncentivePhase2ForumLink, }, From 1fd3ea0ecad49fd5b99519394a2a95abc8dc97df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Tue, 25 Mar 2025 17:40:25 +0100 Subject: [PATCH 4/4] Add merit weeth campaign [skip cypress] (#2400) --- .../incentives/IncentivesTooltipContent.tsx | 5 +++++ src/hooks/useMeritIncentives.ts | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx index f35bafa9a5..f5f0c0cd70 100644 --- a/src/components/incentives/IncentivesTooltipContent.tsx +++ b/src/components/incentives/IncentivesTooltipContent.tsx @@ -73,6 +73,11 @@ const IncentivesSymbolMap: { symbol: 'awS', aToken: true, }, + aBasweETH: { + tokenIconSymbol: 'weETH', + symbol: 'aweETH', + aToken: true, + }, }; interface IncentivesTooltipContentProps { diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 6a411b08e3..804a52c94b 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -25,6 +25,7 @@ export enum MeritAction { BASE_SUPPLY_CBBTC = 'base-supply-cbbtc', BASE_SUPPLY_USDC = 'base-supply-usdc', BASE_SUPPLY_WSTETH = 'base-supply-wsteth', + BASE_SUPPLY_WEETH = 'base-supply-weeth', BASE_SUPPLY_EZETH = 'base-supply-ezeth', BASE_BORROW_USDC = 'base-borrow-usdc', AVALANCHE_SUPPLY_BTCB = 'avalanche-supply-btcb', @@ -61,9 +62,13 @@ const getMeritData = (market: string, symbol: string): MeritReserveIncentiveData 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.'; + const joinedEthCorrelatedIncentiveForumLink = 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56'; +const joinedEthCorrelatedIncentivePhase2ForumLink = + 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/70'; + const MERIT_DATA_MAP: Record> = { [CustomMarket.proto_mainnet_v3]: { GHO: [ @@ -248,6 +253,16 @@ const MERIT_DATA_MAP: Record customForumLink: joinedEthCorrelatedIncentiveForumLink, }, ], + weETH: [ + { + action: MeritAction.BASE_SUPPLY_WEETH, + rewardTokenAddress: AaveV3Base.ASSETS.weETH.A_TOKEN, + rewardTokenSymbol: 'aBasweETH', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + customForumLink: joinedEthCorrelatedIncentivePhase2ForumLink, + }, + ], }, [CustomMarket.proto_avalanche_v3]: { ['BTC.b']: [