added decimals, fixed imports

dl-solarity · Apr 14, 2023 · c6e2785 · c6e2785
1 parent bc42b81
commit c6e2785
Show file tree

Hide file tree

Showing 55 changed files with 1,958 additions and 807 deletions.
diff --git a/contracts/access-control/MerkleWhitelisted.sol b/contracts/access-control/MerkleWhitelisted.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
+import {MerkleProof} from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
 
 /**
  *  @notice The Whitelist Access Control module

diff --git a/contracts/access-control/RBAC.sol b/contracts/access-control/RBAC.sol
@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
-import "../interfaces/access-control/IRBAC.sol";
+import {IRBAC} from "../interfaces/access-control/IRBAC.sol";
 
-import "../libs/utils/TypeCaster.sol";
-import "../libs/arrays/SetHelper.sol";
+import {TypeCaster} from "../libs/utils/TypeCaster.sol";
+import {SetHelper} from "../libs/arrays/SetHelper.sol";
+import {StringSet} from "../libs/data-structures/StringSet.sol";
 
 /**
  *  @notice The Role Based Access Control (RBAC) module

diff --git a/contracts/access-control/extensions/RBACGroupable.sol b/contracts/access-control/extensions/RBACGroupable.sol
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "../../interfaces/access-control/extensions/IRBACGroupable.sol";
+import {IRBACGroupable} from "../../interfaces/access-control/extensions/IRBACGroupable.sol";
 
-import "../RBAC.sol";
+import {StringSet} from "../../libs/data-structures/StringSet.sol";
+import {SetHelper} from "../../libs/arrays/SetHelper.sol";
+
+import {RBAC} from "../RBAC.sol";
 
 /**
  *  @notice The Role Based Access Control (RBAC) module

diff --git a/contracts/compound-rate-keeper/AbstractCompoundRateKeeper.sol b/contracts/compound-rate-keeper/AbstractCompoundRateKeeper.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/utils/math/Math.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
-import "../interfaces/compound-rate-keeper/ICompoundRateKeeper.sol";
+import {ICompoundRateKeeper} from "../interfaces/compound-rate-keeper/ICompoundRateKeeper.sol";
 
-import "../libs/math/DSMath.sol";
+import {DSMath} from "../libs/math/DSMath.sol";
 
-import "../utils/Globals.sol";
+import {PRECISION} from "../utils/Globals.sol";
 
 /**
  *  @notice The Compound Rate Keeper module

diff --git a/contracts/compound-rate-keeper/presets/OwnableCompoundRateKeeper.sol b/contracts/compound-rate-keeper/presets/OwnableCompoundRateKeeper.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-import "../AbstractCompoundRateKeeper.sol";
+import {AbstractCompoundRateKeeper} from "../AbstractCompoundRateKeeper.sol";
 
 /**
  *  @notice The Ownable preset of CompoundRateKeeper

diff --git a/contracts/contracts-registry/AbstractContractsRegistry.sol b/contracts/contracts-registry/AbstractContractsRegistry.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import "./proxy/ProxyUpgrader.sol";
-import "./AbstractDependant.sol";
+import {ProxyUpgrader} from "./proxy/ProxyUpgrader.sol";
+import {AbstractDependant} from "./AbstractDependant.sol";
 
 /**
  *  @notice The ContractsRegistry module

diff --git a/contracts/contracts-registry/pools/AbstractPoolContractsRegistry.sol b/contracts/contracts-registry/pools/AbstractPoolContractsRegistry.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import "@openzeppelin/contracts/utils/math/Math.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
-import "../../libs/arrays/Paginator.sol";
+import {Paginator} from "../../libs/arrays/Paginator.sol";
 
-import "../../contracts-registry/AbstractDependant.sol";
+import {AbstractDependant} from "../../contracts-registry/AbstractDependant.sol";
 
-import "./proxy/ProxyBeacon.sol";
+import {ProxyBeacon} from "./proxy/ProxyBeacon.sol";
 
 /**
  *  @notice The PoolContractsRegistry module

diff --git a/contracts/contracts-registry/pools/pool-factory/AbstractPoolFactory.sol b/contracts/contracts-registry/pools/pool-factory/AbstractPoolFactory.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/Create2.sol";
+import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
-import "../../../contracts-registry/AbstractDependant.sol";
-import "../AbstractPoolContractsRegistry.sol";
+import {AbstractDependant} from "../../../contracts-registry/AbstractDependant.sol";
+import {AbstractPoolContractsRegistry} from "../AbstractPoolContractsRegistry.sol";
 
-import "./proxy/PublicBeaconProxy.sol";
+import {PublicBeaconProxy} from "./proxy/PublicBeaconProxy.sol";
 
 /**
  *  @notice The PoolContractsRegistry module

diff --git a/contracts/contracts-registry/pools/pool-factory/proxy/PublicBeaconProxy.sol b/contracts/contracts-registry/pools/pool-factory/proxy/PublicBeaconProxy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
+import {BeaconProxy} from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
 
 /**
  *  @notice The PoolContractsRegistry module

diff --git a/contracts/contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol b/contracts/contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-import "../AbstractPoolContractsRegistry.sol";
+import {AbstractPoolContractsRegistry} from "../AbstractPoolContractsRegistry.sol";
 
 /**
  *  @notice The Ownable preset of PoolContractsRegistry

diff --git a/contracts/contracts-registry/pools/proxy/ProxyBeacon.sol b/contracts/contracts-registry/pools/proxy/ProxyBeacon.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
-import "@openzeppelin/contracts/utils/Address.sol";
+import {IBeacon} from "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
 /**
  *  @notice The PoolContractsRegistry module

diff --git a/contracts/contracts-registry/presets/OwnableContractsRegistry.sol b/contracts/contracts-registry/presets/OwnableContractsRegistry.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-import "../AbstractContractsRegistry.sol";
+import {AbstractContractsRegistry} from "../AbstractContractsRegistry.sol";
 
 /**
  *  @notice The Ownable preset of ContractsRegistry

diff --git a/contracts/contracts-registry/proxy/ProxyUpgrader.sol b/contracts/contracts-registry/proxy/ProxyUpgrader.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin/contracts/utils/Address.sol";
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
 /**
  *  @notice The ContractsRegistry module

diff --git a/contracts/diamond/Diamond.sol b/contracts/diamond/Diamond.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/Address.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import "./DiamondStorage.sol";
+import {DiamondStorage} from "./DiamondStorage.sol";
 
 /**
  *  @notice The Diamond standard module

diff --git a/contracts/diamond/DiamondStorage.sol b/contracts/diamond/DiamondStorage.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 /**
  *  @notice The Diamond standard module

diff --git a/contracts/diamond/presets/OwnableDiamond/OwnableDiamond.sol b/contracts/diamond/presets/OwnableDiamond/OwnableDiamond.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "../../Diamond.sol";
-import "./OwnableDiamondStorage.sol";
+import {Diamond} from "../../Diamond.sol";
+import {OwnableDiamondStorage} from "./OwnableDiamondStorage.sol";
 
 /**
  *  @notice The Ownable preset of Diamond proxy

diff --git a/contracts/interfaces/access-control/IRBAC.sol b/contracts/interfaces/access-control/IRBAC.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "../../libs/data-structures/StringSet.sol";
+import {StringSet} from "../../libs/data-structures/StringSet.sol";
 
 /**
  *  @notice The RBAC module

diff --git a/contracts/libs/arrays/ArrayHelper.sol b/contracts/libs/arrays/ArrayHelper.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/math/Math.sol";
+import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 /**
  *  @notice A simple library to work with arrays

diff --git a/contracts/libs/arrays/Paginator.sol b/contracts/libs/arrays/Paginator.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import "../data-structures/StringSet.sol";
+import {StringSet} from "../data-structures/StringSet.sol";
 
 /**
  *  @notice Library for pagination.

diff --git a/contracts/libs/arrays/SetHelper.sol b/contracts/libs/arrays/SetHelper.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import "../data-structures/StringSet.sol";
+import {StringSet} from "../data-structures/StringSet.sol";
 
 /**
  *  @notice A simple library to work with sets

diff --git a/contracts/libs/data-structures/PriorityQueue.sol b/contracts/libs/data-structures/PriorityQueue.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "../utils/TypeCaster.sol";
+import {TypeCaster} from "../utils/TypeCaster.sol";
 
 /**
  *  @notice The library that realizes a heap based priority queue.

diff --git a/contracts/libs/data-structures/memory/Vector.sol b/contracts/libs/data-structures/memory/Vector.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "../../utils/TypeCaster.sol";
+import {TypeCaster} from "../../utils/TypeCaster.sol";
 
 /**
  *  @notice The memory data structures module

diff --git a/contracts/libs/decimals/DecimalsConverter.sol b/contracts/libs/decimals/DecimalsConverter.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
 /**
  *  @notice This library is used to convert numbers that use token's N decimals to M decimals.
  *  Comes extremely handy with standardizing the business logic that is intended to work with many different ERC20 tokens
@@ -30,6 +32,15 @@ pragma solidity ^0.8.4;
  *  }
  */
 library DecimalsConverter {
+    /**
+     *  @notice The function to get the decimals of ERC20 token. Needed for bytecode optimization
+     *  @param token_ the ERC20 token
+     *  @return the decimals of provided token
+     */
+    function decimals(address token_) internal view returns (uint256) {
+        return ERC20(token_).decimals();
+    }
+
     /**
      *  @notice The function to bring the number to 18 decimals of precision
      *  @param amount_ the number to convert