fix: Add new code of GHO IR (#15)

* fix: Updates GHO code

* fix: Update fork block number to account for stkaave upgrade

Author: miguelmtzinf

lib/gho-core

@@ -66,7 +66,10 @@ library Helpers {
       'GHO_VARIABLE_DEBT_TOKEN_IMPL',
       '0x0'
     );
-    GhoInterestRateStrategy ghoInterestRateStrategy = new GhoInterestRateStrategy(ghoInterestRate);
+    GhoInterestRateStrategy ghoInterestRateStrategy = new GhoInterestRateStrategy(
+      address(IPool(pool).ADDRESSES_PROVIDER()),
+      ghoInterestRate
+    );
     GhoDiscountRateStrategy ghoDiscountRateStrategy = new GhoDiscountRateStrategy();
 
     return

scripts/Helpers.sol

@@ -35,14 +35,13 @@ contract GhoListingTest is ProtocolV3TestBase {
   address constant AAVE = 0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9;
   address public constant STKAAVE = 0x4da27a545c0c5B758a6BA100e3a049001de870f5;
 
-  address public constant STKAAVE_UPGRADE_PAYLOAD = 0xe427FCbD54169136391cfEDf68E96abB13dA87A0; // AIP#124
-  uint256 public constant STKAAVE_UPGRADE_BLOCK_NUMBER = 17138206;
+  uint256 public constant FORK_BLOCK_NUMBER = 17334690;
 
   address public GHO_TOKEN;
   address public GHO_FLASHMINTER;
 
   function testListingComplete() public {
-    vm.createSelectFork(vm.rpcUrl('mainnet'), STKAAVE_UPGRADE_BLOCK_NUMBER);
+    vm.createSelectFork(vm.rpcUrl('mainnet'), FORK_BLOCK_NUMBER);
 
     Helpers.AaveFacilitatorData memory aaveData = Helpers.deployAaveFacilitator(
       address(AaveV3Ethereum.POOL),
@@ -60,30 +59,16 @@ contract GhoListingTest is ProtocolV3TestBase {
     GHO_TOKEN = payload.precomputeGhoTokenAddress();
     GHO_FLASHMINTER = payload.precomputeGhoFlashMinterAddress();
 
-    // Simulate stkAave upgrade
-    uint256 upgradeProposalId = _passProposal(
-      AaveGovernanceV2.LONG_EXECUTOR,
-      STKAAVE_UPGRADE_PAYLOAD
-    );
-    GovHelper._execute(upgradeProposalId);
-
     // Simulate GOV action
     uint256 listingProposalId = _passProposal(AaveGovernanceV2.SHORT_EXECUTOR, address(payload));
 
     _testListing(address(payload), listingProposalId);
   }
 
   function _testListingWithPayload() public {
-    vm.createSelectFork(vm.rpcUrl('mainnet'), STKAAVE_UPGRADE_BLOCK_NUMBER);
+    vm.createSelectFork(vm.rpcUrl('mainnet'), FORK_BLOCK_NUMBER);
     address GHO_AIP = address(0); // TODO
 
-    // Simulate stkAave upgrade
-    uint256 upgradeProposalId = _passProposal(
-      AaveGovernanceV2.LONG_EXECUTOR,
-      STKAAVE_UPGRADE_PAYLOAD
-    );
-    GovHelper._execute(upgradeProposalId);
-
     // Simulate GOV action
     uint256 listingProposalId = _passProposal(AaveGovernanceV2.SHORT_EXECUTOR, GHO_AIP);
 
@@ -95,7 +80,7 @@ contract GhoListingTest is ProtocolV3TestBase {
    * This is possible due to the permissionless create2 singleton factory
    */
   function testPayloadExecutionWithContractsAlreadyDeployed() public {
-    vm.createSelectFork(vm.rpcUrl('mainnet'), STKAAVE_UPGRADE_BLOCK_NUMBER);
+    vm.createSelectFork(vm.rpcUrl('mainnet'), FORK_BLOCK_NUMBER);
 
     Helpers.AaveFacilitatorData memory aaveData = Helpers.deployAaveFacilitator(
       address(AaveV3Ethereum.POOL),
@@ -113,13 +98,6 @@ contract GhoListingTest is ProtocolV3TestBase {
     GHO_TOKEN = payload.precomputeGhoTokenAddress();
     GHO_FLASHMINTER = payload.precomputeGhoFlashMinterAddress();
 
-    // Simulate stkAave upgrade
-    uint256 upgradeProposalId = _passProposal(
-      AaveGovernanceV2.LONG_EXECUTOR,
-      STKAAVE_UPGRADE_PAYLOAD
-    );
-    GovHelper._execute(upgradeProposalId);
-
     // Simulate GOV action
     uint256 listingProposalId = _passProposal(AaveGovernanceV2.SHORT_EXECUTOR, address(payload));