@bgd-labs/aave-address-book 1.2.1 → 1.3.0

package/src/AaveV3.sol

@@ -1919,7 +1919,6 @@ struct TokenData {
 
 // TODO: add better documentation
 interface IAaveProtocolDataProvider {
-  
   function getAllReservesTokens() external view returns (TokenData[] memory);
 
   function getAllATokens() external view returns (TokenData[] memory);
@@ -2036,11 +2035,11 @@ interface IAaveProtocolDataProvider {
       address stableDebtTokenAddress,
       address variableDebtTokenAddress
     );
-  
-    function getInterestRateStrategyAddress(address asset)
-      external
-      view
-      returns (address irStrategyAddress);
+
+  function getInterestRateStrategyAddress(address asset)
+    external
+    view
+    returns (address irStrategyAddress);
 }
 
 /**
@@ -2331,7 +2330,10 @@ interface IInterestRateStrategy {
    * 1-optimal stable to total debt ratio. Added as a constant here for gas optimizations.
    * Expressed in ray
    */
-  function MAX_EXCESS_STABLE_TO_TOTAL_DEBT_RATIO() external view returns (uint256);
+  function MAX_EXCESS_STABLE_TO_TOTAL_DEBT_RATIO()
+    external
+    view
+    returns (uint256);
 
   function ADDRESSES_PROVIDER() external view returns (IPoolAddressesProvider);
 
@@ -2395,7 +2397,9 @@ interface IInterestRateStrategy {
    * @return stableBorrowRate The stable borrow rate expressed in rays
    * @return variableBorrowRate The variable borrow rate expressed in rays
    */
-  function calculateInterestRates(DataTypes.CalculateInterestRatesParams memory params)
+  function calculateInterestRates(
+    DataTypes.CalculateInterestRatesParams memory params
+  )
     external
     view
     returns (
@@ -2404,3 +2408,61 @@ interface IInterestRateStrategy {
       uint256
     );
 }
+
+/**
+ * @title ICollector
+ * @notice Defines the interface of the Collector contract
+ * @author Aave
+ **/
+interface ICollector {
+  /**
+   * @dev Emitted during the transfer of ownership of the funds administrator address
+   * @param fundsAdmin The new funds administrator address
+   **/
+  event NewFundsAdmin(address indexed fundsAdmin);
+
+  /**
+   * @dev Retrieve the current implementation Revision of the proxy
+   * @return The revision version
+   */
+  function REVISION() external view returns (uint256);
+
+  /**
+   * @dev Retrieve the current funds administrator
+   * @return The address of the funds administrator
+   */
+  function getFundsAdmin() external view returns (address);
+
+  /**
+   * @dev Approve an amount of tokens to be pulled by the recipient.
+   * @param token The address of the asset
+   * @param recipient The address of the entity allowed to pull tokens
+   * @param amount The amount allowed to be pulled. If zero it will revoke the approval.
+   */
+  function approve(
+    // IERC20 token,
+    address token,
+    address recipient,
+    uint256 amount
+  ) external;
+
+  /**
+   * @dev Transfer an amount of tokens to the recipient.
+   * @param token The address of the asset
+   * @param recipient The address of the entity to transfer the tokens.
+   * @param amount The amount to be transferred.
+   */
+  function transfer(
+    // IERC20 token,
+    address token,
+    address recipient,
+    uint256 amount
+  ) external;
+
+  /**
+   * @dev Transfer the ownership of the funds administrator role.
+          This function should only be callable by the current funds administrator.
+   * @param admin The address of the new funds administrator
+   */
+  function setFundsAdmin(address admin) external;
+}

package/src/AaveV3Arbitrum.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Arbitrum {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Arbitrum {
     address internal constant COLLECTOR =
         0x053D55f9B5AF8694c503EB288a1B7E552f590710;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0xC3301b30f4EcBfd59dE0d74e89690C1a70C6f21B;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xC3301b30f4EcBfd59dE0d74e89690C1a70C6f21B);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x929EC64c34a17401F460460D4B9390518E5B473e;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e;
 }

package/src/AaveV3ArbitrumGoerli.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.0;
+
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
+
+library AaveV3ArbitrumGoerli {
+    IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
+        IPoolAddressesProvider(0xF8aa90E66B8BAe13f2e4aDe6104abAb8eeDaBfdc);
+
+    IPool internal constant POOL =
+        IPool(0x6Cbb4E8eC402E07fDF96DbbC6c752aCfB0eB6075);
+
+    IPoolConfigurator internal constant POOL_CONFIGURATOR =
+        IPoolConfigurator(0x279Dd50e124D45bDeDCF408849937A4985e56dD2);
+
+    IAaveOracle internal constant ORACLE =
+        IAaveOracle(0x86b4D2636EC473AC4A5dD83Fc2BEDa98845249A7);
+
+    IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
+        IAaveProtocolDataProvider(0xce3Aa85237C075d2102b7B35079d305307D745C8);
+
+    IACLManager internal constant ACL_MANAGER =
+        IACLManager(0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383);
+
+    address internal constant ACL_ADMIN =
+        0x4365F8e70CF38C6cA67DE41448508F2da8825500;
+
+    address internal constant COLLECTOR =
+        0xad848879F9Ac276BdB7D38123F381C692FD6D6dE;
+
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xff01517f8811E532900a46e6AdB4484BDB3f2B8a);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0xCf9C57744E10495490cB873612Db709417cFe4f4;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0x60bD8be38855AAd1459E958dC921ed5bbb5E3292;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x0aadeE9418641b5749e872eDEF9844200143865D;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x6A83d738fCBaB0c3973234AC7b7b4f7DDa2aD248;
+}

package/src/AaveV3Avalanche.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Avalanche {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Avalanche {
     address internal constant COLLECTOR =
         0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0xaCbE7d574EF8dC39435577eb638167Aca74F79f0;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xaCbE7d574EF8dC39435577eb638167Aca74F79f0);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x929EC64c34a17401F460460D4B9390518E5B473e;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e;
 }

package/src/AaveV3Fantom.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Fantom {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Fantom {
     address internal constant COLLECTOR =
         0xBe85413851D195fC6341619cD68BfDc26a25b928;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0xc0F0cFBbd0382BcE3B93234E4BFb31b2aaBE36aD;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xc0F0cFBbd0382BcE3B93234E4BFb31b2aaBE36aD);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x929EC64c34a17401F460460D4B9390518E5B473e;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e;
 }

package/src/AaveV3FantomTestnet.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3FantomTestnet {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3FantomTestnet {
     address internal constant COLLECTOR =
         0xF49dA7a22463D140f9f8dc7C91468C8721215496;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0x7aaB2c2CC186131851d6B1876D16eDc849846042;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0x7aaB2c2CC186131851d6B1876D16eDc849846042);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x54Bc1D59873A5ABde98cf76B6EcF4075ff65d685;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xFc1Ab0379db4B6ad8Bf5Bc1382e108a341E2EaBb;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x981D8AcaF6af3a46785e7741d22fBE81B25Ebf1e;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0xc048C1b6ac47393F073dA2b3d5D1cc43b94891Fd;
 }

package/src/AaveV3Fuji.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Fuji {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Fuji {
     address internal constant COLLECTOR =
         0xBaaCc99123133851Ba2D6d34952aa08CBDf5A4E4;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0xFCadBDefd30E11258559Ba239C8a5A8A8D28CB00;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xFCadBDefd30E11258559Ba239C8a5A8A8D28CB00);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x58Cd851c28dF05Edc7F018B533C0257DE57673f7;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xA3a8697C4C6A7D9ccF9238cb567b122d53012ac9;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x651b8A8cA545b251a8f49B57D5838Da0a8DFbEF9;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x06Db7973d6D724Eb15404a0d178624f6e07834F9;
 }

package/src/AaveV3Goerli.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.0;
+
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
+
+library AaveV3Goerli {
+    IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
+        IPoolAddressesProvider(0xc4dCB5126a3AfEd129BC3668Ea19285A9f56D15D);
+
+    IPool internal constant POOL =
+        IPool(0x368EedF3f56ad10b9bC57eed4Dac65B26Bb667f6);
+
+    IPoolConfigurator internal constant POOL_CONFIGURATOR =
+        IPoolConfigurator(0x723d17Ee6a668C011F01553D19B850E425075665);
+
+    IAaveOracle internal constant ORACLE =
+        IAaveOracle(0x5bed0810073cc9f0DacF73C648202249E87eF6cB);
+
+    IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
+        IAaveProtocolDataProvider(0x9BE876c6DC42215B00d7efe892E2691C3bc35d10);
+
+    IACLManager internal constant ACL_MANAGER =
+        IACLManager(0x4c952A81A72A6BA2919a658feff1e7F023e4aadc);
+
+    address internal constant ACL_ADMIN =
+        0x77c45699A715A64A7a7796d5CEe884cf617D5254;
+
+    address internal constant COLLECTOR =
+        0xFbAF383eB6c757faCb8cb19B68d5131aEbc5c11e;
+
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0x5665007321915c8f0E72d041315bA1AD15065337);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x0C501fB73808e1BD73cBDdd0c99237bbc481Bb58;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xF2EBFA003f04f38Fc606a37ab8D1c015c015725c;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x1342dd8Ff58aee340e3C25268A4d08168cC5d990;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x7D17eCD9fc4F64F180227216befb9d8E2c723135;
+}

package/src/AaveV3Harmony.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Harmony {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Harmony {
     address internal constant COLLECTOR =
         0x8A020d92D6B119978582BE4d3EdFdC9F7b28BF31;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0xeaC16519923774Fd7723d3D5E442a1e2E46BA962;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xeaC16519923774Fd7723d3D5E442a1e2E46BA962);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x929EC64c34a17401F460460D4B9390518E5B473e;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e;
 }

package/src/AaveV3Mumbai.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Mumbai {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Mumbai {
     address internal constant COLLECTOR =
         0x3B6E7a4750e478D7f7d6A5d464099A02ef164bCC;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0x810d913542D399F3680F0E806DEDf6EACf0e3383;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0x810d913542D399F3680F0E806DEDf6EACf0e3383);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0xFfaDa869df79320120dfFd6eeE8cF664Dba43146;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0x8017B7FC5473d05e67E617072fB237D24Add550b;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x08a917bbd0E22D496Ca9364B5D21311fe1D31637;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x651b8A8cA545b251a8f49B57D5838Da0a8DFbEF9;
 }

package/src/AaveV3Optimism.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Optimism {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Optimism {
     address internal constant COLLECTOR =
         0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0xA77E4A084d7d4f064E326C0F6c0aCefd47A5Cb21;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xA77E4A084d7d4f064E326C0F6c0aCefd47A5Cb21);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x929EC64c34a17401F460460D4B9390518E5B473e;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e;
 }

package/src/AaveV3OptimismGoerli.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.0;
+
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
+
+library AaveV3OptimismGoerli {
+    IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
+        IPoolAddressesProvider(0x74a328ED938160D702378Daeb7aB2504714B4E4b);
+
+    IPool internal constant POOL =
+        IPool(0x4b529A5d8268d74B687aC3dbb00e1b85bF4BF0d4);
+
+    IPoolConfigurator internal constant POOL_CONFIGURATOR =
+        IPoolConfigurator(0x598fCb66f358d0C1396972a1BC30DeC2daB87E46);
+
+    IAaveOracle internal constant ORACLE =
+        IAaveOracle(0x171Af9229972716f28DBB04DBFC712F05B45B021);
+
+    IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
+        IAaveProtocolDataProvider(0x42BdE9c98B80e83F1B051B4bb11812aDa314213a);
+
+    IACLManager internal constant ACL_MANAGER =
+        IACLManager(0x9B14C2DEe92CE731da32bf861Ca4Fb2202662248);
+
+    address internal constant ACL_ADMIN =
+        0x4365F8e70CF38C6cA67DE41448508F2da8825500;
+
+    address internal constant COLLECTOR =
+        0x8Ee63E24D91317f9DabFf3c5361d747244c0f16c;
+
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xADDcE1e19761577d7FBB278B1b3158891679a066);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x0C501fB73808e1BD73cBDdd0c99237bbc481Bb58;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0x08483a8d324C94942D9B9071e5e4aB6F28da0DF1;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0xC642A760bE9F04b453b899f7F454b2AFe21C1C61;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0xff01517f8811E532900a46e6AdB4484BDB3f2B8a;
+}

package/src/AaveV3Polygon.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager} from "./AaveV3.sol";
-import {Token} from "./Common.sol";
+import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IAaveProtocolDataProvider, IACLManager, ICollector} from "./AaveV3.sol";
 
 library AaveV3Polygon {
     IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
@@ -29,6 +28,18 @@ library AaveV3Polygon {
     address internal constant COLLECTOR =
         0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383;
 
-    address internal constant COLLECTOR_CONTROLLER =
-        0x73D435AFc15e35A9aC63B2a81B5AA54f974eadFe;
+    ICollector internal constant COLLECTOR_CONTROLLER =
+        ICollector(0xDB89487A449274478e984665b8692AfC67459deF);
+
+    address internal constant DEFAULT_INCENTIVES_CONTROLLER =
+        0x929EC64c34a17401F460460D4B9390518E5B473e;
+
+    address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 =
+        0xa5ba6E5EC19a1Bf23C857991c857dB62b2Aa187B;
+
+    address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x81387c40EB75acB02757C1Ae55D5936E78c9dEd3;
+
+    address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
+        0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e;
 }

package/src/test/AaveV2Misfits.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import "forge-std/Test.sol";
-import { AaveV2Avalanche, AaveV2Polygon, AaveV2EthereumArc } from "../AaveAddressBook.sol";
+import 'forge-std/Test.sol';
+import {AaveV2Avalanche, AaveV2Polygon, AaveV2EthereumArc} from '../AaveAddressBook.sol';
 
 /**
  * @dev This test contains regression tests for markets that are slightly different then the default.
@@ -16,7 +16,6 @@ contract AaveAddressMisfitsTest is Test {
    */
   function testCollectorControllerIs0Address() public {
     assertEq(address(AaveV2Avalanche.COLLECTOR_CONTROLLER), address(0));
-    assertEq(address(AaveV2Polygon.COLLECTOR_CONTROLLER), address(0));
   }
 
   /**

package/src/test/AaveV3Avalanche.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.0;
 
-import "forge-std/Test.sol";
-import { AaveV3Avalanche } from "../AaveAddressBook.sol";
+import 'forge-std/Test.sol';
+import {AaveV3Avalanche} from '../AaveAddressBook.sol';
 
 contract AaveAddressBookTest is Test {
   function setUp() public {}
@@ -58,7 +58,7 @@ contract AaveAddressBookTest is Test {
 
   function testCollectorControllerIsCorrect() public {
     assertEq(
-      AaveV3Avalanche.COLLECTOR_CONTROLLER,
+      address(AaveV3Avalanche.COLLECTOR_CONTROLLER),
       address(0xaCbE7d574EF8dC39435577eb638167Aca74F79f0)
     );
   }

package/src/ts/AaveAddressBook.ts

@@ -1,6 +1,11 @@
+export * as AaveGovernanceV2 from "./AaveGovernanceV2";
+export * as AaveSafetyModule from "./AaveSafetyModule";
+// autogenerated entrypoints
 export * as AaveV2Ethereum from "./AaveV2Ethereum";
 export * as AaveV2EthereumAMM from "./AaveV2EthereumAMM";
 export * as AaveV2EthereumArc from "./AaveV2EthereumArc";
+export * as AaveV2Goerli from "./AaveV2Goerli";
+export * as AaveV3Goerli from "./AaveV3Goerli";
 export * as AaveV2Mumbai from "./AaveV2Mumbai";
 export * as AaveV3Mumbai from "./AaveV3Mumbai";
 export * as AaveV2Polygon from "./AaveV2Polygon";
@@ -10,8 +15,9 @@ export * as AaveV3Fuji from "./AaveV3Fuji";
 export * as AaveV2Avalanche from "./AaveV2Avalanche";
 export * as AaveV3Avalanche from "./AaveV3Avalanche";
 export * as AaveV3Arbitrum from "./AaveV3Arbitrum";
+export * as AaveV3ArbitrumGoerli from "./AaveV3ArbitrumGoerli";
 export * as AaveV3FantomTestnet from "./AaveV3FantomTestnet";
 export * as AaveV3Fantom from "./AaveV3Fantom";
 export * as AaveV3Harmony from "./AaveV3Harmony";
-export * as AaveV3OptimismKovan from "./AaveV3OptimismKovan";
 export * as AaveV3Optimism from "./AaveV3Optimism";
+export * as AaveV3OptimismGoerli from "./AaveV3OptimismGoerli";

package/src/ts/AaveGovernanceV2.ts

@@ -0,0 +1,4 @@
+export const GOV = "0xEC568fffba86c094cf06b22134B23074DFE2252c";
+export const SHORT_EXECUTOR = "0xEE56e2B3D491590B5b31738cC34d5232F378a8D5";
+export const LONG_EXECUTOR = "0x61910EcD7e8e942136CE7Fe7943f956cea1CC2f7";
+export const ARC_TIMELOCK = "0xAce1d11d836cb3F51Ef658FD4D353fFb3c301218";

package/src/ts/AaveSafetyModule.ts

@@ -0,0 +1,2 @@
+export const STK_AAVE = "0x4da27a545c0c5B758a6BA100e3a049001de870f5";
+export const STK_ABPT = "0xa1116930326D21fB917d5A27F1E9943A9595fb47";

package/src/ts/AaveV2Avalanche.ts

@@ -10,3 +10,8 @@ export const EMERGENCY_ADMIN = "0x01244E7842254e3FD229CD263472076B1439D1Cd";
 export const COLLECTOR = "0x467b92aF281d14cB6809913AD016a607b5ba8A36";
 export const COLLECTOR_CONTROLLER = "address(0)";
 export const CHAIN_ID = 43114;
+export const WETH_GATEWAY = "0xC27d4dBefc2C0CE57916a699971b58a3BD9C7d5b";
+export const SWAP_COLLATERAL_ADAPTER =
+  "0x2EcF2a2e74B19Aab2a62312167aFF4B78E93B6C5";
+export const REPAY_WITH_COLLATERAL_ADAPTER =
+  "0x935b362EE3E1f342cc48118C528AAbee5118F6e6";

package/src/ts/AaveV2Ethereum.ts

@@ -11,3 +11,8 @@ export const COLLECTOR = "0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c";
 export const COLLECTOR_CONTROLLER =
   "0x3d569673dAa0575c936c7c67c4E6AedA69CC630C";
 export const CHAIN_ID = 1;
+export const WETH_GATEWAY = "0xEFFC18fC3b7eb8E676dac549E0c693ad50D1Ce31";
+export const REPAY_WITH_COLLATERAL_ADAPTER =
+  "0x80Aca0C645fEdABaa20fd2Bf0Daf57885A309FE6";
+export const SWAP_COLLATERAL_ADAPTER =
+  "0x135896DE8421be2ec868E0b811006171D9df802A";

package/src/ts/AaveV2EthereumAMM.ts

@@ -11,3 +11,8 @@ export const COLLECTOR = "0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c";
 export const COLLECTOR_CONTROLLER =
   "0x3d569673dAa0575c936c7c67c4E6AedA69CC630C";
 export const CHAIN_ID = 1;
+export const WETH_GATEWAY = "0x1C4a4e31231F71Fc34867D034a9E68f6fC798249";
+export const WALLET_BALANCE_PROVIDER =
+  "0x8E8dAd5409E0263a51C0aB5055dA66Be28cFF922";
+export const UI_POOL_DATA_PROVIDER =
+  "0x30375522F67a6308630d49A694ca1491fA2D3BC6";

package/src/ts/AaveV2Fuji.ts

@@ -10,3 +10,5 @@ export const EMERGENCY_ADMIN = "0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e";
 export const COLLECTOR = "0xB45F5C501A22288dfdb897e5f73E189597e09288";
 export const COLLECTOR_CONTROLLER = "address(0)";
 export const CHAIN_ID = 43113;
+export const WETH_GATEWAY = "0x1648C14DbB6ccdd5846969cE23DeEC4C66a03335";
+export const FAUCET = "0x90E5BAc5A98fff59617080848959f44eACB4Cd7B";

package/src/ts/AaveV2Goerli.ts

@@ -0,0 +1,14 @@
+export const POOL_ADDRESSES_PROVIDER =
+  "0x5E52dEc931FFb32f609681B8438A51c675cc232d";
+export const POOL = "0x4bd5643ac6f66a5237E18bfA7d47cF22f1c9F210";
+export const POOL_CONFIGURATOR = "0x88B1D3d97656De3Ec44FEDDfa109AF7fb8C2837D";
+export const ORACLE = "0x2cb0d5755436ED904D7D0fbBACc6176286c55667";
+export const AAVE_PROTOCOL_DATA_PROVIDER =
+  "0x0000000000000000000000000000000000000000";
+export const POOL_ADMIN = "0x77c45699A715A64A7a7796d5CEe884cf617D5254";
+export const EMERGENCY_ADMIN = "0x77c45699A715A64A7a7796d5CEe884cf617D5254";
+export const COLLECTOR = "0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c";
+export const COLLECTOR_CONTROLLER = "address(0)";
+export const CHAIN_ID = 5;
+export const WETH_GATEWAY = "0x3bd3a20Ac9Ff1dda1D99C0dFCE6D65C4960B3627";
+export const FAUCET = "0x681860075529352da2C94082Eb66c59dF958e89C";

package/src/ts/AaveV2Mumbai.ts

@@ -10,3 +10,5 @@ export const EMERGENCY_ADMIN = "0x943E44157dC0302a5CEb172374d1749018a00994";
 export const COLLECTOR = "0x943E44157dC0302a5CEb172374d1749018a00994";
 export const COLLECTOR_CONTROLLER = "address(0)";
 export const CHAIN_ID = 80001;
+export const WETH_GATEWAY = "0xee9eE614Ad26963bEc1Bec0D2c92879ae1F209fA";
+export const FAUCET = "0x0b3C23243106A69449e79C14c58BB49E358f9B10";