PROTOCOL-1177 Reorganize storage directory

contracts/contexts2/access-control/reentry/ReentryMods.sol

@@ -4,6 +4,19 @@ pragma solidity ^0.8.0;
 import { AccessControlStorageLib, AccessControlStorage } from "../storage.sol";
 
 abstract contract ReentryMods {
+    /**
+     * @notice Reentry modifier
+     *
+     * @dev It makes sure that a function isn't re-entered more than once through
+     * @dev a fallback function. This works by marking a mapping to a bytes32 as true
+     * @dev the moment a function commences. Afterwards, when the function ends, it
+     * @dev maps to a false value.
+     */
+
+    /***
+        Run by the idea of using nonReentry once to execute throughout the whole
+        diamond through Nick Mudgen. 
+      */
     modifier nonReentry(bytes32 id) {
         AccessControlStorage storage s = AccessControlStorageLib.store();
         require(!s.entered[id], "AccessControl: reentered");

contracts/escrow/EscrowClaimTokens.sol

@@ -10,7 +10,7 @@ import {
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 // Storage
-import { MarketStorageLib, LoanStatus } from "../storage/market.sol";
+import { MarketStorageLib, LoanStatus } from "../market/storage/market.sol";
 
 // Libraries
 import { LibLoans } from "../market/libraries/LibLoans.sol";

contracts/escrow/dapps/libraries/LibDapps.sol

@@ -17,8 +17,11 @@ import {
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 // Storage
-import { MarketStorageLib, MarketStorage } from "../../../storage/market.sol";
-import { AppStorageLib } from "../../../storage/app.sol";
+import {
+    MarketStorageLib,
+    MarketStorage
+} from "../../../market/storage/market.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 library LibDapps {
     function s() internal pure returns (MarketStorage storage) {

contracts/escrow/dapps/swappers/AbstractSwapper.sol

@@ -9,7 +9,7 @@ import {
 } from "../../../price-aggregator/pricers/ChainlinkPricer.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 abstract contract AbstractSwapper is PausableMods, DappMods {
     function __isValidPath(address src, address dst) internal returns (bool) {

contracts/escrow/libraries/LibEscrow.sol

@@ -13,8 +13,11 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { ILoansEscrow } from "../escrow/ILoansEscrow.sol";
 
 // Storage
-import { AppStorageLib } from "../../storage/app.sol";
-import { MarketStorageLib, MarketStorage } from "../../storage/market.sol";
+import { AppStorageLib } from "../../settings/storage/app.sol";
+import {
+    MarketStorageLib,
+    MarketStorage
+} from "../../market/storage/market.sol";
 
 library LibEscrow {
     function s() internal pure returns (MarketStorage storage) {

contracts/lending/LendingFacet.sol

@@ -24,7 +24,7 @@ import { MaxTVLLib } from "../settings/asset/libraries/MaxTVLLib.sol";
 import { LendingLib } from "./libraries/LendingLib.sol";
 
 // Storage
-import { AppStorageLib } from "../storage/app.sol";
+import { AppStorageLib } from "../settings/storage/app.sol";
 
 contract LendingFacet is RolesMods, ReentryMods, PausableMods {
     /**

contracts/lending/libraries/LendingLib.sol

@@ -8,7 +8,10 @@ import { NumbersLib } from "../../shared/libraries/NumbersLib.sol";
 import { ITToken } from "../ttoken/ITToken.sol";
 
 // Storage
-import { MarketStorageLib, MarketStorage } from "../../storage/market.sol";
+import {
+    MarketStorageLib,
+    MarketStorage
+} from "../../market/storage/market.sol";
 
 library LendingLib {
     bytes32 internal constant ID = keccak256("LENDING");

contracts/market/CollateralFacet.sol

@@ -22,7 +22,7 @@ import {
     MarketStorage,
     LoanStatus,
     Loan
-} from "../storage/market.sol";
+} from "../market/storage/market.sol";
 
 contract CollateralFacet is RolesMods, ReentryMods, PausableMods {
     /**

contracts/market/CreateLoanConsensusFacet.sol

@@ -26,7 +26,7 @@ import {
     LoanStatus,
     Loan,
     MarketStorageLib
-} from "../storage/market.sol";
+} from "../market/storage/market.sol";
 
 contract CreateLoanConsensusFacet is RolesMods, ReentryMods, PausableMods {
     /**

contracts/market/CreateLoanWithNFTFacet.sol

@@ -22,7 +22,11 @@ import { TellerNFT_V2 } from "../nft/TellerNFT_V2.sol";
 import { ITToken } from "../lending/ttoken/ITToken.sol";
 
 // Storage
-import { LoanUserRequest, LoanStatus, Loan } from "../storage/market.sol";
+import {
+    LoanUserRequest,
+    LoanStatus,
+    Loan
+} from "../market/storage/market.sol";
 
 /**
  * @notice This facet contains the logic for taking out a loan using the Teller NFT.

contracts/market/LoanDataFacet.sol

@@ -10,7 +10,7 @@ import {
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 // Storage
-import { Loan, LoanDebt, LoanTerms } from "../storage/market.sol";
+import { Loan, LoanDebt, LoanTerms } from "../market/storage/market.sol";
 
 contract LoanDataFacet {
     /**

contracts/market/RepayFacet.sol

@@ -34,13 +34,13 @@ import { ITToken } from "../lending/ttoken/ITToken.sol";
 import { ILoansEscrow } from "../escrow/escrow/ILoansEscrow.sol";
 
 // Storage
-import { AppStorageLib } from "../storage/app.sol";
+import { AppStorageLib } from "../settings/storage/app.sol";
 import {
     MarketStorageLib,
     MarketStorage,
     Loan,
     LoanStatus
-} from "../storage/market.sol";
+} from "../market/storage/market.sol";
 
 import { TellerNFT_V2 } from "../nft/TellerNFT_V2.sol";
 

contracts/market/SignersFacet.sol

@@ -11,7 +11,7 @@ import {
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 // Storage
-import { MarketStorageLib } from "../storage/market.sol";
+import { MarketStorageLib } from "../market/storage/market.sol";
 
 contract SignersFacet is RolesMods {
     /**

contracts/market/libraries/LibCollateral.sol

@@ -6,8 +6,8 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { ICollateralEscrow } from "../collateral/ICollateralEscrow.sol";
 
 // Storage
-import { AppStorageLib } from "../../storage/app.sol";
-import { MarketStorageLib } from "../../storage/market.sol";
+import { AppStorageLib } from "../../settings/storage/app.sol";
+import { MarketStorageLib } from "../../market/storage/market.sol";
 
 library LibCollateral {
     /**

contracts/market/libraries/LibConsensus.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { AppStorageLib } from "../../storage/app.sol";
+import { AppStorageLib } from "../../settings/storage/app.sol";
 import {
     MarketStorageLib,
     MarketStorage,
     LoanRequest,
     LoanUserRequest,
     LoanConsensusResponse,
     Signature
-} from "../../storage/market.sol";
+} from "../../market/storage/market.sol";
 import { NumbersLib } from "../../shared/libraries/NumbersLib.sol";
 import { NumbersList } from "../../shared/libraries/NumbersList.sol";
 import {

contracts/market/libraries/LibCreateLoan.sol

@@ -22,8 +22,8 @@ import {
     LoanStatus,
     Loan,
     MarketStorageLib
-} from "../../storage/market.sol";
-import { AppStorageLib } from "../../storage/app.sol";
+} from "../../market/storage/market.sol";
+import { AppStorageLib } from "../../settings/storage/app.sol";
 
 library LibCreateLoan {
     /**

contracts/market/libraries/LibLoans.sol

@@ -9,15 +9,15 @@ import {
 } from "../../settings/platform/libraries/PlatformSettingsLib.sol";
 
 // Storage
-import { AppStorageLib } from "../../storage/app.sol";
+import { AppStorageLib } from "../../settings/storage/app.sol";
 import {
     MarketStorageLib,
     MarketStorage,
     Loan,
     LoanStatus,
     LoanDebt,
     LoanTerms
-} from "../../storage/market.sol";
+} from "../../market/storage/market.sol";
 
 library LibLoans {
     using NumbersLib for int256;

contracts/storage/market.sol → contracts/market/storage/market.sol

@@ -6,12 +6,12 @@ import { Counters } from "@openzeppelin/contracts/utils/Counters.sol";
 import {
     EnumerableSet
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import "../shared/libraries/NumbersList.sol";
+import "../../shared/libraries/NumbersList.sol";
 
 // Interfaces
-import { ILoansEscrow } from "../escrow/escrow/ILoansEscrow.sol";
-import { ICollateralEscrow } from "../market/collateral/ICollateralEscrow.sol";
-import { ITToken } from "../lending/ttoken/ITToken.sol";
+import { ILoansEscrow } from "../../escrow/escrow/ILoansEscrow.sol";
+import { ICollateralEscrow } from "../collateral/ICollateralEscrow.sol";
+import { ITToken } from "../../lending/ttoken/ITToken.sol";
 
 // DEPRECATED
 struct LoanTerms {

contracts/nft/libraries/NFTLib.sol

@@ -13,8 +13,8 @@ import {
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 // Storage
-import { AppStorageLib, AppStorage } from "../../storage/app.sol";
-import { NFTStorageLib, NFTStorage } from "../../storage/nft.sol";
+import { AppStorageLib, AppStorage } from "../../settings/storage/app.sol";
+import { NFTStorageLib, NFTStorage } from "../../nft/storage/nft.sol";
 
 library NFTLib {
     function s() internal pure returns (NFTStorage storage s_) {

contracts/nft/mainnet/NFTMainnetBridgingToPolygonFacet.sol

@@ -20,7 +20,7 @@ import {
 } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 // Storage
-import { NFTStorageLib, NFTStorage } from "../../storage/nft.sol";
+import { NFTStorageLib, NFTStorage } from "../../nft/storage/nft.sol";
 
 contract NFTMainnetBridgingToPolygonFacet {
     address private constant POLYGON_NFT_ADDRESS =

contracts/storage/nft.sol → contracts/nft/storage/nft.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 // Contracts
-import "../nft/TellerNFTDictionary.sol";
+import "../TellerNFTDictionary.sol";
 
 // Utils
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

contracts/price-aggregator/PriceAggFacet.sol

@@ -7,7 +7,7 @@ import { ADMIN } from "../shared/roles.sol";
 import { PriceAggregator } from "./PriceAggregator.sol";
 
 // Storage
-import { AppStorageLib } from "../storage/app.sol";
+import { AppStorageLib } from "../settings/storage/app.sol";
 
 contract PriceAggFacet is RolesMods {
     function setPriceAggregator(address priceAggAddress)

contracts/price-aggregator/PriceAggregator.sol

@@ -54,6 +54,7 @@ contract PriceAggregator is RolesFacet, Initializable {
         chainlinkPricer = ChainlinkPricer(pricer);
     }
 
+    // set assets for pricer
     function setAssetPricers(address pricer, address[] calldata assets)
         external
         authorized(ADMIN, msg.sender)
@@ -63,6 +64,7 @@ contract PriceAggregator is RolesFacet, Initializable {
         }
     }
 
+    // set asset for pricer
     function setAssetPricer(address asset, address pricer)
         public
         authorized(ADMIN, msg.sender)

contracts/price-aggregator/readme.md

@@ -0,0 +1,10 @@
+iSALPPricer
+- getRateFor(address saLPToken) 
+    - returns the exchange rate of the token (DAI) in the underlying asset (i.e: Aave)
+    - example:  1:1 AAVE
+
+
+PriceAggregator
+- _valueFor
+    - ETH/ASSET
+        - getEthPrice

contracts/settings/SettingsFacet.sol

@@ -17,7 +17,7 @@ import { RolesLib } from "../contexts2/access-control/roles/RolesLib.sol";
 import { NFTLib } from "../nft/libraries/NFTLib.sol";
 
 // Storage
-import { AppStorageLib, AppStorage } from "../storage/app.sol";
+import { AppStorageLib, AppStorage } from "../settings/storage/app.sol";
 
 struct InitArgs {
     address admin;

contracts/settings/asset/AssetSettingsDataFacet.sol

@@ -29,7 +29,7 @@ import { MaxTVLLib } from "./libraries/MaxTVLLib.sol";
 import { MaxDebtRatioLib } from "./libraries/MaxDebtRatioLib.sol";
 
 // Storage
-import { AppStorageLib, AppStorage } from "../../storage/app.sol";
+import { AppStorageLib, AppStorage } from "../../settings/storage/app.sol";
 import {
     PrizePoolInterface
 } from "../../shared/interfaces/pooltogether/PrizePoolInterface.sol";

contracts/settings/asset/AssetSettingsFacet.sol

@@ -14,7 +14,7 @@ import {
 import { MaxTVLLib } from "./libraries/MaxTVLLib.sol";
 
 // Storage
-import { AppStorageLib, AppStorage } from "../../storage/app.sol";
+import { AppStorageLib, AppStorage } from "../../settings/storage/app.sol";
 
 struct AssetSettingRequest {
     bytes32 key;

contracts/settings/asset/libraries/AssetATokenLib.sol

@@ -10,7 +10,7 @@ import {
 import { IAToken } from "../../../shared/interfaces/IAToken.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for Aave asset setting.

contracts/settings/asset/libraries/AssetCTokenLib.sol

@@ -10,7 +10,7 @@ import {
 import { ICErc20 } from "../../../shared/interfaces/ICErc20.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for Compound asset setting.

contracts/settings/asset/libraries/AssetPPoolLib.sol

@@ -12,7 +12,7 @@ import {
 } from "../../../shared/interfaces/pooltogether/PrizePoolInterface.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for Pool together asset setting.

contracts/settings/asset/libraries/AssetYVaultLib.sol

@@ -10,7 +10,7 @@ import {
 import { IVault } from "../../../shared/interfaces/IVault.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for Yearn vault asset setting.

contracts/settings/asset/libraries/MaxDebtRatioLib.sol

@@ -9,7 +9,7 @@ import {
 } from "../../../shared/libraries/CacheLib.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for MaxDebtRatio asset setting.

contracts/settings/asset/libraries/MaxLoanAmountLib.sol

@@ -9,7 +9,7 @@ import {
 } from "../../../shared/libraries/CacheLib.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for MaxLoanAmount asset setting.

contracts/settings/asset/libraries/MaxTVLLib.sol

@@ -9,7 +9,7 @@ import {
 } from "../../../shared/libraries/CacheLib.sol";
 
 // Storage
-import { AppStorageLib } from "../../../storage/app.sol";
+import { AppStorageLib } from "../../../settings/storage/app.sol";
 
 /**
  * @notice Utility library of inline functions for MaxDebtRatio asset setting.

contracts/settings/pausable/PausableFacet.sol

@@ -6,7 +6,7 @@ import { RolesMods } from "../../contexts2/access-control/roles/RolesMods.sol";
 import { PAUSER } from "../../shared/roles.sol";
 
 // Storage
-import { AppStorageLib } from "../../storage/app.sol";
+import { AppStorageLib } from "../../settings/storage/app.sol";
 
 contract PausableFacet is RolesMods {
     /**