test: post-exec fork tests; pr comments; rwa borrow test

Author: yan-man

.env.example

@@ -1,5 +1,8 @@
 # Verifier URL for contract verification
 VERIFIER_URL=
+DRY=
+ACCOUNT=
+CHAIN=
 
 # Test rpc_endpoints
 # To generate RPCs based on you api keys, you can use

Makefile

@@ -11,13 +11,13 @@ test   :; forge test -vvv
 
 test-contract :; forge test --match-contract ${filter} -vv
 
-# Deploys payload to list ACRED asset. `make deploy-acred dry=false CHAIN=mainnet ACCOUNT=<account>`
+# Deploys payload to list ACRED asset. `make deploy-acred`
 deploy-acred :; 
 	FOUNDRY_PROFILE=${CHAIN} forge script src/AaveV3Horizon_ACREDListing_20260217/ACREDListing_20260217.s.sol:DeployEthereum \
 		--rpc-url ${CHAIN} --account ${ACCOUNT} --slow --gas-estimate-multiplier 150 \
 		--chain ${CHAIN} --verifier-url ${VERIFIER_URL} \
 		--sig "run()" \
-		$(if ${dry},, --broadcast --verify) \
+		$(if ${DRY},, --broadcast --verify) \
 
 # Utilities
 download :; cast etherscan-source --chain ${chain} -d src/etherscan/${chain}_${address} ${address}

diffs/AaveV3Horizon_ACREDListing_20260217_before_AaveV3Horizon_ACREDListing_20260217_after.md

@@ -9,7 +9,7 @@
 | decimals | 6 |
 | isActive | true |
 | isFrozen | false |
-| supplyCap | 32,000 ACRED |
+| supplyCap | 30,000 ACRED |
 | borrowCap | 0 ACRED |
 | debtCeiling | 0 $ [0] |
 | isSiloed | false |
@@ -55,24 +55,24 @@
 
 
 
-### EMode: (id: 3)
+### EMode: ACRED GHO(id: 3)
 
+| description | value before | value after |
+| --- | --- | --- |
+| eMode.label | - | ACRED GHO |
+| eMode.ltv | 72 % | 68 % |
+| eMode.liquidationThreshold | 79 % | 78 % |
+| eMode.liquidationBonus | 7.5 % | 9 % |
+| eMode.borrowableBitmap |  | GHO |
+| eMode.collateralBitmap |  | ACRED |
 
 
 ### EMode: USCC GHO(id: 4)
 
 
 
-### EMode: ACRED GHO(id: 5)
+### EMode: (id: 5)
 
-| description | value before | value after |
-| --- | --- | --- |
-| eMode.label | - | ACRED GHO |
-| eMode.ltv | 85 % | 90 % |
-| eMode.liquidationThreshold | 89 % | 92 % |
-| eMode.liquidationBonus | 3.1 % | 3 % |
-| eMode.borrowableBitmap |  | GHO |
-| eMode.collateralBitmap |  | ACRED |
 
 
 ### EMode: USYC GHO(id: 6)
@@ -100,7 +100,7 @@
 ```json
 {
   "eModes": {
-    "5": {
+    "3": {
       "borrowableBitmap": {
         "from": "0",
         "to": "1"
@@ -114,16 +114,16 @@
         "to": "ACRED GHO"
       },
       "liquidationBonus": {
-        "from": 10310,
-        "to": 10300
+        "from": 10750,
+        "to": 10900
       },
       "liquidationThreshold": {
-        "from": 8900,
-        "to": 9200
+        "from": 7900,
+        "to": 7800
       },
       "ltv": {
-        "from": 8500,
-        "to": 9000
+        "from": 7200,
+        "to": 6800
       }
     }
   },
@@ -156,7 +156,7 @@
         "oracleDescription": "ACRED NAV - Aave LlamaGuard",
         "oracleLatestAnswer": "109713972400",
         "reserveFactor": 0,
-        "supplyCap": 32000,
+        "supplyCap": 30000,
         "symbol": "ACRED",
         "underlying": "0x17418038ecF73BA4026c4f428547BF099706F27B",
         "usageAsCollateralEnabled": true,
@@ -297,25 +297,25 @@
           "previousValue": "0x0000000000000000000000000000000000000000000000090000000000000000",
           "newValue": "0x00000000000000000000000000000000000000000000000a0000000000000000"
         },
-        "0x50039cf134a124858bd88bbc9225ec3c537b89a0e9237ce39fe1813e6edf8257": {
-          "previousValue": "0x0000000000000000000000000000000000000000000000000000284622c42134",
-          "newValue": "0x0000000000000000000000000000000000000000000000000200283c23f02328"
+        "0x748ad6d0c5a24a04515706b6da6a7b0cb9e1a9408b9f3a5672a42f933d02d13e": {
+          "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "newValue": "0x00000000000000000000000017418038ecf73ba4026c4f428547bf099706f27b"
+        },
+        "0x81d0999fde243adcc41b7fa1be5cea14f789e3a6065b815ac58f4bc0838c3155": {
+          "previousValue": "0x000000000000000000000000000000000000000000000000000029fe1edc1c20",
+          "newValue": "0x00000000000000000000000000000000000000000000000002002a941e781a90"
         },
-        "0x50039cf134a124858bd88bbc9225ec3c537b89a0e9237ce39fe1813e6edf8258": {
+        "0x81d0999fde243adcc41b7fa1be5cea14f789e3a6065b815ac58f4bc0838c3156": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "newValue": "0x41435245442047484f0000000000000000000000000000000000000000000012"
         },
-        "0x50039cf134a124858bd88bbc9225ec3c537b89a0e9237ce39fe1813e6edf8259": {
+        "0x81d0999fde243adcc41b7fa1be5cea14f789e3a6065b815ac58f4bc0838c3157": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "newValue": "0x0000000000000000000000000000000000000000000000000000000000000001"
         },
-        "0x748ad6d0c5a24a04515706b6da6a7b0cb9e1a9408b9f3a5672a42f933d02d13e": {
-          "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
-          "newValue": "0x00000000000000000000000017418038ecf73ba4026c4f428547bf099706f27b"
-        },
         "0xe7569c1de36b7b382c11b8838312b8b7a0397157bf8b3c82731f39ca7162a47e": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
-          "newValue": "0x10000000000000000000000000000007d00000000000000001062a941db019c8"
+          "newValue": "0x10000000000000000000000000000007530000000000000001062a941db019c8"
         },
         "0xe7569c1de36b7b382c11b8838312b8b7a0397157bf8b3c82731f39ca7162a47f": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",

foundry.toml

@@ -22,10 +22,6 @@ out = 'out/prague'
 evm_version = 'prague'
 cache_path = 'cache/prague'
 
-[profile.mainnet]
-evm_version = 'shanghai'
-cache_path = 'cache/shanghai'
-
 [profile.deploy]
 out = 'out/shanghai'
 evm_version = 'shanghai'

src/AaveV3Horizon_ACREDListing_20260217/AaveV3Horizon_ACREDListing_20260217.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AaveV3HorizonEthereum} from '../utils/AaveV3HorizonEthereum.sol';
-import {AaveV3PayloadHorizonEthereum} from '../utils/AaveV3PayloadHorizonEthereum.sol';
+import {AaveV3HorizonEthereum} from 'src/utils/AaveV3HorizonEthereum.sol';
+import {AaveV3PayloadHorizonEthereum} from 'src/utils/AaveV3PayloadHorizonEthereum.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/contracts/extensions/v3-config-engine/EngineFlags.sol';
 
@@ -15,7 +15,7 @@ import {EngineFlags} from 'aave-v3-origin/contracts/extensions/v3-config-engine/
 contract AaveV3Horizon_ACREDListing_20260217 is AaveV3PayloadHorizonEthereum {
   address public constant ACRED = 0x17418038ecF73BA4026c4f428547BF099706F27B;
   address public constant ACRED_PRICE_FEED = 0x60AEd7d20AC6328f7BA771aD58931c996aff30E8;
-  uint8 public constant ACRED_EMODE_CATEGORY = 5;
+  uint8 public constant ACRED_EMODE_CATEGORY = 3;
 
   function newListingsCustom()
     public
@@ -30,12 +30,7 @@ contract AaveV3Horizon_ACREDListing_20260217 is AaveV3PayloadHorizonEthereum {
         asset: ACRED,
         assetSymbol: 'ACRED',
         priceFeed: ACRED_PRICE_FEED,
-        rateStrategyParams: IEngine.InterestRateInputData({
-          optimalUsageRatio: 99_00,
-          baseVariableBorrowRate: 0,
-          variableRateSlope1: 0,
-          variableRateSlope2: 0
-        }),
+        rateStrategyParams: AaveV3HorizonEthereum.defaultRwaInterestRateInputData(),
         enabledToBorrow: EngineFlags.DISABLED,
         borrowableInIsolation: EngineFlags.DISABLED,
         withSiloedBorrowing: EngineFlags.DISABLED,
@@ -44,7 +39,7 @@ contract AaveV3Horizon_ACREDListing_20260217 is AaveV3PayloadHorizonEthereum {
         liqThreshold: 76_00,
         liqBonus: 9_00,
         reserveFactor: EngineFlags.KEEP_CURRENT,
-        supplyCap: 32_000,
+        supplyCap: 30_000,
         borrowCap: 0,
         debtCeiling: 0,
         liqProtocolFee: 0
@@ -91,9 +86,9 @@ contract AaveV3Horizon_ACREDListing_20260217 is AaveV3PayloadHorizonEthereum {
     // ACRED GHO
     eModeCategories[0] = IEngine.EModeCategoryUpdate({
       eModeCategory: ACRED_EMODE_CATEGORY,
-      ltv: 90_00,
-      liqThreshold: 92_00,
-      liqBonus: 3_00,
+      ltv: 68_00,
+      liqThreshold: 78_00,
+      liqBonus: 9_00,
       label: 'ACRED GHO'
     });
 

src/AaveV3Horizon_ACREDListing_20260217/AaveV3Horizon_ACREDListing_20260217.t.sol

@@ -2,9 +2,10 @@
 pragma solidity ^0.8.0;
 
 import {IPool} from 'aave-v3-origin/contracts/interfaces/IPool.sol';
+import {IDefaultInterestRateStrategyV2} from 'aave-v3-origin/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
 import {AaveV3HorizonEthereum} from 'src/utils/AaveV3HorizonEthereum.sol';
-import {ProtocolV3HorizonTestBase, ReserveConfig} from 'src/utils/ProtocolV3HorizonTestBase.sol';
-import {HorizonConfigAssertionHelper} from 'src/utils/HorizonConfigAssertionHelper.sol';
+import {ProtocolV3HorizonTestBase, ReserveConfig} from 'tests/utils/ProtocolV3HorizonTestBase.sol';
+import {HorizonConfigAssertionHelper} from 'tests/utils/HorizonConfigAssertionHelper.sol';
 import {AaveV3Horizon_ACREDListing_20260217} from 'src/AaveV3Horizon_ACREDListing_20260217/AaveV3Horizon_ACREDListing_20260217.sol';
 
 /**
@@ -27,7 +28,7 @@ contract AaveV3Horizon_ACREDListing_20260217_Test is ProtocolV3HorizonTestBase {
   /**
    * @dev executes the generic test suite including e2e and config snapshots
    */
-  function test_defaultProposalExecution() public {
+  function test_defaultProposalExecution() public virtual {
     defaultTest_v3_3(
       'AaveV3Horizon_ACREDListing_20260217',
       IPool(AaveV3HorizonEthereum.POOL),
@@ -41,14 +42,14 @@ contract AaveV3Horizon_ACREDListing_20260217_Test is ProtocolV3HorizonTestBase {
   function test_acredConfig() public {
     IPool pool = IPool(AaveV3HorizonEthereum.POOL);
 
-    // check eMode 5 before execution (pool default values, no label/assets)
+    // check eMode 3 before execution (has config values but no assets assigned)
     _assertEModeConfig(
       pool,
       ExpectedEModeConfig({
-        eModeCategory: 5,
-        ltv: 85_00,
-        liquidationThreshold: 89_00,
-        liquidationBonus: 100_00 + 3_10,
+        eModeCategory: 3,
+        ltv: 72_00,
+        liquidationThreshold: 79_00,
+        liquidationBonus: 100_00 + 7_50,
         label: '',
         collateralAssets: new address[](0),
         borrowableAssets: new address[](0)
@@ -61,7 +62,7 @@ contract AaveV3Horizon_ACREDListing_20260217_Test is ProtocolV3HorizonTestBase {
     // verify ACRED asset config
     _assertAssetConfig(pool, expectedAssetConfig);
 
-    // verify eMode 5 = ACRED GHO after execution
+    // verify eMode 3 = ACRED GHO after execution
     _assertEModeConfig(pool, expectedEModeConfig);
   }
 
@@ -74,7 +75,7 @@ contract AaveV3Horizon_ACREDListing_20260217_Test is ProtocolV3HorizonTestBase {
       aTokenSymbol: 'aHorRwaACRED',
       variableDebtTokenName: 'Aave Horizon RWA Variable Debt ACRED',
       variableDebtTokenSymbol: 'variableDebtHorRwaACRED',
-      supplyCap: 32_000,
+      supplyCap: 30_000,
       borrowCap: 0,
       reserveFactor: 0,
       borrowingEnabled: false,
@@ -84,16 +85,18 @@ contract AaveV3Horizon_ACREDListing_20260217_Test is ProtocolV3HorizonTestBase {
       liquidationBonus: 100_00 + 9_00,
       debtCeiling: 0,
       liqProtocolFee: 0,
-      optimalUsageRatio: 99_00,
-      baseVariableBorrowRate: 0,
-      variableRateSlope1: 0,
-      variableRateSlope2: 0
+      rateData: IDefaultInterestRateStrategyV2.InterestRateData({
+        optimalUsageRatio: 99_00,
+        baseVariableBorrowRate: 0,
+        variableRateSlope1: 0,
+        variableRateSlope2: 0
+      })
     });
     expectedEModeConfig = ExpectedEModeConfig({
-      eModeCategory: 5,
-      ltv: 90_00,
-      liquidationThreshold: 92_00,
-      liquidationBonus: 100_00 + 3_00,
+      eModeCategory: 3,
+      ltv: 68_00,
+      liquidationThreshold: 78_00,
+      liquidationBonus: 100_00 + 9_00,
       label: 'ACRED GHO',
       collateralAssets: _toAddressArray(AaveV3HorizonEthereum.ACRED_UNDERLYING),
       borrowableAssets: _toAddressArray(AaveV3HorizonEthereum.GHO_UNDERLYING)
@@ -103,7 +106,7 @@ contract AaveV3Horizon_ACREDListing_20260217_Test is ProtocolV3HorizonTestBase {
 
 /**
  * @dev Post-execution fork test. Run after the payload has been executed on mainnet
- *      to validate the live state matches expected config.
+ *      to validate the live state matches expected config and run full E2E.
  * command: FOUNDRY_PROFILE=test forge test --match-contract AaveV3Horizon_ACREDListing_20260217_PostExecution_Test -vv
  */
 contract AaveV3Horizon_ACREDListing_20260217_PostExecution_Test is
@@ -116,9 +119,16 @@ contract AaveV3Horizon_ACREDListing_20260217_PostExecution_Test is
     vm.createSelectFork(vm.rpcUrl('mainnet'));
   }
 
+  function test_defaultPostExecution() public {
+    defaultTest_v3_3_postExecution(IPool(AaveV3HorizonEthereum.POOL));
+  }
+
   function test_acredConfigPostExecution() public {
     IPool pool = IPool(AaveV3HorizonEthereum.POOL);
     _assertAssetConfig(pool, expectedAssetConfig);
     _assertEModeConfig(pool, expectedEModeConfig);
   }
+
+  // no payload to execute post-deployment
+  function test_defaultProposalExecution() public override {}
 }

src/utils/AaveV3HorizonEthereum.sol

@@ -1,7 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
+
 library AaveV3HorizonEthereum {
+  function defaultRwaInterestRateInputData()
+    internal
+    pure
+    returns (IEngine.InterestRateInputData memory)
+  {
+    return
+      IEngine.InterestRateInputData({
+        optimalUsageRatio: 99_00,
+        baseVariableBorrowRate: 0,
+        variableRateSlope1: 0,
+        variableRateSlope2: 0
+      });
+  }
+
   // executor roles
   address public constant HORIZON_OPS = 0xE6ec1f0Ae6Cd023bd0a9B4d0253BDC755103253c;
   address public constant HORIZON_EMERGENCY = 0x13B57382c36BAB566E75C72303622AF29E27e1d3;