feat: added setIncentivesController

aave · Oct 12, 2021 · 8c027f4 · 8c027f4
1 parent 63f0779
commit 8c027f4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/contracts/protocol/tokenization/AToken.sol b/contracts/protocol/tokenization/AToken.sol
@@ -19,11 +19,7 @@ import {IncentivizedERC20} from './IncentivizedERC20.sol';
  * @author Aave
  * @notice Implementation of the interest bearing token for the Aave protocol
  */
-contract AToken is
-  VersionedInitializable,
-  IncentivizedERC20('ATOKEN_IMPL', 'ATOKEN_IMPL', 0),
-  IAToken
-{
+contract AToken is VersionedInitializable, IncentivizedERC20, IAToken {
   using WadRayMath for uint256;
   using SafeERC20 for IERC20;
 
@@ -54,7 +50,9 @@ contract AToken is
     return ATOKEN_REVISION;
   }
 
-  constructor(IPool pool) {
+  constructor(IPool pool)
+    IncentivizedERC20(pool.getAddressesProvider(), 'ATOKEN_IMPL', 'ATOKEN_IMPL', 0)
+  {
     _pool = pool;
   }
 

diff --git a/contracts/protocol/tokenization/IncentivizedERC20.sol b/contracts/protocol/tokenization/IncentivizedERC20.sol
@@ -7,6 +7,9 @@ import {IERC20Detailed} from '../../dependencies/openzeppelin/contracts/IERC20De
 import {IAaveIncentivesController} from '../../interfaces/IAaveIncentivesController.sol';
 import {Helpers} from '../libraries/helpers/Helpers.sol';
 import {WadRayMath} from '../libraries/math/WadRayMath.sol';
+import {IPoolAddressesProvider} from '../../interfaces/IPoolAddressesProvider.sol';
+import {IACLManager} from '../../interfaces/IACLManager.sol';
+import {Errors} from '../libraries/helpers/Errors.sol';
 
 /**
  * @title IncentivizedERC20
@@ -16,6 +19,12 @@ import {WadRayMath} from '../libraries/math/WadRayMath.sol';
 abstract contract IncentivizedERC20 is Context, IERC20, IERC20Detailed {
   using WadRayMath for uint256;
 
+  modifier onlyPoolAdmins() {
+    IACLManager aclManager = IACLManager(_addressesProvider.getACLManager());
+    require(aclManager.isPoolAdmin(msg.sender), Errors.CALLER_NOT_POOL_ADMIN);
+    _;
+  }
+
   /**
    * @dev UserState - additionalData is a flexible field.
    * ATokens and VariableDebtTokens use this field store the index of the
@@ -34,12 +43,15 @@ abstract contract IncentivizedERC20 is Context, IERC20, IERC20Detailed {
   string private _symbol;
   uint8 private _decimals;
   IAaveIncentivesController internal _incentivesController;
+  IPoolAddressesProvider internal _addressesProvider;
 
   constructor(
+    IPoolAddressesProvider addressesProvider,
     string memory name,
     string memory symbol,
     uint8 decimals
   ) {
+    _addressesProvider = addressesProvider;
     _name = name;
     _symbol = symbol;
     _decimals = decimals;
@@ -78,6 +90,14 @@ abstract contract IncentivizedERC20 is Context, IERC20, IERC20Detailed {
     return _incentivesController;
   }
 
+  /**
+   * @notice Sets a new incentives controller
+   * @param controller the new Incentives controller
+   **/
+  function setIncentivesController(IAaveIncentivesController controller) external onlyPoolAdmins {
+    _incentivesController = controller;
+  }
+
   /// @inheritdoc IERC20
   function transfer(address recipient, uint256 amount) external virtual override returns (bool) {
     uint128 castAmount = Helpers.castUint128(amount);

diff --git a/contracts/protocol/tokenization/StableDebtToken.sol b/contracts/protocol/tokenization/StableDebtToken.sol
@@ -12,6 +12,7 @@ import {IInitializableDebtToken} from '../../interfaces/IInitializableDebtToken.
 import {IStableDebtToken} from '../../interfaces/IStableDebtToken.sol';
 import {IPool} from '../../interfaces/IPool.sol';
 import {DebtTokenBase} from './base/DebtTokenBase.sol';
+import {IncentivizedERC20} from './IncentivizedERC20.sol';
 
 /**
  * @title StableDebtToken
@@ -31,7 +32,9 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
   IPool internal immutable _pool;
   address internal _underlyingAsset;
 
-  constructor(IPool pool) {
+  constructor(IPool pool)
+    IncentivizedERC20(pool.getAddressesProvider(), 'DEBT_TOKEN_IMPL', 'DEBT_TOKEN_IMPL', 0)
+  {
     _pool = pool;
   }
 

diff --git a/contracts/protocol/tokenization/VariableDebtToken.sol b/contracts/protocol/tokenization/VariableDebtToken.sol
@@ -12,6 +12,7 @@ import {IInitializableDebtToken} from '../../interfaces/IInitializableDebtToken.
 import {IVariableDebtToken} from '../../interfaces/IVariableDebtToken.sol';
 import {IScaledBalanceToken} from '../../interfaces/IScaledBalanceToken.sol';
 import {DebtTokenBase} from './base/DebtTokenBase.sol';
+import {IncentivizedERC20} from './IncentivizedERC20.sol';
 
 /**
  * @title VariableDebtToken
@@ -27,7 +28,9 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
   IPool internal immutable _pool;
   address internal _underlyingAsset;
 
-  constructor(IPool pool) {
+  constructor(IPool pool)
+    IncentivizedERC20(pool.getAddressesProvider(), 'DEBT_TOKEN_IMPL', 'DEBT_TOKEN_IMPL', 0)
+  {
     _pool = pool;
   }
 

diff --git a/contracts/protocol/tokenization/base/DebtTokenBase.sol b/contracts/protocol/tokenization/base/DebtTokenBase.sol
@@ -14,7 +14,7 @@ import {IncentivizedERC20} from '../IncentivizedERC20.sol';
  * @dev Transfer and approve functionalities are disabled since its a non-transferable token.
  */
 abstract contract DebtTokenBase is
-  IncentivizedERC20('DEBTTOKEN_IMPL', 'DEBTTOKEN_IMPL', 0),
+  IncentivizedERC20,
   VersionedInitializable,
   ICreditDelegationToken
 {