Merge pull request #26 from VenusProtocol/develop

New release
VenusProtocol · May 14, 2024 · 0d838c8 · 0d838c8
2 parents 4de4101 + dd40f8c
commit 0d838c8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.0.2-dev.1](https://github.com/VenusProtocol/solidity-utilities/compare/v2.0.1...v2.0.2-dev.1) (2024-05-13)
+
+
+### Bug Fixes
+
+* TimeManagerV5 remove function pointer and add conditional logic ([d3b0ebf](https://github.com/VenusProtocol/solidity-utilities/commit/d3b0ebf3b175b3e14c6783c8c659d09f47b0cf7b))
+
 ## [2.0.1](https://github.com/VenusProtocol/solidity-utilities/compare/v2.0.0...v2.0.1) (2024-04-19)
 
 

diff --git a/contracts/TimeManagerV5.sol b/contracts/TimeManagerV5.sol
@@ -14,11 +14,8 @@ contract TimeManagerV5 {
     /// @dev Sets true when contract is initialized
     bool private isInitialized;
 
-    /**
-     * @dev Retrieves the current slot
-     * @return Current slot
-     */
-    function() view returns (uint256) private _getCurrentSlot;
+    /// @notice Deprecated slot for _getCurrentSlot function pointer
+    bytes32 private __deprecatedSlot1;
 
     /**
      * @dev This empty reserved space is put in place to allow future versions to add new
@@ -32,7 +29,7 @@ contract TimeManagerV5 {
      * @return Current block number or block timestamp
      */
     function getBlockNumberOrTimestamp() public view returns (uint256) {
-        return _getCurrentSlot();
+        return isTimeBased ? _getBlockTimestamp() : _getBlockNumber();
     }
 
     /**
@@ -53,7 +50,6 @@ contract TimeManagerV5 {
 
         isTimeBased = timeBased_;
         blocksOrSecondsPerYear = timeBased_ ? SECONDS_PER_YEAR : blocksPerYear_;
-        _getCurrentSlot = timeBased_ ? _getBlockTimestamp : _getBlockNumber;
         isInitialized = true;
     }
 

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -38,6 +38,7 @@ const config: HardhatUserConfig = {
             enabled: true,
             runs: 200,
           },
+          evmVersion: "paris",
           outputSelection: {
             "*": {
               "*": ["storageLayout"],

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