feat: add claim-rewards-to-self functionality to incentives controller

contracts/incentives/StakedTokenIncentivesController.sol

@@ -27,7 +27,7 @@ contract StakedTokenIncentivesController is
   using SafeMath for uint256;
   using SafeERC20 for IERC20;
 
-  uint256 public constant REVISION = 1;
+  uint256 public constant REVISION = 2;
 
   IStakedTokenWithConfig public immutable STAKE_TOKEN;
 
@@ -49,13 +49,9 @@ contract StakedTokenIncentivesController is
   }
 
   /**
-   * @dev Initialize IStakedTokenIncentivesController
-   * @param addressesProvider the address of the corresponding addresses provider
+   * @dev Initialize IStakedTokenIncentivesController. Empty after REVISION 1, but maintains the expected interface.
    **/
-  function initialize(address addressesProvider) external initializer {
-    //approves the safety module to allow staking
-    IERC20(STAKE_TOKEN.STAKED_TOKEN()).safeApprove(address(STAKE_TOKEN), type(uint256).max);
-  }
+  function initialize(address) external initializer {}
 
   /// @inheritdoc IAaveIncentivesController
   function configureAssets(address[] calldata assets, uint256[] calldata emissionsPerSecond)
@@ -134,6 +130,15 @@ contract StakedTokenIncentivesController is
     return _claimRewards(assets, amount, msg.sender, user, to);
   }
 
+  /// @inheritdoc IAaveIncentivesController
+  function claimRewardsToSelf(address[] calldata assets, uint256 amount)
+    external
+    override
+    returns (uint256)
+  {
+    return _claimRewards(assets, amount, msg.sender, msg.sender, msg.sender);
+  }
+
   /**
    * @dev Claims reward for an user on behalf, on all the assets of the lending pool, accumulating the pending rewards.
    * @param amount Amount of rewards to claim

contracts/interfaces/IAaveIncentivesController.sol

@@ -90,6 +90,14 @@ interface IAaveIncentivesController is IAaveDistributionManager {
     address to
   ) external returns (uint256);
 
+  /**
+   * @dev Claims rewards for a user, on the specified assets of the lending pool, distributing the pending rewards to self
+   * @param assets Incentivized assets on which to claim rewards
+   * @param amount Amount of rewards to claim
+   * @return Rewards claimed
+   **/
+  function claimRewardsToSelf(address[] calldata assets, uint256 amount) external returns (uint256);
+
   /**
    * @dev returns the unclaimed rewards of the user
    * @param user the address of the user

contracts/interfaces/IProposalIncentivesV2Executor.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity 0.7.5;
+
+interface IProposalIncentivesV2Executor {
+  function execute() external;
+}

contracts/proposals/ProposalIncentivesV2Executor.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity 0.7.5;
+
+import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol';
+import {IProposalIncentivesV2Executor} from '../interfaces/IProposalIncentivesV2Executor.sol';
+
+contract ProposalIncentivesV2Executor is IProposalIncentivesV2Executor {
+  bytes32 constant INCENTIVES_CONTROLLER_ID = bytes32(keccak256(bytes('INCENTIVES_CONTROLLER')));
+  address constant INCENTIVES_CONTROLLER_IMPL_ADDRESS = 0xD9ED413bCF58c266F95fE6BA63B13cf79299CE31;
+  address constant LENDING_POOL_ADDRESS_PROVIDER = 0xB53C1a33016B2DC2fF3653530bfF1848a515c8c5;
+
+  function execute() external override {
+    ILendingPoolAddressesProvider(LENDING_POOL_ADDRESS_PROVIDER).setAddressAsProxy(
+      INCENTIVES_CONTROLLER_ID,
+      INCENTIVES_CONTROLLER_IMPL_ADDRESS
+    );
+  }
+}

hardhat.config.ts

@@ -21,7 +21,7 @@ import 'solidity-coverage';
 const SKIP_LOAD = process.env.SKIP_LOAD === 'true';
 const DEFAULT_BLOCK_GAS_LIMIT = 12450000;
 const DEFAULT_GAS_MUL = 5;
-const HARDFORK = 'istanbul';
+const HARDFORK = 'london';
 const ETHERSCAN_KEY = process.env.ETHERSCAN_KEY || '';
 const MNEMONIC_PATH = "m/44'/60'/0'/0";
 const MNEMONIC = process.env.MNEMONIC || '';
@@ -58,7 +58,7 @@ const getCommonNetworkConfig = (networkName: eNetwork, networkId: number) => ({
 
 const mainnetFork = MAINNET_FORK
   ? {
-      blockNumber: 12290275,
+      blockNumber: parseInt(process.env.FORKING_BLOCK as string),
       url: NETWORKS_RPC_URL['main'],
     }
   : undefined;

helpers/types.ts

@@ -13,7 +13,7 @@ export enum eContractid {
   ATokenMock = 'ATokenMock',
   IERC20Detailed = 'IERC20Detailed',
   StakedTokenIncentivesController = 'StakedTokenIncentivesController',
-  MockSelfDestruct = 'MockSelfDestruct',
+  MockSelfDestruct = 'SelfdestructTransfer',
   StakedAaveV3 = 'StakedAaveV3',
 }