From 1cb0644f92c1ac238c1ffe3297c8f552b57c585b Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sun, 22 Oct 2017 09:27:13 -0400 Subject: [PATCH 1/4] Revert "update solc version" This reverts commit d23cd753ce993b9d9542432ef7d71a4019c3f972. --- demo/app/contracts/simple_storage.sol | 2 +- package.json | 2 +- test_app/app/contracts/another_storage.sol | 2 +- test_app/app/contracts/ownable.sol | 2 +- test_app/app/contracts/simple_storage.sol | 2 +- test_app/app/contracts/test.sol | 2 +- test_app/app/contracts/token.sol | 2 +- test_app/config/contracts.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demo/app/contracts/simple_storage.sol b/demo/app/contracts/simple_storage.sol index 9872d7782..955ad8994 100644 --- 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/package.json b/package.json index 17d64be89..bd32be53c 100644 --- 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 index d8e0a1a81..6bad71066 100644 --- 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.11; contract AnotherStorage { address public simpleStorageAddress; address simpleStorageAddress2; diff --git a/test_app/app/contracts/ownable.sol b/test_app/app/contracts/ownable.sol index 097df9951..0e2562c04 100644 --- 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.11; /** * @title Ownable diff --git a/test_app/app/contracts/simple_storage.sol b/test_app/app/contracts/simple_storage.sol index 2682a7e4d..4098c6f07 100644 --- 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.7; import "ownable.sol"; diff --git a/test_app/app/contracts/test.sol b/test_app/app/contracts/test.sol index f1523673f..20070e0b9 100644 --- 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.11; library ZAMyLib { diff --git a/test_app/app/contracts/token.sol b/test_app/app/contracts/token.sol index fc92206a8..98c9bd49c 100644 --- 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.2; 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 index d5e24c97e..d2a7e2b34 100644 --- 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", From 73bd2df860d0dddd37b1b6e7d00a6967f4e81610 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sun, 22 Oct 2017 09:38:54 -0400 Subject: [PATCH 2/4] downgrade to 0.4.17 --- test_app/app/contracts/another_storage.sol | 2 +- test_app/app/contracts/ownable.sol | 2 +- test_app/app/contracts/simple_storage.sol | 2 +- test_app/app/contracts/test.sol | 2 +- test_app/app/contracts/token.sol | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test_app/app/contracts/another_storage.sol b/test_app/app/contracts/another_storage.sol index 6bad71066..92233769b 100644 --- a/test_app/app/contracts/another_storage.sol +++ b/test_app/app/contracts/another_storage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +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 index 0e2562c04..af8aa0cfc 100644 --- a/test_app/app/contracts/ownable.sol +++ b/test_app/app/contracts/ownable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +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 index 4098c6f07..58c90a356 100644 --- a/test_app/app/contracts/simple_storage.sol +++ b/test_app/app/contracts/simple_storage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.7; +pragma solidity ^0.4.17; import "ownable.sol"; diff --git a/test_app/app/contracts/test.sol b/test_app/app/contracts/test.sol index 20070e0b9..3d347f3fd 100644 --- a/test_app/app/contracts/test.sol +++ b/test_app/app/contracts/test.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity ^0.4.17; library ZAMyLib { diff --git a/test_app/app/contracts/token.sol b/test_app/app/contracts/token.sol index 98c9bd49c..32b1dafdc 100644 --- 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.2; +pragma solidity ^0.4.17; contract Token { event Transfer(address indexed from, address indexed to, uint value); From 05ebefff9a1d57ba58b6a7059a6b459b75c67f4d Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sun, 22 Oct 2017 09:44:32 -0400 Subject: [PATCH 3/4] downgrade to 0.4.17 --- boilerplate/config/contracts.json | 2 +- demo/config/contracts.json | 2 +- lib/core/config.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boilerplate/config/contracts.json b/boilerplate/config/contracts.json index f365b2137..41db174dd 100644 --- 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/config/contracts.json b/demo/config/contracts.json index 41fa45739..e6dd6ac94 100644 --- 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 index 9e2a7fd0c..9ea787ee0 100644 --- 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", From 60e4079f20717b649f88d29440c4ce9fc2e23d5c Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Sun, 22 Oct 2017 09:46:52 -0400 Subject: [PATCH 4/4] clarify whisper support --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1e3ea199..42f1440d6 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,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/)