status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'next' into develop

This commit is contained in:
Iuri Matias 2017-10-22 09:47:11 -04:00
parent f3a8e68c60 60e4079f20
commit 2690ada62d
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -57,7 +57,7 @@ Table of Contents
Installation 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. 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/) Further: depending on the dapp stack you choose: [IPFS](https://ipfs.io/)

2
boilerplate/config/contracts.json
View File

@ -2,7 +2,7 @@
"default": { "default": {
"versions": { "versions": {
"web3.js": "1.0.0-beta", "web3.js": "1.0.0-beta",
"solc": "0.4.18" "solc": "0.4.17"
}, },
"deployment": { "deployment": {
"host": "localhost", "host": "localhost",

2
demo/app/contracts/simple_storage.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.18; pragma solidity ^0.4.7;
contract SimpleStorage { contract SimpleStorage {
uint public storedData; uint public storedData;

2
demo/config/contracts.json
View File

@ -2,7 +2,7 @@
"default": { "default": {
"versions": { "versions": {
"web3.js": "1.0.0-beta", "web3.js": "1.0.0-beta",
"solc": "0.4.18" "solc": "0.4.17"
}, },
"deployment": { "deployment": {
"host": "localhost", "host": "localhost",

2
lib/core/config.js
View File

@ -79,7 +79,7 @@ Config.prototype.loadContractsConfigFile = function() {
var configObject = { var configObject = {
"versions": { "versions": {
"web3.js": "0.19.1", "web3.js": "0.19.1",
"solc": "0.4.18" "solc": "0.4.17"
}, },
"deployment": { "deployment": {
"host": "localhost", "host": "localhost",

2
package.json
View File

@ -33,7 +33,7 @@
"promptly": "^2.1.0", "promptly": "^2.1.0",
"serve-static": "^1.11.1", "serve-static": "^1.11.1",
"shelljs": "^0.5.0", "shelljs": "^0.5.0",
"solc": "0.4.18", "solc": "0.4.17",
"tar": "^3.1.5", "tar": "^3.1.5",
"toposort": "^1.0.0", "toposort": "^1.0.0",
"underscore": "^1.8.3", "underscore": "^1.8.3",

2
test_app/app/contracts/another_storage.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.18; pragma solidity ^0.4.17;
contract AnotherStorage { contract AnotherStorage {
address public simpleStorageAddress; address public simpleStorageAddress;
address simpleStorageAddress2; address simpleStorageAddress2;

2
test_app/app/contracts/ownable.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.18; pragma solidity ^0.4.17;
/** /**
* @title Ownable * @title Ownable

2
test_app/app/contracts/simple_storage.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.18; pragma solidity ^0.4.17;
import "ownable.sol"; import "ownable.sol";

2
test_app/app/contracts/test.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.18; pragma solidity ^0.4.17;
library ZAMyLib { library ZAMyLib {

2
test_app/app/contracts/token.sol
View File

@ -1,6 +1,6 @@
// https://github.com/nexusdev/erc20/blob/master/contracts/base.sol // https://github.com/nexusdev/erc20/blob/master/contracts/base.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.17;
contract Token { contract Token {
event Transfer(address indexed from, address indexed to, uint value); event Transfer(address indexed from, address indexed to, uint value);

2
test_app/config/contracts.json
View File

@ -2,7 +2,7 @@
"default": { "default": {
"versions": { "versions": {
"web3.js": "1.0.0-beta", "web3.js": "1.0.0-beta",
"solc": "0.4.18" "solc": "0.4.17"
}, },
"deployment": { "deployment": {
"host": "localhost", "host": "localhost",