Merge branch 'next' into develop

iurimatias · iurimatias · commit 2690ada62dda · 2017-10-22T09:47:11.000-04:00
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Table of Contents
 
 Installation
 ======
-Requirements: geth (1.6.5 or higher recommended, 1.6.0 or lower for whisper support), node (6.9.1 or higher is recommended) and npm
+Requirements: geth (1.6.5 or higher recommended, 1.6.0 or lower for whisper v1 support; whisper v5 support coming soon), node (6.9.1 or higher is recommended) and npm
 Optional: testrpc (3.0 or higher) if using the simulator or the test functionality.
 Further: depending on the dapp stack you choose: [IPFS](https://ipfs.io/)
 
diff --git a/boilerplate/config/contracts.json b/boilerplate/config/contracts.json
@@ -2,7 +2,7 @@
   "default": {
     "versions": {
       "web3.js": "1.0.0-beta",
-      "solc": "0.4.18"
+      "solc": "0.4.17"
     },
     "deployment": {
       "host": "localhost",
diff --git a/demo/app/contracts/simple_storage.sol b/demo/app/contracts/simple_storage.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.7;
 contract SimpleStorage {
   uint public storedData;
 
diff --git a/demo/config/contracts.json b/demo/config/contracts.json
@@ -2,7 +2,7 @@
   "default": {
     "versions": {
       "web3.js": "1.0.0-beta",
-      "solc": "0.4.18"
+      "solc": "0.4.17"
     },
     "deployment": {
       "host": "localhost",
diff --git a/lib/core/config.js b/lib/core/config.js
@@ -79,7 +79,7 @@ Config.prototype.loadContractsConfigFile = function() {
   var configObject = {
     "versions": {
       "web3.js": "0.19.1",
-      "solc": "0.4.18"
+      "solc": "0.4.17"
     },
     "deployment": {
       "host": "localhost",
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "promptly": "^2.1.0",
     "serve-static": "^1.11.1",
     "shelljs": "^0.5.0",
-    "solc": "0.4.18",
+    "solc": "0.4.17",
     "tar": "^3.1.5",
     "toposort": "^1.0.0",
     "underscore": "^1.8.3",
diff --git a/test_app/app/contracts/another_storage.sol b/test_app/app/contracts/another_storage.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.17;
 contract AnotherStorage {
   address public simpleStorageAddress;
   address simpleStorageAddress2;
diff --git a/test_app/app/contracts/ownable.sol b/test_app/app/contracts/ownable.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.17;
 
 /**
  * @title Ownable
diff --git a/test_app/app/contracts/simple_storage.sol b/test_app/app/contracts/simple_storage.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.17;
 
 import "ownable.sol";
 
diff --git a/test_app/app/contracts/test.sol b/test_app/app/contracts/test.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.17;
 
 library ZAMyLib {
 
diff --git a/test_app/app/contracts/token.sol b/test_app/app/contracts/token.sol
@@ -1,6 +1,6 @@
 // https://github.com/nexusdev/erc20/blob/master/contracts/base.sol
 
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.17;
 contract Token {
 
   event Transfer(address indexed from, address indexed to, uint value);
diff --git a/test_app/config/contracts.json b/test_app/config/contracts.json
@@ -2,7 +2,7 @@
   "default": {
     "versions": {
       "web3.js": "1.0.0-beta",
-      "solc": "0.4.18"
+      "solc": "0.4.17"
     },
     "deployment": {
       "host": "localhost",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pragma solidity ^0.4.18;`
	`1`	`+pragma solidity ^0.4.7;`
`2`	`2`	`contract SimpleStorage {`
`3`	`3`	`uint public storedData;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pragma solidity ^0.4.18;`
	`1`	`+pragma solidity ^0.4.17;`
`2`	`2`	`contract AnotherStorage {`
`3`	`3`	`address public simpleStorageAddress;`
`4`	`4`	`address simpleStorageAddress2;`