Merge branch '1.x' into issue/3134

web3 · Nov 4, 2019 · e9f6cfa · e9f6cfa
2 parents 93feb45 + a9c3420
commit e9f6cfa
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 51 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/web3-eth-accounts/package-lock.json b/packages/web3-eth-accounts/package-lock.json
diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json
@@ -18,7 +18,7 @@
         "eth-lib": "0.2.7",
         "ethereumjs-common": "^1.3.2",
         "ethereumjs-tx": "^2.1.1",
-        "scrypt-shim": "github:web3-js/scrypt-shim",
+        "@web3-js/scrypt-shim": "^0.1.0",
         "underscore": "1.9.1",
         "uuid": "3.3.2",
         "web3-core": "1.2.2",

diff --git a/packages/web3-eth-accounts/src/index.js b/packages/web3-eth-accounts/src/index.js
@@ -129,7 +129,7 @@ Accounts.prototype.signTransaction = function signTransaction(tx, privateKey, ca
         error = false,
         transactionOptions = {},
         result,
-        hasTxSigningOptions = !!((tx.chain && tx.hardfork) || tx.common);
+        hasTxSigningOptions = !!(tx && ((tx.chain && tx.hardfork) || tx.common));
 
     callback = callback || function() {
     };

diff --git a/packages/web3-providers-ws/package-lock.json b/packages/web3-providers-ws/package-lock.json
diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "underscore": "1.9.1",
     "web3-core-helpers": "1.2.2",
-    "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis"
+    "@web3-js/websocket": "^1.0.29"
   },
   "devDependencies": {
     "definitelytyped-header-parser": "^1.0.1",