Merge 68550b0 into 744a79d

.github/workflows/build.yml

@@ -11,15 +11,16 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [10.x, 12.x, 13.x, 14.x]
+        node-version: [10.x, 12.x, 13.x, 14.4.0, 14.5.0, 14.6.0, 14.7.0, 14.8.0, 14.9.0]
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - run: npm install
       - run: npm run test
@@ -36,7 +37,7 @@ jobs:
         with:
           node-version: 12.x
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - run: npm install
       - run: npm run test:browser

karma.conf.js

@@ -15,7 +15,7 @@ module.exports = function(config) {
     reporters: ['progress', 'karma-typescript'],
     browsers: ['FirefoxHeadless', 'ChromeHeadless'],
     singleRun: true,
-    concurrency: Infinity,
+    concurrency: 1,
     // Extend timeouts for long tests
     browserDisconnectTimeout: 1000000,
     browserNoActivityTimeout: 1000000,

package.json

@@ -63,11 +63,11 @@
     "@types/node": "^12.0.10",
     "ethers": "^4.0.33",
     "husky": "^2.1.0",
-    "karma": "^5.0.2",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-firefox-launcher": "^1.0.0",
-    "karma-mocha": "^2.0.0",
-    "karma-typescript": "^5.0.2",
+    "karma": "^5.2.2",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-firefox-launcher": "^1.3.0",
+    "karma-mocha": "^2.0.1",
+    "karma-typescript": "^5.1.0",
     "lodash.zip": "^4.2.0",
     "mocha": "^7.1.2",
     "nyc": "^15.0.1",

src/index.ts

@@ -599,7 +599,9 @@ export default class Wallet {
     }
 
     const ciphertext = runCipherBuffer(cipher, this.privKey)
-    const mac = keccak256(Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), Buffer.from(ciphertext)]))
+    const mac = keccak256(
+      Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), Buffer.from(ciphertext)]),
+    )
 
     return {
       version: 3,