test: add test

Author: sakulstra

src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol

@@ -226,7 +226,7 @@ interface IAaveV3ConfigEngine {
    *   liqThreshold: 70_00,
    *   liqBonus: EngineFlags.KEEP_CURRENT,
    *   label: EngineFlags.KEEP_CURRENT_STRING,
-   *   borrowable:[USDC],
+   *   borrowables:[USDC],
    *   collaterals:[ETH]
    * })
    */
@@ -235,7 +235,7 @@ interface IAaveV3ConfigEngine {
     uint256 liqThreshold;
     uint256 liqBonus;
     string label;
-    address[] borrowable;
+    address[] borrowables;
     address[] collaterals;
   }
 

src/contracts/extensions/v3-config-engine/libraries/EModeEngine.sol

@@ -44,9 +44,9 @@ library EModeEngine {
           true
         );
       }
-      for (uint256 k; k < creations[i].borrowable.length; k++) {
+      for (uint256 k; k < creations[i].borrowables.length; k++) {
         engineConstants.poolConfigurator.setAssetBorrowableInEMode(
-          creations[i].borrowable[k],
+          creations[i].borrowables[k],
           categoryId,
           true
         );

tests/extensions/v3-config-engine/AaveV3ConfigEngineTest.t.sol

@@ -17,6 +17,7 @@ import {AaveV3MockPriceFeedUpdate} from './mocks/AaveV3MockPriceFeedUpdate.sol';
 import {AaveV3MockEModeCategoryUpdate, AaveV3MockEModeCategoryUpdateEdgeBonus} from './mocks/AaveV3MockEModeCategoryUpdate.sol';
 import {AaveV3MockEModeCategoryUpdateNoChange} from './mocks/AaveV3MockEModeCategoryUpdateNoChange.sol';
 import {AaveV3MockAssetEModeUpdate} from './mocks/AaveV3MockAssetEModeUpdate.sol';
+import {AaveV3MockEModeCategoryCreation} from './mocks/AaveV3MockEModeCategoryCreation.sol';
 
 import {ATokenInstance} from '../../../src/contracts/instances/ATokenInstance.sol';
 import {EModeConfiguration} from '../../../src/contracts/protocol/libraries/configuration/EModeConfiguration.sol';
@@ -507,14 +508,59 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
     );
   }
 
+  function testEModeCategoryCreation() public {
+    AaveV3MockEModeCategoryCreation payload = new AaveV3MockEModeCategoryCreation(
+      tokenList.weth,
+      tokenList.usdx,
+      tokenList.wbtc,
+      tokenList.weth,
+      configEngine
+    );
+
+    vm.prank(roleList.marketOwner);
+    contracts.aclManager.addPoolAdmin(address(payload));
+
+    payload.execute();
+
+    DataTypes.EModeCategory memory prevEmodeCategoryData;
+    prevEmodeCategoryData.ltv = 50_00;
+    prevEmodeCategoryData.liquidationThreshold = 60_00;
+    prevEmodeCategoryData.liquidationBonus = 101_00; // 100_00 + 1_00
+    prevEmodeCategoryData.label = 'No assets';
+
+    uint256 bitmap = contracts.poolProxy.getEModeCategoryBorrowableBitmap(1);
+    assertEq(bitmap, 0);
+    bitmap = contracts.poolProxy.getEModeCategoryCollateralBitmap(1);
+    assertEq(bitmap, 0);
+    _validateEmodeCategory(
+      IPoolAddressesProvider(address(contracts.poolAddressesProvider)),
+      1,
+      prevEmodeCategoryData
+    );
+
+    prevEmodeCategoryData.ltv = 97_40;
+    prevEmodeCategoryData.liquidationThreshold = 97_60;
+    prevEmodeCategoryData.liquidationBonus = 101_50; // 100_00 + 1_50
+    prevEmodeCategoryData.label = 'Test';
+    prevEmodeCategoryData.collateralBitmap = 10; // 1010
+    prevEmodeCategoryData.borrowableBitmap = 12; // 1100
+    _validateEmodeCategory(
+      IPoolAddressesProvider(address(contracts.poolAddressesProvider)),
+      2,
+      prevEmodeCategoryData
+    );
+    contracts.poolProxy.getEModeCategoryBorrowableBitmap(2);
+    assertEq(bitmap, 0);
+    bitmap = contracts.poolProxy.getEModeCategoryCollateralBitmap(2);
+    assertEq(bitmap, 0);
+  }
+
   function testEModeCategoryUpdates() public {
     AaveV3MockEModeCategoryUpdate payload = new AaveV3MockEModeCategoryUpdate(configEngine);
 
     vm.prank(roleList.marketOwner);
     contracts.aclManager.addPoolAdmin(address(payload));
 
-    contracts.poolProxy.getEModeCategoryData(1);
-
     createConfigurationSnapshot(
       'preTestEngineEModeCategoryUpdate',
       IPool(address(contracts.poolProxy))

tests/extensions/v3-config-engine/mocks/AaveV3MockEModeCategoryCreation.sol

@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import '../../../../src/contracts/extensions/v3-config-engine/AaveV3Payload.sol';
+
+/**
+ * @dev Smart contract for a mock emode category update, to be able to test
+ * IMPORTANT Parameters are pseudo-random, DON'T USE THIS ANYHOW IN PRODUCTION
+ * @dev Inheriting directly from AaveV3Payload for being able to inject a custom engine
+ * @author BGD Labs
+ */
+contract AaveV3MockEModeCategoryCreation is AaveV3Payload {
+  address immutable COLLATERAL_ONE;
+  address immutable COLLATERAL_TWO;
+
+  address immutable BORROWABLE_ONE;
+  address immutable BORROWABLE_TWO;
+
+  constructor(
+    address collateral1,
+    address collateral2,
+    address borrowable1,
+    address borrowable2,
+    address customEngine
+  ) AaveV3Payload(IEngine(customEngine)) {
+    COLLATERAL_ONE = collateral1;
+    COLLATERAL_TWO = collateral2;
+    BORROWABLE_ONE = borrowable1;
+    BORROWABLE_TWO = borrowable2;
+  }
+
+  function eModeCategoryCreations()
+    public
+    view
+    override
+    returns (IEngine.EModeCategoryCreation[] memory)
+  {
+    IEngine.EModeCategoryCreation[] memory eModeUpdates = new IEngine.EModeCategoryCreation[](2);
+
+    address[] memory empty = new address[](0);
+
+    eModeUpdates[0] = IEngine.EModeCategoryCreation({
+      ltv: 50_00,
+      liqThreshold: 60_00,
+      liqBonus: 1_00,
+      label: 'No assets',
+      borrowables: empty,
+      collaterals: empty
+    });
+    address[] memory collaterals = new address[](2);
+    address[] memory borrowables = new address[](2);
+    collaterals[0] = COLLATERAL_ONE;
+    collaterals[1] = COLLATERAL_TWO;
+    borrowables[0] = BORROWABLE_ONE;
+    borrowables[1] = BORROWABLE_TWO;
+    eModeUpdates[1] = IEngine.EModeCategoryCreation({
+      ltv: 97_40,
+      liqThreshold: 97_60,
+      liqBonus: 1_50,
+      label: 'Test',
+      borrowables: borrowables,
+      collaterals: collaterals
+    });
+
+    return eModeUpdates;
+  }
+
+  function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
+    return IEngine.PoolContext({networkName: 'Polygon', networkAbbreviation: 'Pol'});
+  }
+}

tests/utils/ProtocolV3TestBase.sol

@@ -757,12 +757,12 @@ contract ProtocolV3TestBase is DiffUtils {
     require(
       IPool(poolAddress).getEModeCategoryCollateralBitmap(uint8(category)) ==
         expectedCategoryData.collateralBitmap,
-      '_validateEmodeCategory(): INVALID_LB'
+      '_validateEmodeCategory(): INVALID_COLLATERALS'
     );
     require(
       IPool(poolAddress).getEModeCategoryBorrowableBitmap(uint8(category)) ==
         expectedCategoryData.borrowableBitmap,
-      '_validateEmodeCategory(): INVALID_LB'
+      '_validateEmodeCategory(): INVALID_BORROWABLES'
     );
   }