lm update 2

Author: ncitron

contracts/proposals/IncentiveUpdateExecutor.sol

@@ -5,43 +5,25 @@ pragma abicoder v2;
 import {DataTypes} from '../utils/DataTypes.sol';
 import {IAaveEcosystemReserveController} from '../interfaces/IAaveEcosystemReserveController.sol';
 import {IAaveIncentivesController} from '../interfaces/IAaveIncentivesController.sol';
-import {IATokenDetailed} from '../interfaces/IATokenDetailed.sol';
-import {ILendingPoolConfigurator} from '../interfaces/ILendingPoolConfigurator.sol';
 import {ILendingPoolData} from '../interfaces/ILendingPoolData.sol';
 
 contract IncentiveUpdateExecutor {
 
   address constant AAVE_TOKEN = 0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9;
   address constant CONTROLLER_ECO_RESERVE = 0x1E506cbb6721B83B1549fa1558332381Ffa61A93;
   address constant LENDING_POOL = 0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9;
-  address constant POOL_CONFIGURATOR = 0x311Bb771e4F8952E6Da169b425E7e92d6Ac45756;
   address constant INCENTIVES_CONTROLLER_PROXY_ADDRESS = 0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5;
 
   uint256 constant DISTRIBUTION_DURATION = 7776000;   // 90 days
-  uint256 constant DISTRIBUTION_AMOUNT = 138600 ether;
+  uint256 constant DISTRIBUTION_AMOUNT = 97020 ether;
 
-  uint256 constant PROPOSER_GAS_REFUND = 70 ether;
+  uint256 constant PROPOSER_GAS_REFUND = 35 ether;
   address constant PROPOSER_REFUND_ADDRESS = 0x6904110f17feD2162a11B5FA66B188d801443Ea4;
 
   function execute() external {
 
     IAaveEcosystemReserveController ecosystemReserveController = IAaveEcosystemReserveController(CONTROLLER_ECO_RESERVE);
     IAaveIncentivesController incentivesController = IAaveIncentivesController(INCENTIVES_CONTROLLER_PROXY_ADDRESS);
-    ILendingPoolConfigurator poolConfigurator = ILendingPoolConfigurator(POOL_CONFIGURATOR);
-
-    address payable[4] memory aTokens = [
-      0x00c92Eb9eba1e4F90233B5e4c846A97dDACE0F5B,   // aDPI
-      0xc84E16357b4204523a80E9e4c0cFc8f8EC1613d3,   // aBUSD
-      0xB5AE2299c71aFFDc2dAd3B53974D56d5651FDD35,   // aFRAX
-      0xd78037ED778ec3E2FCDb03B622c42d2F1B66D469    // aCRV
-    ];
-
-    address payable[4] memory vDebtTokens = [
-      address(0),                                   // vDebtDPI
-      0xCFC5923024E782Cb2862520CCfFD48Ad24e7825a,   // vDebtBUSD
-      0xc67c18F4620e003c78fd041Fb5172Cb20642FD47,   // vDebtFRAX
-      address(0)                                    // vDebtCRV
-    ];
 
     address payable[20] memory reserves = [
       0x6B175474E89094C44Da98b954EedeAC495271d0F,   // DAI
@@ -68,58 +50,47 @@ contract IncentiveUpdateExecutor {
 
     uint256[] memory emissions = new uint256[](40);
 
-    emissions[0] = 1203204146880510;    // aDAI
-    emissions[1] = 2406408293761020;    // vDebtDAI
+    emissions[0] = 860629828674028;     // aDAI
+    emissions[1] = 1721259657348060;    // vDebtDAI
     emissions[2] = 0;                   // aGUSD
     emissions[3] = 0;                   // vDebtGUSD
-    emissions[4] = 2674448821531440;    // aUSDC
-    emissions[5] = 5348897643062870;    // vDebtUSDC
-    emissions[6] = 780295758620530;     // aUSDT
-    emissions[7] = 1560591517241060;    // vDebtUSDT
-    emissions[8] = 538517489758869;     // aWBTC
+    emissions[4] = 1903258773510960;    // aUSDC
+    emissions[5] = 3806517547021920;    // vDebtUSDC
+    emissions[6] = 694765960976989;     // aUSDT
+    emissions[7] = 1389531921953980;    // vDebtUSDT
+    emissions[8] = 252193044534425;     // aWBTC
     emissions[9] = 0;                   // vDebtWBTC
-    emissions[10] = 2061139949740800;   // aWETH
+    emissions[10] = 933007096551141;    // aWETH
     emissions[11] = 0;                  // vDebtWETH
-    emissions[12] = 473219265599667;    // aLINK
+    emissions[12] = 272977322986304;    // aLINK
     emissions[13] = 0;                  // vDebtLINK
-    emissions[14] = 35280089910759;     // aSUSD
-    emissions[15] = 70560179821518;     // vDebtSUSD
-    emissions[16] = 47620672711642;     // aYFI
+    emissions[14] = 23046648361494;     // aSUSD
+    emissions[15] = 46093296722988;     // vDebtSUSD
+    emissions[16] = 23204645595171;     // aYFI
     emissions[17] = 0;                  // vDebtYFI
-    emissions[18] = 101144783834246;    // aXSUSHI
+    emissions[18] = 28653877437482;     // aXSUSHI
     emissions[19] = 0;                  // vDebtXSUSHI
     emissions[20] = 0;                  // aUNI
     emissions[21] = 0;                  // vDebtUNI
-    emissions[22] = 128538286894602;    // aMKR
+    emissions[22] = 109957713960904;    // aMKR
     emissions[23] = 0;                  // vDebtMKR
-    emissions[24] = 49670888023944;     // aTUSD
-    emissions[25] = 99341776047887;     // vDebtTUSD
-    emissions[26] = 25422154944980;     // aRAI
-    emissions[27] = 50844309889961;     // vDebtRAI
-    emissions[28] = 13725047526598;     // aBAL
+    emissions[24] = 64158288472709;     // aTUSD
+    emissions[25] = 128316576945418;    // vDebtTUSD
+    emissions[26] = 9846555646706;      // aRAI
+    emissions[27] = 19693111293413;     // vDebtRAI
+    emissions[28] = 4875116344638;      // aBAL
     emissions[29] = 0;                  // vDebtBAL
-    emissions[30] = 9935368896023;      // aUSDP
-    emissions[31] = 19870737792047;     // vDebtUSP
-    emissions[32] = 5807544768359;      // aFRAX
-    emissions[33] = 11615089536718;     // vDebtFRAX
-    emissions[34] = 53890469813093;     // aDPI
+    emissions[30] = 9398984935492;      // aUSDP
+    emissions[31] = 18797969870985;     // vDebtUSP
+    emissions[32] = 8333031502505;      // aFRAX
+    emissions[33] = 16666063005009;     // vDebtFRAX
+    emissions[34] = 22409965951501;     // aDPI
     emissions[35] = 0;                  // vDebtDPI
-    emissions[36] = 5176160414055;      // aBUSD
-    emissions[37] = 10352320828111;     // vDebtBUSD
-    emissions[38] = 37118390250968;     // aCRV
+    emissions[36] = 21223932856405;     // aBUSD
+    emissions[37] = 42447865712811;     // vDebtBUSD
+    emissions[38] = 44508547226299;     // aCRV
     emissions[39] = 0;                  // vDebtCRV
 
-    // Update aTokens and vDebtTokens
-    for (uint256 i = 0; i < aTokens.length; i++) {
-
-      address underlying = IATokenDetailed(aTokens[i]).UNDERLYING_ASSET_ADDRESS();
-      poolConfigurator.updateAToken(underlying, address(aTokens[i]));
-
-      if (vDebtTokens[i] != address(0)) {
-        poolConfigurator.updateVariableDebtToken(underlying, address(vDebtTokens[i]));
-      }
-    }
-
     address[] memory assets = new address[](40);
 
     for (uint256 i = 0; i < reserves.length; i++) {

hardhat.config.ts

@@ -58,7 +58,7 @@ const getCommonNetworkConfig = (networkName: eNetwork, networkId: number) => ({
 
 const mainnetFork = MAINNET_FORK
   ? {
-      blockNumber: 13636950,
+      blockNumber: 14213281,
       url: NETWORKS_RPC_URL['main'],
     }
   : undefined;

tasks/deployment/deploy-incentive-update.ts

@@ -0,0 +1,21 @@
+import { Signer } from "ethers";
+import { task } from "hardhat/config";
+import { verifyContract } from "../../helpers/etherscan-verification";
+import { sleep } from "../../helpers/misc-utils";
+import { IncentiveUpdateExecutor__factory } from "../../types";
+
+task('deploy-incentive-update').setAction(
+  async (_, localBRE) => {
+    _;
+    await localBRE.run('set-DRE');
+
+    let deployer: Signer;
+    [deployer] = await localBRE.ethers.getSigners();
+
+    const { address } = await new IncentiveUpdateExecutor__factory(deployer).deploy();
+
+    await sleep(30000);
+
+    await verifyContract(address, []);
+  }
+);

test-fork/incentivesUpdateProposal.spec.ts

@@ -146,7 +146,7 @@ describe('Enable incentives in target assets', () => {
     variableDebtDAI = IERC20__factory.connect(variableDebtTokenAddress, proposer);
 
     // Transfer enough AAVE to proposer
-    await (await aave.transfer(proposer.address, parseEther('2000000'))).wait();
+    await (await aave.transfer(proposer.address, parseEther('1000000'))).wait();
 
     // Transfer DAI to repay future DAI loan
     await (await dai.transfer(proposer.address, parseEther('100000'))).wait();
@@ -173,6 +173,8 @@ describe('Enable incentives in target assets', () => {
         },
       };
     }
+
+    proposalId = BigNumber.from(58);
   });
 
   it('Proposal should be created', async () => {
@@ -198,16 +200,19 @@ describe('Enable incentives in target assets', () => {
     // Submit proposal
     proposalId = await gov.getProposalsCount();
 
-    await gov.create(
+    const tx = await gov.create(
       AAVE_SHORT_EXECUTOR, 
       [proposalExecutionPayload],
       ['0'],
       ['execute()'],
       ['0x'],
       [true],
-      '0xf7a1f565fcd7684fba6fea5d77c5e699653e21cb6ae25fbf8c5dbc8d694c7949'
+      '0x2e48c935d946eaec9e11be7280ab27bfc15813047a3686b9b00601654858ebac'
     );
 
+    console.log('to: ' + tx.to);
+    console.log('data: ' + tx.data);
+
     console.log('submited');
 
     // Mine block due flash loan voting protection
@@ -245,7 +250,7 @@ describe('Enable incentives in target assets', () => {
   it('Proposer should receive gas refund in AAVE', async () => {
     const aaveBalance = await aave.balanceOf('0x6904110f17feD2162a11B5FA66B188d801443Ea4');
 
-    expect(aaveBalance).to.eq(parseEther('70'));
+    expect(aaveBalance).to.eq(parseEther('35'));
   });
 
   it('Check emission rate', async () => {