oak 28

src/contracts/core/common/Errors.sol

@@ -23,6 +23,7 @@ library Errors {
 
     error ADDRESS_HAS_NO_CODE(address);
     error NOT_INITIALIZING();
+    error TO_WAD_AMOUNT_IS_NEGATIVE(int256);
     error COMMON_ALREADY_INITIALIZED();
     error MINTER_ALREADY_INITIALIZED();
     error SCDP_ALREADY_INITIALIZED();
@@ -144,6 +145,7 @@ library Errors {
     error NOTHING_TO_WITHDRAW(address who, ID, uint256 requested, uint256 principal, uint256 scaled);
     error ACCOUNT_KRASSET_NOT_FOUND(address account, ID, address[] accountCollaterals);
     error ACCOUNT_COLLATERAL_NOT_FOUND(address account, ID, address[] accountCollaterals);
+    error ARRAY_INDEX_OUT_OF_BOUNDS(ID element, uint256 index, address[] elements);
     error ELEMENT_DOES_NOT_MATCH_PROVIDED_INDEX(ID element, uint256 index, address[] elements);
     error NO_FEES_TO_CLAIM(ID asset, address claimer);
     error REPAY_OVERFLOW(ID repayAsset, ID seizeAsset, uint256 invalid, uint256 valid);

src/contracts/core/common/Modifiers.sol

@@ -183,11 +183,11 @@ contract Modifiers {
     }
 
     /**
-     * @notice Ensure only trusted contracts can act on behalf of `_account`
-     * @param _accountIsNotMsgSender The address of the collateral asset.
+     * @notice Check for role if the condition is true.
+     * @param _shouldCheckRole Should be checking the role.
      */
-    modifier onlyRoleIf(bool _accountIsNotMsgSender, bytes32 role) {
-        if (_accountIsNotMsgSender) {
+    modifier onlyRoleIf(bool _shouldCheckRole, bytes32 role) {
+        if (_shouldCheckRole) {
             Auth.checkRole(role);
         }
         _;

src/contracts/core/common/Validations.sol

@@ -325,7 +325,7 @@ library Validations {
     ) internal view {
         if (_amount == 0) revert Errors.ZERO_AMOUNT(Errors.id(_collateralAsset));
         if (_collateralIndex > self.depositedCollateralAssets[_account].length - 1)
-            revert Errors.ELEMENT_DOES_NOT_MATCH_PROVIDED_INDEX(
+            revert Errors.ARRAY_INDEX_OUT_OF_BOUNDS(
                 Errors.id(_collateralAsset),
                 _collateralIndex,
                 self.depositedCollateralAssets[_account]

src/contracts/core/common/funcs/Actions.sol

@@ -48,7 +48,7 @@ function burnSCDP(Asset storage _asset, uint256 _burnAmount, address _fromAddr)
 /// @param _toAddr the account to mint the assets to
 /// @return issued Normalized amount of minted assets.
 function mintSCDP(Asset storage _asset, uint256 _mintAmount, address _toAddr) returns (uint256 issued) {
-    if (!_asset.marketStatus()) revert Errors.MARKET_CLOSED(Errors.id(_asset.anchor), _asset.ticker.toString());
+    if (!_asset.isMarketOpen()) revert Errors.MARKET_CLOSED(Errors.id(_asset.anchor), _asset.ticker.toString());
     issued = mintKrAsset(_mintAmount, _toAddr, _asset.anchor);
     unchecked {
         sdi().totalDebt += _asset.debtAmountToSDI(_mintAmount, false);

src/contracts/core/common/funcs/Assets.sol

@@ -49,7 +49,7 @@ library Assets {
         return Redstone.getPrice(self.ticker);
     }
 
-    function marketStatus(Asset storage) internal pure returns (bool) {
+    function isMarketOpen(Asset storage) internal pure returns (bool) {
         return true;
     }
 

src/contracts/core/common/funcs/Math.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.21;
 
 import {WadRay} from "libs/WadRay.sol";
 import {PercentageMath} from "libs/PercentageMath.sol";
+import {Errors} from "common/Errors.sol";
 
 using WadRay for uint256;
 using PercentageMath for uint256;
@@ -47,6 +48,9 @@ function toWad(uint256 _amount, uint8 _decimals) pure returns (uint256) {
 }
 
 function toWad(int256 _amount, uint8 _decimals) pure returns (uint256) {
+    if (_amount < 0) {
+        revert Errors.TO_WAD_AMOUNT_IS_NEGATIVE(_amount);
+    }
     return toWad(uint256(_amount), _decimals);
 }
 

src/contracts/core/minter/facets/MinterMintFacet.sol

@@ -37,7 +37,7 @@ contract MinterMintFacet is IMinterMintFacet, Modifiers {
 
         MinterState storage s = ms();
 
-        if (!asset.marketStatus()) revert Errors.MARKET_CLOSED(Errors.id(_krAsset), asset.ticker.toString());
+        if (!asset.isMarketOpen()) revert Errors.MARKET_CLOSED(Errors.id(_krAsset), asset.ticker.toString());
 
         uint256 newSupply = IKreskoAsset(_krAsset).totalSupply() + _mintAmount;
         if (newSupply > asset.maxDebtMinter) {

src/contracts/core/periphery/DataV1.sol

@@ -151,7 +151,7 @@ contract DataV1 is ProxyConnector, IDataV1 {
                 tSupply: asset.token.totalSupply(),
                 vSupply: asset.token.balanceOf(VAULT),
                 price: answer > 0 ? uint256(answer) : 0,
-                marketStatus: answer > 0 ? true : false,
+                isMarketOpen: answer > 0 ? true : false,
                 oracleDecimals: asset.feed.decimals(),
                 priceRaw: RawPrice(
                     answer,

src/contracts/core/periphery/IDataV1.sol

@@ -7,7 +7,7 @@ import {VaultAsset} from "vault/VTypes.sol";
 interface IDataV1 {
     struct DVAsset {
         address addr;
-        bool marketStatus;
+        bool isMarketOpen;
         uint8 oracleDecimals;
         string name;
         string symbol;

src/contracts/core/periphery/PFuncs.sol

@@ -192,7 +192,7 @@ library PFunc {
                 name: token.name(),
                 tSupply: token.totalSupply(),
                 price: uint256(price.answer),
-                marketStatus: asset.marketStatus(),
+                isMarketOpen: asset.isMarketOpen(),
                 priceRaw: price,
                 config: asset
             });

src/contracts/core/periphery/PTypes.sol

@@ -95,7 +95,7 @@ library PType {
         string symbol;
         uint256 tSupply;
         uint256 price;
-        bool marketStatus;
+        bool isMarketOpen;
         RawPrice priceRaw;
         Asset config;
     }

src/contracts/core/scdp/facets/SCDPSwapFacet.sol

@@ -54,6 +54,7 @@ contract SCDPSwapFacet is ISCDPSwapFacet, Modifiers {
         } else {
             amountOut = assetIn.krAssetUSD(_amountIn).wadDiv(assetOut.price());
             feeAmount = amountOut.percentMul(feePercentage);
+            amountOut = amountOut - feeAmount;
             feeAmountProtocol = feeAmount.percentMul(protocolFee);
             feeAmount -= feeAmountProtocol;
         }