Merge branch 'next' into develop

Author: iurimatias

boilerplate/config/blockchain.json

@@ -12,7 +12,8 @@
     "rpcCorsDomain": "http://localhost:8000",
     "account": {
       "password": "config/development/password"
-    }
+    },
+    "wsOrigins": "http://localhost:8000"
   },
   "testnet": {
     "enabled": true,

boilerplate/config/communication.json

@@ -2,6 +2,11 @@
   "default": {
     "enabled": true,
     "provider": "whisper",
-    "available_providers": ["whisper", "orbit"]
+    "available_providers": ["whisper", "orbit"],
+    "connection": {
+      "host": "localhost",
+      "port": 8546,
+      "type": "ws"
+    }
   }
 }

boilerplate/config/contracts.json

@@ -1,5 +1,18 @@
 {
   "default": {
+    "versions": {
+      "web3.js": "1.0.0-beta",
+      "solc": "0.4.18"
+    },
+    "deployment": {
+      "host": "localhost",
+      "port": 8545,
+      "type": "rpc"
+    },
+    "dappConnection": [
+      "$WEB3",
+      "http://localhost:8545"
+    ],
     "gas": "auto",
     "contracts": {
     }

boilerplate/config/storage.json

@@ -11,6 +11,7 @@
     "enabled": true,
     "provider": "ipfs",
     "host": "localhost",
-    "port": 5001
+    "port": 5001,
+    "getUrl": "http://localhost:8080/ipfs/"
   }
 }

demo/app/contracts/simple_storage.sol

@@ -1,16 +1,16 @@
-pragma solidity ^0.4.7;
+pragma solidity ^0.4.18;
 contract SimpleStorage {
   uint public storedData;
 
-  function SimpleStorage(uint initialValue) {
+  function SimpleStorage(uint initialValue) public {
     storedData = initialValue;
   }
 
-  function set(uint x) {
+  function set(uint x) public {
     storedData = x;
   }
 
-  function get() constant returns (uint retVal) {
+  function get() public view returns (uint retVal) {
     return storedData;
   }
 

demo/config/blockchain.json

@@ -12,7 +12,8 @@
     "rpcCorsDomain": "http://localhost:8000",
     "account": {
       "password": "config/development/password"
-    }
+    },
+    "wsOrigins": "http://localhost:8000"
   },
   "testnet": {
     "enabled": true,

demo/config/communication.json

@@ -2,6 +2,11 @@
   "default": {
     "enabled": true,
     "provider": "whisper",
-    "available_providers": ["whisper", "orbit"]
+    "available_providers": ["whisper", "orbit"],
+    "connection": {
+      "host": "localhost",
+      "port": 8546,
+      "type": "ws"
+    }
   }
 }

demo/config/contracts.json

@@ -1,5 +1,18 @@
 {
   "default": {
+    "versions": {
+      "web3.js": "1.0.0-beta",
+      "solc": "0.4.18"
+    },
+    "deployment": {
+      "host": "localhost",
+      "port": 8545,
+      "type": "rpc"
+    },
+    "dappConnection": [
+      "$WEB3",
+      "http://localhost:8545"
+    ],
     "gas": "auto",
     "contracts": {
       "SimpleStorage": {

demo/config/storage.json

@@ -11,6 +11,7 @@
     "enabled": true,
     "provider": "ipfs",
     "host": "localhost",
-    "port": 5001
+    "port": 5001,
+    "getUrl": "http://localhost:8080/ipfs/"
   }
 }

docs/conf.py

@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.5'
+version = u'2.6'
 # The full version, including alpha/beta/rc tags.
-release = u'2.5.2'
+release = u'2.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.