Size permissioned

contracts/interfaces/IPoolAddressesProvider.sol

@@ -21,6 +21,13 @@ interface IPoolAddressesProvider {
    */
   event PoolUpdated(address indexed oldAddress, address indexed newAddress);
 
+  /**
+   * @dev Emitted when the Size v2 contract is updated.
+   * @param oldAddress The old address of the Size v2 contract
+   * @param newAddress The new address of the Size v2 contract
+   */
+  event SizeUpdated(address indexed oldAddress, address indexed newAddress);
+
   /**
    * @dev Emitted when the pool configurator is updated.
    * @param oldAddress The old address of the PoolConfigurator
@@ -145,13 +152,25 @@ interface IPoolAddressesProvider {
    */
   function getPool() external view returns (address);
 
+  /**
+   * @notice Returns the address of the Size proxy.
+   * @return The Size proxy address
+   */
+  function getSize() external view returns (address);
+
   /**
    * @notice Updates the implementation of the Pool, or creates a proxy
    * setting the new `pool` implementation when the function is called for the first time.
    * @param newPoolImpl The new Pool implementation
    */
   function setPoolImpl(address newPoolImpl) external;
 
+  /**
+   * @notice Updates the Size v2 contract address
+   * @param newSize The new Size v2 contract
+   */
+  function setSize(address newSize) external;
+
   /**
    * @notice Returns the address of the PoolConfigurator proxy.
    * @return The PoolConfigurator proxy address

contracts/interfaces/ISize.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.8.0;
+
+/**
+ * @title ISize
+ * @notice Defines the basic interface for Size v2.
+ */
+interface ISize {
+  function variablePoolAllowlisted(address account) external returns (bool);
+}

contracts/mocks/SizeMock.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import {ISize} from './../interfaces/ISize.sol';
+
+contract SizeMock is ISize {
+  function variablePoolAllowlisted(address) external pure override returns (bool) {
+    return true;
+  }
+}

contracts/protocol/configuration/PoolAddressesProvider.sol

@@ -27,6 +27,7 @@ contract PoolAddressesProvider is Ownable, IPoolAddressesProvider {
   bytes32 private constant ACL_ADMIN = 'ACL_ADMIN';
   bytes32 private constant PRICE_ORACLE_SENTINEL = 'PRICE_ORACLE_SENTINEL';
   bytes32 private constant DATA_PROVIDER = 'DATA_PROVIDER';
+  bytes32 private constant SIZE = 'SIZE';
 
   /**
    * @dev Constructor.
@@ -76,13 +77,25 @@ contract PoolAddressesProvider is Ownable, IPoolAddressesProvider {
     return getAddress(POOL);
   }
 
+  /// @inheritdoc IPoolAddressesProvider
+  function getSize() external view override returns (address) {
+    return getAddress(SIZE);
+  }
+
   /// @inheritdoc IPoolAddressesProvider
   function setPoolImpl(address newPoolImpl) external override onlyOwner {
     address oldPoolImpl = _getProxyImplementation(POOL);
     _updateImpl(POOL, newPoolImpl);
     emit PoolUpdated(oldPoolImpl, newPoolImpl);
   }
 
+  /// @inheritdoc IPoolAddressesProvider
+  function setSize(address newSize) external override onlyOwner {
+    address oldSize = _addresses[SIZE];
+    _addresses[SIZE] = newSize;
+    emit SizeUpdated(oldSize, newSize);
+  }
+
   /// @inheritdoc IPoolAddressesProvider
   function getPoolConfigurator() external view override returns (address) {
     return getAddress(POOL_CONFIGURATOR);

contracts/protocol/libraries/helpers/Errors.sol

@@ -97,4 +97,5 @@ library Errors {
   string public constant SILOED_BORROWING_VIOLATION = '89'; // 'User is trying to borrow multiple assets including a siloed one'
   string public constant RESERVE_DEBT_NOT_ZERO = '90'; // the total debt of the reserve needs to be 0
   string public constant FLASHLOAN_DISABLED = '91'; // FlashLoaning for this asset is disabled
+  string public constant CALLER_NOT_SIZE = '92'; // The caller of the function is not the Size v2 contract
 }

contracts/protocol/pool/Pool.sol

@@ -18,6 +18,7 @@ import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.so
 import {IPool} from '../../interfaces/IPool.sol';
 import {IACLManager} from '../../interfaces/IACLManager.sol';
 import {PoolStorage} from './PoolStorage.sol';
+import {ISize} from '../../interfaces/ISize.sol';
 
 /**
  * @title Pool contract
@@ -145,7 +146,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint256 amount,
     address onBehalfOf,
     uint16 referralCode
-  ) public virtual override {
+  ) public virtual override onlySize {
     SupplyLogic.executeSupply(
       _reserves,
       _reservesList,
@@ -169,7 +170,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint8 permitV,
     bytes32 permitR,
     bytes32 permitS
-  ) public virtual override {
+  ) public virtual override onlySize {
     IERC20WithPermit(asset).permit(
       msg.sender,
       address(this),
@@ -197,7 +198,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     address asset,
     uint256 amount,
     address to
-  ) public virtual override returns (uint256) {
+  ) public virtual override onlySize returns (uint256) {
     return
       SupplyLogic.executeWithdraw(
         _reserves,
@@ -222,7 +223,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint256 interestRateMode,
     uint16 referralCode,
     address onBehalfOf
-  ) public virtual override {
+  ) public virtual override onlySize {
     BorrowLogic.executeBorrow(
       _reserves,
       _reservesList,
@@ -251,7 +252,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint256 amount,
     uint256 interestRateMode,
     address onBehalfOf
-  ) public virtual override returns (uint256) {
+  ) public virtual override onlySize returns (uint256) {
     return
       BorrowLogic.executeRepay(
         _reserves,
@@ -277,7 +278,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint8 permitV,
     bytes32 permitR,
     bytes32 permitS
-  ) public virtual override returns (uint256) {
+  ) public virtual override onlySize returns (uint256) {
     {
       IERC20WithPermit(asset).permit(
         msg.sender,
@@ -306,7 +307,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     address asset,
     uint256 amount,
     uint256 interestRateMode
-  ) public virtual override returns (uint256) {
+  ) public virtual override onlySize returns (uint256) {
     return
       BorrowLogic.executeRepay(
         _reserves,
@@ -323,7 +324,10 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
   }
 
   /// @inheritdoc IPool
-  function swapBorrowRateMode(address asset, uint256 interestRateMode) public virtual override {
+  function swapBorrowRateMode(
+    address asset,
+    uint256 interestRateMode
+  ) public virtual override onlySize {
     BorrowLogic.executeSwapBorrowRateMode(
       _reserves[asset],
       _usersConfig[msg.sender],
@@ -333,15 +337,15 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
   }
 
   /// @inheritdoc IPool
-  function rebalanceStableBorrowRate(address asset, address user) public virtual override {
+  function rebalanceStableBorrowRate(address asset, address user) public virtual override onlySize {
     BorrowLogic.executeRebalanceStableBorrowRate(_reserves[asset], asset, user);
   }
 
   /// @inheritdoc IPool
   function setUserUseReserveAsCollateral(
     address asset,
     bool useAsCollateral
-  ) public virtual override {
+  ) public virtual override onlySize {
     SupplyLogic.executeUseReserveAsCollateral(
       _reserves,
       _reservesList,
@@ -362,7 +366,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     address user,
     uint256 debtToCover,
     bool receiveAToken
-  ) public virtual override {
+  ) public virtual override onlySize {
     LiquidationLogic.executeLiquidationCall(
       _reserves,
       _reservesList,
@@ -391,7 +395,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     address onBehalfOf,
     bytes calldata params,
     uint16 referralCode
-  ) public virtual override {
+  ) public virtual override onlySize {
     DataTypes.FlashloanParams memory flashParams = DataTypes.FlashloanParams({
       receiverAddress: receiverAddress,
       assets: assets,
@@ -427,7 +431,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint256 amount,
     bytes calldata params,
     uint16 referralCode
-  ) public virtual override {
+  ) public virtual override onlySize {
     DataTypes.FlashloanSimpleParams memory flashParams = DataTypes.FlashloanSimpleParams({
       receiverAddress: receiverAddress,
       asset: asset,
@@ -441,7 +445,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
   }
 
   /// @inheritdoc IPool
-  function mintToTreasury(address[] calldata assets) external virtual override {
+  function mintToTreasury(address[] calldata assets) external virtual override onlySize {
     PoolLogic.executeMintToTreasury(_reserves, assets);
   }
 
@@ -678,7 +682,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
   }
 
   /// @inheritdoc IPool
-  function setUserEMode(uint8 categoryId) external virtual override {
+  function setUserEMode(uint8 categoryId) external virtual override onlySize {
     EModeLogic.executeSetUserEMode(
       _reserves,
       _reservesList,
@@ -721,7 +725,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
     uint256 amount,
     address onBehalfOf,
     uint16 referralCode
-  ) external virtual override {
+  ) external virtual override onlySize {
     SupplyLogic.executeSupply(
       _reserves,
       _reservesList,
@@ -734,4 +738,12 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
       })
     );
   }
+
+  modifier onlySize() {
+    require(
+      ISize(ADDRESSES_PROVIDER.getSize()).variablePoolAllowlisted(msg.sender),
+      Errors.CALLER_NOT_SIZE
+    );
+    _;
+  }
 }

test-suites/helpers/make-suite.ts

@@ -16,6 +16,7 @@ import {
 } from '@aave/deploy-v3/dist/helpers/contract-getters';
 import { tEthereumAddress } from '../../helpers/types';
 import { Pool } from '../../types/Pool';
+import { SizeMock } from '../../types/mocks/SizeMock';
 import { AaveProtocolDataProvider } from '../../types/AaveProtocolDataProvider';
 import { MintableERC20 } from '../../types/MintableERC20';
 import { AToken } from '../../types/AToken';
@@ -43,6 +44,7 @@ export interface TestEnv {
   riskAdmin: SignerWithAddress;
   users: SignerWithAddress[];
   pool: Pool;
+  size: SizeMock;
   configurator: PoolConfigurator;
   oracle: PriceOracle;
   aaveOracle: AaveOracle;
@@ -74,6 +76,7 @@ const testEnv: TestEnv = {
   riskAdmin: {} as SignerWithAddress,
   users: [] as SignerWithAddress[],
   pool: {} as Pool,
+  size: {} as SizeMock,
   configurator: {} as PoolConfigurator,
   helpersContract: {} as AaveProtocolDataProvider,
   oracle: {} as PriceOracle,
@@ -110,9 +113,11 @@ export async function initializeMakeSuite() {
   testEnv.emergencyAdmin = testEnv.users[1];
   testEnv.riskAdmin = testEnv.users[2];
   testEnv.pool = await getPool();
+  testEnv.size = (await hre.ethers.deployContract('SizeMock')) as SizeMock;
   testEnv.configurator = await getPoolConfiguratorProxy();
 
   testEnv.addressesProvider = await getPoolAddressesProvider();
+  testEnv.addressesProvider.setSize(testEnv.size.address);
 
   testEnv.registry = await getPoolAddressesProviderRegistry();
   testEnv.aclManager = await getACLManager();