chore: update aave helpers

scripts/RiskStewards.s.sol

@@ -16,7 +16,7 @@ contract DeployEth is EthereumScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Ethereum.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Ethereum.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Ethereum.CONFIG_ENGINE),
       0x47c71dFEB55Ebaa431Ae3fbF99Ea50e0D3d30fA8
     );
   }
@@ -26,7 +26,7 @@ contract DeployPol is PolygonScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Polygon.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Polygon.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Polygon.CONFIG_ENGINE),
       0x2C40FB1ACe63084fc0bB95F83C31B5854C6C4cB5
     );
   }
@@ -36,7 +36,7 @@ contract DeployOpt is OptimismScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Optimism.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Optimism.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Optimism.CONFIG_ENGINE),
       0xCb86256A994f0c505c5e15c75BF85fdFEa0F2a56
     );
   }
@@ -46,7 +46,7 @@ contract DeployArb is ArbitrumScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Arbitrum.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Arbitrum.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Arbitrum.CONFIG_ENGINE),
       0x3Be327F22eB4BD8042e6944073b8826dCf357Aa2
     );
   }
@@ -56,7 +56,7 @@ contract DeployMet is MetisScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Metis.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Metis.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Metis.CONFIG_ENGINE),
       0x0f547846920C34E70FBE4F3d87E46452a3FeAFfa
     );
   }
@@ -66,7 +66,7 @@ contract DeployAva is AvalancheScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Avalanche.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Avalanche.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Avalanche.CONFIG_ENGINE),
       0xCa66149425E7DC8f81276F6D80C4b486B9503D1a
     );
   }
@@ -76,7 +76,7 @@ contract DeployBas is BaseScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
       AaveV3Base.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Base.LISTING_ENGINE),
+      IAaveV3ConfigEngine(AaveV3Base.CONFIG_ENGINE),
       0xfbeB4AcB31340bA4de9C87B11dfBf7e2bc8C0bF1
     );
   }

scripts/V2RateStrategyFactory.s.sol

@@ -3,17 +3,17 @@ pragma solidity ^0.8.0;
 
 import {ILendingPoolAddressesProvider, IDefaultInterestRateStrategy, ILendingPool} from 'aave-address-book/AaveV2.sol';
 import {AaveGovernanceV2} from 'aave-address-book/AaveGovernanceV2.sol';
-import {AaveMisc} from 'aave-address-book/AaveMisc.sol';
+import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
+import {MiscPolygon} from 'aave-address-book/MiscPolygon.sol';
+import {MiscAvalanche} from 'aave-address-book/MiscAvalanche.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {V2RateStrategyFactory} from '../src/v2-config-engine/V2RateStrategyFactory.sol';
 import '../src/ScriptUtils.sol';
 
 library DeployV2RatesFactoryLib {
-  function _getUniqueStrategiesOnPool(ILendingPool pool)
-    internal
-    view
-    returns (IDefaultInterestRateStrategy[] memory)
-  {
+  function _getUniqueStrategiesOnPool(
+    ILendingPool pool
+  ) internal view returns (IDefaultInterestRateStrategy[] memory) {
     address[] memory listedAssets = pool.getReservesList();
     IDefaultInterestRateStrategy[] memory uniqueRateStrategies = new IDefaultInterestRateStrategy[](
       listedAssets.length
@@ -68,9 +68,8 @@ library DeployV2RatesFactoryLib {
   // To make sure strategies initialised on the factory respect the standard code
   // We do so by checking if the strategy to initialise matches the standard deployed rates address codehash
   function _isStandardStrategy(address strategy) internal view returns (bool) {
-    return (
-      strategy.codehash == 0xd7aa7ce390578e74a5e48d4f530f22cbd75db8437fd6a1ae0a983e550483d972 // Current standard codehash deployed from factory
-    );
+    return (strategy.codehash ==
+      0xd7aa7ce390578e74a5e48d4f530f22cbd75db8437fd6a1ae0a983e550483d972); // Current standard codehash deployed from factory
   }
 }
 
@@ -79,8 +78,8 @@ library DeployV2RatesFactoryEthLib {
     return
       DeployV2RatesFactoryLib._createAndSetupRatesFactory(
         AaveV2Ethereum.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_ETHEREUM,
-        AaveMisc.PROXY_ADMIN_ETHEREUM
+        MiscEthereum.TRANSPARENT_PROXY_FACTORY,
+        MiscEthereum.PROXY_ADMIN
       );
   }
 }
@@ -90,8 +89,8 @@ library DeployV2RatesFactoryEthAMMLib {
     return
       DeployV2RatesFactoryLib._createAndSetupRatesFactory(
         AaveV2EthereumAMM.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_ETHEREUM,
-        AaveMisc.PROXY_ADMIN_ETHEREUM
+        MiscEthereum.TRANSPARENT_PROXY_FACTORY,
+        MiscEthereum.PROXY_ADMIN
       );
   }
 }
@@ -101,8 +100,8 @@ library DeployV2RatesFactoryPolLib {
     return
       DeployV2RatesFactoryLib._createAndSetupRatesFactory(
         AaveV2Polygon.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_POLYGON,
-        AaveMisc.PROXY_ADMIN_POLYGON
+        MiscPolygon.TRANSPARENT_PROXY_FACTORY,
+        MiscPolygon.PROXY_ADMIN
       );
   }
 }
@@ -112,8 +111,8 @@ library DeployV2RatesFactoryAvaLib {
     return
       DeployV2RatesFactoryLib._createAndSetupRatesFactory(
         AaveV2Avalanche.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_AVALANCHE,
-        AaveMisc.PROXY_ADMIN_AVALANCHE
+        MiscAvalanche.TRANSPARENT_PROXY_FACTORY,
+        MiscAvalanche.PROXY_ADMIN
       );
   }
 }

scripts/V3RateStrategyFactory.s.sol

@@ -4,7 +4,13 @@ pragma solidity ^0.8.0;
 import '../src/ScriptUtils.sol';
 import {IPoolAddressesProvider, IPool, IDefaultInterestRateStrategy} from 'aave-address-book/AaveV3.sol';
 import {AaveGovernanceV2} from 'aave-address-book/AaveGovernanceV2.sol';
-import {AaveMisc} from 'aave-address-book/AaveMisc.sol';
+import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
+import {MiscPolygon} from 'aave-address-book/MiscPolygon.sol';
+import {MiscAvalanche} from 'aave-address-book/MiscAvalanche.sol';
+import {MiscMetis} from 'aave-address-book/MiscMetis.sol';
+import {MiscBase} from 'aave-address-book/MiscBase.sol';
+import {MiscArbitrum} from 'aave-address-book/MiscArbitrum.sol';
+import {MiscOptimism} from 'aave-address-book/MiscOptimism.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveV3Optimism} from 'aave-address-book/AaveV3Optimism.sol';
 import {AaveV3Arbitrum} from 'aave-address-book/AaveV3Arbitrum.sol';
@@ -78,8 +84,8 @@ library DeployRatesFactoryEthLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Ethereum.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_ETHEREUM,
-        AaveMisc.PROXY_ADMIN_ETHEREUM
+        MiscEthereum.TRANSPARENT_PROXY_FACTORY,
+        MiscEthereum.PROXY_ADMIN
       );
   }
 }
@@ -89,8 +95,8 @@ library DeployRatesFactoryOptLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Optimism.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_OPTIMISM,
-        AaveMisc.PROXY_ADMIN_OPTIMISM
+        MiscOptimism.TRANSPARENT_PROXY_FACTORY,
+        MiscOptimism.PROXY_ADMIN
       );
   }
 }
@@ -100,8 +106,8 @@ library DeployRatesFactoryArbLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Arbitrum.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_ARBITRUM,
-        AaveMisc.PROXY_ADMIN_ARBITRUM
+        MiscArbitrum.TRANSPARENT_PROXY_FACTORY,
+        MiscArbitrum.PROXY_ADMIN
       );
   }
 }
@@ -111,8 +117,8 @@ library DeployRatesFactoryPolLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Polygon.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_POLYGON,
-        AaveMisc.PROXY_ADMIN_POLYGON
+        MiscPolygon.TRANSPARENT_PROXY_FACTORY,
+        MiscPolygon.PROXY_ADMIN
       );
   }
 }
@@ -122,8 +128,8 @@ library DeployRatesFactoryAvaLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Avalanche.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_AVALANCHE,
-        AaveMisc.PROXY_ADMIN_AVALANCHE
+        MiscAvalanche.TRANSPARENT_PROXY_FACTORY,
+        MiscAvalanche.PROXY_ADMIN
       );
   }
 }
@@ -133,8 +139,8 @@ library DeployRatesFactoryMetLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Metis.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_METIS,
-        AaveMisc.PROXY_ADMIN_METIS
+        MiscMetis.TRANSPARENT_PROXY_FACTORY,
+        MiscMetis.PROXY_ADMIN
       );
   }
 }
@@ -144,8 +150,8 @@ library DeployRatesFactoryBasLib {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
         AaveV3Base.POOL_ADDRESSES_PROVIDER,
-        AaveMisc.TRANSPARENT_PROXY_FACTORY_BASE,
-        AaveMisc.PROXY_ADMIN_BASE
+        MiscBase.TRANSPARENT_PROXY_FACTORY,
+        MiscBase.PROXY_ADMIN
       );
   }
 }

src/CommonTestBase.sol

@@ -4,7 +4,7 @@ pragma solidity >=0.7.5 <0.9.0;
 import 'forge-std/StdJson.sol';
 import 'forge-std/Test.sol';
 import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
-import {AaveMisc} from 'aave-address-book/AaveMisc.sol';
+import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
 import {AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
 import {AaveV3OptimismAssets} from 'aave-address-book/AaveV3Optimism.sol';
 import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
@@ -65,7 +65,7 @@ contract CommonTestBase is Test {
       }
       // AAVE
       if (asset == AaveV3EthereumAssets.AAVE_UNDERLYING) {
-        vm.startPrank(AaveMisc.ECOSYSTEM_RESERVE);
+        vm.startPrank(MiscEthereum.ECOSYSTEM_RESERVE);
         IERC20(asset).transfer(user, amount);
         return true;
       }

src/GovHelpers.sol

@@ -10,7 +10,7 @@ import {IPoolAddressesProvider} from 'aave-address-book/AaveV3.sol';
 import {AaveV3Avalanche} from 'aave-address-book/AaveV3Avalanche.sol';
 import {AaveV3Harmony} from 'aave-address-book/AaveV3Harmony.sol';
 import {AaveV3Fantom} from 'aave-address-book/AaveV3Fantom.sol';
-import {AaveMisc} from 'aave-address-book/AaveMisc.sol';
+import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
 import {ProxyHelpers} from './ProxyHelpers.sol';
 import {ChainIds} from './ChainIds.sol';
 import {StorageHelpers} from './StorageHelpers.sol';
@@ -211,8 +211,8 @@ library GovHelpers {
     Payload[] memory payloads,
     address executor
   ) internal returns (uint256) {
-    vm.deal(AaveMisc.ECOSYSTEM_RESERVE, 1 ether);
-    vm.startPrank(AaveMisc.ECOSYSTEM_RESERVE);
+    vm.deal(MiscEthereum.ECOSYSTEM_RESERVE, 1 ether);
+    vm.startPrank(MiscEthereum.ECOSYSTEM_RESERVE);
     uint256 proposalId = _createProposal(executor, payloads, bytes32('test'), false);
     vm.stopPrank();
     return proposalId;

src/GovV3Helpers.sol

@@ -16,7 +16,7 @@ import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
 import {GovernanceV3Metis} from 'aave-address-book/GovernanceV3Metis.sol';
 import {GovernanceV3Base} from 'aave-address-book/GovernanceV3Base.sol';
 import {GovernanceV3BNB} from 'aave-address-book/GovernanceV3BNB.sol';
-import {AaveMisc} from 'aave-address-book/AaveMisc.sol';
+import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
 import {StorageHelpers} from './StorageHelpers.sol';
 
 library GovV3Helpers {
@@ -656,7 +656,7 @@ library GovV3StorageHelpers {
     vm.store(
       address(GovernanceV3Ethereum.GOVERNANCE),
       bytes32(proposalBaseSlot + 1),
-      bytes32(uint256(uint160(AaveMisc.ECOSYSTEM_RESERVE)))
+      bytes32(uint256(uint160(MiscEthereum.ECOSYSTEM_RESERVE)))
     );
     // overwrite array size
     vm.store(

src/swaps/AaveSwapperDeployment.s.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import {Script} from 'forge-std/Script.sol';
-import {AaveMisc} from 'aave-address-book/AaveMisc.sol';
+import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
 import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
 
 import {AaveSwapper} from './AaveSwapper.sol';
@@ -13,9 +13,9 @@ contract DeplyAaveSwapper is Script {
     vm.startBroadcast();
 
     address aaveSwapper = address(new AaveSwapper());
-    TransparentProxyFactory(AaveMisc.TRANSPARENT_PROXY_FACTORY_ETHEREUM).create(
+    TransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
       aaveSwapper,
-      AaveMisc.PROXY_ADMIN_ETHEREUM,
+      MiscEthereum.PROXY_ADMIN,
       abi.encodeWithSelector(AaveSwapper.initialize.selector)
     );
 

src/v2-config-engine/AaveV2PayloadAvalanche.sol

@@ -10,7 +10,7 @@ import './AaveV2PayloadBase.sol';
  */
 // TODO: Add rates factory address after deploying
 abstract contract AaveV2PayloadAvalanche is
-  AaveV2PayloadBase(IEngine(AaveV2Avalanche.LISTING_ENGINE))
+  AaveV2PayloadBase(IEngine(AaveV2Avalanche.CONFIG_ENGINE))
 {
 
 }

src/v2-config-engine/AaveV2PayloadEthereum.sol

@@ -10,7 +10,7 @@ import './AaveV2PayloadBase.sol';
  */
 // TODO: Add rates factory address after deploying
 abstract contract AaveV2PayloadEthereum is
-  AaveV2PayloadBase(IEngine(AaveV2Ethereum.LISTING_ENGINE))
+  AaveV2PayloadBase(IEngine(AaveV2Ethereum.CONFIG_ENGINE))
 {
 
 }

src/v2-config-engine/AaveV2PayloadEthereumAMM.sol

@@ -10,7 +10,7 @@ import './AaveV2PayloadBase.sol';
  */
 // TODO: Add rates factory address after deploying
 abstract contract AaveV2PayloadEthereumAMM is
-  AaveV2PayloadBase(IEngine(AaveV2EthereumAMM.LISTING_ENGINE))
+  AaveV2PayloadBase(IEngine(AaveV2EthereumAMM.CONFIG_ENGINE))
 {
 
 }

src/v2-config-engine/AaveV2PayloadPolygon.sol

@@ -9,6 +9,6 @@ import './AaveV2PayloadBase.sol';
  * @author BGD Labs
  */
 // TODO: Add rates factory address after deploying
-abstract contract AaveV2PayloadPolygon is AaveV2PayloadBase(IEngine(AaveV2Polygon.LISTING_ENGINE)) {
+abstract contract AaveV2PayloadPolygon is AaveV2PayloadBase(IEngine(AaveV2Polygon.CONFIG_ENGINE)) {
 
 }

src/v3-config-engine/AaveV3PayloadArbitrum.sol

@@ -8,7 +8,7 @@ import './AaveV3Payload.sol';
  * @dev Base smart contract for an Aave v3.0.1 (compatible with 3.0.0) listing on v3 Arbitrum.
  * @author BGD Labs
  */
-abstract contract AaveV3PayloadArbitrum is AaveV3Payload(IEngine(AaveV3Arbitrum.LISTING_ENGINE)) {
+abstract contract AaveV3PayloadArbitrum is AaveV3Payload(IEngine(AaveV3Arbitrum.CONFIG_ENGINE)) {
   function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
     return IEngine.PoolContext({networkName: 'Arbitrum', networkAbbreviation: 'Arb'});
   }

src/v3-config-engine/AaveV3PayloadAvalanche.sol

@@ -8,7 +8,7 @@ import './AaveV3Payload.sol';
  * @dev Base smart contract for an Aave v3.0.1 (compatible with 3.0.0) listing on v3 Avalanche.
  * @author BGD Labs
  */
-abstract contract AaveV3PayloadAvalanche is AaveV3Payload(IEngine(AaveV3Avalanche.LISTING_ENGINE)) {
+abstract contract AaveV3PayloadAvalanche is AaveV3Payload(IEngine(AaveV3Avalanche.CONFIG_ENGINE)) {
   function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
     return IEngine.PoolContext({networkName: 'Avalanche', networkAbbreviation: 'Ava'});
   }

src/v3-config-engine/AaveV3PayloadBase.sol

@@ -8,7 +8,7 @@ import './AaveV3Payload.sol';
  * @dev Base smart contract for an Aave v3.0.2 (compatible with 3.0.0) listing on v3 Base.
  * @author BGD Labs
  */
-abstract contract AaveV3PayloadBase is AaveV3Payload(IEngine(AaveV3Base.LISTING_ENGINE)) {
+abstract contract AaveV3PayloadBase is AaveV3Payload(IEngine(AaveV3Base.CONFIG_ENGINE)) {
   function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
     return IEngine.PoolContext({networkName: 'Base', networkAbbreviation: 'Bas'});
   }

src/v3-config-engine/AaveV3PayloadEthereum.sol

@@ -8,7 +8,7 @@ import './AaveV3Payload.sol';
  * @dev Base smart contract for an Aave v3.0.1 (compatible with 3.0.0) listing on v3 Ethereum.
  * @author BGD Labs
  */
-abstract contract AaveV3PayloadEthereum is AaveV3Payload(IEngine(AaveV3Ethereum.LISTING_ENGINE)) {
+abstract contract AaveV3PayloadEthereum is AaveV3Payload(IEngine(AaveV3Ethereum.CONFIG_ENGINE)) {
   function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
     return IEngine.PoolContext({networkName: 'Ethereum', networkAbbreviation: 'Eth'});
   }

src/v3-config-engine/AaveV3PayloadMetis.sol

@@ -8,7 +8,7 @@ import './AaveV3Payload.sol';
  * @dev Base smart contract for an Aave v3.0.2 (compatible with 3.0.0) listing on v3 Metis.
  * @author BGD Labs
  */
-abstract contract AaveV3PayloadMetis is AaveV3Payload(IEngine(AaveV3Metis.LISTING_ENGINE)) {
+abstract contract AaveV3PayloadMetis is AaveV3Payload(IEngine(AaveV3Metis.CONFIG_ENGINE)) {
   function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
     return IEngine.PoolContext({networkName: 'Metis', networkAbbreviation: 'Met'});
   }