From b32c186dfb862570b88a87e3f4ddb33ddafcf8fe Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Wed, 12 Mar 2025 14:17:08 +0000 Subject: [PATCH 1/7] feat: celo market --- src/ui-config/marketsConfig.tsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index d34c4259a0..273a47dba6 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -9,6 +9,7 @@ import { AaveV3Avalanche, AaveV3Base, AaveV3BNB, + AaveV3Celo, AaveV3Ethereum, AaveV3EthereumEtherFi, AaveV3EthereumLido, @@ -96,6 +97,7 @@ export enum CustomMarket { proto_etherfi_v3 = 'proto_etherfi_v3', proto_linea_v3 = 'proto_linea_v3', proto_sonic_v3 = 'proto_sonic_v3', + proto_celo_v3 = 'proto_celo_v3', // v2 proto_mainnet = 'proto_mainnet', proto_avalanche = 'proto_avalanche', @@ -717,4 +719,18 @@ export const marketsData: { COLLECTOR: AaveV3Sonic.COLLECTOR, }, }, + [CustomMarket.proto_celo_v3]: { + marketTitle: 'Celo', + market: CustomMarket.proto_celo_v3, + chainId: ChainId.celo, + v3: true, + addresses: { + LENDING_POOL_ADDRESS_PROVIDER: AaveV3Celo.POOL_ADDRESSES_PROVIDER, + LENDING_POOL: AaveV3Celo.POOL, + WALLET_BALANCE_PROVIDER: AaveV3Celo.WALLET_BALANCE_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Celo.UI_POOL_DATA_PROVIDER, + UI_INCENTIVE_DATA_PROVIDER: AaveV3Celo.UI_INCENTIVE_DATA_PROVIDER, + COLLECTOR: AaveV3Celo.COLLECTOR, + }, + }, } as const; From 5735c73bc1d3127acd27e8b2c2bfc1b9300fa2f1 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Wed, 12 Mar 2025 16:33:30 +0000 Subject: [PATCH 2/7] feat: icons, permit config --- public/icons/networks/celo.svg | 8 +++++++- public/icons/tokens/celo.svg | 7 +++++++ public/icons/tokens/ceur.svg | 11 +++++++++++ public/icons/tokens/cusd.svg | 12 ++++++++++++ src/ui-config/permitConfig.ts | 6 ++++++ 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 public/icons/tokens/celo.svg create mode 100644 public/icons/tokens/ceur.svg create mode 100644 public/icons/tokens/cusd.svg diff --git a/public/icons/networks/celo.svg b/public/icons/networks/celo.svg index c1bc95f9dd..be08b56833 100644 --- a/public/icons/networks/celo.svg +++ b/public/icons/networks/celo.svg @@ -1 +1,7 @@ - + + + + + diff --git a/public/icons/tokens/celo.svg b/public/icons/tokens/celo.svg new file mode 100644 index 0000000000..be08b56833 --- /dev/null +++ b/public/icons/tokens/celo.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/public/icons/tokens/ceur.svg b/public/icons/tokens/ceur.svg new file mode 100644 index 0000000000..6edd0919da --- /dev/null +++ b/public/icons/tokens/ceur.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/icons/tokens/cusd.svg b/public/icons/tokens/cusd.svg new file mode 100644 index 0000000000..82326f752c --- /dev/null +++ b/public/icons/tokens/cusd.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/ui-config/permitConfig.ts b/src/ui-config/permitConfig.ts index d902f7bcdc..6287ca5f2f 100644 --- a/src/ui-config/permitConfig.ts +++ b/src/ui-config/permitConfig.ts @@ -61,4 +61,10 @@ export const permitByChainAndToken: { '0x039e2fb66102314ce7b64ce5ce3e5183bc94ad38': false, // wS '0x29219dd400f2bf60e5a23d13be72b486d4038894': false, // USDC.e }, + [ChainId.celo]: { + '0xceba9300f2b948710d2653dd7b07f33a8b32118c': true, // USDC + '0x48065fbbe25f71c9282ddf5e1cd6d6a887483d5e': true, // USDT + '0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73': true, // cEUR + '0x765de816845861e75a25fca122bb6898b8b1282a': true, // cUSD + }, }; From 13b2dfd7d8686bc42ee194c0b5e2121e40ae47fb Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Wed, 12 Mar 2025 16:47:15 +0000 Subject: [PATCH 3/7] feat: subgraph --- src/ui-config/marketsConfig.tsx | 1 + src/ui-config/networksConfig.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 273a47dba6..cdcaddd363 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -724,6 +724,7 @@ export const marketsData: { market: CustomMarket.proto_celo_v3, chainId: ChainId.celo, v3: true, + subgraphUrl: `https://gateway.thegraph.com/api/${apiKey}/subgraphs/id/72ysXwyqW9CvfqD8keWo2fEfdKZQRWGYdgC6cnvTSFKy`, addresses: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3Celo.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3Celo.POOL, diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts index 0ffb195fed..a587bf3b0e 100644 --- a/src/ui-config/networksConfig.ts +++ b/src/ui-config/networksConfig.ts @@ -453,7 +453,6 @@ export const prodNetworkConfig: Record = { name: 'Celo Bridge', url: 'https://docs.celo.org/protocol/bridge', }, - ratesHistoryApiUrl, wagmiChain: celo, }, }; From b8ec9ae8eb402a4987ad1f83ddb4915d4bb1d124 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Wed, 12 Mar 2025 16:55:53 +0000 Subject: [PATCH 4/7] fix: svgs --- public/icons/networks/celo.svg | 8 +------- public/icons/tokens/celo.svg | 8 +------- public/icons/tokens/ceur.svg | 12 +----------- public/icons/tokens/cusd.svg | 13 +------------ 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/public/icons/networks/celo.svg b/public/icons/networks/celo.svg index be08b56833..7399c6b24a 100644 --- a/public/icons/networks/celo.svg +++ b/public/icons/networks/celo.svg @@ -1,7 +1 @@ - - - - - + diff --git a/public/icons/tokens/celo.svg b/public/icons/tokens/celo.svg index be08b56833..7399c6b24a 100644 --- a/public/icons/tokens/celo.svg +++ b/public/icons/tokens/celo.svg @@ -1,7 +1 @@ - - - - - + diff --git a/public/icons/tokens/ceur.svg b/public/icons/tokens/ceur.svg index 6edd0919da..1f7ec2b8ac 100644 --- a/public/icons/tokens/ceur.svg +++ b/public/icons/tokens/ceur.svg @@ -1,11 +1 @@ - - - - - - - - - - - + diff --git a/public/icons/tokens/cusd.svg b/public/icons/tokens/cusd.svg index 82326f752c..59483ba86f 100644 --- a/public/icons/tokens/cusd.svg +++ b/public/icons/tokens/cusd.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + From c744d612f9877ec2e77795c3ed8e977a0b5176c7 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Thu, 13 Mar 2025 10:55:16 +0000 Subject: [PATCH 5/7] fix: subgraph url --- src/ui-config/marketsConfig.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index cdcaddd363..58e07c4d61 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -724,7 +724,7 @@ export const marketsData: { market: CustomMarket.proto_celo_v3, chainId: ChainId.celo, v3: true, - subgraphUrl: `https://gateway.thegraph.com/api/${apiKey}/subgraphs/id/72ysXwyqW9CvfqD8keWo2fEfdKZQRWGYdgC6cnvTSFKy`, + subgraphUrl: `https://gateway.thegraph.com/api/${apiKey}/subgraphs/id/GAVWZzGwQ6d6QbFojyFWxpZ2GB9Rf5hZgGyJHCEry8kn`, addresses: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3Celo.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3Celo.POOL, From 9eb66bbe6476e3299a076535ad0c8c71680210de Mon Sep 17 00:00:00 2001 From: Mark Hinschberger Date: Mon, 17 Mar 2025 10:28:33 +0000 Subject: [PATCH 6/7] fix: token icon for ustd --- src/ui-config/reservePatches.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui-config/reservePatches.ts b/src/ui-config/reservePatches.ts index 03b071db27..4de84c61db 100644 --- a/src/ui-config/reservePatches.ts +++ b/src/ui-config/reservePatches.ts @@ -43,6 +43,8 @@ export const SYMBOL_MAP: { [key: string]: string } = { 'm.USDC': 'USDC', 'm.USDT': 'USDT', 'm.DAI': 'DAI', + // celo + 'USDâ‚®': 'USDT', }; /** From fcb1efd456fe8af8b1ad7e5794d9d75808d5c4c9 Mon Sep 17 00:00:00 2001 From: Mark Hinschberger Date: Mon, 17 Mar 2025 14:46:15 +0000 Subject: [PATCH 7/7] chore: disable permits temp celo --- src/ui-config/permitConfig.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui-config/permitConfig.ts b/src/ui-config/permitConfig.ts index 6287ca5f2f..a293cd9a85 100644 --- a/src/ui-config/permitConfig.ts +++ b/src/ui-config/permitConfig.ts @@ -62,9 +62,9 @@ export const permitByChainAndToken: { '0x29219dd400f2bf60e5a23d13be72b486d4038894': false, // USDC.e }, [ChainId.celo]: { - '0xceba9300f2b948710d2653dd7b07f33a8b32118c': true, // USDC + // '0xceba9300f2b948710d2653dd7b07f33a8b32118c': true, // USDC '0x48065fbbe25f71c9282ddf5e1cd6d6a887483d5e': true, // USDT - '0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73': true, // cEUR - '0x765de816845861e75a25fca122bb6898b8b1282a': true, // cUSD + // '0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73': true, // cEUR + // '0x765de816845861e75a25fca122bb6898b8b1282a': true, // cUSD }, };