Merge pull request #53 from synapsecns/dev

Merge dev into master

.github/workflows/tests.yaml

@@ -52,6 +52,7 @@ jobs:
           ETH_RPC_URI:      ${{ secrets.ETHEREUM_RPC_URI }}
           POLYGON_RPC_URI:  ${{ secrets.POLYGON_RPC_URI }}
           HARMONY_RPC_URI:  "https://api.fuzz.fi/"
+          TEST_PRIVKEY_A: ${{ secrets.TEST_PRIVKEY_A }}
 
       - name: Coverage report
         run: yarn -s run coverage:report

.mocharc.json

@@ -7,8 +7,11 @@
   "extensions":  ["ts"],
   "recursive": true,
   "spec": [
-    "./test/setup.ts",
-    "./test/**/*-test.ts"
+    "./test/basic/*-test.ts",
+    "./test/entities/*-test.ts",
+    "./test/erc20/*-test.ts",
+    "./test/tokenswap/*-test.ts",
+    "./test/bridge/*-test.ts"
   ],
   "watch-files": [
     "src"

.nvmrc

@@ -1 +1 @@
-v16.6.1
+v17.0.1

package.json

@@ -25,8 +25,8 @@
     "prepare": "ts-patch install -s",
     "setup:dev": "yarn install --frozen-lockfile",
     "setup": "yarn && yarn -s run typegen",
-    "test": "mocha",
-    "test:coverage": "c8 --reports-dir $REPORTS_DIR mocha",
+    "test": "ts-mocha",
+    "test:coverage": "c8 --reports-dir $REPORTS_DIR ts-mocha",
     "coverage:report": "c8 report --reports-dir $REPORTS_DIR --reporter=text-lcov > $REPORTS_DIR/lcov.info",
     "prebuild": "yarn prepare && rm -rf ./dist",
     "build": "tsc --project tsconfig.build.json",
@@ -50,18 +50,22 @@
     "@ethersproject/wallet": "^5.5.0",
     "dotenv": "^10.0.0",
     "ethers": "^5.5.1",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "utility-types": "^3.10.0"
   },
   "devDependencies": {
     "@ethereum-waffle/chai": "3.4.3",
     "@typechain/ethers-v5": "9.0.0",
-    "@types/expect": "24.3.0",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/chai-things": "^0.0.35",
+    "@types/expect": "^24.3.0",
     "@types/mocha": "9.1.0",
     "@types/node": "16.11.25",
     "@zoltu/typescript-transformer-append-js-extension": "1.0.1",
     "c8": "7.11.0",
     "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
+    "chai-bignumber": "^3.0.0",
     "chai-things": "0.2.0",
     "coveralls": "3.1.1",
     "mocha": "9.2.1",