fix: fixed validateSetUserEMode

aave · Sep 24, 2021 · 750fd34 · 750fd34
1 parent 0534f47
commit 750fd34
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/contracts/mocks/helpers/MockReserveConfiguration.sol b/contracts/mocks/helpers/MockReserveConfiguration.sol
@@ -103,6 +103,12 @@ contract MockReserveConfiguration {
     return configuration.getEModeCategory();
   }
 
+  function setEModeCategory(uint8 categoryId) external {
+    DataTypes.ReserveConfigurationMap memory config = configuration;
+    config.setEModeCategory(categoryId);
+    configuration = config;
+  }
+
   function setSupplyCap(uint256 supplyCap) external {
     DataTypes.ReserveConfigurationMap memory config = configuration;
     config.setSupplyCap(supplyCap);

diff --git a/contracts/protocol/libraries/logic/ValidationLogic.sol b/contracts/protocol/libraries/logic/ValidationLogic.sol
@@ -49,7 +49,7 @@ library ValidationLogic {
     (bool isActive, bool isFrozen, , , bool isPaused) = reserveCache
       .reserveConfiguration
       .getFlags();
-    (, , , uint256 reserveDecimals, ,) = reserveCache.reserveConfiguration.getParams();
+    (, , , uint256 reserveDecimals, , ) = reserveCache.reserveConfiguration.getParams();
     uint256 supplyCap = reserveCache.reserveConfiguration.getSupplyCap();
 
     require(amount != 0, Errors.VL_INVALID_AMOUNT);
@@ -122,7 +122,7 @@ library ValidationLogic {
   ) internal view {
     ValidateBorrowLocalVars memory vars;
 
-    (, , , vars.reserveDecimals, ,) = params.reserveCache.reserveConfiguration.getParams();
+    (, , , vars.reserveDecimals, , ) = params.reserveCache.reserveConfiguration.getParams();
 
     (
       vars.isActive,
@@ -169,8 +169,7 @@ library ValidationLogic {
 
     if (params.userEModeCategory != 0) {
       require(
-        params.reserveCache.reserveConfiguration.getEModeCategory() ==
-          params.userEModeCategory,
+        params.reserveCache.reserveConfiguration.getEModeCategory() == params.userEModeCategory,
         Errors.VL_INCONSISTENT_EMODE_CATEGORY
       );
       vars.eModePriceSource = eModeCategories[params.userEModeCategory].priceSource;
@@ -630,7 +629,7 @@ library ValidationLogic {
   ) internal view {
     // category is invalid if the liq threshold is not set
     require(
-      eModeCategories[categoryId].liquidationThreshold > 0,
+      categoryId == 0 || eModeCategories[categoryId].liquidationThreshold > 0,
       Errors.VL_INCONSISTENT_EMODE_CATEGORY
     );
 

diff --git a/test-suites/reserve-configuration.spec.ts b/test-suites/reserve-configuration.spec.ts
@@ -73,13 +73,13 @@ describe('ReserveConfiguration', async () => {
   it('getEModeCategory()', async () => {
     expect(await configMock.getParams()).to.be.eql([ZERO, ZERO, ZERO, ZERO, ZERO, ZERO]);
     expect(await configMock.getEModeCategory()).to.be.eq(ZERO);
-    expect(await configMock.setDecimals(EMODE_CATEGORY));
+    expect(await configMock.setEModeCategory(EMODE_CATEGORY));
     // eMode category is the 6th param
     expect(await configMock.getParams()).to.be.eql([ZERO, ZERO, ZERO, ZERO, ZERO, EMODE_CATEGORY]);
-    expect(await configMock.getDecimals()).to.be.eq(EMODE_CATEGORY);
-    expect(await configMock.setDecimals(0));
+    expect(await configMock.getEModeCategory()).to.be.eq(EMODE_CATEGORY);
+    expect(await configMock.setEModeCategory(0));
     expect(await configMock.getParams()).to.be.eql([ZERO, ZERO, ZERO, ZERO, ZERO, ZERO]);
-    expect(await configMock.getDecimals()).to.be.eq(ZERO);
+    expect(await configMock.getEModeCategory()).to.be.eq(ZERO);
   });
 
   it('getFrozen()', async () => {