From 69e350658e8c60d3eb537ed9de7f1d72099dc714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Fri, 4 Apr 2025 15:50:53 +0800 Subject: [PATCH 1/5] feat: define action names --- src/hooks/useMeritIncentives.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index e20c128323..d766fbd529 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -35,6 +35,14 @@ export enum MeritAction { AVALANCHE_SUPPLY_SAVAX = 'avalanche-supply-savax', AVALANCHE_SUPPLY_AUSD = 'avalanche-supply-ausd', SONIC_SUPPLY_USDCE = 'sonic-supply-usdce', + CELO_SUPPLY_CELO = 'celo-supply-celo', + CELO_SUPPLY_USDT = 'celo-supply-usdt', + CELO_SUPPLY_USDC = 'celo-supply-usdc', + CELO_SUPPLY_WETH = 'celo-supply-weth', + CELO_BORROW_CELO = 'celo-borrow-celo', + CELO_BORROW_USDT = 'celo-borrow-usdt', + CELO_BORROW_USDC = 'celo-borrow-usdc', + CELO_BORROW_WETH = 'celo-borrow-weth', } type MeritIncentives = { @@ -67,7 +75,6 @@ const antiLoopMessage = 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'; From ac2b3941a8172550b84302c544c68671b808bbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Fri, 4 Apr 2025 16:02:26 +0800 Subject: [PATCH 2/5] feat: add Merit Celo campaigns data --- src/hooks/useMeritIncentives.ts | 67 +++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index d766fbd529..fb166d1224 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -4,6 +4,7 @@ import { AaveV3Arbitrum, AaveV3Avalanche, AaveV3Base, + AaveV3Celo, AaveV3Ethereum, AaveV3EthereumLido, AaveV3Sonic, @@ -339,6 +340,72 @@ const MERIT_DATA_MAP: Record }, ], }, + [CustomMarket.proto_celo_v3]: { + CELO: [ + { + action: MeritAction.CELO_SUPPLY_CELO, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, + { + action: MeritAction.CELO_BORROW_CELO, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.borrow, + customMessage: antiLoopBorrowMessage, + }, + ], + USDT: [ + { + action: MeritAction.CELO_SUPPLY_USDT, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, + { + action: MeritAction.CELO_BORROW_USDT, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.borrow, + customMessage: antiLoopBorrowMessage, + }, + ], + USDC: [ + { + action: MeritAction.CELO_SUPPLY_USDC, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, + { + action: MeritAction.CELO_BORROW_USDC, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.borrow, + customMessage: antiLoopBorrowMessage, + }, + ], + WETH: [ + { + action: MeritAction.CELO_SUPPLY_WETH, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, + { + action: MeritAction.CELO_BORROW_WETH, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.borrow, + customMessage: antiLoopBorrowMessage, + }, + ], + }, }; export const useMeritIncentives = ({ From 40dc4275bf7853e16e849a1848cce64e72c02b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nandy=20B=C3=A2?= Date: Fri, 4 Apr 2025 16:35:21 +0800 Subject: [PATCH 3/5] feat: support aCelo logo, fix usdt0 incentives --- src/components/incentives/IncentivesTooltipContent.tsx | 5 +++++ src/hooks/useMeritIncentives.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx index f5f0c0cd70..4492d7162c 100644 --- a/src/components/incentives/IncentivesTooltipContent.tsx +++ b/src/components/incentives/IncentivesTooltipContent.tsx @@ -78,6 +78,11 @@ const IncentivesSymbolMap: { symbol: 'aweETH', aToken: true, }, + aCelCELO: { + tokenIconSymbol: 'CELO', + symbol: 'aCELO', + aToken: true, + }, }; interface IncentivesTooltipContentProps { diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index fb166d1224..d9bd8f7275 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -357,7 +357,7 @@ const MERIT_DATA_MAP: Record customMessage: antiLoopBorrowMessage, }, ], - USDT: [ + ['USD₮']: [ { action: MeritAction.CELO_SUPPLY_USDT, rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, From 32c337b8ee5e52fb3f3579ac39fb302b9e482284 Mon Sep 17 00:00:00 2001 From: MartinGbz Date: Fri, 4 Apr 2025 15:39:24 +0200 Subject: [PATCH 4/5] fix: remove weth campaign --- src/hooks/useMeritIncentives.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index d9bd8f7275..4d761f8d8f 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -39,11 +39,9 @@ export enum MeritAction { CELO_SUPPLY_CELO = 'celo-supply-celo', CELO_SUPPLY_USDT = 'celo-supply-usdt', CELO_SUPPLY_USDC = 'celo-supply-usdc', - CELO_SUPPLY_WETH = 'celo-supply-weth', CELO_BORROW_CELO = 'celo-borrow-celo', CELO_BORROW_USDT = 'celo-borrow-usdt', CELO_BORROW_USDC = 'celo-borrow-usdc', - CELO_BORROW_WETH = 'celo-borrow-weth', } type MeritIncentives = { @@ -389,22 +387,6 @@ const MERIT_DATA_MAP: Record customMessage: antiLoopBorrowMessage, }, ], - WETH: [ - { - action: MeritAction.CELO_SUPPLY_WETH, - rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, - rewardTokenSymbol: 'aCelCELO', - protocolAction: ProtocolAction.supply, - customMessage: antiLoopMessage, - }, - { - action: MeritAction.CELO_BORROW_WETH, - rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, - rewardTokenSymbol: 'aCelCELO', - protocolAction: ProtocolAction.borrow, - customMessage: antiLoopBorrowMessage, - }, - ], }, }; From db95e9858fdc9fde8aedce7436b7e17e956278b2 Mon Sep 17 00:00:00 2001 From: MartinGbz Date: Fri, 4 Apr 2025 15:54:35 +0200 Subject: [PATCH 5/5] Revert "fix: remove weth campaign" This reverts commit 32c337b8ee5e52fb3f3579ac39fb302b9e482284. --- src/hooks/useMeritIncentives.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index 4d761f8d8f..d9bd8f7275 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -39,9 +39,11 @@ export enum MeritAction { CELO_SUPPLY_CELO = 'celo-supply-celo', CELO_SUPPLY_USDT = 'celo-supply-usdt', CELO_SUPPLY_USDC = 'celo-supply-usdc', + CELO_SUPPLY_WETH = 'celo-supply-weth', CELO_BORROW_CELO = 'celo-borrow-celo', CELO_BORROW_USDT = 'celo-borrow-usdt', CELO_BORROW_USDC = 'celo-borrow-usdc', + CELO_BORROW_WETH = 'celo-borrow-weth', } type MeritIncentives = { @@ -387,6 +389,22 @@ const MERIT_DATA_MAP: Record customMessage: antiLoopBorrowMessage, }, ], + WETH: [ + { + action: MeritAction.CELO_SUPPLY_WETH, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.supply, + customMessage: antiLoopMessage, + }, + { + action: MeritAction.CELO_BORROW_WETH, + rewardTokenAddress: AaveV3Celo.ASSETS.CELO.A_TOKEN, + rewardTokenSymbol: 'aCelCELO', + protocolAction: ProtocolAction.borrow, + customMessage: antiLoopBorrowMessage, + }, + ], }, };