From 6f311d5506a900e8f3bb7d131cf05f3c1eb6b803 Mon Sep 17 00:00:00 2001 From: miguelmtz <36620902+miguelmtzinf@users.noreply.github.com> Date: Tue, 1 Oct 2024 12:31:49 +0200 Subject: [PATCH] fix: use aave address book for last psp adapters (#2194) --- 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 f97443c7ce..d500689994 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dependencies": { "@aave/contract-helpers": "1.30.2", "@aave/math-utils": "1.30.2", - "@bgd-labs/aave-address-book": "^3.4.0", + "@bgd-labs/aave-address-book": "3.5.1", "@emotion/cache": "11.10.3", "@emotion/react": "11.10.4", "@emotion/server": "latest", diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 3f4fc49168..a99d87ad45 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -136,7 +136,7 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3Ethereum.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3Ethereum.POOL, WETH_GATEWAY: AaveV3Ethereum.WETH_GATEWAY, - REPAY_WITH_COLLATERAL_ADAPTER: '0x35bb522b102326ea3f1141661df4626c87000e3e', + 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, @@ -145,7 +145,7 @@ export const marketsData: { GHO_TOKEN_ADDRESS: AaveV3Ethereum.ASSETS.GHO.UNDERLYING, GHO_UI_DATA_PROVIDER: AaveV3Ethereum.UI_GHO_DATA_PROVIDER, WITHDRAW_SWITCH_ADAPTER: AaveV3Ethereum.WITHDRAW_SWAP_ADAPTER, - DEBT_SWITCH_ADAPTER: '0xd7852e139a7097e119623de0751ae53a61efb442', + DEBT_SWITCH_ADAPTER: AaveV3Ethereum.DEBT_SWAP_ADAPTER, }, }, [CustomMarket.proto_lido_v3]: { @@ -169,7 +169,7 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3EthereumLido.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3EthereumLido.POOL, WETH_GATEWAY: AaveV3EthereumLido.WETH_GATEWAY, - REPAY_WITH_COLLATERAL_ADAPTER: '0x66E1aBdb06e7363a618D65a910c540dfED23754f', + 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, @@ -199,7 +199,7 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3EthereumEtherFi.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3EthereumEtherFi.POOL, WETH_GATEWAY: AaveV3EthereumEtherFi.WETH_GATEWAY, - REPAY_WITH_COLLATERAL_ADAPTER: '0x23b282c49C88d9161aae14b5eD777B976A5Ae65D', + 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, @@ -233,7 +233,7 @@ export const marketsData: { UI_INCENTIVE_DATA_PROVIDER: AaveV2Ethereum.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV2Ethereum.COLLECTOR, V3_MIGRATOR: AaveV2Ethereum.MIGRATION_HELPER, - DEBT_SWITCH_ADAPTER: '0xAf5c88245CD02Ff3DF332EF1E1FfD5bc5D1d87cd', + DEBT_SWITCH_ADAPTER: AaveV2Ethereum.DEBT_SWAP_ADAPTER, }, }, // [CustomMarket.permissioned_market]: { @@ -295,7 +295,7 @@ export const marketsData: { UI_INCENTIVE_DATA_PROVIDER: AaveV2Polygon.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV2Polygon.COLLECTOR, V3_MIGRATOR: AaveV2Polygon.MIGRATION_HELPER, - DEBT_SWITCH_ADAPTER: '0x63dfa7c09Dc2Ff4030d6B8Dc2ce6262BF898C8A4', + DEBT_SWITCH_ADAPTER: AaveV2Polygon.DEBT_SWAP_ADAPTER, }, }, [CustomMarket.proto_avalanche]: { @@ -321,7 +321,7 @@ export const marketsData: { UI_INCENTIVE_DATA_PROVIDER: AaveV2Avalanche.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV2Avalanche.COLLECTOR, V3_MIGRATOR: AaveV2Avalanche.MIGRATION_HELPER, - DEBT_SWITCH_ADAPTER: '0x63dfa7c09Dc2Ff4030d6B8Dc2ce6262BF898C8A4', + DEBT_SWITCH_ADAPTER: AaveV2Avalanche.DEBT_SWAP_ADAPTER, }, }, // v3 @@ -368,11 +368,11 @@ export const marketsData: { UI_INCENTIVE_DATA_PROVIDER: AaveV3Base.UI_INCENTIVE_DATA_PROVIDER, L2_ENCODER: AaveV3Base.L2_ENCODER, COLLECTOR: AaveV3Base.COLLECTOR, - REPAY_WITH_COLLATERAL_ADAPTER: '0x63dfa7c09Dc2Ff4030d6B8Dc2ce6262BF898C8A4', + REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Base.REPAY_WITH_COLLATERAL_ADAPTER, SWAP_COLLATERAL_ADAPTER: AaveV3Base.SWAP_COLLATERAL_ADAPTER, // WALLET_BALANCE_PROVIDER: AaveV2Ethereum.WALLET_BALANCE_PROVIDER, WITHDRAW_SWITCH_ADAPTER: AaveV3Base.WITHDRAW_SWAP_ADAPTER, - DEBT_SWITCH_ADAPTER: '0xb12e82df057bf16ecfa89d7d089dc7e5c1dc057b', + DEBT_SWITCH_ADAPTER: AaveV3Base.DEBT_SWAP_ADAPTER, }, }, [CustomMarket.proto_arbitrum_sepolia_v3]: { @@ -418,10 +418,10 @@ export const marketsData: { L2_ENCODER: AaveV3Arbitrum.L2_ENCODER, COLLECTOR: AaveV3Arbitrum.COLLECTOR, SWAP_COLLATERAL_ADAPTER: AaveV3Arbitrum.SWAP_COLLATERAL_ADAPTER, - REPAY_WITH_COLLATERAL_ADAPTER: '0xe28e2c8d240dd5ebd0adcab86fbd79df7a052034', - DEBT_SWITCH_ADAPTER: '0x63dfa7c09dc2ff4030d6b8dc2ce6262bf898c8a4', + REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Arbitrum.REPAY_WITH_COLLATERAL_ADAPTER, + DEBT_SWITCH_ADAPTER: AaveV3Arbitrum.DEBT_SWAP_ADAPTER, WITHDRAW_SWITCH_ADAPTER: AaveV3Arbitrum.WITHDRAW_SWAP_ADAPTER, - GHO_TOKEN_ADDRESS: '0x7dff72693f6a4149b17e7c6314655f6a9f7c8b33', + GHO_TOKEN_ADDRESS: AaveV3Arbitrum.ASSETS.GHO.UNDERLYING, }, }, [CustomMarket.proto_base_sepolia_v3]: { @@ -459,14 +459,14 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3Avalanche.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3Avalanche.POOL, WETH_GATEWAY: AaveV3Avalanche.WETH_GATEWAY, - REPAY_WITH_COLLATERAL_ADAPTER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16', + 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_INCENTIVE_DATA_PROVIDER: AaveV3Avalanche.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Avalanche.COLLECTOR, - DEBT_SWITCH_ADAPTER: '0xe28e2c8d240dd5ebd0adcab86fbd79df7a052034', + DEBT_SWITCH_ADAPTER: AaveV3Avalanche.DEBT_SWAP_ADAPTER, WITHDRAW_SWITCH_ADAPTER: AaveV3Avalanche.WITHDRAW_SWAP_ADAPTER, }, }, @@ -611,8 +611,8 @@ export const marketsData: { L2_ENCODER: AaveV3Optimism.L2_ENCODER, COLLECTOR: AaveV3Optimism.COLLECTOR, SWAP_COLLATERAL_ADAPTER: AaveV3Optimism.SWAP_COLLATERAL_ADAPTER, - REPAY_WITH_COLLATERAL_ADAPTER: '0x5d4d4007a4c6336550ddaa2a7c0d5e7972eebd16', - DEBT_SWITCH_ADAPTER: '0xe28e2c8d240dd5ebd0adcab86fbd79df7a052034', + REPAY_WITH_COLLATERAL_ADAPTER: AaveV3Optimism.REPAY_WITH_COLLATERAL_ADAPTER, + DEBT_SWITCH_ADAPTER: AaveV3Optimism.DEBT_SWAP_ADAPTER, WITHDRAW_SWITCH_ADAPTER: AaveV3Optimism.WITHDRAW_SWAP_ADAPTER, }, }, @@ -634,13 +634,13 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3Polygon.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3Polygon.POOL, WETH_GATEWAY: AaveV3Polygon.WETH_GATEWAY, - REPAY_WITH_COLLATERAL_ADAPTER: '0x5d4d4007a4c6336550ddaa2a7c0d5e7972eebd16', + 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_INCENTIVE_DATA_PROVIDER: AaveV3Polygon.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3Polygon.COLLECTOR, - DEBT_SWITCH_ADAPTER: '0xe28e2c8d240dd5ebd0adcab86fbd79df7a052034', + DEBT_SWITCH_ADAPTER: AaveV3Polygon.DEBT_SWAP_ADAPTER, WITHDRAW_SWITCH_ADAPTER: AaveV3Polygon.WITHDRAW_SWAP_ADAPTER, }, }, @@ -716,13 +716,13 @@ export const marketsData: { LENDING_POOL_ADDRESS_PROVIDER: AaveV3BNB.POOL_ADDRESSES_PROVIDER, LENDING_POOL: AaveV3BNB.POOL, WETH_GATEWAY: AaveV3BNB.WETH_GATEWAY, - REPAY_WITH_COLLATERAL_ADAPTER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9', + 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_INCENTIVE_DATA_PROVIDER: AaveV3BNB.UI_INCENTIVE_DATA_PROVIDER, COLLECTOR: AaveV3BNB.COLLECTOR, - DEBT_SWITCH_ADAPTER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16', + DEBT_SWITCH_ADAPTER: AaveV3BNB.DEBT_SWAP_ADAPTER, WITHDRAW_SWITCH_ADAPTER: AaveV3BNB.WITHDRAW_SWAP_ADAPTER, }, }, diff --git a/yarn.lock b/yarn.lock index 12d61d80e1..0943c9c561 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1317,10 +1317,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@bgd-labs/aave-address-book@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-3.4.0.tgz#e139ffbb01eea7b51ea5b162e45a9b28e41d74bc" - integrity sha512-0msSmy6tF///f062FheaafONO2niOeWvD0nychrxMVXojcX+obM7g8Ad0+JjSfxmKoGxAYKGER7zF7WbBEz6nw== +"@bgd-labs/aave-address-book@3.5.1": + version "3.5.1" + resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-3.5.1.tgz#25ed53b25bcf1ff3d8f476f40fd38c1afe3a8ec2" + integrity sha512-XONdy82J2CzDM1+qFNyxOmE/qd9l+/g2nL0OcNQB25lU0KQ+dBwbB4oyF+lUnz8gFyGcuH1Pe1HZNDg/BdsSFA== "@coinbase/wallet-sdk@3.1.0", "@coinbase/wallet-sdk@^3.0.4": version "3.1.0"