Merge pull request #68 from The-Poolz/issue-66

add latest openzeppelin support
The-Poolz · Jun 27, 2024 · 5c188d5 · 5c188d5
2 parents 29c41e4 + 135f22e
commit 5c188d5
Show file tree

Hide file tree

Showing 7 changed files with 6,146 additions and 9,658 deletions.
diff --git a/contracts/Vault/Vault.sol b/contracts/Vault/Vault.sol
@@ -24,6 +24,6 @@ contract Vault is IVault, ERC20Helper {
 
     function withdraw(address to, uint _amount) external override onlyManager {
         require(tokenBalance() >= _amount, "Vault: Not enough balance");
-        TransferToken(tokenAddress, to, _amount);
+        transferToken(IERC20(tokenAddress), to, _amount);
     }
 }
diff --git a/contracts/VaultManager/SignCheck.sol b/contracts/VaultManager/SignCheck.sol
@@ -2,10 +2,13 @@
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import "@ironblocks/firewall-consumer/contracts/FirewallConsumer.sol";
 
 abstract contract SignCheck is FirewallConsumer {
     using ECDSA for bytes32;
+    using MessageHashUtils for bytes32;
+
     mapping(address => uint) public nonces;
 
     function _checkData(

diff --git a/contracts/VaultManager/VaultManager.sol b/contracts/VaultManager/VaultManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "./SignCheck.sol";
 import "./VaultControl.sol";
 import "@ironblocks/firewall-consumer/contracts/FirewallConsumer.sol";
@@ -11,6 +11,8 @@ contract VaultManager is
     SignCheck,
     ReentrancyGuard
 {
+    constructor() Ownable(_msgSender()) {}
+
     /*
      * @dev Will be used by the Trustee to deposit tokens to the vault.
      * @param _from Trustee is responsible to provide the correct _from address.

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -5,18 +5,14 @@ import 'solidity-coverage'
 
 const config: HardhatUserConfig = {
   solidity: {
-    compilers: [
-      {
-          version: "0.8.19",
-          settings: {
-            evmVersion: "istanbul",
-            optimizer: {
-              enabled: true,
-              runs: 200,
-            },
-          },
+    version: "0.8.20",
+    settings: {
+      evmVersion: "istanbul",
+      optimizer: {
+        enabled: true,
+        runs: 200,
       },
-    ],
+    },
   },
 };