Merge branch '1.x' into feat/use-blooms-lib

Author: nivida

packages/web3/angular-patch.js

@@ -0,0 +1,17 @@
+const fs = require('fs');
+const f = '../../node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/browser.js';
+
+// This is because we have to replace the `node:false` in the `/angular-cli-files/models/webpack-configs/browser.js`
+// with `node: {crypto: true, stream: true}` to allow web3 to work with angular (as they enforce node: false.)
+// as explained here - https://github.com/ethereum/web3.js/issues/2260#issuecomment-458519127
+if (fs.existsSync(f)) {
+    fs.readFile(f, 'utf8', function(err, data) {
+        if (err) {
+            return console.log(err);
+        }
+        var result = data.replace(/node: false/g, 'node: {crypto: true, stream: true}');
+        fs.writeFile(f, result, 'utf8', function(err) {
+            if (err) return console.log(err);
+        });
+    });
+}

packages/web3/package.json

@@ -20,7 +20,8 @@
     "author": "ethereum.org",
     "types": "types/index.d.ts",
     "scripts": {
-        "dtslint": "dtslint types --onlyTestTsNext"
+        "dtslint": "dtslint types --onlyTestTsNext",
+        "postinstall": "node angular-patch.js"
     },
     "authors": [
         {

scripts/ci.sh

@@ -4,6 +4,9 @@
 # Travis CI matrix job selector
 # -----------------------------
 
+# Exit immediately on error
+set -o errexit
+
 if [ "$TEST" = "unit" ]; then
 
   npm run build

scripts/e2e.geth.automine.sh

@@ -30,7 +30,7 @@ geth-dev-assistant --period 2 --accounts 1 --tag 'stable'
 istanbul cover _mocha -- \
   --reporter spec \
   --grep 'E2E' \
-  --timeout 10000 \
+  --timeout 15000 \
   --exit
 
 # Copy cov for this run to a temp file we can combine later and send to coveralls

scripts/e2e.geth.instamine.sh

@@ -30,7 +30,7 @@ geth-dev-assistant --accounts 1 --tag 'stable'
 GETH_INSTAMINE=true istanbul cover _mocha -- \
   --reporter spec \
   --grep 'E2E' \
-  --timeout 10000 \
+  --timeout 15000 \
   --exit
 
 # Copy cov for this run to a temp file we can combine later and send to coveralls

test/e2e.method.signing.js

@@ -51,7 +51,7 @@ describe('transaction and message signing [ @E2E ]', function() {
         assert(receipt.status === true);
     });
 
-    it('sendSignedTransaction (with eth.accounts.signTransaction)', async function(){
+    it.skip('sendSignedTransaction (with eth.accounts.signTransaction)', async function(){
         var source = wallet[0].address
         var destination = wallet[1].address;