Merge pull request #22 from unchain-tech/feature/upgrade-solidity-ver…

…sion Feature/upgrade solidity version
unchain-tech · Aug 7, 2023 · c125989 · c125989
2 parents 98b37db + a224af6
commit c125989
Show file tree

Hide file tree

Showing 6 changed files with 19,211 additions and 13,798 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
+# yarn
 **/yarn-error.log*
+.yarn/*
+!.yarn/plugins
+!.yarn/releases
 
 # dependencies
 **/node_modules

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/packages/contract/contracts/WavePortal.sol b/packages/contract/contracts/WavePortal.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.19;
 
 import 'hardhat/console.sol';
 
@@ -29,7 +29,7 @@ contract WavePortal {
     /*
      * 初期シードの設定
      */
-    _seed = (block.timestamp + block.difficulty) % 100;
+    _seed = (block.timestamp + block.prevrandao) % 100;
   }
 
   function wave(string memory _message) public {
@@ -49,7 +49,7 @@ contract WavePortal {
     /*
      *  ユーザーのために乱数を設定
      */
-    _seed = (block.difficulty + block.timestamp + _seed) % 100;
+    _seed = (block.prevrandao + block.timestamp + _seed) % 100;
 
     _waves.push(Wave(msg.sender, _message, block.timestamp, _seed));
 

diff --git a/packages/contract/hardhat.config.js b/packages/contract/hardhat.config.js
@@ -4,7 +4,7 @@ require('dotenv').config();
 const { PRIVATE_KEY, STAGING_ALCHEMY_KEY } = process.env;
 
 module.exports = {
-  solidity: '0.8.17',
+  solidity: '0.8.19',
   networks: {
     sepolia: {
       url: STAGING_ALCHEMY_KEY || '',

diff --git a/packages/contract/package.json b/packages/contract/package.json
@@ -13,11 +13,9 @@
     "prettier:fix": "prettier --ignore-unknown --no-error-on-unmatched-pattern --ignore-path .prettierignore --check ."
   },
   "devDependencies": {
-    "@nomicfoundation/hardhat-toolbox": "^2.0.1",
-    "hardhat": "^2.12.7",
-    "solhint": "3.3.8",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+    "@nomicfoundation/hardhat-toolbox": "^2.0.1",
     "@nomiclabs/hardhat-ethers": "^2.2.2",
     "@nomiclabs/hardhat-etherscan": "^3.1.6",
     "@typechain/ethers-v5": "^10.2.0",
@@ -26,11 +24,12 @@
     "@types/mocha": "^10.0.1",
     "chai": "^4.3.7",
     "dotenv": "^16.0.3",
+    "hardhat": "^2.17.1",
     "hardhat-gas-reporter": "^1.0.9",
+    "solhint": "3.3.8",
     "solidity-coverage": "^0.8.2",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.1",
     "typescript": "^4.9.5"
-  },
-  "dependencies": {}
+  }
 }