Merge pull request #20 from VenusProtocol/develop

New release
VenusProtocol · Apr 10, 2024 · 297c500 · 297c500
2 parents 38bfcb9 + 543eee2
commit 297c500
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## [2.0.0-dev.1](https://github.com/VenusProtocol/solidity-utilities/compare/v1.3.1-dev.1...v2.0.0-dev.1) (2024-04-10)
+
+
+### ⚠ BREAKING CHANGES
+
+* migrate to 0.8.25
+
+### Features
+
+* migrate to 0.8.25 ([88b12ce](https://github.com/VenusProtocol/solidity-utilities/commit/88b12ce1f501b650eeacb8664d0fc744f1c3b61b))
+
+## [1.3.1-dev.1](https://github.com/VenusProtocol/solidity-utilities/compare/v1.3.0...v1.3.1-dev.1) (2024-03-04)
+
+
+### Bug Fixes
+
+* revert change for gap variable ([1c452e2](https://github.com/VenusProtocol/solidity-utilities/commit/1c452e2a14833716640458716bec6b1c6bf67ecf))
+* Scope 1. Misc. TimeManagerV8 ([0a957e5](https://github.com/VenusProtocol/solidity-utilities/commit/0a957e59733ca79b3cf547974a39a3b435c87b0a))
+
 ## [1.3.0](https://github.com/VenusProtocol/solidity-utilities/compare/v1.2.0...v1.3.0) (2024-01-09)
 
 

diff --git a/contracts/ExponentialNoError.sol b/contracts/ExponentialNoError.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { EXP_SCALE as EXP_SCALE_, MANTISSA_ONE as MANTISSA_ONE_ } from "./constants.sol";
 

diff --git a/contracts/MaxLoopsLimitHelper.sol b/contracts/MaxLoopsLimitHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 /**
  * @title MaxLoopsLimitHelper

diff --git a/contracts/TimeManagerV8.sol b/contracts/TimeManagerV8.sol
@@ -1,25 +1,28 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { SECONDS_PER_YEAR } from "./constants.sol";
 
 abstract contract TimeManagerV8 {
+    /// @notice Stores blocksPerYear if isTimeBased is true else secondsPerYear is stored
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
     uint256 public immutable blocksOrSecondsPerYear;
 
+    /// @notice Acknowledges if a contract is time based or not
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
     bool public immutable isTimeBased;
 
+    /// @notice Stores the current block timestamp or block number depending on isTimeBased
+    /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
+    function() view returns (uint256) private immutable _getCurrentSlot;
+
     /**
      * @dev This empty reserved space is put in place to allow future versions to add new
      * variables without shifting down storage in the inheritance chain
      * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps
      */
     uint256[48] private __gap;
 
-    /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
-    function() view returns (uint256) private immutable _getCurrentSlot;
-
     /// @notice Thrown when blocks per year is invalid
     error InvalidBlocksPerYear();
 

diff --git a/contracts/constants.sol b/contracts/constants.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 /// @dev Base unit for computations, usually used in scaling (multiplications, divisions)
 uint256 constant EXP_SCALE = 1e18;

diff --git a/contracts/test/HarnessMaxLoopsLimitHelper.sol b/contracts/test/HarnessMaxLoopsLimitHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { MaxLoopsLimitHelper } from "../MaxLoopsLimitHelper.sol";
 

diff --git a/contracts/validators.sol b/contracts/validators.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 /// @notice Thrown if the supplied address is a zero address where it is not allowed
 error ZeroAddressNotAllowed();

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -32,7 +32,7 @@ const config: HardhatUserConfig = {
   solidity: {
     compilers: [
       {
-        version: "0.8.13",
+        version: "0.8.25",
         settings: {
           optimizer: {
             enabled: true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@venusprotocol/solidity-utilities",
-  "version": "1.3.0",
+  "version": "2.0.0-dev.1",
   "description": "Solidity code used by other Venus projects",
   "files": [
     "artifacts",