fix: add Executor support for listings

Author: avniculae

scripts/misc/ConfigureHorizonPhaseOne.sol

@@ -5,9 +5,10 @@ import {MarketReport} from '../../src/deployments/interfaces/IMarketReportTypes.
 import {HorizonPhaseOneListing} from '../../src/deployments/inputs/HorizonPhaseOneListing.sol';
 import {IMetadataReporter} from '../../src/deployments/interfaces/IMetadataReporter.sol';
 import {DeployUtils} from '../../src/deployments/contracts/utilities/DeployUtils.sol';
+import {HorizonInput} from '../../src/deployments/inputs/HorizonInput.sol';
 import {Script} from 'forge-std/Script.sol';
 
-contract ConfigureHorizonPhaseOne is Script, DeployUtils {
+contract ConfigureHorizonPhaseOne is Script, DeployUtils, HorizonInput {
   function run(string memory reportPath) public {
     _run(msg.sender, reportPath);
   }
@@ -21,8 +22,17 @@ contract ConfigureHorizonPhaseOne is Script, DeployUtils {
 
     vm.startBroadcast(deployer);
     HorizonPhaseOneListing horizonInitialListing = new HorizonPhaseOneListing(report);
-    horizonInitialListing.ACL_MANAGER().addPoolAdmin(address(horizonInitialListing));
-    horizonInitialListing.execute();
+    (bool success, ) = PHASE_ONE_LISTING_EXECUTOR.call(
+      abi.encodeWithSignature(
+        'executeTransaction(address,uint256,string,bytes,bool)',
+        address(horizonInitialListing), // target
+        0, // value
+        'execute()', // signature
+        '', // data
+        true // withDelegatecall
+      )
+    );
+    require(success, 'Failed to execute transaction');
     vm.stopBroadcast();
   }
 }

src/deployments/inputs/HorizonInput.sol

@@ -3,9 +3,10 @@ pragma solidity ^0.8.0;
 import './MarketInput.sol';
 
 contract HorizonInput is MarketInput {
-  address public constant DEPLOYER = 0xA22f39d5fEb10489F7FA84C2C545BAc4EA48eBB7;
+  address public constant AAVE_DAO_EXECUTOR = 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A;
+  address public constant AAVE_DAO_COLLECTOR = 0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c;
   bytes32 public constant POOL_ADMIN_ROLE = keccak256('POOL_ADMIN');
-  address public constant PHASE_ONE_LISTING_EXECUTOR = address(0); // todo
+  address public constant PHASE_ONE_LISTING_EXECUTOR = 0xf046907a4371F7F027113bf751F3347459a08b71;
 
   function _getMarketInput(
     address
@@ -23,10 +24,10 @@ contract HorizonInput is MarketInput {
     bytes[] memory additionalRoles = new bytes[](1);
     additionalRoles[0] = abi.encode(POOL_ADMIN_ROLE, PHASE_ONE_LISTING_EXECUTOR);
     roles = Roles({
-      marketOwner: DEPLOYER,
-      emergencyAdmin: DEPLOYER,
-      poolAdmin: DEPLOYER,
-      rwaATokenManagerAdmin: DEPLOYER,
+      marketOwner: AAVE_DAO_EXECUTOR,
+      emergencyAdmin: AAVE_DAO_EXECUTOR,
+      poolAdmin: AAVE_DAO_EXECUTOR,
+      rwaATokenManagerAdmin: AAVE_DAO_EXECUTOR,
       additionalRoles: additionalRoles
     });
 
@@ -45,7 +46,7 @@ contract HorizonInput is MarketInput {
       flashLoanPremiumToProtocol: 1e4,
       incentivesProxy: address(0),
       treasury: address(0),
-      treasuryPartner: 0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c, // TreasuryCollector
+      treasuryPartner: AAVE_DAO_COLLECTOR, // TreasuryCollector
       treasurySplitPercent: 50_00
     });
 

src/deployments/inputs/HorizonPhaseOneListing.sol

@@ -286,6 +286,12 @@ contract HorizonPhaseOneListing is AaveV3Payload {
   }
 
   function _postExecute() internal override {
+    CONFIGURATOR.setReservePause(GHO_ADDRESS, true, 0);
+    CONFIGURATOR.setReservePause(USDC_ADDRESS, true, 0);
+    CONFIGURATOR.setReservePause(RLUSD_ADDRESS, true, 0);
+    CONFIGURATOR.setReservePause(USTB_ADDRESS, true, 0);
+    CONFIGURATOR.setReservePause(USCC_ADDRESS, true, 0);
+    CONFIGURATOR.setReservePause(USYC_ADDRESS, true, 0);
     ACL_MANAGER.renounceRole(POOL_ADMIN_ROLE_ID, address(this));
   }
 }

tests/deployments/HorizonDeployment.t.sol

@@ -24,7 +24,7 @@ contract HorizonDeploymentTest is Test, Default {
   }
 
   function test_HorizonInput() public {
-    (, MarketConfig memory config, , ) = _getMarketInput(DEPLOYER);
+    (, MarketConfig memory config, , ) = _getMarketInput(address(0));
     assertEq(contracts.poolAddressesProvider.getMarketId(), config.marketId);
     assertEq(
       contracts.poolAddressesProviderRegistry.getAddressesProviderAddressById(config.providerId),
@@ -37,14 +37,14 @@ contract HorizonDeploymentTest is Test, Default {
       contracts.poolProxy.FLASHLOAN_PREMIUM_TO_PROTOCOL(),
       config.flashLoanPremiumToProtocol
     );
-    assertEq(contracts.treasury.isFundsAdmin(DEPLOYER), true);
+    assertEq(contracts.treasury.isFundsAdmin(AAVE_DAO_EXECUTOR), true);
     assertEq(contracts.revenueSplitter.RECIPIENT_A(), marketReport.treasury);
     assertEq(contracts.revenueSplitter.RECIPIENT_B(), config.treasuryPartner);
     assertEq(contracts.revenueSplitter.SPLIT_PERCENTAGE_RECIPIENT_A(), config.treasurySplitPercent);
   }
 
   function test_RewardsController() public {
     assertEq(contracts.rewardsControllerProxy.EMISSION_MANAGER(), marketReport.emissionManager);
-    assertEq(Ownable(address(contracts.emissionManager)).owner(), DEPLOYER);
+    assertEq(Ownable(address(contracts.emissionManager)).owner(), AAVE_DAO_EXECUTOR);
   }
 }

tests/deployments/HorizonPhaseOneListing.t.sol

@@ -12,6 +12,7 @@ import {IMetadataReporter} from '../../src/deployments/interfaces/IMetadataRepor
 import {IRevenueSplitter} from '../../src/contracts/treasury/IRevenueSplitter.sol';
 import {IDefaultInterestRateStrategyV2} from '../../src/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
 import {IERC20Detailed} from '../../src/contracts/dependencies/openzeppelin/contracts/IERC20Detailed.sol';
+import {IACLManager} from '../../src/contracts/interfaces/IACLManager.sol';
 import {IAToken} from '../../src/contracts/interfaces/IAToken.sol';
 import {IPool} from '../../src/contracts/interfaces/IPool.sol';
 import {Errors} from '../../src/contracts/protocol/libraries/helpers/Errors.sol';
@@ -23,7 +24,7 @@ contract ConfigureHorizonPhaseOneTest is Test, ConfigureHorizonPhaseOne {
   }
 }
 
-contract HorizonListingBaseTest is Test {
+abstract contract HorizonListingBaseTest is Test {
   using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
 
   IPool internal pool;
@@ -71,6 +72,15 @@ contract HorizonListingBaseTest is Test {
     variableDebtTokenImpl = variableDebtTokenImpl_;
   }
 
+  function getListingExecutor() internal view virtual returns (address);
+
+  function test_listingExecutor() public {
+    assertEq(
+      IACLManager(pool.ADDRESSES_PROVIDER().getACLManager()).isPoolAdmin(getListingExecutor()),
+      false
+    );
+  }
+
   function test_getConfiguration(address token, TokenListingParams memory params) private {
     DataTypes.ReserveConfigurationMap memory config = pool.getConfiguration(token);
     assertEq(config.getSupplyCap(), params.supplyCap);
@@ -86,6 +96,7 @@ contract HorizonListingBaseTest is Test {
     assertEq(config.getLiquidationBonus(), params.liquidationBonus);
     assertEq(config.getDebtCeiling(), params.debtCeiling);
     assertEq(config.getLiquidationProtocolFee(), params.liqProtocolFee);
+    assertEq(config.getPaused(), true);
   }
 
   function test_interestRateStrategy(address token, TokenListingParams memory params) private {
@@ -162,6 +173,9 @@ contract HorizonListingBaseTest is Test {
 }
 
 contract HorizonListingMainnetTest is HorizonListingBaseTest {
+  address internal constant DEPLOYER = 0xA22f39d5fEb10489F7FA84C2C545BAc4EA48eBB7;
+  address internal constant LISTING_EXECUTOR = 0xf046907a4371F7F027113bf751F3347459a08b71;
+
   address internal constant GHO_ADDRESS = 0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f;
   address internal constant USDC_ADDRESS = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
   address internal constant RLUSD_ADDRESS = 0x8292Bb45bf1Ee4d140127049757C2E0fF06317eD;
@@ -200,6 +214,10 @@ contract HorizonListingMainnetTest is HorizonListingBaseTest {
   function setUp() public virtual {
     vm.createSelectFork('mainnet');
   }
+
+  function getListingExecutor() internal pure override returns (address) {
+    return LISTING_EXECUTOR;
+  }
 }
 
 contract HorizonPhaseOneListingTest is HorizonListingMainnetTest, Default {