Set solidity version to 0.8.9

Fantom-foundation · Oct 2, 2024 · 525a952 · 525a952
1 parent f4d0250
commit 525a952
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -15,3 +15,7 @@ test:
 	docker run --rm --user $$(id -u):$$(id -g) -v $(PWD):/src -w /src node:20.17.0 bash -c \
 	    'export NPM_CONFIG_PREFIX=~; npm install --no-save; npx hardhat test'
 
+.PHONY: workspace
+workspace:
+	docker run -t -i --rm --user $$(id -u):$$(id -g) -v $(PWD):/src -w /src node:20.17.0 bash -c \
+	    'export NPM_CONFIG_PREFIX=~; npm install --no-save; bash'
diff --git a/contracts/common/Decimal.sol b/contracts/common/Decimal.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 library Decimal {
     // unit is used for decimals, e.g. 0.123456

diff --git a/contracts/common/Initializable.sol b/contracts/common/Initializable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 /**
  * @title Initializable

diff --git a/contracts/common/ReentrancyGuard.sol b/contracts/common/ReentrancyGuard.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./Initializable.sol";
 

diff --git a/contracts/erc20/base/ERC20.sol b/contracts/erc20/base/ERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./IERC20.sol";
 import "../../common/Initializable.sol";

diff --git a/contracts/erc20/base/ERC20Burnable.sol b/contracts/erc20/base/ERC20Burnable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./ERC20.sol";
 

diff --git a/contracts/erc20/base/ERC20Detailed.sol b/contracts/erc20/base/ERC20Detailed.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../../common/Initializable.sol";
 import {ERC20} from "./ERC20.sol";

diff --git a/contracts/erc20/base/ERC20Mintable.sol b/contracts/erc20/base/ERC20Mintable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./ERC20.sol";
 import "./MinterRole.sol";

diff --git a/contracts/erc20/base/IERC20.sol b/contracts/erc20/base/IERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.

diff --git a/contracts/erc20/base/MinterRole.sol b/contracts/erc20/base/MinterRole.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./Roles.sol";
 

diff --git a/contracts/erc20/base/Roles.sol b/contracts/erc20/base/Roles.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 
 /**

diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../common/Initializable.sol";
 

diff --git a/contracts/sfc/ConstantsManager.sol b/contracts/sfc/ConstantsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../ownership/Ownable.sol";
 import "../common/Decimal.sol";

diff --git a/contracts/sfc/GasPriceConstants.sol b/contracts/sfc/GasPriceConstants.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../common/Decimal.sol";
 

diff --git a/contracts/sfc/Migrations.sol b/contracts/sfc/Migrations.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 contract Migrations {
   address public owner;
   uint public last_completed_migration;
 
-  constructor() public {
-    owner = msg.sender;
+  constructor(address contractOwner) {
+    owner = contractOwner;
   }
 
   modifier restricted() {

diff --git a/contracts/sfc/NetworkInitializer.sol b/contracts/sfc/NetworkInitializer.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./SFCI.sol";
 import "./NodeDriver.sol";
@@ -32,6 +32,5 @@ contract NetworkInitializer {
         consts.transferOwnership(_owner);
 
         SFCI(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner);
-        selfdestruct(payable(address(0)));
     }
 }
diff --git a/contracts/sfc/NodeDriver.sol b/contracts/sfc/NodeDriver.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../common/Initializable.sol";
 import "../ownership/Ownable.sol";

diff --git a/contracts/sfc/NodeDriverI.sol b/contracts/sfc/NodeDriverI.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 interface NodeDriverI {
     function setGenesisValidator(address _auth, uint256 validatorID, bytes calldata pubkey, uint256 status, uint256 createdEpoch, uint256 createdTime, uint256 deactivatedEpoch, uint256 deactivatedTime) external;

diff --git a/contracts/sfc/SFC.sol b/contracts/sfc/SFC.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./GasPriceConstants.sol";
 import "../version/Version.sol";
@@ -263,7 +263,8 @@ contract SFC is SFCBase, Version {
         if (treasuryAddress != address(0)) {
             uint256 feeShare = ctx.epochFee * c.treasuryFeeShare() / Decimal.unit();
             _mintNativeToken(feeShare);
-            treasuryAddress.call{value: feeShare, gas: 1000000}("");
+            (bool success,) = treasuryAddress.call{value: feeShare, gas: 1000000}("");
+            require(success, "treasury transfer failed");
         }
     }
 

diff --git a/contracts/sfc/SFCBase.sol b/contracts/sfc/SFCBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./SFCState.sol";
 

diff --git a/contracts/sfc/SFCI.sol b/contracts/sfc/SFCI.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 interface SFCI {
     event CreatedValidator(uint256 indexed validatorID, address indexed auth, uint256 createdEpoch, uint256 createdTime);

diff --git a/contracts/sfc/SFCLib.sol b/contracts/sfc/SFCLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../common/Decimal.sol";
 import "./GasPriceConstants.sol";
@@ -533,7 +533,8 @@ contract SFCLib is SFCBase {
         ld.lockedStake -= amount;
         if (penalty != 0) {
             _rawUndelegate(delegator, toValidatorID, penalty, true, false, false);
-            treasuryAddress.call{value: penalty}("");
+            (bool success,) = treasuryAddress.call{value: penalty}("");
+            require(success, "Failed to send penalty");
         }
 
         emit UnlockedStake(delegator, toValidatorID, amount, penalty);

diff --git a/contracts/sfc/SFCState.sol b/contracts/sfc/SFCState.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./NodeDriver.sol";
 import "../ownership/Ownable.sol";

diff --git a/contracts/sfc/StakeTokenizer.sol b/contracts/sfc/StakeTokenizer.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./SFC.sol";
 import "../erc20/base/ERC20Burnable.sol";

diff --git a/contracts/sfc/Updater.sol b/contracts/sfc/Updater.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "./NodeDriver.sol";
 import "./SFC.sol";
@@ -25,7 +25,7 @@ contract Updater {
     address public voteBook;
     address public owner;
 
-    constructor(address _sfcFrom, address _sfcLib, address _sfcConsts, address _govTo, address _govFrom, address _voteBook, address _owner) public {
+    constructor(address _sfcFrom, address _sfcLib, address _sfcConsts, address _govTo, address _govFrom, address _voteBook, address _owner) {
         sfcFrom = _sfcFrom;
         sfcLib = _sfcLib;
         sfcConsts = _sfcConsts;

diff --git a/contracts/test/StubEvmWriter.sol b/contracts/test/StubEvmWriter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../sfc/NodeDriver.sol";
 

diff --git a/contracts/test/UnitTestConstantsManager.sol b/contracts/test/UnitTestConstantsManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 import "../sfc/ConstantsManager.sol";
 
 contract UnitTestConstantsManager is ConstantsManager {

diff --git a/contracts/test/UnitTestSFC.sol b/contracts/test/UnitTestSFC.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 import "../sfc/SFC.sol";
 import "../sfc/SFCI.sol";
@@ -64,11 +64,11 @@ contract UnitTestSFCLib is SFCLib, UnitTestSFCBase {
         return SFCBase.isNode(addr);
     }
 
-    function _getAvgEpochStep(uint256) internal view override returns(uint256) {
+    function _getAvgEpochStep(uint256) internal pure override returns(uint256) {
         return 1;
     }
 
-    function _getAvgUptime(uint256, uint256 duration, uint256) internal view override returns(uint256) {
+    function _getAvgUptime(uint256, uint256 duration, uint256) internal pure override returns(uint256) {
         return duration;
     }
 }
@@ -98,7 +98,6 @@ contract UnitTestNetworkInitializer {
         consts.transferOwnership(_owner);
 
         SFCUnitTestI(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner);
-        selfdestruct(payable(address(0)));
     }
 }
 

diff --git a/contracts/version/Version.sol b/contracts/version/Version.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.9;
 
 /**
  * @dev Version contract gives the versioning information of the implementation contract

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -8,7 +8,7 @@ dotenv.config();
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: '0.8.19',
+    version: '0.8.24',
     settings: {
       evmVersion: 'london',
       optimizer: {
@@ -22,4 +22,4 @@ const config: HardhatUserConfig = {
   },
 };
 
-export default config;
+export default config;