Merge pull request #1203 from airswap/develop

Publish Latest to NPM
airswap · Oct 2, 2023 · 35b95f9 · 35b95f9
2 parents 385ec50 + 9209dd6
commit 35b95f9
Show file tree

Hide file tree

Showing 85 changed files with 3,208 additions and 6,294 deletions.
diff --git a/.env.example b/.env.example
@@ -7,4 +7,5 @@ SNOWTRACE_API_KEY=00000000000000000000000000000000
 ARBISCAN_API_KEY=00000000000000000000000000000000
 LINEASCAN_API_KEY=00000000000000000000000000000000
 BLOCKSCOUT_API_KEY=abc
-MULTISIG_OWNER=0xf8bB149F9525875Fa47B8CC632d368EB600FAba3
+MULTISIG_OWNER=0xf8bB149F9525875Fa47B8CC632d368EB600FAba3
+REPORT_GAS=true
diff --git a/.eslintrc b/.eslintrc
@@ -28,6 +28,7 @@
     "@typescript-eslint/camelcase": 0,
     "@typescript-eslint/explicit-function-return-type": 0,
     "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/ban-ts-comment": 0
+    "@typescript-eslint/ban-ts-comment": 0,
+    "prefer-const": 1
   }
 }
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
           node-version: '18.x'
       - run: yarn install
       - run: lerna run compile --concurrency=1
-      - run: lerna run test:unit --concurrency=1
+      - run: lerna run test:ci --concurrency=1
         env:
           MNEMONIC: ${{ secrets.MNEMONIC }}
       - name: Success ✅

diff --git a/.prettierrc b/.prettierrc
@@ -1,9 +1,9 @@
 {
+  "bracketSpacing": true,
   "printWidth": 80,
-  "tabWidth": 2,
   "semi": false,
   "singleQuote": true,
-  "bracketSpacing": true,
+  "tabWidth": 2,
   "trailingComma": "es5",
   "overrides": [
     {

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -3,6 +3,7 @@ require('@typechain/hardhat')
 require('@nomiclabs/hardhat-ethers')
 require('@nomiclabs/hardhat-waffle')
 require('@nomiclabs/hardhat-etherscan')
+require('hardhat-gas-reporter')
 require('solidity-coverage')
 
 const {
@@ -147,6 +148,9 @@ module.exports = {
       },
     ],
   },
+  gasReporter: {
+    enabled: process.env.REPORT_GAS === 'true' ? true : false,
+  },
   paths: {
     artifacts: './build',
   },

diff --git a/package.json b/package.json
@@ -14,7 +14,8 @@
     "compile": "lerna run compile",
     "lint:check": "yarn eslint . --ext .js,.ts",
     "lint:fix": "yarn eslint . --ext .js,.ts --fix",
-    "test": "lerna run test:unit",
+    "test": "lerna run test",
+    "test:ci": "lerna run test:ci",
     "ownership:check": "node ./scripts/ownership.js check",
     "prepare": "husky install",
     "pretty:check": "prettier --check \"./**/*.sol\" \"./**/*.ts\" \"./**/*.js\" \"./**/*.json\"",
@@ -38,13 +39,14 @@
     "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "ethereum-waffle": "^3.4.4",
+    "ethereum-waffle": "^4.0.10",
     "ethers": "^5.6.9",
     "hardhat": "^2.12.7",
+    "hardhat-gas-reporter": "^1.0.9",
     "husky": "^8.0.1",
     "lerna": "^7.3.0",
     "mocha": "^10.2.0",
-    "nx": "^15.9.2",
+    "nx": "^16.5.5",
     "prettier": "^2.8.4",
     "prettier-plugin-solidity": "^1.1.2",
     "solidity-coverage": "^0.8.2",

diff --git a/source/balances/package.json b/source/balances/package.json
@@ -20,15 +20,15 @@
     "typechain": "tsc -b",
     "coverage": "hardhat coverage",
     "test": "hardhat test",
-    "test:unit": "hardhat test",
+    "test:ci": "hardhat test",
     "deploy": "hardhat run ./scripts/deploy.js",
     "verify": "hardhat run ./scripts/verify.js"
   },
   "dependencies": {
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "^4.0.10",
+    "@airswap/constants": "^4.1.0",
     "@airswap/utils": "^4.0.8",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/source/balances/scripts/deploy.js b/source/balances/scripts/deploy.js
@@ -2,7 +2,7 @@
 const fs = require('fs')
 const Confirm = require('prompt-confirm')
 const { ethers, run } = require('hardhat')
-const { ChainIds, chainNames } = require('@airswap/constants')
+const { ChainIds, chainNames, chainLabels } = require('@airswap/constants')
 const { getReceiptUrl } = require('@airswap/utils')
 const balancesDeploys = require('../deploys.js')
 
@@ -40,7 +40,7 @@ async function main() {
     console.log('Updated deploys.js')
 
     console.log(
-      `\nVerify with "yarn verify --network ${chainNames[
+      `\nVerify with "yarn verify --network ${chainLabels[
         chainId
       ].toLowerCase()}"\n`
     )

diff --git a/source/pool/README.md b/source/pool/README.md
@@ -28,7 +28,7 @@ Environment variables are set in an `.env` file in the repository root.
 | `yarn compile`   | Compile all contracts to `build` folder  |
 | `yarn coverage`  | Report test coverage                     |
 | `yarn test`      | Run all tests in `test` folder           |
-| `yarn test:unit` | Run unit tests in `test` folder          |
+| `yarn test:ci`   | Run CI tests in `test` folder            |
 | `yarn deploy`    | Deploy on a network using --network flag |
 | `yarn verify`    | Verify on a network using --network flag |