Solidity version update

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 18
       - uses: actions/cache@master
         id: yarn-cache
         with:
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 18
       - uses: actions/cache@master
         id: yarn-cache
         with:
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 18
       - uses: actions/cache@master
         id: yarn-cache
         with:
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 18
       - uses: actions/cache@master
         id: yarn-cache
         with:
@@ -84,7 +84,7 @@ jobs:
   #     - uses: actions/checkout@v1
   #     - uses: actions/setup-node@v1
   #       with:
-  #         node-version: 12
+  #         node-version: 18
   #     - uses: actions/cache@master
   #       id: yarn-cache
   #       with:

.solhint.json

@@ -17,7 +17,7 @@
     "no-unused-vars": "off",
     "no-inline-assembly": "off",
     "visibility-modifier-order": "off",
-    "compiler-version": ["error", "0.7.4"],
+    "compiler-version": ["error", "^0.8.0"],
     "func-visibility": ["warn", {"ignoreConstructors":true}],
     "reason-string": ["warn", {"maxLength": 96}]
   }

README.md

@@ -13,7 +13,7 @@ an ERC-20 token to function as an ERC-1155 contract.
 ### Usage from Solidity
 
 ```solidity
-pragma solidity ^0.7.4;
+pragma solidity ^0.8.0;
 
 import '@0xsequence/erc20-meta-token/contracts/interfaces/IERC20Wrapper.sol';
 

hardhat.config.ts

@@ -8,7 +8,7 @@ import '@tenderly/hardhat-tenderly'
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: '0.7.4',
+    version: '0.8.18',
     settings: {
       optimizer: {
         enabled: true,

package.json

@@ -10,13 +10,12 @@
     "clean": "rimraf src/artifacts && rimraf src/gen && rimraf cache",
     "compile": "hardhat --max-memory 4096 compile",
     "adapter": "yarn adapter:gen && yarn adapter:build",
-    "adapter:gen": "rimraf src/gen/typechain && typechain --target ethers-v5 --outDir src/gen/typechain './src/artifacts/contracts/**/*[^dbg].json'",
+    "adapter:gen": "rimraf src/gen/typechain && typechain --target ethers-v5 --out-dir src/gen/typechain './src/artifacts/contracts/**/*[^dbg].json'",
     "adapter:build": "rimraf src/gen/adapter && tsc ./src/gen/typechain/index.ts --outDir ./src/gen/adapter",
-    "test": "yarn build && yarn concurrently -k --success first 'yarn start:ganache' 'yarn test:ganache'",
-    "test:hardhat": "hardhat test tests/*.spec.ts",
-    "test:ganache": "hardhat --network ganache test tests/*.spec.ts",
+    "test": "yarn build && yarn test:hardhat",
+    "test:hardhat": "hardhat test",
+    "test:ganache": "hardhat --network ganache test",
     "test:gas-report": "REPORT_GAS=true yarn test",
-    "test:benchmark": "hardhat --network ganache test tests/*.bench.ts",
     "lint": "yarn lint:ts && yarn lint:sol",
     "lint:fix": "yarn lint:ts:fix && yarn lint:sol:fix",
     "lint:sol": "solhint './src/contracts/**/*.sol'",
@@ -35,7 +34,7 @@
     "@nomiclabs/hardhat-truffle5": "^2.0.0",
     "@nomiclabs/hardhat-web3": "^2.0.0",
     "@tenderly/hardhat-tenderly": "^1.0.11",
-    "@typechain/ethers-v5": "^6.0.3",
+    "@typechain/ethers-v5": "^10.1.1",
     "@types/chai": "^4.2.15",
     "@types/chai-as-promised": "^7.1.3",
     "@types/chai-string": "^1.4.2",
@@ -53,16 +52,16 @@
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-prettier": "^3.3.1",
-    "ethers": "^5.0.32",
+    "ethers": "^5.7.2",
     "ganache-cli": "6.12.2",
-    "hardhat": "2.1.1",
+    "hardhat": "2.12.2",
     "hardhat-gas-reporter": "^1.0.4",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.4.0",
     "solhint": "^3.3.2",
     "solidity-coverage": "^0.7.16",
     "ts-node": "^9.1.1",
-    "typechain": "^4.0.3",
-    "typescript": "^4.2.3"
+    "typechain": "^8.1.1",
+    "typescript": "^4.8.4"
   },
   "keywords": [
     "token",

src/README.md

@@ -22,7 +22,7 @@ For more information see, [github.com/0xsequence/erc20-meta-token](https://githu
 ### Usage from Solidity
 
 ```solidity
-pragma solidity ^0.7.4;
+pragma solidity ^0.8.0;
 
 import '@0xsequence/erc20-meta-token/contracts/interfaces/IMetaERC20Wrapper.sol';
 

src/artifacts/@0xsequence/erc-1155/contracts/utils/Address.sol/Address.json

@@ -3,8 +3,8 @@
   "contractName": "Address",
   "sourceName": "@0xsequence/erc-1155/contracts/utils/Address.sol",
   "abi": [],
-  "bytecode": "0x60566023600b82828239805160001a607314601657fe5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220a6456a1fc9cb9106615db79dbcf6e38917b43ae48c6fbdee6c3f71f6c78d8e9564736f6c63430007040033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220a6456a1fc9cb9106615db79dbcf6e38917b43ae48c6fbdee6c3f71f6c78d8e9564736f6c63430007040033",
+  "bytecode": "0x60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203737a7246d8828b0177847c6324a9961dd3ec23e0b55b58c3ac5835d6545d52c64736f6c63430008120033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203737a7246d8828b0177847c6324a9961dd3ec23e0b55b58c3ac5835d6545d52c64736f6c63430008120033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

src/artifacts/@0xsequence/erc-1155/contracts/utils/LibBytes.sol/LibBytes.json

@@ -3,8 +3,8 @@
   "contractName": "LibBytes",
   "sourceName": "@0xsequence/erc-1155/contracts/utils/LibBytes.sol",
   "abi": [],
-  "bytecode": "0x60566023600b82828239805160001a607314601657fe5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220525d0669f5f620c0b95a25c33290a8da789eb2138d8db62d9b98a2c9f3883d2264736f6c63430007040033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220525d0669f5f620c0b95a25c33290a8da789eb2138d8db62d9b98a2c9f3883d2264736f6c63430007040033",
+  "bytecode": "0x60566050600b82828239805160001a6073146043577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200a67ed69d7e8fe8081bf2946900b8e6bb0bdeeae86cfed2fbcfad59644b246ca64736f6c63430008120033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212200a67ed69d7e8fe8081bf2946900b8e6bb0bdeeae86cfed2fbcfad59644b246ca64736f6c63430008120033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

src/artifacts/@0xsequence/erc-1155/contracts/utils/LibEIP712.sol/LibEIP712.json

@@ -3,8 +3,8 @@
   "contractName": "LibEIP712",
   "sourceName": "@0xsequence/erc-1155/contracts/utils/LibEIP712.sol",
   "abi": [],
-  "bytecode": "0x6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220f60c7dc440f3913f227714dd4ed35140d496244f60794b9f5865229445b54abf64736f6c63430007040033",
-  "deployedBytecode": "0x6080604052600080fdfea2646970667358221220f60c7dc440f3913f227714dd4ed35140d496244f60794b9f5865229445b54abf64736f6c63430007040033",
+  "bytecode": "0x6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220c693bf70fac64aa1c4f3136072f1d2b7b93cb3de19e8ea32398b9d5baa243a6164736f6c63430008120033",
+  "deployedBytecode": "0x6080604052600080fdfea2646970667358221220c693bf70fac64aa1c4f3136072f1d2b7b93cb3de19e8ea32398b9d5baa243a6164736f6c63430008120033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }