From 456bfc625cba1c8caa98b1ad9ef500376990b747 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Wed, 17 Dec 2025 16:27:29 -0600 Subject: [PATCH 01/10] feat: v3.6 --- package.json | 4 ++-- src/services/UIPoolService.ts | 35 ++++++------------------------ src/ui-config/marketsConfig.tsx | 38 ++++++++++++++++----------------- yarn.lock | 16 +++++++------- 4 files changed, 35 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 172ec30bef..1dc82df290 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "test:coverage": "jest --coverage" }, "dependencies": { - "@aave/contract-helpers": "1.36.1", + "@aave/contract-helpers": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", "@aave/graphql": "^0.8.0", - "@aave/math-utils": "1.36.1", + "@aave/math-utils": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", "@aave/react": "^0.7.1", "@amplitude/analytics-browser": "^2.13.0", "@bgd-labs/aave-address-book": "^4.36.3", diff --git a/src/services/UIPoolService.ts b/src/services/UIPoolService.ts index ff388f0581..3441b3b929 100644 --- a/src/services/UIPoolService.ts +++ b/src/services/UIPoolService.ts @@ -1,13 +1,11 @@ import { EmodeDataHumanized, - LegacyUiPoolDataProvider, ReservesDataHumanized, UiPoolDataProvider, UserReserveDataHumanized, } from '@aave/contract-helpers'; import { Provider } from '@ethersproject/providers'; -import { CustomMarket, MarketDataType } from 'src/ui-config/marketsConfig'; -import { ENABLE_TESTNET } from 'src/utils/marketsAndNetworksConfig'; +import { MarketDataType } from 'src/ui-config/marketsConfig'; export type UserReservesDataHumanized = { userReserves: UserReserveDataHumanized[]; @@ -19,32 +17,11 @@ export class UiPoolService { private async getUiPoolDataService(marketData: MarketDataType) { const provider = this.getProvider(marketData.chainId); - if (this.useLegacyUiPoolDataProvider(marketData)) { - return new LegacyUiPoolDataProvider({ - uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER, - provider, - chainId: marketData.chainId, - }); - } else { - return new UiPoolDataProvider({ - uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER as string, - provider, - chainId: marketData.chainId, - }); - } - } - - private useLegacyUiPoolDataProvider(marketData: MarketDataType) { - if (marketData.market === CustomMarket.proto_base_sepolia_v3) { - return false; - } - - if (ENABLE_TESTNET || !marketData.v3) { - // it's a v2 market, or it does not have v3.1 upgrade - return true; - } - - return false; + return new UiPoolDataProvider({ + uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER as string, + provider, + chainId: marketData.chainId, + }); } async getReservesHumanized(marketData: MarketDataType): Promise { diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 16d1591e8f..d48363bcf4 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -134,7 +134,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Ethereum.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Ethereum.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Ethereum.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Ethereum.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', //AaveV3Ethereum.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Ethereum.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Ethereum.COLLECTOR, GHO_TOKEN_ADDRESS: AaveV3Ethereum.ASSETS.GHO.UNDERLYING, @@ -165,7 +165,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumLido.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3EthereumLido.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3EthereumLido.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3EthereumLido.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', // AaveV3EthereumLido.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3EthereumLido.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Ethereum.COLLECTOR, WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumLido.WITHDRAW_SWAP_ADAPTER, @@ -266,7 +266,7 @@ export const marketsData: { LENDING_POOL: AaveV3Base.POOL, WETH_GATEWAY: AaveV3Base.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Base.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Base.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xb84A20e848baE3e13897934bB4e74E2225f4546B', // AaveV3Base.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Base.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Base.L2_ENCODER, COLLECTOR: AaveV3Base.COLLECTOR, @@ -297,7 +297,7 @@ export const marketsData: { LENDING_POOL: AaveV3Arbitrum.POOL, WETH_GATEWAY: AaveV3Arbitrum.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Arbitrum.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Arbitrum.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x13c833256BD767da2320d727a3691BAff3770E39', // AaveV3Arbitrum.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Arbitrum.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Arbitrum.L2_ENCODER, COLLECTOR: AaveV3Arbitrum.COLLECTOR, @@ -345,7 +345,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Avalanche.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Avalanche.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Avalanche.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Avalanche.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x3518E8927A7827CDdAf841872453003CA95906A3', // AaveV3Avalanche.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Avalanche.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Avalanche.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3Avalanche.DEBT_SWAP_ADAPTER, @@ -364,7 +364,7 @@ export const marketsData: { LENDING_POOL: AaveV3Linea.POOL, WETH_GATEWAY: AaveV3Linea.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Linea.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Linea.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x898813Dd328BD3D7353c77aD0B1C0E10F3773E29', // AaveV3Linea.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Linea.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Linea.COLLECTOR, }, @@ -386,7 +386,7 @@ export const marketsData: { LENDING_POOL: AaveV3Sonic.POOL, WETH_GATEWAY: AaveV3Sonic.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Sonic.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Sonic.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x4F3F69979ED28c962028582B1760E98B1a117097', // AaveV3Sonic.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Sonic.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Sonic.COLLECTOR, SWAP_COLLATERAL_ADAPTER: AaveV3Sonic.SWAP_COLLATERAL_ADAPTER, @@ -413,7 +413,7 @@ export const marketsData: { LENDING_POOL: AaveV3Optimism.POOL, WETH_GATEWAY: AaveV3Optimism.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Optimism.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Optimism.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xa6741111f4CcB5162Ec6A825465354Ed8c6F7095', // AaveV3Optimism.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Optimism.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Optimism.L2_ENCODER, COLLECTOR: AaveV3Optimism.COLLECTOR, @@ -436,7 +436,7 @@ export const marketsData: { // REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumLido.REPAY_WITH_COLLATERAL_ADAPTER, // SWAP_COLLATERAL_ADAPTER: AaveV3EthereumLido.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: '0xd8F7829ceB2692C90e418e0963b5Cbcbafc260Bd', - UI_POOL_DATA_PROVIDER: '0x2581d1f2Ce3860b651bF84AF416e7d28d9500D7F', + UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', UI_INCENTIVE_DATA_PROVIDER: '0xC5E1717BEafC680E0148DD561591410b69650a5F', COLLECTOR: '0x8b8d44751a933f190dde25A69E8cC6F9101b5435', // WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumLido.WITHDRAW_SWAP_ADAPTER, @@ -454,7 +454,7 @@ export const marketsData: { LENDING_POOL: AaveV3Plasma.POOL, WETH_GATEWAY: AaveV3Plasma.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Plasma.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763', //AaveV3Plasma.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xdA549478Fd5C2BdB9e5eB000D0ff2554771598C7', // AaveV3Plasma.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Plasma.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Plasma.COLLECTOR, }, @@ -479,7 +479,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Polygon.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Polygon.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Polygon.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Polygon.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xFa1A7c4a8A63C9CAb150529c26f182cBB5500944', // AaveV3Polygon.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Polygon.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Polygon.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3Polygon.DEBT_SWAP_ADAPTER, @@ -498,7 +498,7 @@ export const marketsData: { LENDING_POOL: AaveV3InkWhitelabel.POOL, WETH_GATEWAY: AaveV3InkWhitelabel.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3InkWhitelabel.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763', // custom as doesnt work utils + UI_POOL_DATA_PROVIDER: '0xF1485fb7DBFa5db0B368FeA808FD6ff945c36064', UI_INCENTIVE_DATA_PROVIDER: AaveV3InkWhitelabel.UI_INCENTIVE_DATA_PROVIDER, // COLLECTOR: AaveV3InkWhitelabel.COLLECTOR, }, @@ -542,7 +542,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Gnosis.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Gnosis.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Gnosis.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Gnosis.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xD14F4d3495d5096a31F33605F2D0803bbe2EAdc0', // AaveV3Gnosis.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Gnosis.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Gnosis.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3Gnosis.DEBT_SWAP_ADAPTER, @@ -569,7 +569,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3BNB.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3BNB.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3BNB.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3BNB.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x632b5Dfc315b228bfE779E6442322Ad8a110Ea13', // AaveV3BNB.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3BNB.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3BNB.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3BNB.DEBT_SWAP_ADAPTER, @@ -586,7 +586,7 @@ export const marketsData: { LENDING_POOL: AaveV3Scroll.POOL, WETH_GATEWAY: AaveV3Scroll.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Scroll.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Scroll.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x6926c8195a8840099Daa643C2d9aDE18C0D233d9', // AaveV3Scroll.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Scroll.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Scroll.COLLECTOR, }, @@ -631,7 +631,7 @@ export const marketsData: { 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_POOL_DATA_PROVIDER: '0xe48424542b30b0b8D1Dc09099aceE407f40b4491', // AaveV3Celo.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Celo.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Celo.COLLECTOR, }, @@ -646,7 +646,7 @@ export const marketsData: { LENDING_POOL: AaveV3Soneium.POOL, WETH_GATEWAY: AaveV3Soneium.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Soneium.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Soneium.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xc69299Ddd3a704F6954c8Ae1AD00e0892d77Aee4', // AaveV3Soneium.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Soneium.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Soneium.COLLECTOR, }, @@ -674,7 +674,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumEtherFi.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3EthereumEtherFi.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3EthereumEtherFi.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3EthereumEtherFi.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', // AaveV3EthereumEtherFi.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3EthereumEtherFi.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3EthereumEtherFi.COLLECTOR, WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumEtherFi.WITHDRAW_SWAP_ADAPTER, @@ -695,7 +695,7 @@ export const marketsData: { LENDING_POOL: AaveV3Metis.POOL, WETH_GATEWAY: '0x0', // not applicable for Metis WALLET_BALANCE_PROVIDER: AaveV3Metis.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3Metis.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xE970Db949A75702bB5A280125742078cF39CE568', // AaveV3Metis.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Metis.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Metis.COLLECTOR, }, diff --git a/yarn.lock b/yarn.lock index 3b37d39fa3..7685f07222 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,10 +26,10 @@ "@urql/core" "^5.2.0" graphql "^16.11.0" -"@aave/contract-helpers@1.36.1": - version "1.36.1" - resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.36.1.tgz#729735e6be4f8a1872e1e3400591485fc2198b76" - integrity sha512-Ppoz11WRA3bjkZqnRA0a/txjfb67fVWh+ucgtN/RR45WI9oDsEmtYsqAwiNR3egvigSeyJASFeei0ijGGoFifw== +"@aave/contract-helpers@1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44": + version "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3" + resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3.tgz#d16c386b6f7735d920e238d83587f9f4e6dd4d94" + integrity sha512-HHuVBd1/DqKfzMxcMB/GaIN/gvC6eyjfMofZTU84KblsohgUUks+vdgCUNwh71Ypt19JJtLHtrNfWP4Q4F5tnA== dependencies: isomorphic-unfetch "^3.1.0" @@ -52,10 +52,10 @@ graphql "^16.11.0" type-fest "^4.41.0" -"@aave/math-utils@1.36.1": - version "1.36.1" - resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.1.tgz#3e501962de3700250c213c981ea47b36a8e37a54" - integrity sha512-rR1sbDX1IFb1B1TLdi8hZANvtviPeU8hfpLuHC9cwlXluujCdHttnNVODwco1J5d2k6KxnNnc0DZJj2yV7nLTQ== +"@aave/math-utils@1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44": + version "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3" + resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3.tgz#45c38aad2068ed9dc33125b6e84fb10c557c9234" + integrity sha512-7od7jo2oYBMBCL25MReAEDqNgcUN2X12wYR8w9M09upCxBMOghMuTL/zWdFjotngIUf6iRluMI335Yd/OQti8w== "@aave/react@^0.7.1": version "0.7.1" From 06a4728976f6270f1fc134610d15069f571a4e0b Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Wed, 17 Dec 2025 16:52:48 -0600 Subject: [PATCH 02/10] feat: zksync --- 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 d48363bcf4..adf7764ad2 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -601,7 +601,7 @@ export const marketsData: { LENDING_POOL: AaveV3ZkSync.POOL, WETH_GATEWAY: AaveV3ZkSync.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3ZkSync.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: AaveV3ZkSync.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: '0x419FFd4736671bbe1d9122d797345774Bd5db3b0', // AaveV3ZkSync.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3ZkSync.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3ZkSync.COLLECTOR, }, From 0a35e16d24413bd8fabbe5f7653b7e74b2eb11ae Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Thu, 18 Dec 2025 10:18:11 -0600 Subject: [PATCH 03/10] chore: address book --- package.json | 2 +- src/ui-config/marketsConfig.tsx | 40 ++++++++++++++++----------------- yarn.lock | 8 +++---- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 1dc82df290..4f489c46d9 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@aave/math-utils": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", "@aave/react": "^0.7.1", "@amplitude/analytics-browser": "^2.13.0", - "@bgd-labs/aave-address-book": "^4.36.3", + "@bgd-labs/aave-address-book": "^4.38.0", "@cowprotocol/cow-sdk": "7.2.4", "@cowprotocol/sdk-ethers-v5-adapter": "0.3.0", "@cowprotocol/sdk-flash-loans": "1.6.0", diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index adf7764ad2..8f47336678 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -134,7 +134,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Ethereum.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Ethereum.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Ethereum.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', //AaveV3Ethereum.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Ethereum.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Ethereum.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Ethereum.COLLECTOR, GHO_TOKEN_ADDRESS: AaveV3Ethereum.ASSETS.GHO.UNDERLYING, @@ -165,7 +165,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumLido.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3EthereumLido.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3EthereumLido.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', // AaveV3EthereumLido.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3EthereumLido.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3EthereumLido.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Ethereum.COLLECTOR, WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumLido.WITHDRAW_SWAP_ADAPTER, @@ -266,7 +266,7 @@ export const marketsData: { LENDING_POOL: AaveV3Base.POOL, WETH_GATEWAY: AaveV3Base.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Base.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xb84A20e848baE3e13897934bB4e74E2225f4546B', // AaveV3Base.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Base.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Base.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Base.L2_ENCODER, COLLECTOR: AaveV3Base.COLLECTOR, @@ -274,7 +274,7 @@ export const marketsData: { SWAP_COLLATERAL_ADAPTER: AaveV3Base.SWAP_COLLATERAL_ADAPTER, WITHDRAW_SWITCH_ADAPTER: AaveV3Base.WITHDRAW_SWAP_ADAPTER, DEBT_SWITCH_ADAPTER: AaveV3Base.DEBT_SWAP_ADAPTER, - GHO_TOKEN_ADDRESS: '0x6bb7a212910682dcfdbd5bcbb3e28fb4e8da10ee', + GHO_TOKEN_ADDRESS: AaveV3Base.ASSETS.GHO.UNDERLYING, }, }, @@ -297,7 +297,7 @@ export const marketsData: { LENDING_POOL: AaveV3Arbitrum.POOL, WETH_GATEWAY: AaveV3Arbitrum.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Arbitrum.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x13c833256BD767da2320d727a3691BAff3770E39', // AaveV3Arbitrum.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Arbitrum.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Arbitrum.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Arbitrum.L2_ENCODER, COLLECTOR: AaveV3Arbitrum.COLLECTOR, @@ -345,7 +345,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Avalanche.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Avalanche.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Avalanche.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x3518E8927A7827CDdAf841872453003CA95906A3', // AaveV3Avalanche.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Avalanche.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Avalanche.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Avalanche.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3Avalanche.DEBT_SWAP_ADAPTER, @@ -364,7 +364,7 @@ export const marketsData: { LENDING_POOL: AaveV3Linea.POOL, WETH_GATEWAY: AaveV3Linea.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Linea.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x898813Dd328BD3D7353c77aD0B1C0E10F3773E29', // AaveV3Linea.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Linea.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Linea.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Linea.COLLECTOR, }, @@ -386,7 +386,7 @@ export const marketsData: { LENDING_POOL: AaveV3Sonic.POOL, WETH_GATEWAY: AaveV3Sonic.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Sonic.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x4F3F69979ED28c962028582B1760E98B1a117097', // AaveV3Sonic.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Sonic.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Sonic.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Sonic.COLLECTOR, SWAP_COLLATERAL_ADAPTER: AaveV3Sonic.SWAP_COLLATERAL_ADAPTER, @@ -413,7 +413,7 @@ export const marketsData: { LENDING_POOL: AaveV3Optimism.POOL, WETH_GATEWAY: AaveV3Optimism.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Optimism.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xa6741111f4CcB5162Ec6A825465354Ed8c6F7095', // AaveV3Optimism.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Optimism.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Optimism.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Optimism.L2_ENCODER, COLLECTOR: AaveV3Optimism.COLLECTOR, @@ -454,7 +454,7 @@ export const marketsData: { LENDING_POOL: AaveV3Plasma.POOL, WETH_GATEWAY: AaveV3Plasma.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Plasma.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xdA549478Fd5C2BdB9e5eB000D0ff2554771598C7', // AaveV3Plasma.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Plasma.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Plasma.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Plasma.COLLECTOR, }, @@ -479,7 +479,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Polygon.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Polygon.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Polygon.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xFa1A7c4a8A63C9CAb150529c26f182cBB5500944', // AaveV3Polygon.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Polygon.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Polygon.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Polygon.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3Polygon.DEBT_SWAP_ADAPTER, @@ -498,7 +498,7 @@ export const marketsData: { LENDING_POOL: AaveV3InkWhitelabel.POOL, WETH_GATEWAY: AaveV3InkWhitelabel.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3InkWhitelabel.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xF1485fb7DBFa5db0B368FeA808FD6ff945c36064', + UI_POOL_DATA_PROVIDER: AaveV3InkWhitelabel.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3InkWhitelabel.UI_INCENTIVE_DATA_PROVIDER, // COLLECTOR: AaveV3InkWhitelabel.COLLECTOR, }, @@ -542,7 +542,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Gnosis.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Gnosis.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3Gnosis.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xD14F4d3495d5096a31F33605F2D0803bbe2EAdc0', // AaveV3Gnosis.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Gnosis.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Gnosis.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Gnosis.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3Gnosis.DEBT_SWAP_ADAPTER, @@ -569,7 +569,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3BNB.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3BNB.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3BNB.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x632b5Dfc315b228bfE779E6442322Ad8a110Ea13', // AaveV3BNB.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3BNB.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3BNB.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3BNB.COLLECTOR, DEBT_SWITCH_ADAPTER: AaveV3BNB.DEBT_SWAP_ADAPTER, @@ -586,7 +586,7 @@ export const marketsData: { LENDING_POOL: AaveV3Scroll.POOL, WETH_GATEWAY: AaveV3Scroll.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Scroll.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x6926c8195a8840099Daa643C2d9aDE18C0D233d9', // AaveV3Scroll.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Scroll.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Scroll.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Scroll.COLLECTOR, }, @@ -601,7 +601,7 @@ export const marketsData: { LENDING_POOL: AaveV3ZkSync.POOL, WETH_GATEWAY: AaveV3ZkSync.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3ZkSync.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x419FFd4736671bbe1d9122d797345774Bd5db3b0', // AaveV3ZkSync.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3ZkSync.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3ZkSync.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3ZkSync.COLLECTOR, }, @@ -631,7 +631,7 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3Celo.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3Celo.POOL, WALLET_BALANCE_PROVIDER: AaveV3Celo.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xe48424542b30b0b8D1Dc09099aceE407f40b4491', // AaveV3Celo.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Celo.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Celo.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Celo.COLLECTOR, }, @@ -646,7 +646,7 @@ export const marketsData: { LENDING_POOL: AaveV3Soneium.POOL, WETH_GATEWAY: AaveV3Soneium.WETH_GATEWAY, WALLET_BALANCE_PROVIDER: AaveV3Soneium.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xc69299Ddd3a704F6954c8Ae1AD00e0892d77Aee4', // AaveV3Soneium.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Soneium.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Soneium.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Soneium.COLLECTOR, }, @@ -674,7 +674,7 @@ export const marketsData: { REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumEtherFi.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3EthereumEtherFi.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: AaveV3EthereumEtherFi.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', // AaveV3EthereumEtherFi.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3EthereumEtherFi.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3EthereumEtherFi.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3EthereumEtherFi.COLLECTOR, WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumEtherFi.WITHDRAW_SWAP_ADAPTER, @@ -695,7 +695,7 @@ export const marketsData: { LENDING_POOL: AaveV3Metis.POOL, WETH_GATEWAY: '0x0', // not applicable for Metis WALLET_BALANCE_PROVIDER: AaveV3Metis.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0xE970Db949A75702bB5A280125742078cF39CE568', // AaveV3Metis.UI_POOL_DATA_PROVIDER, + UI_POOL_DATA_PROVIDER: AaveV3Metis.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: AaveV3Metis.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Metis.COLLECTOR, }, diff --git a/yarn.lock b/yarn.lock index 7685f07222..0c2c52632a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1209,10 +1209,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@bgd-labs/aave-address-book@^4.36.3": - version "4.36.3" - resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.36.3.tgz#5a565e9507a71546f723093422a9d0abfee6b132" - integrity sha512-s8LjAry382FeRyY7ajxpbWVNA6ejGEiUW8HI/Ya/Jwt33JTKtKUBHcloapB1T0Cez/X6eawuxdJhYzZJSmrfOw== +"@bgd-labs/aave-address-book@^4.38.0": + version "4.38.0" + resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.38.0.tgz#75b03aff9fc691e4d1cc37896093f2f563618003" + integrity sha512-qic555Lqm/qC4BeZsiOmafxnm8E4R04kGhfWPsKjilRFnORHaBPs2+FhIv2wJmO8/xJaKT92pWrUJfc/Brbr0A== "@coinbase/wallet-sdk@4.3.0": version "4.3.0" From d8908483a627c0ade67334f94bfdeda62d43bfce Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Thu, 18 Dec 2025 10:36:10 -0600 Subject: [PATCH 04/10] fix: celo tokens --- src/hooks/useMeritIncentives.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts index c975102c04..0b26c0a53d 100644 --- a/src/hooks/useMeritIncentives.ts +++ b/src/hooks/useMeritIncentives.ts @@ -632,21 +632,21 @@ export const MERIT_DATA_MAP: Record Date: Thu, 18 Dec 2025 12:02:30 -0600 Subject: [PATCH 05/10] fix: testnet --- src/ui-config/marketsConfig.tsx | 12 ++++++------ src/ui-config/networksConfig.ts | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 8f47336678..fc03360ec7 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -315,12 +315,12 @@ export const marketsData: { permitDisabled: true, chainId: ChainId.base_sepolia, addresses: { - LENDING_POOL_ADDRESS_PROVIDER: '0xE4C23309117Aa30342BFaae6c95c6478e0A4Ad00', // AaveV3BaseSepolia.POOL_ADDRESSES_PROVIDER, - LENDING_POOL: '0x8bAB6d1b75f19e9eD9fCe8b9BD338844fF79aE27', // AaveV3BaseSepolia.POOL, - WETH_GATEWAY: '0x0568130e794429D2eEBC4dafE18f25Ff1a1ed8b6', // AaveV3BaseSepolia.WETH_GATEWAY, - WALLET_BALANCE_PROVIDER: '0x2c4D1F4EC7F4FfA09a5E1C9e74fD3A10f21Bd811', // AaveV3BaseSepolia.WALLET_BALANCE_PROVIDER, - UI_POOL_DATA_PROVIDER: '0x6a9D64f93DB660EaCB2b6E9424792c630CdA87d8', // AaveV3BaseSepolia.UI_POOL_DATA_PROVIDER, - UI_INCENTIVE_DATA_PROVIDER: '0xDB1412acf288D5bE057f8e90fd7b1BF4f84bB3B1', // AaveV3BaseSepolia.UI_INCENTIVE_DATA_PROVIDER, + LENDING_POOL_ADDRESS_PROVIDER: AaveV3BaseSepolia.POOL_ADDRESSES_PROVIDER, + LENDING_POOL: AaveV3BaseSepolia.POOL, + WETH_GATEWAY: AaveV3BaseSepolia.WETH_GATEWAY, + WALLET_BALANCE_PROVIDER: AaveV3BaseSepolia.WALLET_BALANCE_PROVIDER, + UI_POOL_DATA_PROVIDER: '0xd3815B9f70E0cD7F17F7d5e4A8bc8dd7e53CAe44', // AaveV3BaseSepolia.UI_POOL_DATA_PROVIDER, + UI_INCENTIVE_DATA_PROVIDER: AaveV3BaseSepolia.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3BaseSepolia.L2_ENCODER, FAUCET: '0xD9145b5F45Ad4519c7ACcD6E0A4A82e83bB8A6Dc', }, diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts index bf2e56dc00..523214e9d9 100644 --- a/src/ui-config/networksConfig.ts +++ b/src/ui-config/networksConfig.ts @@ -127,11 +127,7 @@ export const testnetConfig: Record = { }, [ChainId.base_sepolia]: { name: 'Base Sepolia', - publicJsonRPCUrl: [ - 'https://base-sepolia.blockpi.network/v1/rpc/public', - 'https://sepolia.base.org', - 'https://base-sepolia.gateway.tenderly.co', - ], + publicJsonRPCUrl: ['https://sepolia.base.org', 'https://base-sepolia.gateway.tenderly.co'], baseUniswapAdapter: '0x0', baseAssetSymbol: 'ETH', wrappedBaseAssetSymbol: 'WETH', From 43f087213cca5ede72b1df2389055de9c9a1ccd5 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Thu, 18 Dec 2025 13:59:12 -0600 Subject: [PATCH 06/10] fix: celo token icons --- public/icons/tokens/{ceur.svg => eurm.svg} | 0 public/icons/tokens/{cusd.svg => usdm.svg} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename public/icons/tokens/{ceur.svg => eurm.svg} (100%) rename public/icons/tokens/{cusd.svg => usdm.svg} (100%) diff --git a/public/icons/tokens/ceur.svg b/public/icons/tokens/eurm.svg similarity index 100% rename from public/icons/tokens/ceur.svg rename to public/icons/tokens/eurm.svg diff --git a/public/icons/tokens/cusd.svg b/public/icons/tokens/usdm.svg similarity index 100% rename from public/icons/tokens/cusd.svg rename to public/icons/tokens/usdm.svg From 6722b953ddc2c2daff72063958a260892763f0f7 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Fri, 19 Dec 2025 12:22:08 -0600 Subject: [PATCH 07/10] chore: packages --- package.json | 4 ++-- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index d66fbd69ae..69078711de 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ }, "dependencies": { "@aave/contract-helpers": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", - "@aave/graphql": "^0.10.0", + "@aave/graphql": "^0.11.0", "@aave/math-utils": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", - "@aave/react": "^0.8.1", + "@aave/react": "^0.8.2", "@amplitude/analytics-browser": "^2.13.0", "@bgd-labs/aave-address-book": "^4.38.0", "@cowprotocol/cow-sdk": "7.2.4", diff --git a/yarn.lock b/yarn.lock index e033fdfcd7..3e470c81ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,13 +15,13 @@ "@gql.tada/internal" "^1.0.0" graphql "^15.5.0 || ^16.0.0 || ^17.0.0" -"@aave/client@0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@aave/client/-/client-0.9.1.tgz#5a11908715e67bb2a3992d30f9df16c049d9c162" - integrity sha512-pWwICirnQdG37sbNBTYqrFCDRN+rRnCGjNPGZtKZj/QxIbQ2p0GEZcGFpUfDw2lDSBsa4VK75T6IFiNn50zmNQ== +"@aave/client@0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@aave/client/-/client-0.9.2.tgz#7f9bd4d5a6c3a0b0155d97c1786d24c311372590" + integrity sha512-PTbbgzZQWdjUNJQZd0Mvrk5NG5RhLEnhG283fjIYnZCSeu2YUSeyiHTUCONY7C0u5dwdt/CpZZ309isgNkwPVA== dependencies: "@aave/core" "0.1.0" - "@aave/graphql" "0.10.0" + "@aave/graphql" "0.11.0" "@aave/types" "0.2.0" "@urql/core" "^5.2.0" graphql "^16.11.0" @@ -42,10 +42,10 @@ "@urql/core" "^5.2.0" graphql "^16.11.0" -"@aave/graphql@0.10.0", "@aave/graphql@^0.10.0": - version "0.10.0" - resolved "https://registry.yarnpkg.com/@aave/graphql/-/graphql-0.10.0.tgz#953ad5c74d2c104fe4f4bd6f55d220b99d05b1f1" - integrity sha512-CRYjJbd04dUIuQjHcKHmd43y/agQ55NKiW+wKwz8M2vhyUb2qNP9I/fPKmEo+K+Stdr+ybcF8QMXBupRbMvEUA== +"@aave/graphql@0.11.0", "@aave/graphql@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@aave/graphql/-/graphql-0.11.0.tgz#16c9c8be81068c6ecee89afbfdcec3c806a44347" + integrity sha512-jXQdgHo8Q0nz7slKKdIOVJvbAO92XnrlEjglbBI8ycrBlnT3eDhh2moCGj/f1kSauc/Y/fsvIlC/rrmemeR3LA== dependencies: "@aave/types" "0.2.0" gql.tada "^1.8.13" @@ -57,13 +57,13 @@ resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3.tgz#45c38aad2068ed9dc33125b6e84fb10c557c9234" integrity sha512-7od7jo2oYBMBCL25MReAEDqNgcUN2X12wYR8w9M09upCxBMOghMuTL/zWdFjotngIUf6iRluMI335Yd/OQti8w== -"@aave/react@^0.8.1": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@aave/react/-/react-0.8.1.tgz#11a92ad9f193700ac10d5b9fe1e3a6244e7b50dd" - integrity sha512-XZdWocic1xKNCb4x+cSsbAMHEJwsJf0D1hQmhQ5s9kisQOWGde23OsMaXPcS0Zh4XB4u5KMQWCrM7/CFMZqAQA== +"@aave/react@^0.8.2": + version "0.8.2" + resolved "https://registry.yarnpkg.com/@aave/react/-/react-0.8.2.tgz#2971e9a44a312d4957d6508a795b550ceab2c5a0" + integrity sha512-4r3zkikrPNb2iAIz2A2AWuI7Ve+GXA+FL+RHvZXybLzj1C6XSVIjCGQoLNxoDobyu7OEvzNVPU/iRxcnzrv62g== dependencies: - "@aave/client" "0.9.1" - "@aave/graphql" "0.10.0" + "@aave/client" "0.9.2" + "@aave/graphql" "0.11.0" "@aave/types" "0.2.0" urql "^4.2.2" From 8de029991022ec8ce37f3ea3dbd37d7a73c4d5a0 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Fri, 19 Dec 2025 12:37:39 -0600 Subject: [PATCH 08/10] chore: cleanup hardcoded chain ids --- pages/api/rpc-proxy.ts | 4 ++-- src/components/transactions/Bridge/BridgeConfig.ts | 4 ++-- src/components/transactions/Bridge/BridgeModalContent.tsx | 7 ++++--- src/ui-config/governanceConfig.ts | 4 ++-- src/ui-config/marketsConfig.tsx | 4 ++-- src/ui-config/networksConfig.ts | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pages/api/rpc-proxy.ts b/pages/api/rpc-proxy.ts index 87c52f6b00..0e65bda939 100644 --- a/pages/api/rpc-proxy.ts +++ b/pages/api/rpc-proxy.ts @@ -25,8 +25,8 @@ const NETWORK_CONFIG: Record = { [ChainId.sonic]: { network: 'sonic-mainnet', apiKey: process.env.SONIC_RPC_API_KEY || '' }, [ChainId.celo]: { network: 'celo-mainnet', apiKey: process.env.CELO_RPC_API_KEY || '' }, [ChainId.soneium]: { network: 'soneium-mainnet', apiKey: process.env.SONEIUM_RPC_API_KEY || '' }, - [57073]: { network: 'ink-mainnet', apiKey: process.env.INK_RPC_API_KEY || '' }, - [9745]: { network: 'plasma-mainnet', apiKey: process.env.PLASMA_RPC_API_KEY || '' }, + [ChainId.ink]: { network: 'ink-mainnet', apiKey: process.env.INK_RPC_API_KEY || '' }, + [ChainId.plasma]: { network: 'plasma-mainnet', apiKey: process.env.PLASMA_RPC_API_KEY || '' }, // Testnets [ChainId.sepolia]: { network: 'eth-sepolia', apiKey: process.env.MAINNET_RPC_API_KEY || '' }, diff --git a/src/components/transactions/Bridge/BridgeConfig.ts b/src/components/transactions/Bridge/BridgeConfig.ts index 1985edcdfc..854370a39a 100644 --- a/src/components/transactions/Bridge/BridgeConfig.ts +++ b/src/components/transactions/Bridge/BridgeConfig.ts @@ -203,7 +203,7 @@ const prodConfig: Config[] = [ ], }, { - sourceChainId: 57073, + sourceChainId: ChainId.ink, chainSelector: '3461204551265785888', burnMintTokenPool: '0xDe6539018B095353A40753Dc54C91C68c9487D4E', router: '0xca7c90A52B44E301AC01Cb5EB99b2fD99339433A', @@ -216,7 +216,7 @@ const prodConfig: Config[] = [ symbol: 'ETH', decimals: 18, address: constants.AddressZero, // Use zero address for network token ccip - chainId: 57073, + chainId: ChainId.ink, extensions: { isNative: true, }, diff --git a/src/components/transactions/Bridge/BridgeModalContent.tsx b/src/components/transactions/Bridge/BridgeModalContent.tsx index 0309b81d14..eea445701b 100644 --- a/src/components/transactions/Bridge/BridgeModalContent.tsx +++ b/src/components/transactions/Bridge/BridgeModalContent.tsx @@ -1,3 +1,4 @@ +import { ChainId } from '@aave/contract-helpers'; import { AaveV3InkWhitelabel } from '@bgd-labs/aave-address-book'; import { SwitchVerticalIcon } from '@heroicons/react/outline'; import { Trans } from '@lingui/macro'; @@ -58,11 +59,11 @@ const defaultNetwork = supportedNetworksWithBridge[0]; function getUseBridgeTokensParams(chainId: number): UseBridgeTokensParams { const tokenOracle = getConfigFor(chainId).tokenOracle; - if (chainId === 57073) { + if (chainId === ChainId.ink) { // no market config available yet for ink, so values are set here return { chainId, - ghoTokenAddress: '0xfc421aD3C883Bf9E7C4f42dE845C4e4405799e73', + ghoTokenAddress: AaveV3InkWhitelabel.ASSETS.GHO.UNDERLYING, tokenOracle, walletBalanceProviderAddress: AaveV3InkWhitelabel.WALLET_BALANCE_PROVIDER, }; @@ -324,7 +325,7 @@ export const BridgeModalContent = () => { ); // There's no market config available for ink yet, so skip showing gas station since it relies on having a market - const showGasStation = sourceNetworkObj.chainId !== 57073; + const showGasStation = sourceNetworkObj.chainId !== ChainId.ink; return ( <> diff --git a/src/ui-config/governanceConfig.ts b/src/ui-config/governanceConfig.ts index 15d304d55d..08fe22327a 100644 --- a/src/ui-config/governanceConfig.ts +++ b/src/ui-config/governanceConfig.ts @@ -144,8 +144,8 @@ export const governanceChainConfig: GovernanceChainConfig = { [ChainId.sonic]: GovernanceV3Sonic.PC_DATA_HELPER, [ChainId.celo]: GovernanceV3Celo.PC_DATA_HELPER, [ChainId.soneium]: GovernanceV3Soneium.PC_DATA_HELPER, - [9745]: GovernanceV3Plasma.PC_DATA_HELPER, - [57073]: GovernanceV3Ink.PC_DATA_HELPER, + [ChainId.plasma]: GovernanceV3Plasma.PC_DATA_HELPER, + [ChainId.ink]: GovernanceV3Ink.PC_DATA_HELPER, }, votingAssets: { aaveTokenAddress: AaveV3Ethereum.ASSETS.AAVE.UNDERLYING, diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index fc03360ec7..714d6b5350 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -446,7 +446,7 @@ export const marketsData: { [CustomMarket.proto_plasma_v3]: { marketTitle: 'Plasma', market: CustomMarket.proto_plasma_v3, - chainId: 9745 as ChainId, + chainId: ChainId.plasma, v3: true, logo: '/icons/networks/plasma.svg', addresses: { @@ -490,7 +490,7 @@ export const marketsData: { [CustomMarket.proto_ink_v3]: { marketTitle: 'Ink', market: CustomMarket.proto_ink_v3, - chainId: 57073 as ChainId, + chainId: ChainId.ink, v3: true, logo: '/icons/networks/ink.svg', addresses: { diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts index 523214e9d9..abdbead0dc 100644 --- a/src/ui-config/networksConfig.ts +++ b/src/ui-config/networksConfig.ts @@ -427,7 +427,7 @@ export const prodNetworkConfig: Record = { }, wagmiChain: soneium, }, - [9745]: { + [ChainId.plasma]: { name: 'Plasma', publicJsonRPCUrl: ['https://rpc.plasma.to'], baseAssetSymbol: 'XPL', @@ -442,7 +442,7 @@ export const prodNetworkConfig: Record = { url: 'https://stargate.finance/bridge?srcChain=ethereum&srcToken=0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE&dstChain=plasma&dstToken=0x9895D81bB462A195b4922ED7De0e3ACD007c32CB', }, }, - [57073]: { + [ChainId.ink]: { name: 'Ink', publicJsonRPCUrl: ['https://ink.drpc.org'], baseAssetSymbol: 'ETH', From 1d0fa1df5718d03cf43e06e061bf01ac416a9b79 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Mon, 22 Dec 2025 09:06:59 -0600 Subject: [PATCH 09/10] chore: utils --- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 69078711de..60fc099f12 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "test:coverage": "jest --coverage" }, "dependencies": { - "@aave/contract-helpers": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", + "@aave/contract-helpers": "1.37.0", "@aave/graphql": "^0.11.0", - "@aave/math-utils": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44", + "@aave/math-utils": "1.37.0", "@aave/react": "^0.8.2", "@amplitude/analytics-browser": "^2.13.0", "@bgd-labs/aave-address-book": "^4.38.0", diff --git a/yarn.lock b/yarn.lock index 3e470c81ba..c1c666d820 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,10 +26,10 @@ "@urql/core" "^5.2.0" graphql "^16.11.0" -"@aave/contract-helpers@1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44": - version "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3" - resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3.tgz#d16c386b6f7735d920e238d83587f9f4e6dd4d94" - integrity sha512-HHuVBd1/DqKfzMxcMB/GaIN/gvC6eyjfMofZTU84KblsohgUUks+vdgCUNwh71Ypt19JJtLHtrNfWP4Q4F5tnA== +"@aave/contract-helpers@1.37.0": + version "1.37.0" + resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.37.0.tgz#c899cdb1fa5b356c8a6fce104dfec68fc1031db0" + integrity sha512-MYuJZg1+cIGuv4bxI8Nb2qPsPdiPujsQ2sGZSVgYSK1f/ILUFX80ZeKT/l89mQlG9gA9M1y/PZpu1q290rmv0A== dependencies: isomorphic-unfetch "^3.1.0" @@ -52,10 +52,10 @@ graphql "^16.11.0" type-fest "^4.41.0" -"@aave/math-utils@1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44": - version "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3" - resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3.tgz#45c38aad2068ed9dc33125b6e84fb10c557c9234" - integrity sha512-7od7jo2oYBMBCL25MReAEDqNgcUN2X12wYR8w9M09upCxBMOghMuTL/zWdFjotngIUf6iRluMI335Yd/OQti8w== +"@aave/math-utils@1.37.0": + version "1.37.0" + resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.37.0.tgz#e572a43a1709d625b7114c26d8481def43082eda" + integrity sha512-wFcLPeRMXNW4lwogZTqw9C7wTG37rFn+W2ZJDFRGAyjWBNr5DHAPmrzbDKZxIG8Cjw1eZhW0R6l2EAm1FN5cEw== "@aave/react@^0.8.2": version "0.8.2" From d43e60752d996c202f8ec7aae3e2a70c8b7fce8d Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Mon, 22 Dec 2025 09:18:33 -0600 Subject: [PATCH 10/10] chore: cleanup --- src/services/UIPoolService.ts | 2 +- src/ui-config/marketsConfig.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/UIPoolService.ts b/src/services/UIPoolService.ts index 3441b3b929..fee13015d7 100644 --- a/src/services/UIPoolService.ts +++ b/src/services/UIPoolService.ts @@ -18,7 +18,7 @@ export class UiPoolService { private async getUiPoolDataService(marketData: MarketDataType) { const provider = this.getProvider(marketData.chainId); return new UiPoolDataProvider({ - uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER as string, + uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER, provider, chainId: marketData.chainId, }); diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 714d6b5350..d4a417ab64 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -436,7 +436,7 @@ export const marketsData: { // REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumLido.REPAY_WITH_COLLATERAL_ADAPTER, // SWAP_COLLATERAL_ADAPTER: AaveV3EthereumLido.SWAP_COLLATERAL_ADAPTER, WALLET_BALANCE_PROVIDER: '0xd8F7829ceB2692C90e418e0963b5Cbcbafc260Bd', - UI_POOL_DATA_PROVIDER: '0x56b7A1012765C285afAC8b8F25C69Bf10ccfE978', + UI_POOL_DATA_PROVIDER: AaveV3Ethereum.UI_POOL_DATA_PROVIDER, UI_INCENTIVE_DATA_PROVIDER: '0xC5E1717BEafC680E0148DD561591410b69650a5F', COLLECTOR: '0x8b8d44751a933f190dde25A69E8cC6F9101b5435', // WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumLido.WITHDRAW_SWAP_ADAPTER,