update to solidity 8.20

zeta-chain · Aug 30, 2024 · 8ec9bee · 8ec9bee
1 parent 0250c90
commit 8ec9bee
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 62 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.23.1",
     "@nomicfoundation/hardhat-verify": "2.0.3",
-    "@nomiclabs/hardhat-ethers": "^2.0.5",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@typechain/ethers-v5": "^10.0.0",
     "@typechain/hardhat": "^6.0.0",
@@ -55,8 +55,8 @@
     "eslint-plugin-typescript-sort-keys": "2.1.0",
     "ethereum-waffle": "^4.0.9",
     "ethereumjs-utils": "^5.2.5",
-    "ethers": "5.6.8",
-    "hardhat": "2.12.6",
+    "ethers": "5.7.2",
+    "hardhat": "2.22.6",
     "inquirer": "^8.2.4",
     "mocha": "^10.2.0",
     "ts-mocha": "^10.0.0",

diff --git a/packages/zevm-app-contracts/contracts/instant-rewards/InstantRewards.sol b/packages/zevm-app-contracts/contracts/instant-rewards/InstantRewards.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/security/Pausable.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/access/Ownable2Step.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
 
-contract InstantRewards is Ownable, Pausable, ReentrancyGuard, EIP712 {
+contract InstantRewards is Ownable2Step, Pausable, ReentrancyGuard, EIP712 {
     bytes32 private constant CLAIM_TYPEHASH =
         keccak256("Claim(address to,uint256 sigExpiration,bytes32 taskId,uint256 amount)");
 
@@ -23,6 +23,7 @@ contract InstantRewards is Ownable, Pausable, ReentrancyGuard, EIP712 {
 
     address public signerAddress;
 
+    event SignerUpdated(address indexed signerAddress);
     event Claimed(address indexed to, bytes32 indexed taskId, uint256 amount);
     event Withdrawn(address indexed wallet, uint256 amount);
 
@@ -51,7 +52,7 @@ contract InstantRewards is Ownable, Pausable, ReentrancyGuard, EIP712 {
         if (block.timestamp > claimData.sigExpiration) revert SignatureExpired();
     }
 
-    function claim(ClaimData memory claimData) external whenNotPaused nonReentrant {
+    function claim(ClaimData memory claimData) external nonReentrant whenNotPaused {
         claimData.to = msg.sender;
         _verify(claimData);
 
@@ -68,12 +69,15 @@ contract InstantRewards is Ownable, Pausable, ReentrancyGuard, EIP712 {
     function setSignerAddress(address signerAddress_) external onlyOwner {
         if (signerAddress_ == address(0)) revert InvalidAddress();
         signerAddress = signerAddress_;
+        emit SignerUpdated(signerAddress_);
     }
 
     function withdraw(address wallet, uint256 amount) external onlyOwner {
         if (wallet == address(0)) revert InvalidAddress();
         if (amount > address(this).balance) revert TransferFailed();
-        payable(wallet).transfer(amount);
+        (bool success, ) = wallet.call{value: amount}("");
+        if (!success) revert TransferFailed();
+
         emit Withdrawn(wallet, amount);
     }
 

diff --git a/packages/zevm-app-contracts/contracts/xp-nft/test/xpNFTV2.sol b/packages/zevm-app-contracts/contracts/xp-nft/test/xpNFTV2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity ^0.8.20;
 
 import "../xpNFT.sol";
 

diff --git a/packages/zevm-app-contracts/contracts/xp-nft/xpNFT.sol b/packages/zevm-app-contracts/contracts/xp-nft/xpNFT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";

diff --git a/packages/zevm-app-contracts/package.json b/packages/zevm-app-contracts/package.json
@@ -39,7 +39,6 @@
     "@openzeppelin/hardhat-upgrades": "^1.7.0-rc.0",
     "@uniswap/v2-periphery": "1.1.0-beta.0",
     "@zetachain/networks": "^4.0.0",
-    "@zetachain/protocol-contracts": "^4.0.1",
-    "ethers": "5.6.8"
+    "@zetachain/protocol-contracts": "^4.0.1"
   }
 }
diff --git a/packages/zevm-app-contracts/test/instant-rewards/instant-rewards.ts b/packages/zevm-app-contracts/test/instant-rewards/instant-rewards.ts
@@ -289,6 +289,7 @@ describe("Instant Rewards Contract test", () => {
       expect(ownerAddr).to.be.eq(owner.address);
     }
     await instantRewards.transferOwnership(user.address);
+    await instantRewards.connect(user).acceptOwnership();
     {
       const ownerAddr = await instantRewards.owner();
       expect(ownerAddr).to.be.eq(user.address);