From d9836d6c63523f9d05eb89156a3c66108401437f Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Thu, 23 Nov 2023 15:41:37 +0530 Subject: [PATCH 01/12] feat: add SavingsDaiTokenWrapper address on Ethereum (#6) * feat: add SavingsDaiTokenWrapper address on Ethereum * fix: indent issue --- scripts/configs/pools/ethereum.ts | 1 + scripts/configs/types.ts | 1 + src/AaveV3Ethereum.sol | 3 +++ src/ts/AaveV3Ethereum.ts | 3 +++ 4 files changed, 8 insertions(+) diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts index 1c8f7d81..1c85f99a 100644 --- a/scripts/configs/pools/ethereum.ts +++ b/scripts/configs/pools/ethereum.ts @@ -106,5 +106,6 @@ export const mainnetProtoV3Pool: PoolConfig = { WALLET_BALANCE_PROVIDER: '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2', WETH_GATEWAY: '0xD322A49006FC828F9B5B37Ab215F99B4E5caB19C', WITHDRAW_SWAP_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0', + SAVINGS_DAI_TOKEN_WRAPPER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16', }, }; diff --git a/scripts/configs/types.ts b/scripts/configs/types.ts index 6e278b9e..7830419c 100644 --- a/scripts/configs/types.ts +++ b/scripts/configs/types.ts @@ -44,6 +44,7 @@ export interface PoolConfig { SWAP_COLLATERAL_ADAPTER?: Hex; DEBT_SWAP_ADAPTER?: Hex; WITHDRAW_SWAP_ADAPTER?: Hex; + SAVINGS_DAI_TOKEN_WRAPPER?: Hex; POOL_ADDRESSES_PROVIDER_REGISTRY?: Hex; LISTING_ENGINE?: Hex; MIGRATION_HELPER?: Hex; diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol index dd9e3d4b..c69a14c6 100644 --- a/src/AaveV3Ethereum.sol +++ b/src/AaveV3Ethereum.sol @@ -105,6 +105,9 @@ library AaveV3Ethereum { // https://etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0 address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0; + + // https://etherscan.io/address/0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16 + address internal constant SAVINGS_DAI_TOKEN_WRAPPER = 0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16; } library AaveV3EthereumAssets { diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts index 3295593a..23aeff8c 100644 --- a/src/ts/AaveV3Ethereum.ts +++ b/src/ts/AaveV3Ethereum.ts @@ -89,6 +89,9 @@ export const WETH_GATEWAY = '0xD322A49006FC828F9B5B37Ab215F99B4E5caB19C'; // https://etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0'; +// https://etherscan.io/address/0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16 +export const SAVINGS_DAI_TOKEN_WRAPPER = '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16'; + export const CHAIN_ID = 1; export const ASSETS = { WETH: { From f99d1dc868af7586a6e2ff648ec606caaed8ee1e Mon Sep 17 00:00:00 2001 From: miguelmtz <36620902+miguelmtzinf@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:37:03 +0100 Subject: [PATCH 02/12] fix: Replace address of SDAI token wrapper (#7) --- scripts/configs/pools/ethereum.ts | 2 +- src/AaveV3Ethereum.sol | 4 ++-- src/ts/AaveV3Ethereum.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts index 1c85f99a..1e37af95 100644 --- a/scripts/configs/pools/ethereum.ts +++ b/scripts/configs/pools/ethereum.ts @@ -106,6 +106,6 @@ export const mainnetProtoV3Pool: PoolConfig = { WALLET_BALANCE_PROVIDER: '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2', WETH_GATEWAY: '0xD322A49006FC828F9B5B37Ab215F99B4E5caB19C', WITHDRAW_SWAP_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0', - SAVINGS_DAI_TOKEN_WRAPPER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16', + SAVINGS_DAI_TOKEN_WRAPPER: '0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034', }, }; diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol index c69a14c6..0faad4ff 100644 --- a/src/AaveV3Ethereum.sol +++ b/src/AaveV3Ethereum.sol @@ -106,8 +106,8 @@ library AaveV3Ethereum { // https://etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0 address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0; - // https://etherscan.io/address/0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16 - address internal constant SAVINGS_DAI_TOKEN_WRAPPER = 0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16; + // https://etherscan.io/address/0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034 + address internal constant SAVINGS_DAI_TOKEN_WRAPPER = 0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034; } library AaveV3EthereumAssets { diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts index 23aeff8c..aa6f3235 100644 --- a/src/ts/AaveV3Ethereum.ts +++ b/src/ts/AaveV3Ethereum.ts @@ -89,8 +89,8 @@ export const WETH_GATEWAY = '0xD322A49006FC828F9B5B37Ab215F99B4E5caB19C'; // https://etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0'; -// https://etherscan.io/address/0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16 -export const SAVINGS_DAI_TOKEN_WRAPPER = '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16'; +// https://etherscan.io/address/0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034 +export const SAVINGS_DAI_TOKEN_WRAPPER = '0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034'; export const CHAIN_ID = 1; export const ASSETS = { From 843a8cbf45a479e02ca47828f0b53f100ab2d02b Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 10 Jan 2024 22:38:20 +0530 Subject: [PATCH 03/12] add gho addresses for sepolia --- src/AaveV3SepoliaGho.sol | 208 +++++++++++++++++++++++++++++++++++++ src/ts/AaveV3SepoliaGho.ts | 126 ++++++++++++++++++++++ 2 files changed, 334 insertions(+) create mode 100644 src/AaveV3SepoliaGho.sol create mode 100644 src/ts/AaveV3SepoliaGho.ts diff --git a/src/AaveV3SepoliaGho.sol b/src/AaveV3SepoliaGho.sol new file mode 100644 index 00000000..89c0df85 --- /dev/null +++ b/src/AaveV3SepoliaGho.sol @@ -0,0 +1,208 @@ +// SPDX-License-Identifier: MIT +pragma solidity >=0.6.0; + +import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolDataProvider, IACLManager} from './AaveV3.sol'; +import {ICollector} from './common/ICollector.sol'; + +library AaveV3SepoliaGho { + // https://sepolia.etherscan.io/address/0x012bAC54348C0E635dCAc9D5FB99f06F24136C9A + IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER = + IPoolAddressesProvider(0x012bAC54348C0E635dCAc9D5FB99f06F24136C9A); + + // https://sepolia.etherscan.io/address/0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951 + IPool internal constant POOL = IPool(0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951); + + // https://sepolia.etherscan.io/address/0x7Ee60D184C24Ef7AfC1Ec7Be59A0f448A0abd138 + IPoolConfigurator internal constant POOL_CONFIGURATOR = + IPoolConfigurator(0x7Ee60D184C24Ef7AfC1Ec7Be59A0f448A0abd138); + + // https://sepolia.etherscan.io/address/0x2da88497588bf89281816106C7259e31AF45a663 + IAaveOracle internal constant ORACLE = IAaveOracle(0x2da88497588bf89281816106C7259e31AF45a663); + + // https://sepolia.etherscan.io/address/0x0000000000000000000000000000000000000000 + address internal constant PRICE_ORACLE_SENTINEL = 0x0000000000000000000000000000000000000000; + + // https://sepolia.etherscan.io/address/0x3e9708d80f7B3e43118013075F7e95CE3AB31F31 + IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER = + IPoolDataProvider(0x3e9708d80f7B3e43118013075F7e95CE3AB31F31); + + // https://sepolia.etherscan.io/address/0x7F2bE3b178deeFF716CD6Ff03Ef79A1dFf360ddD + IACLManager internal constant ACL_MANAGER = + IACLManager(0x7F2bE3b178deeFF716CD6Ff03Ef79A1dFf360ddD); + + // https://sepolia.etherscan.io/address/0xfA0e305E0f46AB04f00ae6b5f4560d61a2183E00 + address internal constant ACL_ADMIN = 0xfA0e305E0f46AB04f00ae6b5f4560d61a2183E00; + + // https://sepolia.etherscan.io/address/0x48424f2779be0f03cDF6F02E17A591A9BF7AF89f + address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0x48424f2779be0f03cDF6F02E17A591A9BF7AF89f; + + // https://sepolia.etherscan.io/address/0x54bdE009156053108E73E2401aEA755e38f92098 + address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = + 0x54bdE009156053108E73E2401aEA755e38f92098; + + // https://sepolia.etherscan.io/address/0xd1CF2FBf4fb82045eE0B116eB107d29246E8DCe9 + address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = + 0xd1CF2FBf4fb82045eE0B116eB107d29246E8DCe9; + + // https://sepolia.etherscan.io/address/0x098a890BAfDf6FB4ACD24bF107D20EA15D229C62 + address internal constant EMISSION_MANAGER = 0x098a890BAfDf6FB4ACD24bF107D20EA15D229C62; + + // https://sepolia.etherscan.io/address/0xC959483DBa39aa9E78757139af0e9a2EDEb3f42D + address internal constant FAUCET = 0xC959483DBa39aa9E78757139af0e9a2EDEb3f42D; + + // https://sepolia.etherscan.io/address/0xBA25de9a7DC623B30799F33B770d31B44c2C3b77 + address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xBA25de9a7DC623B30799F33B770d31B44c2C3b77; + + // https://sepolia.etherscan.io/address/0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE + address internal constant UI_POOL_DATA_PROVIDER = 0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE; + + // https://sepolia.etherscan.io/address/0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709 + address internal constant WALLET_BALANCE_PROVIDER = 0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709; + + // https://sepolia.etherscan.io/address/0x387d311e47e80b498169e6fb51d3193167d89F7D + address internal constant WETH_GATEWAY = 0x387d311e47e80b498169e6fb51d3193167d89F7D; +} + +library AaveV3SepoliaGhoAssets { + // https://sepolia.etherscan.io/address/0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a + address internal constant AAVE_UNDERLYING = 0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a; + + uint8 internal constant AAVE_DECIMALS = 18; + + // https://sepolia.etherscan.io/address/0x6b8558764d3b7572136F17174Cb9aB1DDc7E1259 + address internal constant AAVE_A_TOKEN = 0x6b8558764d3b7572136F17174Cb9aB1DDc7E1259; + + // https://sepolia.etherscan.io/address/0xf12fdFc4c631F6D361b48723c2F2800b84B519e6 + address internal constant AAVE_V_TOKEN = 0xf12fdFc4c631F6D361b48723c2F2800b84B519e6; + + // https://sepolia.etherscan.io/address/0x4F15CaD6ebAE920a773bF00C6E941cccCB704915 + address internal constant AAVE_S_TOKEN = 0x4F15CaD6ebAE920a773bF00C6E941cccCB704915; + + // https://sepolia.etherscan.io/address/0xda678Ef100c13504edDb8a228A1e8e4CB139f189 + address internal constant AAVE_ORACLE = 0xda678Ef100c13504edDb8a228A1e8e4CB139f189; + + // https://sepolia.etherscan.io/address/0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB + address internal constant AAVE_INTEREST_RATE_STRATEGY = + 0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB; + + // https://sepolia.etherscan.io/address/0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357 + address internal constant DAI_UNDERLYING = 0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357; + + uint8 internal constant DAI_DECIMALS = 18; + + // https://sepolia.etherscan.io/address/0x29598b72eb5CeBd806C5dCD549490FdA35B13cD8 + address internal constant DAI_A_TOKEN = 0x29598b72eb5CeBd806C5dCD549490FdA35B13cD8; + + // https://sepolia.etherscan.io/address/0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0 + address internal constant DAI_V_TOKEN = 0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0; + + // https://sepolia.etherscan.io/address/0xbEF786E742edB13361ff2f005b901A82c23AA491 + address internal constant DAI_S_TOKEN = 0xbEF786E742edB13361ff2f005b901A82c23AA491; + + // https://sepolia.etherscan.io/address/0x9aF11c35c5d3Ae182C0050438972aac4376f9516 + address internal constant DAI_ORACLE = 0x9aF11c35c5d3Ae182C0050438972aac4376f9516; + + // https://sepolia.etherscan.io/address/0xA813CC4d67821fbAcF24659e414A1Cf6c551373c + address internal constant DAI_INTEREST_RATE_STRATEGY = 0xA813CC4d67821fbAcF24659e414A1Cf6c551373c; + + // https://sepolia.etherscan.io/address/0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8 + address internal constant USDC_UNDERLYING = 0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8; + + uint8 internal constant USDC_DECIMALS = 6; + + // https://sepolia.etherscan.io/address/0x16dA4541aD1807f4443d92D26044C1147406EB80 + address internal constant USDC_A_TOKEN = 0x16dA4541aD1807f4443d92D26044C1147406EB80; + + // https://sepolia.etherscan.io/address/0x36B5dE936eF1710E1d22EabE5231b28581a92ECc + address internal constant USDC_V_TOKEN = 0x36B5dE936eF1710E1d22EabE5231b28581a92ECc; + + // https://sepolia.etherscan.io/address/0x42A218F7bd03c63c4835496506492A383EfcF726 + address internal constant USDC_S_TOKEN = 0x42A218F7bd03c63c4835496506492A383EfcF726; + + // https://sepolia.etherscan.io/address/0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051 + address internal constant USDC_ORACLE = 0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051; + + // https://sepolia.etherscan.io/address/0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A + address internal constant USDC_INTEREST_RATE_STRATEGY = + 0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A; + + // https://sepolia.etherscan.io/address/0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c + address internal constant WETH_UNDERLYING = 0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c; + + uint8 internal constant WETH_DECIMALS = 18; + + // https://sepolia.etherscan.io/address/0x5b071b590a59395fE4025A0Ccc1FcC931AAc1830 + address internal constant WETH_A_TOKEN = 0x5b071b590a59395fE4025A0Ccc1FcC931AAc1830; + + // https://sepolia.etherscan.io/address/0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A + address internal constant WETH_V_TOKEN = 0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A; + + // https://sepolia.etherscan.io/address/0xEb45D5A0efF06fFb88f6A70811c08375A8de84A3 + address internal constant WETH_S_TOKEN = 0xEb45D5A0efF06fFb88f6A70811c08375A8de84A3; + + // https://sepolia.etherscan.io/address/0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F + address internal constant WETH_ORACLE = 0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F; + + // https://sepolia.etherscan.io/address/0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB + address internal constant WETH_INTEREST_RATE_STRATEGY = + 0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB; + + // https://sepolia.etherscan.io/address/0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5 + address internal constant LINK_UNDERLYING = 0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5; + + uint8 internal constant LINK_DECIMALS = 18; + + // https://sepolia.etherscan.io/address/0x3FfAf50D4F4E96eB78f2407c090b72e86eCaed24 + address internal constant LINK_A_TOKEN = 0x3FfAf50D4F4E96eB78f2407c090b72e86eCaed24; + + // https://sepolia.etherscan.io/address/0x34a4d932E722b9dFb492B9D8131127690CE2430B + address internal constant LINK_V_TOKEN = 0x34a4d932E722b9dFb492B9D8131127690CE2430B; + + // https://sepolia.etherscan.io/address/0x8f7440aa789924626ab9f5687AF305da2ffB996b + address internal constant LINK_S_TOKEN = 0x8f7440aa789924626ab9f5687AF305da2ffB996b; + + // https://sepolia.etherscan.io/address/0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F + address internal constant LINK_ORACLE = 0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F; + + // https://sepolia.etherscan.io/address/0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB + address internal constant LINK_INTEREST_RATE_STRATEGY = + 0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB; + + // https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 + address internal constant GHO_UNDERLYING = 0xc4bF5CbDaBE595361438F8c6a187bDc330539c60; + + uint8 internal constant GHO_DECIMALS = 18; + + // https://sepolia.etherscan.io/address/0xd190eF37dB51Bb955A680fF1A85763CC72d083D4 + address internal constant GHO_A_TOKEN = 0xd190eF37dB51Bb955A680fF1A85763CC72d083D4; + + // https://sepolia.etherscan.io/address/0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844 + address internal constant GHO_V_TOKEN = 0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844; + + // https://sepolia.etherscan.io/address/0xdCA691FB9609aB814E59c62d70783da1c056A9b6 + address internal constant GHO_S_TOKEN = 0xdCA691FB9609aB814E59c62d70783da1c056A9b6; + + // https://sepolia.etherscan.io/address/0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C + address internal constant GHO_ORACLE = 0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C; + + // https://sepolia.etherscan.io/address/0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf + address internal constant GHO_INTEREST_RATE_STRATEGY = 0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf; + + // https://sepolia.etherscan.io/address/0x19cdecE64EDE475ba0EB114ff4E319d64Ef8ECCf + address internal constant GHO_DISCOUNT_RATE_STRATEGY = 0x19cdecE64EDE475ba0EB114ff4E319d64Ef8ECCf; + + // https://sepolia.etherscan.io/address/0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E + address internal constant GHO_FLASH_MINTER = 0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E; + + // https://sepolia.etherscan.io/address/0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A + address internal constant UI_GHO_DATA_PROVIDER = 0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A; + + // https://sepolia.etherscan.io/address/0x4bF0c2c74717a4e538cfe25DD389C21A139E0096 + address internal constant GHO_STEWARD = 0x4bF0c2c74717a4e538cfe25DD389C21A139E0096; +} + +library AaveV3SepoliaGhoEModes { + uint8 internal constant NONE = 0; + + uint8 internal constant STABLE_EMODE = 1; +} diff --git a/src/ts/AaveV3SepoliaGho.ts b/src/ts/AaveV3SepoliaGho.ts new file mode 100644 index 00000000..328df7f2 --- /dev/null +++ b/src/ts/AaveV3SepoliaGho.ts @@ -0,0 +1,126 @@ +// IPoolAddressesProvider https://sepolia.etherscan.io/address/0x012bAC54348C0E635dCAc9D5FB99f06F24136C9A +export const POOL_ADDRESSES_PROVIDER = '0x012bac54348c0e635dcac9d5fb99f06f24136c9a'; + +// IPool https://sepolia.etherscan.io/address/0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951 +export const POOL = '0x6ae43d3271ff6888e7fc43fd7321a503ff738951'; + +// IPoolConfigurator https://sepolia.etherscan.io/address/0x7Ee60D184C24Ef7AfC1Ec7Be59A0f448A0abd138 +export const POOL_CONFIGURATOR = '0x7ee60d184c24ef7afc1ec7be59a0f448a0abd138'; + +// IAaveOracle https://sepolia.etherscan.io/address/0x2da88497588bf89281816106C7259e31AF45a663 +export const ORACLE = '0x2da88497588bf89281816106c7259e31af45a663'; + +// https://sepolia.etherscan.io/address/0x0000000000000000000000000000000000000000 +export const PRICE_ORACLE_SENTINEL = '0x0000000000000000000000000000000000000000'; + +// IPoolDataProvider https://sepolia.etherscan.io/address/0x3e9708d80f7B3e43118013075F7e95CE3AB31F31 +export const AAVE_PROTOCOL_DATA_PROVIDER = '0x3e9708d80f7b3e43118013075f7e95ce3ab31f31'; + +// IACLManager https://sepolia.etherscan.io/address/0x7F2bE3b178deeFF716CD6Ff03Ef79A1dFf360ddD +export const ACL_MANAGER = '0x7f2be3b178deeff716cd6ff03ef79a1dff360ddd'; + +// https://sepolia.etherscan.io/address/0xfA0e305E0f46AB04f00ae6b5f4560d61a2183E00 +export const ACL_ADMIN = '0xfa0e305e0f46ab04f00ae6b5f4560d61a2183e00'; + +// https://sepolia.etherscan.io/address/0x48424f2779be0f03cDF6F02E17A591A9BF7AF89f +export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0x48424f2779be0f03cdf6f02e17a591a9bf7af89f'; + +// https://sepolia.etherscan.io/address/0x54bdE009156053108E73E2401aEA755e38f92098 +export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0x54bde009156053108e73e2401aea755e38f92098'; + +// https://sepolia.etherscan.io/address/0xd1CF2FBf4fb82045eE0B116eB107d29246E8DCe9 +export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0xd1cf2fbf4fb82045ee0b116eb107d29246e8dce9'; + +// https://sepolia.etherscan.io/address/0x098a890BAfDf6FB4ACD24bF107D20EA15D229C62 +export const EMISSION_MANAGER = '0x098a890bafdf6fb4acd24bf107d20ea15d229c62'; + +// https://sepolia.etherscan.io/address/0xC959483DBa39aa9E78757139af0e9a2EDEb3f42D +export const FAUCET = '0xc959483dba39aa9e78757139af0e9a2edeb3f42d'; + +// https://sepolia.etherscan.io/address/0xBA25de9a7DC623B30799F33B770d31B44c2C3b77 +export const UI_INCENTIVE_DATA_PROVIDER = '0xba25de9a7dc623b30799f33b770d31b44c2c3b77'; + +// https://sepolia.etherscan.io/address/0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE +export const UI_POOL_DATA_PROVIDER = '0x69529987fa4a075d0c00b0128fa848dc9ebbe9ce'; + +// https://sepolia.etherscan.io/address/0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709 +export const WALLET_BALANCE_PROVIDER = '0xcd4e0d6d2b1252e2a709b8ae97dba31164c5a709'; + +// https://sepolia.etherscan.io/address/0x387d311e47e80b498169e6fb51d3193167d89F7D +export const WETH_GATEWAY = '0x387d311e47e80b498169e6fb51d3193167d89f7d'; + +// https://sepolia.etherscan.io/address/0x19cdecE64EDE475ba0EB114ff4E319d64Ef8ECCf +export const GHO_DISCOUNT_RATE_STRATEGY = '0x19cdece64ede475ba0eb114ff4e319d64ef8eccf'; + +// https://sepolia.etherscan.io/address/0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E +export const GHO_FLASH_MINTER = '0xb5d0ef1548d9c70d3e7a96ca67a2d7ebc5b1173e'; + +// https://sepolia.etherscan.io/address/0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A +export const UI_GHO_DATA_PROVIDER = '0x69b9843a16a6e9933125ebd97659ba3ccbe2ef8a'; + +// https://sepolia.etherscan.io/address/0x4bF0c2c74717a4e538cfe25DD389C21A139E0096 +export const GHO_STEWARD = '0x4bf0c2c74717a4e538cfe25dd389c21a139e0096'; + +export const CHAIN_ID = 11155111; + +export const ASSETS = { + AAVE: { + decimals: 18, + UNDERLYING: '0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a', + A_TOKEN: '0x6b8558764d3b7572136F17174Cb9aB1DDc7E1259', + S_TOKEN: '0x4F15CaD6ebAE920a773bF00C6E941cccCB704915', + V_TOKEN: '0xf12fdFc4c631F6D361b48723c2F2800b84B519e6', + INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB', + ORACLE: '0xda678Ef100c13504edDb8a228A1e8e4CB139f189', + }, + DAI: { + decimals: 18, + UNDERLYING: '0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357', + A_TOKEN: '0x29598b72eb5CeBd806C5dCD549490FdA35B13cD8', + S_TOKEN: '0xbEF786E742edB13361ff2f005b901A82c23AA491', + V_TOKEN: '0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0', + INTEREST_RATE_STRATEGY: '0xA813CC4d67821fbAcF24659e414A1Cf6c551373c', + ORACLE: '0x9aF11c35c5d3Ae182C0050438972aac4376f9516', + }, + USDC: { + decimals: 6, + UNDERLYING: '0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8', + A_TOKEN: '0x16dA4541aD1807f4443d92D26044C1147406EB80', + S_TOKEN: '0x42A218F7bd03c63c4835496506492A383EfcF726', + V_TOKEN: '0x36B5dE936eF1710E1d22EabE5231b28581a92ECc', + INTEREST_RATE_STRATEGY: '0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A', + ORACLE: '0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051', + }, + WETH: { + decimals: 18, + UNDERLYING: '0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c', + A_TOKEN: '0x5b071b590a59395fE4025A0Ccc1FcC931AAc1830', + S_TOKEN: '0xEb45D5A0efF06fFb88f6A70811c08375A8de84A3', + V_TOKEN: '0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A', + INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB', + ORACLE: '0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F', + }, + LINK: { + decimals: 18, + UNDERLYING: '0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5', + A_TOKEN: '0x3FfAf50D4F4E96eB78f2407c090b72e86eCaed24', + S_TOKEN: '0x8f7440aa789924626ab9f5687AF305da2ffB996b', + V_TOKEN: '0x34a4d932E722b9dFb492B9D8131127690CE2430B', + INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB', + ORACLE: '0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F', + }, + GHO: { + decimals: 18, + UNDERLYING: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', + A_TOKEN: '0xd190eF37dB51Bb955A680fF1A85763CC72d083D4', + S_TOKEN: '0xdCA691FB9609aB814E59c62d70783da1c056A9b6', + V_TOKEN: '0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844', + INTEREST_RATE_STRATEGY: '0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf', + ORACLE: '0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C', + }, +} as const; + +export const E_MODES = { + NONE: 0, + STABLE_EMODE: 1, +} as const; From 64b000681f0dc6f5d4653ec87336a069777eb200 Mon Sep 17 00:00:00 2001 From: defispartan Date: Tue, 16 Jan 2024 09:59:57 -0600 Subject: [PATCH 04/12] feat: sepolia v3 gho (#8) * feat: add GHO config for primary Sepolia V3 test market * Feat: add latest addresses --------- Co-authored-by: miguelmtz <36620902+miguelmtzinf@users.noreply.github.com> --- scripts/configs/pools/ethereum.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts index 1bdc2b84..47ab657d 100644 --- a/scripts/configs/pools/ethereum.ts +++ b/scripts/configs/pools/ethereum.ts @@ -1,5 +1,5 @@ -import {ChainId} from '../../generator/chains'; -import {PoolConfig} from '../types'; +import { ChainId } from '../../generator/chains'; +import { PoolConfig } from '../types'; export const goerliProtoV2Pool: PoolConfig = { name: 'Goerli', @@ -39,6 +39,8 @@ export const sepoliaProtoV3: PoolConfig = { WALLET_BALANCE_PROVIDER: '0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709', WETH_GATEWAY: '0x387d311e47e80b498169e6fb51d3193167d89F7D', STATIC_A_TOKEN_FACTORY: '0xd210dFB43B694430B8d31762B5199e30c31266C8', + UI_GHO_DATA_PROVIDER: '0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A', + GHO_TOKEN: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', }, }; From 1b0f19e11c82f01b408bb28c337daf65066a9ac6 Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Tue, 16 Jan 2024 22:46:40 +0530 Subject: [PATCH 05/12] fix: add address for gho-sepolia canonical deployment --- src/AaveV3SepoliaGho.sol | 208 ------------------------------------- src/ts/AaveV3SepoliaGho.ts | 126 ---------------------- 2 files changed, 334 deletions(-) delete mode 100644 src/AaveV3SepoliaGho.sol delete mode 100644 src/ts/AaveV3SepoliaGho.ts diff --git a/src/AaveV3SepoliaGho.sol b/src/AaveV3SepoliaGho.sol deleted file mode 100644 index 89c0df85..00000000 --- a/src/AaveV3SepoliaGho.sol +++ /dev/null @@ -1,208 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.6.0; - -import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolDataProvider, IACLManager} from './AaveV3.sol'; -import {ICollector} from './common/ICollector.sol'; - -library AaveV3SepoliaGho { - // https://sepolia.etherscan.io/address/0x012bAC54348C0E635dCAc9D5FB99f06F24136C9A - IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER = - IPoolAddressesProvider(0x012bAC54348C0E635dCAc9D5FB99f06F24136C9A); - - // https://sepolia.etherscan.io/address/0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951 - IPool internal constant POOL = IPool(0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951); - - // https://sepolia.etherscan.io/address/0x7Ee60D184C24Ef7AfC1Ec7Be59A0f448A0abd138 - IPoolConfigurator internal constant POOL_CONFIGURATOR = - IPoolConfigurator(0x7Ee60D184C24Ef7AfC1Ec7Be59A0f448A0abd138); - - // https://sepolia.etherscan.io/address/0x2da88497588bf89281816106C7259e31AF45a663 - IAaveOracle internal constant ORACLE = IAaveOracle(0x2da88497588bf89281816106C7259e31AF45a663); - - // https://sepolia.etherscan.io/address/0x0000000000000000000000000000000000000000 - address internal constant PRICE_ORACLE_SENTINEL = 0x0000000000000000000000000000000000000000; - - // https://sepolia.etherscan.io/address/0x3e9708d80f7B3e43118013075F7e95CE3AB31F31 - IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER = - IPoolDataProvider(0x3e9708d80f7B3e43118013075F7e95CE3AB31F31); - - // https://sepolia.etherscan.io/address/0x7F2bE3b178deeFF716CD6Ff03Ef79A1dFf360ddD - IACLManager internal constant ACL_MANAGER = - IACLManager(0x7F2bE3b178deeFF716CD6Ff03Ef79A1dFf360ddD); - - // https://sepolia.etherscan.io/address/0xfA0e305E0f46AB04f00ae6b5f4560d61a2183E00 - address internal constant ACL_ADMIN = 0xfA0e305E0f46AB04f00ae6b5f4560d61a2183E00; - - // https://sepolia.etherscan.io/address/0x48424f2779be0f03cDF6F02E17A591A9BF7AF89f - address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0x48424f2779be0f03cDF6F02E17A591A9BF7AF89f; - - // https://sepolia.etherscan.io/address/0x54bdE009156053108E73E2401aEA755e38f92098 - address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = - 0x54bdE009156053108E73E2401aEA755e38f92098; - - // https://sepolia.etherscan.io/address/0xd1CF2FBf4fb82045eE0B116eB107d29246E8DCe9 - address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = - 0xd1CF2FBf4fb82045eE0B116eB107d29246E8DCe9; - - // https://sepolia.etherscan.io/address/0x098a890BAfDf6FB4ACD24bF107D20EA15D229C62 - address internal constant EMISSION_MANAGER = 0x098a890BAfDf6FB4ACD24bF107D20EA15D229C62; - - // https://sepolia.etherscan.io/address/0xC959483DBa39aa9E78757139af0e9a2EDEb3f42D - address internal constant FAUCET = 0xC959483DBa39aa9E78757139af0e9a2EDEb3f42D; - - // https://sepolia.etherscan.io/address/0xBA25de9a7DC623B30799F33B770d31B44c2C3b77 - address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xBA25de9a7DC623B30799F33B770d31B44c2C3b77; - - // https://sepolia.etherscan.io/address/0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE - address internal constant UI_POOL_DATA_PROVIDER = 0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE; - - // https://sepolia.etherscan.io/address/0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709 - address internal constant WALLET_BALANCE_PROVIDER = 0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709; - - // https://sepolia.etherscan.io/address/0x387d311e47e80b498169e6fb51d3193167d89F7D - address internal constant WETH_GATEWAY = 0x387d311e47e80b498169e6fb51d3193167d89F7D; -} - -library AaveV3SepoliaGhoAssets { - // https://sepolia.etherscan.io/address/0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a - address internal constant AAVE_UNDERLYING = 0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a; - - uint8 internal constant AAVE_DECIMALS = 18; - - // https://sepolia.etherscan.io/address/0x6b8558764d3b7572136F17174Cb9aB1DDc7E1259 - address internal constant AAVE_A_TOKEN = 0x6b8558764d3b7572136F17174Cb9aB1DDc7E1259; - - // https://sepolia.etherscan.io/address/0xf12fdFc4c631F6D361b48723c2F2800b84B519e6 - address internal constant AAVE_V_TOKEN = 0xf12fdFc4c631F6D361b48723c2F2800b84B519e6; - - // https://sepolia.etherscan.io/address/0x4F15CaD6ebAE920a773bF00C6E941cccCB704915 - address internal constant AAVE_S_TOKEN = 0x4F15CaD6ebAE920a773bF00C6E941cccCB704915; - - // https://sepolia.etherscan.io/address/0xda678Ef100c13504edDb8a228A1e8e4CB139f189 - address internal constant AAVE_ORACLE = 0xda678Ef100c13504edDb8a228A1e8e4CB139f189; - - // https://sepolia.etherscan.io/address/0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB - address internal constant AAVE_INTEREST_RATE_STRATEGY = - 0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB; - - // https://sepolia.etherscan.io/address/0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357 - address internal constant DAI_UNDERLYING = 0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357; - - uint8 internal constant DAI_DECIMALS = 18; - - // https://sepolia.etherscan.io/address/0x29598b72eb5CeBd806C5dCD549490FdA35B13cD8 - address internal constant DAI_A_TOKEN = 0x29598b72eb5CeBd806C5dCD549490FdA35B13cD8; - - // https://sepolia.etherscan.io/address/0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0 - address internal constant DAI_V_TOKEN = 0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0; - - // https://sepolia.etherscan.io/address/0xbEF786E742edB13361ff2f005b901A82c23AA491 - address internal constant DAI_S_TOKEN = 0xbEF786E742edB13361ff2f005b901A82c23AA491; - - // https://sepolia.etherscan.io/address/0x9aF11c35c5d3Ae182C0050438972aac4376f9516 - address internal constant DAI_ORACLE = 0x9aF11c35c5d3Ae182C0050438972aac4376f9516; - - // https://sepolia.etherscan.io/address/0xA813CC4d67821fbAcF24659e414A1Cf6c551373c - address internal constant DAI_INTEREST_RATE_STRATEGY = 0xA813CC4d67821fbAcF24659e414A1Cf6c551373c; - - // https://sepolia.etherscan.io/address/0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8 - address internal constant USDC_UNDERLYING = 0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8; - - uint8 internal constant USDC_DECIMALS = 6; - - // https://sepolia.etherscan.io/address/0x16dA4541aD1807f4443d92D26044C1147406EB80 - address internal constant USDC_A_TOKEN = 0x16dA4541aD1807f4443d92D26044C1147406EB80; - - // https://sepolia.etherscan.io/address/0x36B5dE936eF1710E1d22EabE5231b28581a92ECc - address internal constant USDC_V_TOKEN = 0x36B5dE936eF1710E1d22EabE5231b28581a92ECc; - - // https://sepolia.etherscan.io/address/0x42A218F7bd03c63c4835496506492A383EfcF726 - address internal constant USDC_S_TOKEN = 0x42A218F7bd03c63c4835496506492A383EfcF726; - - // https://sepolia.etherscan.io/address/0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051 - address internal constant USDC_ORACLE = 0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051; - - // https://sepolia.etherscan.io/address/0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A - address internal constant USDC_INTEREST_RATE_STRATEGY = - 0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A; - - // https://sepolia.etherscan.io/address/0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c - address internal constant WETH_UNDERLYING = 0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c; - - uint8 internal constant WETH_DECIMALS = 18; - - // https://sepolia.etherscan.io/address/0x5b071b590a59395fE4025A0Ccc1FcC931AAc1830 - address internal constant WETH_A_TOKEN = 0x5b071b590a59395fE4025A0Ccc1FcC931AAc1830; - - // https://sepolia.etherscan.io/address/0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A - address internal constant WETH_V_TOKEN = 0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A; - - // https://sepolia.etherscan.io/address/0xEb45D5A0efF06fFb88f6A70811c08375A8de84A3 - address internal constant WETH_S_TOKEN = 0xEb45D5A0efF06fFb88f6A70811c08375A8de84A3; - - // https://sepolia.etherscan.io/address/0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F - address internal constant WETH_ORACLE = 0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F; - - // https://sepolia.etherscan.io/address/0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB - address internal constant WETH_INTEREST_RATE_STRATEGY = - 0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB; - - // https://sepolia.etherscan.io/address/0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5 - address internal constant LINK_UNDERLYING = 0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5; - - uint8 internal constant LINK_DECIMALS = 18; - - // https://sepolia.etherscan.io/address/0x3FfAf50D4F4E96eB78f2407c090b72e86eCaed24 - address internal constant LINK_A_TOKEN = 0x3FfAf50D4F4E96eB78f2407c090b72e86eCaed24; - - // https://sepolia.etherscan.io/address/0x34a4d932E722b9dFb492B9D8131127690CE2430B - address internal constant LINK_V_TOKEN = 0x34a4d932E722b9dFb492B9D8131127690CE2430B; - - // https://sepolia.etherscan.io/address/0x8f7440aa789924626ab9f5687AF305da2ffB996b - address internal constant LINK_S_TOKEN = 0x8f7440aa789924626ab9f5687AF305da2ffB996b; - - // https://sepolia.etherscan.io/address/0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F - address internal constant LINK_ORACLE = 0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F; - - // https://sepolia.etherscan.io/address/0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB - address internal constant LINK_INTEREST_RATE_STRATEGY = - 0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB; - - // https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 - address internal constant GHO_UNDERLYING = 0xc4bF5CbDaBE595361438F8c6a187bDc330539c60; - - uint8 internal constant GHO_DECIMALS = 18; - - // https://sepolia.etherscan.io/address/0xd190eF37dB51Bb955A680fF1A85763CC72d083D4 - address internal constant GHO_A_TOKEN = 0xd190eF37dB51Bb955A680fF1A85763CC72d083D4; - - // https://sepolia.etherscan.io/address/0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844 - address internal constant GHO_V_TOKEN = 0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844; - - // https://sepolia.etherscan.io/address/0xdCA691FB9609aB814E59c62d70783da1c056A9b6 - address internal constant GHO_S_TOKEN = 0xdCA691FB9609aB814E59c62d70783da1c056A9b6; - - // https://sepolia.etherscan.io/address/0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C - address internal constant GHO_ORACLE = 0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C; - - // https://sepolia.etherscan.io/address/0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf - address internal constant GHO_INTEREST_RATE_STRATEGY = 0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf; - - // https://sepolia.etherscan.io/address/0x19cdecE64EDE475ba0EB114ff4E319d64Ef8ECCf - address internal constant GHO_DISCOUNT_RATE_STRATEGY = 0x19cdecE64EDE475ba0EB114ff4E319d64Ef8ECCf; - - // https://sepolia.etherscan.io/address/0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E - address internal constant GHO_FLASH_MINTER = 0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E; - - // https://sepolia.etherscan.io/address/0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A - address internal constant UI_GHO_DATA_PROVIDER = 0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A; - - // https://sepolia.etherscan.io/address/0x4bF0c2c74717a4e538cfe25DD389C21A139E0096 - address internal constant GHO_STEWARD = 0x4bF0c2c74717a4e538cfe25DD389C21A139E0096; -} - -library AaveV3SepoliaGhoEModes { - uint8 internal constant NONE = 0; - - uint8 internal constant STABLE_EMODE = 1; -} diff --git a/src/ts/AaveV3SepoliaGho.ts b/src/ts/AaveV3SepoliaGho.ts deleted file mode 100644 index 328df7f2..00000000 --- a/src/ts/AaveV3SepoliaGho.ts +++ /dev/null @@ -1,126 +0,0 @@ -// IPoolAddressesProvider https://sepolia.etherscan.io/address/0x012bAC54348C0E635dCAc9D5FB99f06F24136C9A -export const POOL_ADDRESSES_PROVIDER = '0x012bac54348c0e635dcac9d5fb99f06f24136c9a'; - -// IPool https://sepolia.etherscan.io/address/0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951 -export const POOL = '0x6ae43d3271ff6888e7fc43fd7321a503ff738951'; - -// IPoolConfigurator https://sepolia.etherscan.io/address/0x7Ee60D184C24Ef7AfC1Ec7Be59A0f448A0abd138 -export const POOL_CONFIGURATOR = '0x7ee60d184c24ef7afc1ec7be59a0f448a0abd138'; - -// IAaveOracle https://sepolia.etherscan.io/address/0x2da88497588bf89281816106C7259e31AF45a663 -export const ORACLE = '0x2da88497588bf89281816106c7259e31af45a663'; - -// https://sepolia.etherscan.io/address/0x0000000000000000000000000000000000000000 -export const PRICE_ORACLE_SENTINEL = '0x0000000000000000000000000000000000000000'; - -// IPoolDataProvider https://sepolia.etherscan.io/address/0x3e9708d80f7B3e43118013075F7e95CE3AB31F31 -export const AAVE_PROTOCOL_DATA_PROVIDER = '0x3e9708d80f7b3e43118013075f7e95ce3ab31f31'; - -// IACLManager https://sepolia.etherscan.io/address/0x7F2bE3b178deeFF716CD6Ff03Ef79A1dFf360ddD -export const ACL_MANAGER = '0x7f2be3b178deeff716cd6ff03ef79a1dff360ddd'; - -// https://sepolia.etherscan.io/address/0xfA0e305E0f46AB04f00ae6b5f4560d61a2183E00 -export const ACL_ADMIN = '0xfa0e305e0f46ab04f00ae6b5f4560d61a2183e00'; - -// https://sepolia.etherscan.io/address/0x48424f2779be0f03cDF6F02E17A591A9BF7AF89f -export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0x48424f2779be0f03cdf6f02e17a591a9bf7af89f'; - -// https://sepolia.etherscan.io/address/0x54bdE009156053108E73E2401aEA755e38f92098 -export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0x54bde009156053108e73e2401aea755e38f92098'; - -// https://sepolia.etherscan.io/address/0xd1CF2FBf4fb82045eE0B116eB107d29246E8DCe9 -export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0xd1cf2fbf4fb82045ee0b116eb107d29246e8dce9'; - -// https://sepolia.etherscan.io/address/0x098a890BAfDf6FB4ACD24bF107D20EA15D229C62 -export const EMISSION_MANAGER = '0x098a890bafdf6fb4acd24bf107d20ea15d229c62'; - -// https://sepolia.etherscan.io/address/0xC959483DBa39aa9E78757139af0e9a2EDEb3f42D -export const FAUCET = '0xc959483dba39aa9e78757139af0e9a2edeb3f42d'; - -// https://sepolia.etherscan.io/address/0xBA25de9a7DC623B30799F33B770d31B44c2C3b77 -export const UI_INCENTIVE_DATA_PROVIDER = '0xba25de9a7dc623b30799f33b770d31b44c2c3b77'; - -// https://sepolia.etherscan.io/address/0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE -export const UI_POOL_DATA_PROVIDER = '0x69529987fa4a075d0c00b0128fa848dc9ebbe9ce'; - -// https://sepolia.etherscan.io/address/0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709 -export const WALLET_BALANCE_PROVIDER = '0xcd4e0d6d2b1252e2a709b8ae97dba31164c5a709'; - -// https://sepolia.etherscan.io/address/0x387d311e47e80b498169e6fb51d3193167d89F7D -export const WETH_GATEWAY = '0x387d311e47e80b498169e6fb51d3193167d89f7d'; - -// https://sepolia.etherscan.io/address/0x19cdecE64EDE475ba0EB114ff4E319d64Ef8ECCf -export const GHO_DISCOUNT_RATE_STRATEGY = '0x19cdece64ede475ba0eb114ff4e319d64ef8eccf'; - -// https://sepolia.etherscan.io/address/0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E -export const GHO_FLASH_MINTER = '0xb5d0ef1548d9c70d3e7a96ca67a2d7ebc5b1173e'; - -// https://sepolia.etherscan.io/address/0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A -export const UI_GHO_DATA_PROVIDER = '0x69b9843a16a6e9933125ebd97659ba3ccbe2ef8a'; - -// https://sepolia.etherscan.io/address/0x4bF0c2c74717a4e538cfe25DD389C21A139E0096 -export const GHO_STEWARD = '0x4bf0c2c74717a4e538cfe25dd389c21a139e0096'; - -export const CHAIN_ID = 11155111; - -export const ASSETS = { - AAVE: { - decimals: 18, - UNDERLYING: '0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a', - A_TOKEN: '0x6b8558764d3b7572136F17174Cb9aB1DDc7E1259', - S_TOKEN: '0x4F15CaD6ebAE920a773bF00C6E941cccCB704915', - V_TOKEN: '0xf12fdFc4c631F6D361b48723c2F2800b84B519e6', - INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB', - ORACLE: '0xda678Ef100c13504edDb8a228A1e8e4CB139f189', - }, - DAI: { - decimals: 18, - UNDERLYING: '0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357', - A_TOKEN: '0x29598b72eb5CeBd806C5dCD549490FdA35B13cD8', - S_TOKEN: '0xbEF786E742edB13361ff2f005b901A82c23AA491', - V_TOKEN: '0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0', - INTEREST_RATE_STRATEGY: '0xA813CC4d67821fbAcF24659e414A1Cf6c551373c', - ORACLE: '0x9aF11c35c5d3Ae182C0050438972aac4376f9516', - }, - USDC: { - decimals: 6, - UNDERLYING: '0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8', - A_TOKEN: '0x16dA4541aD1807f4443d92D26044C1147406EB80', - S_TOKEN: '0x42A218F7bd03c63c4835496506492A383EfcF726', - V_TOKEN: '0x36B5dE936eF1710E1d22EabE5231b28581a92ECc', - INTEREST_RATE_STRATEGY: '0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A', - ORACLE: '0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051', - }, - WETH: { - decimals: 18, - UNDERLYING: '0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c', - A_TOKEN: '0x5b071b590a59395fE4025A0Ccc1FcC931AAc1830', - S_TOKEN: '0xEb45D5A0efF06fFb88f6A70811c08375A8de84A3', - V_TOKEN: '0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A', - INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB', - ORACLE: '0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F', - }, - LINK: { - decimals: 18, - UNDERLYING: '0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5', - A_TOKEN: '0x3FfAf50D4F4E96eB78f2407c090b72e86eCaed24', - S_TOKEN: '0x8f7440aa789924626ab9f5687AF305da2ffB996b', - V_TOKEN: '0x34a4d932E722b9dFb492B9D8131127690CE2430B', - INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB', - ORACLE: '0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F', - }, - GHO: { - decimals: 18, - UNDERLYING: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', - A_TOKEN: '0xd190eF37dB51Bb955A680fF1A85763CC72d083D4', - S_TOKEN: '0xdCA691FB9609aB814E59c62d70783da1c056A9b6', - V_TOKEN: '0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844', - INTEREST_RATE_STRATEGY: '0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf', - ORACLE: '0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C', - }, -} as const; - -export const E_MODES = { - NONE: 0, - STABLE_EMODE: 1, -} as const; From 0a4c5a6e553d23c6bebe52d1ab4d7a8b9d58e4b8 Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 17 Jan 2024 12:46:35 +0530 Subject: [PATCH 06/12] add Gho token --- src/AaveV3Sepolia.sol | 3 +++ src/ts/AaveV3Sepolia.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/AaveV3Sepolia.sol b/src/AaveV3Sepolia.sol index cd5ba525..014ff736 100644 --- a/src/AaveV3Sepolia.sol +++ b/src/AaveV3Sepolia.sol @@ -72,6 +72,9 @@ library AaveV3Sepolia { // https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8 address internal constant STATIC_A_TOKEN_FACTORY = 0xd210dFB43B694430B8d31762B5199e30c31266C8; + + // https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 + address internal constant GHO_TOKEN = 0xc4bF5CbDaBE595361438F8c6a187bDc330539c60; } library AaveV3SepoliaAssets { diff --git a/src/ts/AaveV3Sepolia.ts b/src/ts/AaveV3Sepolia.ts index 8c63ff42..ff3ee897 100644 --- a/src/ts/AaveV3Sepolia.ts +++ b/src/ts/AaveV3Sepolia.ts @@ -59,6 +59,9 @@ export const WETH_GATEWAY = '0x387d311e47e80b498169e6fb51d3193167d89F7D'; // https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8 export const STATIC_A_TOKEN_FACTORY = '0xd210dFB43B694430B8d31762B5199e30c31266C8'; +// https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 +export const GHO_TOKEN = '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60'; + export const CHAIN_ID = 11155111; export const ASSETS = { DAI: { From beb024cb859e05cf6a1cb2ffa4fca4de5640a5ea Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 17 Jan 2024 15:15:30 +0530 Subject: [PATCH 07/12] add Gho token for arbitrum sepolia --- src/AaveV3ArbitrumSepolia.sol | 14 ++++++++++++++ src/ts/AaveV3ArbitrumSepolia.ts | 11 +++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/AaveV3ArbitrumSepolia.sol create mode 100644 src/ts/AaveV3ArbitrumSepolia.ts diff --git a/src/AaveV3ArbitrumSepolia.sol b/src/AaveV3ArbitrumSepolia.sol new file mode 100644 index 00000000..34414599 --- /dev/null +++ b/src/AaveV3ArbitrumSepolia.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: MIT +pragma solidity >=0.6.0; + +library AaveV3Sepolia { + // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 + address internal constant GHO_TOKEN = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; +} + +library AaveV3SepoliaAssets { + // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 + address internal constant GHO_UNDERLYING = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; + + uint8 internal constant GHO_DECIMALS = 18; +} \ No newline at end of file diff --git a/src/ts/AaveV3ArbitrumSepolia.ts b/src/ts/AaveV3ArbitrumSepolia.ts new file mode 100644 index 00000000..5e172391 --- /dev/null +++ b/src/ts/AaveV3ArbitrumSepolia.ts @@ -0,0 +1,11 @@ +// https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 +export const GHO_TOKEN = '0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810'; + +export const CHAIN_ID = 421614; + +export const ASSETS = { + GHO: { + decimals: 18, + UNDERLYING: '0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810', + }, +} as const; From eb5761c239306432ef92b8587fcb28d3ac4bc548 Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 17 Jan 2024 15:16:37 +0530 Subject: [PATCH 08/12] fix: contract name --- src/AaveV3ArbitrumSepolia.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AaveV3ArbitrumSepolia.sol b/src/AaveV3ArbitrumSepolia.sol index 34414599..f05969e5 100644 --- a/src/AaveV3ArbitrumSepolia.sol +++ b/src/AaveV3ArbitrumSepolia.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.6.0; -library AaveV3Sepolia { +library AaveV3ArbitrumSepolia { // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 address internal constant GHO_TOKEN = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; } -library AaveV3SepoliaAssets { +library AaveV3ArbitrumSepoliaAssets { // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 address internal constant GHO_UNDERLYING = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; From 8c11829c37b6745a6d9281c4004adb29da97e7e3 Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 17 Jan 2024 16:13:35 +0530 Subject: [PATCH 09/12] fix: remove change in ts files --- src/ts/AaveV3ArbitrumSepolia.ts | 11 ----------- src/ts/AaveV3Sepolia.ts | 13 ------------- 2 files changed, 24 deletions(-) delete mode 100644 src/ts/AaveV3ArbitrumSepolia.ts diff --git a/src/ts/AaveV3ArbitrumSepolia.ts b/src/ts/AaveV3ArbitrumSepolia.ts deleted file mode 100644 index 5e172391..00000000 --- a/src/ts/AaveV3ArbitrumSepolia.ts +++ /dev/null @@ -1,11 +0,0 @@ -// https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 -export const GHO_TOKEN = '0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810'; - -export const CHAIN_ID = 421614; - -export const ASSETS = { - GHO: { - decimals: 18, - UNDERLYING: '0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810', - }, -} as const; diff --git a/src/ts/AaveV3Sepolia.ts b/src/ts/AaveV3Sepolia.ts index ff3ee897..bf87e829 100644 --- a/src/ts/AaveV3Sepolia.ts +++ b/src/ts/AaveV3Sepolia.ts @@ -59,9 +59,6 @@ export const WETH_GATEWAY = '0x387d311e47e80b498169e6fb51d3193167d89F7D'; // https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8 export const STATIC_A_TOKEN_FACTORY = '0xd210dFB43B694430B8d31762B5199e30c31266C8'; -// https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 -export const GHO_TOKEN = '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60'; - export const CHAIN_ID = 11155111; export const ASSETS = { DAI: { @@ -144,16 +141,6 @@ export const ASSETS = { ORACLE: '0xCbE15C1f40f1D7eE1De3756D1557d5Fdc2A50bBD', STATA_TOKEN: '0x72B49a461900e11632C95dfa563e7173438D4e3E', }, - GHO: { - decimals: 18, - UNDERLYING: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', - A_TOKEN: '0xd190eF37dB51Bb955A680fF1A85763CC72d083D4', - S_TOKEN: '0xdCA691FB9609aB814E59c62d70783da1c056A9b6', - V_TOKEN: '0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844', - INTEREST_RATE_STRATEGY: '0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf', - ORACLE: '0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C', - STATA_TOKEN: '0x0000000000000000000000000000000000000000', - }, } as const; export const E_MODES = { NONE: 0, From 036bf8764aeb8d81da61120d67c0a0d1e9ea690e Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 17 Jan 2024 16:33:47 +0530 Subject: [PATCH 10/12] undo removal of asset and remove AaveV3ArbitrumSepoliaAssets lib --- src/AaveV3ArbitrumSepolia.sol | 7 ------- src/ts/AaveV3Sepolia.ts | 10 ++++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/AaveV3ArbitrumSepolia.sol b/src/AaveV3ArbitrumSepolia.sol index f05969e5..af5b2f07 100644 --- a/src/AaveV3ArbitrumSepolia.sol +++ b/src/AaveV3ArbitrumSepolia.sol @@ -4,11 +4,4 @@ pragma solidity >=0.6.0; library AaveV3ArbitrumSepolia { // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 address internal constant GHO_TOKEN = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; -} - -library AaveV3ArbitrumSepoliaAssets { - // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 - address internal constant GHO_UNDERLYING = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; - - uint8 internal constant GHO_DECIMALS = 18; } \ No newline at end of file diff --git a/src/ts/AaveV3Sepolia.ts b/src/ts/AaveV3Sepolia.ts index bf87e829..8c63ff42 100644 --- a/src/ts/AaveV3Sepolia.ts +++ b/src/ts/AaveV3Sepolia.ts @@ -141,6 +141,16 @@ export const ASSETS = { ORACLE: '0xCbE15C1f40f1D7eE1De3756D1557d5Fdc2A50bBD', STATA_TOKEN: '0x72B49a461900e11632C95dfa563e7173438D4e3E', }, + GHO: { + decimals: 18, + UNDERLYING: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', + A_TOKEN: '0xd190eF37dB51Bb955A680fF1A85763CC72d083D4', + S_TOKEN: '0xdCA691FB9609aB814E59c62d70783da1c056A9b6', + V_TOKEN: '0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844', + INTEREST_RATE_STRATEGY: '0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf', + ORACLE: '0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C', + STATA_TOKEN: '0x0000000000000000000000000000000000000000', + }, } as const; export const E_MODES = { NONE: 0, From b9c174b5686de712311602e35cd98581d10c8a68 Mon Sep 17 00:00:00 2001 From: Parth Patel Date: Wed, 17 Jan 2024 22:37:14 +0530 Subject: [PATCH 11/12] create MiscArbitrumSepolia --- src/{AaveV3ArbitrumSepolia.sol => MiscArbitrumSepolia.sol} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/{AaveV3ArbitrumSepolia.sol => MiscArbitrumSepolia.sol} (87%) diff --git a/src/AaveV3ArbitrumSepolia.sol b/src/MiscArbitrumSepolia.sol similarity index 87% rename from src/AaveV3ArbitrumSepolia.sol rename to src/MiscArbitrumSepolia.sol index af5b2f07..8ca5b99d 100644 --- a/src/AaveV3ArbitrumSepolia.sol +++ b/src/MiscArbitrumSepolia.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.6.0; -library AaveV3ArbitrumSepolia { +library MiscArbitrumSepolia { // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 address internal constant GHO_TOKEN = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; } \ No newline at end of file From c49d1cba01cf9471639a145c2711adcdb18ee0e9 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Thu, 18 Jan 2024 13:20:39 +0100 Subject: [PATCH 12/12] fix: Move GHO addresses to misc --- scripts/configs/networks/arbitrum.ts | 9 +++++++++ scripts/configs/networks/ethereum.ts | 4 ++++ scripts/configs/pools/ethereum.ts | 2 -- scripts/configs/types.ts | 3 ++- scripts/generateAddresses.ts | 3 ++- src/AaveAddressBook.sol | 1 + src/AaveV3Ethereum.sol | 3 --- src/AaveV3Sepolia.sol | 4 ++-- src/MiscArbitrumSepolia.sol | 5 +++-- src/MiscEthereum.sol | 7 +++++++ src/MiscSepolia.sol | 7 +++++++ src/ts/AaveAddressBook.ts | 1 + src/ts/AaveV3Ethereum.ts | 3 --- src/ts/AaveV3Sepolia.ts | 3 +++ src/ts/MiscArbitrumSepolia.ts | 5 +++++ src/ts/MiscEthereum.ts | 6 ++++++ src/ts/MiscSepolia.ts | 6 ++++++ 17 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 src/ts/MiscArbitrumSepolia.ts diff --git a/scripts/configs/networks/arbitrum.ts b/scripts/configs/networks/arbitrum.ts index c4d987bc..a6958976 100644 --- a/scripts/configs/networks/arbitrum.ts +++ b/scripts/configs/networks/arbitrum.ts @@ -12,3 +12,12 @@ export const arbitrumAddresses: NetworkAddresses = { PROTOCOL_GUARDIAN: '0xbbd9f90699c1fa0d7a65870d241dd1f1217c96eb', }, }; + + +export const arbitrumSepoliaAddresses: NetworkAddresses = { + name: 'ArbitrumSepolia', + chainId: ChainId.arbitrum_sepolia, + addresses: { + GHO_TOKEN: '0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810', + }, +}; diff --git a/scripts/configs/networks/ethereum.ts b/scripts/configs/networks/ethereum.ts index 1e67be72..1b8cfaf5 100644 --- a/scripts/configs/networks/ethereum.ts +++ b/scripts/configs/networks/ethereum.ts @@ -26,6 +26,8 @@ export const ethereumAddresses: NetworkAddresses<{ CREATE_3_FACTORY: '0xcc3C54B95f3f1867A43009B80ed4DD930E3cE2F7', PROTOCOL_GUARDIAN: '0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633', AAVE_MERKLE_DISTRIBUTOR: '0xa88c6D90eAe942291325f9ae3c66f3563B93FE10', + GHO_TOKEN: '0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f', + GHO_FLASHMINTER_FACILITATOR: '0xb639D208Bcf0589D54FaC24E655C79EC529762B8', }, }; @@ -35,5 +37,7 @@ export const sepoliaAddresses: NetworkAddresses = { addresses: { TRANSPARENT_PROXY_FACTORY: '0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2', PROXY_ADMIN: '0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7', + GHO_TOKEN: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', + GHO_FLASHMINTER_FACILITATOR: '0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E', }, }; diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts index a118d4a6..6bc1856c 100644 --- a/scripts/configs/pools/ethereum.ts +++ b/scripts/configs/pools/ethereum.ts @@ -40,7 +40,6 @@ export const sepoliaProtoV3: PoolConfig = { WETH_GATEWAY: '0x387d311e47e80b498169e6fb51d3193167d89F7D', STATIC_A_TOKEN_FACTORY: '0xd210dFB43B694430B8d31762B5199e30c31266C8', UI_GHO_DATA_PROVIDER: '0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A', - GHO_TOKEN: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60', }, }; @@ -97,7 +96,6 @@ export const mainnetProtoV3Pool: PoolConfig = { FREEZING_STEWARD: '0x2eE68ACb6A1319de1b49DC139894644E424fefD6', DEBT_SWAP_ADAPTER: '0x8761e0370f94f68Db8EaA731f4fC581f6AD0Bd68', DELEGATION_AWARE_A_TOKEN_IMPL_REV_1: '0x21714092D90c7265F52fdfDae068EC11a23C6248', - GHO_TOKEN: '0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f', CONFIG_ENGINE: '0xA3e44d830440dF5098520F62Ebec285B1198c51E', POOL_ADDRESSES_PROVIDER_REGISTRY: '0xbaA999AC55EAce41CcAE355c77809e68Bb345170', RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896', diff --git a/scripts/configs/types.ts b/scripts/configs/types.ts index d3a23548..d12a27b8 100644 --- a/scripts/configs/types.ts +++ b/scripts/configs/types.ts @@ -59,7 +59,6 @@ export interface PoolConfig { STATIC_A_TOKEN_FACTORY?: Hex; CAPS_PLUS_RISK_STEWARD?: Hex; FREEZING_STEWARD?: Hex; - GHO_TOKEN?: Hex; UI_GHO_DATA_PROVIDER?: Hex; RATES_FACTORY?: Hex; PERMISSION_MANAGER?: Hex; @@ -100,5 +99,7 @@ export interface NetworkAddresses = {}> { CREATE_3_FACTORY?: Hex; PROTOCOL_GUARDIAN?: Hex; AAVE_MERKLE_DISTRIBUTOR?: Hex; + GHO_TOKEN?: Hex; + GHO_FLASHMINTER_FACILITATOR?: Hex; } & T; } diff --git a/scripts/generateAddresses.ts b/scripts/generateAddresses.ts index da10d1e6..a62f078d 100644 --- a/scripts/generateAddresses.ts +++ b/scripts/generateAddresses.ts @@ -48,7 +48,7 @@ import {governanceConfigBNB} from './configs/governance/bnb'; import {governanceConfigGnosis} from './configs/governance/gnosis'; import {baseAddresses} from './configs/networks/base'; import {generateNetworkAddresses} from './generator/networkGenerator'; -import {arbitrumAddresses} from './configs/networks/arbitrum'; +import {arbitrumAddresses, arbitrumSepoliaAddresses} from './configs/networks/arbitrum'; import {avalancheAddresses} from './configs/networks/avalanche'; import {ethereumAddresses, sepoliaAddresses} from './configs/networks/ethereum'; import {mumbaiAddresses, polygonAddresses} from './configs/networks/polygon'; @@ -132,6 +132,7 @@ async function main() { const networkAddresses = [ arbitrumAddresses, + arbitrumSepoliaAddresses, avalancheAddresses, baseAddresses, ethereumAddresses, diff --git a/src/AaveAddressBook.sol b/src/AaveAddressBook.sol index 49208bd8..742889fa 100644 --- a/src/AaveAddressBook.sol +++ b/src/AaveAddressBook.sol @@ -45,6 +45,7 @@ import {AaveV3ScrollSepolia} from './AaveV3ScrollSepolia.sol'; import {AaveV3FantomTestnet} from './AaveV3FantomTestnet.sol'; import {AaveV3Fantom} from './AaveV3Fantom.sol'; import {MiscArbitrum} from './MiscArbitrum.sol'; +import {MiscArbitrumSepolia} from './MiscArbitrumSepolia.sol'; import {MiscAvalanche} from './MiscAvalanche.sol'; import {MiscBase} from './MiscBase.sol'; import {MiscEthereum} from './MiscEthereum.sol'; diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol index 5ebd220b..4add2daf 100644 --- a/src/AaveV3Ethereum.sol +++ b/src/AaveV3Ethereum.sol @@ -68,9 +68,6 @@ library AaveV3Ethereum { address internal constant DELEGATION_AWARE_A_TOKEN_IMPL_REV_1 = 0x21714092D90c7265F52fdfDae068EC11a23C6248; - // https://etherscan.io/address/0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f - address internal constant GHO_TOKEN = 0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f; - // https://etherscan.io/address/0xA3e44d830440dF5098520F62Ebec285B1198c51E address internal constant CONFIG_ENGINE = 0xA3e44d830440dF5098520F62Ebec285B1198c51E; diff --git a/src/AaveV3Sepolia.sol b/src/AaveV3Sepolia.sol index 014ff736..a9070d7a 100644 --- a/src/AaveV3Sepolia.sol +++ b/src/AaveV3Sepolia.sol @@ -73,8 +73,8 @@ library AaveV3Sepolia { // https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8 address internal constant STATIC_A_TOKEN_FACTORY = 0xd210dFB43B694430B8d31762B5199e30c31266C8; - // https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 - address internal constant GHO_TOKEN = 0xc4bF5CbDaBE595361438F8c6a187bDc330539c60; + // https://sepolia.etherscan.io/address/0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A + address internal constant UI_GHO_DATA_PROVIDER = 0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A; } library AaveV3SepoliaAssets { diff --git a/src/MiscArbitrumSepolia.sol b/src/MiscArbitrumSepolia.sol index 8ca5b99d..3fb1d9a6 100644 --- a/src/MiscArbitrumSepolia.sol +++ b/src/MiscArbitrumSepolia.sol @@ -1,7 +1,8 @@ +// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR // SPDX-License-Identifier: MIT pragma solidity >=0.6.0; library MiscArbitrumSepolia { - // https://sepolia.arbiscan.io/address/0xb13cfa6f8b2eed2c37fb00ff0c1a59807c585810 + // https://sepolia.arbiscan.io/address/0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810 address internal constant GHO_TOKEN = 0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810; -} \ No newline at end of file +} diff --git a/src/MiscEthereum.sol b/src/MiscEthereum.sol index fd8e7eb9..8748d3e6 100644 --- a/src/MiscEthereum.sol +++ b/src/MiscEthereum.sol @@ -39,4 +39,11 @@ library MiscEthereum { // https://etherscan.io/address/0xa88c6D90eAe942291325f9ae3c66f3563B93FE10 address internal constant AAVE_MERKLE_DISTRIBUTOR = 0xa88c6D90eAe942291325f9ae3c66f3563B93FE10; + + // https://etherscan.io/address/0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f + address internal constant GHO_TOKEN = 0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f; + + // https://etherscan.io/address/0xb639D208Bcf0589D54FaC24E655C79EC529762B8 + address internal constant GHO_FLASHMINTER_FACILITATOR = + 0xb639D208Bcf0589D54FaC24E655C79EC529762B8; } diff --git a/src/MiscSepolia.sol b/src/MiscSepolia.sol index 77b0bac8..0ab49517 100644 --- a/src/MiscSepolia.sol +++ b/src/MiscSepolia.sol @@ -8,4 +8,11 @@ library MiscSepolia { // https://sepolia.etherscan.io/address/0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7 address internal constant PROXY_ADMIN = 0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7; + + // https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 + address internal constant GHO_TOKEN = 0xc4bF5CbDaBE595361438F8c6a187bDc330539c60; + + // https://sepolia.etherscan.io/address/0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E + address internal constant GHO_FLASHMINTER_FACILITATOR = + 0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E; } diff --git a/src/ts/AaveAddressBook.ts b/src/ts/AaveAddressBook.ts index 9d1662ba..9929e169 100644 --- a/src/ts/AaveAddressBook.ts +++ b/src/ts/AaveAddressBook.ts @@ -42,6 +42,7 @@ export * as AaveV3ScrollSepolia from './AaveV3ScrollSepolia'; export * as AaveV3FantomTestnet from './AaveV3FantomTestnet'; export * as AaveV3Fantom from './AaveV3Fantom'; export * as MiscArbitrum from './MiscArbitrum'; +export * as MiscArbitrumSepolia from './MiscArbitrumSepolia'; export * as MiscAvalanche from './MiscAvalanche'; export * as MiscBase from './MiscBase'; export * as MiscEthereum from './MiscEthereum'; diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts index a573ffc7..b683e537 100644 --- a/src/ts/AaveV3Ethereum.ts +++ b/src/ts/AaveV3Ethereum.ts @@ -53,9 +53,6 @@ export const DEBT_SWAP_ADAPTER = '0x8761e0370f94f68Db8EaA731f4fC581f6AD0Bd68'; // https://etherscan.io/address/0x21714092D90c7265F52fdfDae068EC11a23C6248 export const DELEGATION_AWARE_A_TOKEN_IMPL_REV_1 = '0x21714092D90c7265F52fdfDae068EC11a23C6248'; -// https://etherscan.io/address/0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f -export const GHO_TOKEN = '0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f'; - // https://etherscan.io/address/0xA3e44d830440dF5098520F62Ebec285B1198c51E export const CONFIG_ENGINE = '0xA3e44d830440dF5098520F62Ebec285B1198c51E'; diff --git a/src/ts/AaveV3Sepolia.ts b/src/ts/AaveV3Sepolia.ts index 8c63ff42..53cefa79 100644 --- a/src/ts/AaveV3Sepolia.ts +++ b/src/ts/AaveV3Sepolia.ts @@ -59,6 +59,9 @@ export const WETH_GATEWAY = '0x387d311e47e80b498169e6fb51d3193167d89F7D'; // https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8 export const STATIC_A_TOKEN_FACTORY = '0xd210dFB43B694430B8d31762B5199e30c31266C8'; +// https://sepolia.etherscan.io/address/0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A +export const UI_GHO_DATA_PROVIDER = '0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A'; + export const CHAIN_ID = 11155111; export const ASSETS = { DAI: { diff --git a/src/ts/MiscArbitrumSepolia.ts b/src/ts/MiscArbitrumSepolia.ts new file mode 100644 index 00000000..fb6b5c0d --- /dev/null +++ b/src/ts/MiscArbitrumSepolia.ts @@ -0,0 +1,5 @@ +// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR +// https://sepolia.arbiscan.io/address/0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810 +export const GHO_TOKEN = '0xb13Cfa6f8B2Eed2C37fB00fF0c1A59807C585810'; + +export const CHAIN_ID = 421614; diff --git a/src/ts/MiscEthereum.ts b/src/ts/MiscEthereum.ts index a6c5fd41..1b331e45 100644 --- a/src/ts/MiscEthereum.ts +++ b/src/ts/MiscEthereum.ts @@ -32,4 +32,10 @@ export const PROTOCOL_GUARDIAN = '0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633'; // https://etherscan.io/address/0xa88c6D90eAe942291325f9ae3c66f3563B93FE10 export const AAVE_MERKLE_DISTRIBUTOR = '0xa88c6D90eAe942291325f9ae3c66f3563B93FE10'; +// https://etherscan.io/address/0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f +export const GHO_TOKEN = '0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f'; + +// https://etherscan.io/address/0xb639D208Bcf0589D54FaC24E655C79EC529762B8 +export const GHO_FLASHMINTER_FACILITATOR = '0xb639D208Bcf0589D54FaC24E655C79EC529762B8'; + export const CHAIN_ID = 1; diff --git a/src/ts/MiscSepolia.ts b/src/ts/MiscSepolia.ts index f6d9f027..b330c85c 100644 --- a/src/ts/MiscSepolia.ts +++ b/src/ts/MiscSepolia.ts @@ -5,4 +5,10 @@ export const TRANSPARENT_PROXY_FACTORY = '0x3Bad08c7b17D77cE12A2e1438Db2353b58F7 // https://sepolia.etherscan.io/address/0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7 export const PROXY_ADMIN = '0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7'; +// https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60 +export const GHO_TOKEN = '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60'; + +// https://sepolia.etherscan.io/address/0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E +export const GHO_FLASHMINTER_FACILITATOR = '0xB5d0ef1548D9C70d3E7a96cA67A2d7EbC5b1173E'; + export const CHAIN_ID = 11155111;