fix: solidity .8.28 and optimization

EKOKE-DAO · Nov 26, 2024 · 147454b · 147454b
1 parent ff47952
commit 147454b
Show file tree

Hide file tree

Showing 12 changed files with 226 additions and 638 deletions.
diff --git a/ethereum/contracts/Deferred.sol b/ethereum/contracts/Deferred.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.28;
 
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";

diff --git a/ethereum/contracts/Ekoke.sol b/ethereum/contracts/Ekoke.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.28;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";

diff --git a/ethereum/contracts/Marketplace.sol b/ethereum/contracts/Marketplace.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.28;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";

diff --git a/ethereum/contracts/RewardPool.sol b/ethereum/contracts/RewardPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.28;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";

diff --git a/ethereum/hardhat.config.ts b/ethereum/hardhat.config.ts
@@ -13,7 +13,15 @@ const {
 } = process.env;
 
 const config: HardhatUserConfig = {
-  solidity: "0.8.20",
+  solidity: {
+    version: "0.8.28",
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 200,
+      },
+    },
+  },
   sourcify: {
     enabled: true,
   },

diff --git a/ethereum/package.json b/ethereum/package.json
@@ -37,7 +37,7 @@
     "commander": "^12.1.0",
     "dotenv": "^16.3.1",
     "ethers": "^6",
-    "hardhat": "^2.19.4",
+    "hardhat": "^2",
     "hardhat-gas-reporter": "^2",
     "solidity-coverage": "^0.8.5",
     "ts-node": "^10.9.2",

diff --git a/ethereum/yarn.lock b/ethereum/yarn.lock
diff --git a/integration-tests/src/abi/Deferred.json b/integration-tests/src/abi/Deferred.json
diff --git a/integration-tests/src/abi/Ekoke.json b/integration-tests/src/abi/Ekoke.json
diff --git a/integration-tests/src/abi/Marketplace.json b/integration-tests/src/abi/Marketplace.json
diff --git a/integration-tests/src/abi/RewardPool.json b/integration-tests/src/abi/RewardPool.json
diff --git a/integration-tests/tests/pocket_ic/get_eth_address.rs b/integration-tests/tests/pocket_ic/get_eth_address.rs
@@ -14,6 +14,6 @@ async fn test_should_get_eth_address() {
         .await
         .expect("Failed to get eth address");
 
-    println!("Eth address: {:?}", address);
+    println!("Minter address: {:?}", address);
     assert_ne!(address, H160::zero());
 }