Merge pull request #177 from VenusProtocol/feat/solidity-0.8.25

feat!: migrate to Solidity 0.8.25
VenusProtocol · Apr 10, 2024 · e404ca0 · e404ca0
2 parents 6774e17 + 00d4cd0
commit e404ca0
Show file tree

Hide file tree

Showing 28 changed files with 43 additions and 43 deletions.
diff --git a/contracts/ResilientOracle.sol b/contracts/ResilientOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2022 Venus
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 import "./interfaces/VBep20Interface.sol";

diff --git a/contracts/interfaces/FeedRegistryInterface.sol b/contracts/interfaces/FeedRegistryInterface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 interface FeedRegistryInterface {
     function latestRoundDataByName(

diff --git a/contracts/interfaces/IStETH.sol b/contracts/interfaces/IStETH.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 interface IStETH {
     function getPooledEthByShares(uint256 _sharesAmount) external view returns (uint256);

diff --git a/contracts/interfaces/OracleInterface.sol b/contracts/interfaces/OracleInterface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 interface OracleInterface {
     function getPrice(address asset) external view returns (uint256);

diff --git a/contracts/interfaces/PublicResolverInterface.sol b/contracts/interfaces/PublicResolverInterface.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2022 Venus
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 interface PublicResolverInterface {
     function addr(bytes32 node) external view returns (address payable);

diff --git a/contracts/interfaces/PythInterface.sol b/contracts/interfaces/PythInterface.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2021 Pyth Data Foundation
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 contract PythStructs {
     // A price with a degree of uncertainty, represented as a price +- a confidence interval.

diff --git a/contracts/interfaces/SIDRegistryInterface.sol b/contracts/interfaces/SIDRegistryInterface.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2022 Venus
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 interface SIDRegistryInterface {
     function resolver(bytes32 node) external view returns (address);

diff --git a/contracts/interfaces/VBep20Interface.sol b/contracts/interfaces/VBep20Interface.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity ^0.8.25;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 

diff --git a/contracts/oracles/BinanceOracle.sol b/contracts/oracles/BinanceOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "../interfaces/VBep20Interface.sol";

diff --git a/contracts/oracles/BoundValidator.sol b/contracts/oracles/BoundValidator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "../interfaces/VBep20Interface.sol";
 import "../interfaces/OracleInterface.sol";

diff --git a/contracts/oracles/ChainlinkOracle.sol b/contracts/oracles/ChainlinkOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "../interfaces/VBep20Interface.sol";
 import "../interfaces/OracleInterface.sol";

diff --git a/contracts/oracles/PythOracle.sol b/contracts/oracles/PythOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import "@openzeppelin/contracts/utils/math/SignedMath.sol";

diff --git a/contracts/oracles/SequencerChainlinkOracle.sol b/contracts/oracles/SequencerChainlinkOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { ChainlinkOracle } from "./ChainlinkOracle.sol";
 import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

diff --git a/contracts/oracles/WstETHOracle.sol b/contracts/oracles/WstETHOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { OracleInterface } from "../interfaces/OracleInterface.sol";
 import { IStETH } from "../interfaces/IStETH.sol";

diff --git a/contracts/oracles/mocks/MockBinanceFeedRegistry.sol b/contracts/oracles/mocks/MockBinanceFeedRegistry.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "../../interfaces/FeedRegistryInterface.sol";
 

diff --git a/contracts/oracles/mocks/MockBinanceOracle.sol b/contracts/oracles/mocks/MockBinanceOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { OracleInterface } from "../../interfaces/OracleInterface.sol";

diff --git a/contracts/oracles/mocks/MockChainlinkOracle.sol b/contracts/oracles/mocks/MockChainlinkOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { OracleInterface } from "../../interfaces/OracleInterface.sol";

diff --git a/contracts/oracles/mocks/MockPythOracle.sol b/contracts/oracles/mocks/MockPythOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { IPyth } from "../PythOracle.sol";

diff --git a/contracts/test/AccessControlManager.sol b/contracts/test/AccessControlManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 import "@openzeppelin/contracts/access/AccessControl.sol";
 import "@venusprotocol/governance-contracts/contracts/Governance/AccessControlManager.sol";
 

diff --git a/contracts/test/BEP20Harness.sol b/contracts/test/BEP20Harness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/test/MockPyth.sol b/contracts/test/MockPyth.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "../interfaces/PythInterface.sol";
 

diff --git a/contracts/test/MockSimpleOracle.sol b/contracts/test/MockSimpleOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "../interfaces/OracleInterface.sol";
 

diff --git a/contracts/test/MockV3Aggregator.sol b/contracts/test/MockV3Aggregator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol";
 

diff --git a/contracts/test/PancakePairHarness.sol b/contracts/test/PancakePairHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.13;
+pragma solidity 0.8.25;
 
 // a library for performing various math operations
 

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

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -52,7 +52,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
@@ -38,8 +38,8 @@
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@openzeppelin/contracts": "^4.6.0",
     "@openzeppelin/contracts-upgradeable": "^4.7.3",
-    "@venusprotocol/governance-contracts": "^1.4.0",
-    "@venusprotocol/solidity-utilities": "1.3.0",
+    "@venusprotocol/governance-contracts": "^2.0.0",
+    "@venusprotocol/solidity-utilities": "^2.0.0",
     "@venusprotocol/venus-protocol": "^6.0.0",
     "ethers": "^5.6.8",
     "hardhat": "^2.16.1",

diff --git a/yarn.lock b/yarn.lock
@@ -3135,25 +3135,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@venusprotocol/governance-contracts@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "@venusprotocol/governance-contracts@npm:1.4.0"
+"@venusprotocol/governance-contracts@npm:^1.4.0-dev.1":
+  version: 1.4.0-dev.9
+  resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.9"
   dependencies:
     "@venusprotocol/solidity-utilities": ^1.1.0
     hardhat-deploy-ethers: ^0.3.0-beta.13
     module-alias: ^2.2.2
-  checksum: 85c6b6a815edb0befa4c38e3652a58464827d390620210b99575c16960ee6505e95e7c2192ebc972da7ed758d3c62e150d32fbdd1f01acab1731f29b11d1884e
+  checksum: 25583a20738973d2ade4a1fdf84dcacf0caec42004f5bf755fdfa29b3602f2b9184638f2d828359195bf8baa3b082797cad941874be1a91a61900b343420cead
   languageName: node
   linkType: hard
 
-"@venusprotocol/governance-contracts@npm:^1.4.0-dev.1":
-  version: 1.4.0-dev.9
-  resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.9"
+"@venusprotocol/governance-contracts@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@venusprotocol/governance-contracts@npm:2.0.0"
   dependencies:
-    "@venusprotocol/solidity-utilities": ^1.1.0
+    "@venusprotocol/solidity-utilities": 2.0.0
     hardhat-deploy-ethers: ^0.3.0-beta.13
     module-alias: ^2.2.2
-  checksum: 25583a20738973d2ade4a1fdf84dcacf0caec42004f5bf755fdfa29b3602f2b9184638f2d828359195bf8baa3b082797cad941874be1a91a61900b343420cead
+  checksum: 18b56d951c4e68fa1edadc93ed44daa55c8b81294778a4969d940a084de6d949630eacd4702d1b92f04ad5d709963a3a0a790014871ec34b0b2f4806cebc731c
   languageName: node
   linkType: hard
 
@@ -3188,8 +3188,8 @@ __metadata:
     "@types/sinon-chai": ^3.2.9
     "@typescript-eslint/eslint-plugin": ^5.27.1
     "@typescript-eslint/parser": ^5.27.1
-    "@venusprotocol/governance-contracts": ^1.4.0
-    "@venusprotocol/solidity-utilities": 1.3.0
+    "@venusprotocol/governance-contracts": ^2.0.0
+    "@venusprotocol/solidity-utilities": ^2.0.0
     "@venusprotocol/venus-protocol": ^6.0.0
     chai: ^4.3.6
     cross-env: ^7.0.3
@@ -3241,10 +3241,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@venusprotocol/solidity-utilities@npm:1.3.0":
-  version: 1.3.0
-  resolution: "@venusprotocol/solidity-utilities@npm:1.3.0"
-  checksum: d1109365a5e01959c47b25fb129373db93792e60bf1bc0ed324b63c2a64f6e4a7878ebf016cfade94bc41a2c1245d3e861fdc6b8c5844ac210ed1d73e7307e72
+"@venusprotocol/solidity-utilities@npm:2.0.0, @venusprotocol/solidity-utilities@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@venusprotocol/solidity-utilities@npm:2.0.0"
+  checksum: 87a2ce2fd1d702bc04c4e98d675b904176c7f2489476e8da586d1782b48faae92aa4f2ba894737773d189ba72a6b274f1464cf2e0308e62758303d0adde749e6
   languageName: node
   linkType: hard