Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts

.codeclimate.yml

@@ -30,10 +30,11 @@ ratings:
 exclude_paths:
 - "test/"
 - "old_test/"
-- "boilerplate/"
+- "templates/boilerplate/"
-- "demo/"
+- "templates/demo/"
 - "js/"
-- "test_app/"
+- "test_apps/test_app/"
+- "test_apps/contracts_app/"
 - "docs/"
 checks:
   similar-code:

.gitignore

@@ -2,18 +2,23 @@ node_modules
 TODO
 NOTES
 .node-xmlhttprequest-sync-*
-demo/dist/
+templates/demo/dist/
-demo/.embark/development/
+templates/demo/.embark/development/
-demo/config/production/password
+templates/demo/config/production/password
-demo/node_modules/
+templates/demo/node_modules/
-boilerplate/dist/
+templates/boilerplate/dist/
 docs/_build
 docs/utils/__pycache_
-test_app/dist/
+test_apps/test_app/dist/
-test_app/.embark/development/
+test_apps/test_app/.embark/development/
-test_app/config/production/password
+test_apps/test_app/config/production/password
-test_app/node_modules/
+test_apps/test_app/node_modules/
-test_app/chains.json
+test_apps/test_app/chains.json
+test_apps/contracts_app/build/
+test_apps/contracts_app/.embark/development/
+test_apps/contracts_app/config/production/password
+test_apps/contracts_app/node_modules/
+test_apps/contracts_app/chains.json
 .idea
 .eslintrc.json
 .embark/

.travis.yml

@@ -8,4 +8,5 @@ addons:
 script:
     - npm run lint
     - npm run test
-    - npm run testdapp
+    - npm run testdapp_1
+    - npm run testdapp_2

Class Hierarchy.mmd

@@ -1,29 +0,0 @@
-Mind Map generated by NB MindMap plugin   
-> __version__=`1.1`,showJumps=`true`
----
-
-# Embark
-
-## Config
-
-## CLI
-
-## Engine
-> leftSide=`true`
-
-
-### Plugins
-
-#### DefaultLogger
-
-#### DefaultPipeline
-
-### Services
-
-## DefaultLogger
-
-## Utils
-> leftSide=`true`
-
-
-## DeployManager

docs/working-with-different-chains.rst

@@ -53,7 +53,9 @@ gasLimit
     # config/development/genesis.json
      {
         "config": {
-          "homesteadBlock": 1
+          "homesteadBlock": 0,
+          "byzantiumBlock": 0,
+          "daoForkSupport": true
         },
         "nonce": "0x0000000000000042",
         "difficulty": "0x0",

js/embark.js

@@ -25,6 +25,7 @@ EmbarkJS.Contract = function(options) {
       // add gasPrice
       ContractClass = new this.web3.eth.Contract(this.abi, this.address);
       ContractClass.setProvider(this.web3.currentProvider);
+      ContractClass.options.data = this.code;
 
       return ContractClass;
     } else {

lib/cmd.js

@@ -44,7 +44,8 @@ class Cmd {
     program
       .command('new [name]')
       .description('new application')
-      .action(function (name) {
+      .option('--simple', 'create a barebones project meant only for contract development')
+      .action(function (name, options) {
         if (name === undefined) {
           return promptly.prompt("Name your app (default is embarkDApp):", {
             default: "embarkDApp",
@@ -57,13 +58,20 @@ class Cmd {
               err.retry();
             } else {
               //slightly different assignment of name since it comes from child prompt
-              embark.generateTemplate('boilerplate', './', inputvalue);
+              if (options.simple) {
+                embark.generateTemplate('simple', './', inputvalue);
+              } else {
+                embark.generateTemplate('boilerplate', './', inputvalue);
+              }
             }
           });
         } else {
-          embark.generateTemplate('boilerplate', './', name);
+          if (options.simple) {
+            embark.generateTemplate('simple', './', name);
+          } else {
+            embark.generateTemplate('boilerplate', './', name);
+          }
         }
-
       });
   }
 
@@ -110,7 +118,7 @@ class Cmd {
   blockchain() {
     program
       .command('blockchain [environment]')
-      .option('-c, --client [client]', 'Use a specific ethereum client or simulator (supported: geth, testrpc')
+      .option('-c, --client [client]', 'Use a specific ethereum client or simulator (supported: geth, testrpc)')
       .description('run blockchain server (default: development)')
       .action(function (env, options) {
         embark.initConfig(env || 'development', {

lib/cmds/blockchain/blockchain.js

@@ -45,8 +45,8 @@ var Blockchain = function(options) {
 
   if (this.blockchainConfig === {} || JSON.stringify(this.blockchainConfig) === '{"enabled":true}') {
     this.config.account = {};
-    this.config.account.password = fs.embarkPath("boilerplate/config/development/password");
+    this.config.account.password = fs.embarkPath("templates/boilerplate/config/development/password");
-    this.config.genesisBlock = fs.embarkPath("boilerplate/config/development/genesis.json");
+    this.config.genesisBlock = fs.embarkPath("templates/boilerplate/config/development/genesis.json");
     this.config.datadir = fs.embarkPath(".embark/development/datadir");
   }
 

lib/cmds/template_generator.js

@@ -7,7 +7,7 @@ class TemplateGenerator {
   }
 
   generate(destinationFolder, name) {
-    let templatePath = fs.embarkPath(this.templateName);
+    let templatePath = fs.embarkPath(utils.joinPath('templates', this.templateName));
     console.log('Initializing Embark Template....'.green);
     let fspath = utils.joinPath(destinationFolder, name);
 

lib/contracts/code_generator.js

@@ -1,6 +1,5 @@
 let async = require('async');
 let fs = require('../core/fs.js');
-var utils = require('../utils/utils.js');
 
 require('ejs');
 const Templates = {
@@ -281,10 +280,10 @@ class CodeGenerator {
       function getWeb3Location(next) {
         self.events.request("version:get:web3", function(web3Version) {
           if (web3Version === "1.0.0-beta") {
-            return next(null, utils.joinPath(fs.embarkPath("js/web3-1.0.min.js")));
+            return next(null, fs.embarkPath("js/web3-1.0.min.js"));
           } else {
             self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) {
-              return next(null, utils.joinPath(process.env.PWD, location));
+              return next(null, fs.dappPath(location));
             });
           }
         });
@@ -308,9 +307,8 @@ class CodeGenerator {
         next();
       },
       function writeFile(next) {
-        let filePath = utils.joinPath(fs.dappPath(), ".embark", 'embark.js');
+        fs.mkdirpSync(fs.dappPath(".embark"));
-        fs.mkdirpSync(utils.joinPath(fs.dappPath(), ".embark"));
+        fs.writeFileSync(fs.dappPath(".embark", 'embark.js'), code);
-        fs.writeFileSync(filePath, code);
         next();
       }
     ], function(_err, _result) {

lib/core/config.js

@@ -18,6 +18,7 @@ var Config = function(options) {
   this.plugins = options.plugins;
   this.logger = options.logger;
   this.events = options.events;
+  this.embarkConfig = {};
 };
 
 Config.prototype.loadConfigFiles = function(options) {
@@ -62,10 +63,18 @@ Config.prototype.reloadConfig = function() {
   this.loadChainTrackerFile();
 };
 
-Config.prototype._mergeConfig = function(configFilename, defaultConfig, env) {
+Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env, enabledByDefault) {
-  let configFilePath = this.configDir + configFilename;
+  if (!configFilePath) {
+    let configToReturn = defaultConfig['default'] || {};
+    configToReturn.enabled = enabledByDefault || false;
+    return configToReturn;
+  }
+
   if (!fs.existsSync(configFilePath)) {
-    this.logger.warn("no config file found at " + configFilePath + ". using default config");
+    // TODO: remove this if
+    if (this.logger) {
+      this.logger.warn("no config file found at " + configFilePath + ". using default config");
+    }
     return defaultConfig['default'] || {};
   }
 
@@ -79,6 +88,13 @@ Config.prototype._mergeConfig = function(configFilename, defaultConfig, env) {
   }
 };
 
+Config.prototype._getFileOrOject = function(object, filePath, property) {
+  if (typeof (this.configDir) === 'object') {
+    return this.configDir[property];
+  }
+  return this.configDir + filePath;
+};
+
 Config.prototype.loadBlockchainConfigFile = function() {
   var configObject = {
     "default": {
@@ -86,16 +102,21 @@ Config.prototype.loadBlockchainConfigFile = function() {
     }
   };
 
-  this.blockchainConfig = this._mergeConfig("blockchain.json", configObject, this.env);
+  let configFilePath = this._getFileOrOject(this.configDir, 'blockchain.json', 'blockchain');
+
+  this.blockchainConfig = this._mergeConfig(configFilePath, configObject, this.env, true);
 };
 
 Config.prototype.loadContractsConfigFile = function() {
+  var defaultVersions = {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17"
+  };
+  var versions = utils.recursiveMerge(defaultVersions, this.embarkConfig.versions || {});
+
   var configObject = {
     "default": {
-      "versions": {
+      "versions": versions,
-        "web3.js": "1.0.0-beta",
-        "solc": "0.4.17"
-      },
       "deployment": {
         "host": "localhost", "port": 8545, "type": "rpc"
       },
@@ -114,15 +135,17 @@ Config.prototype.loadContractsConfigFile = function() {
     configObject = utils.recursiveMerge(configObject, pluginConfig);
   });
 
-  this.contractsConfig = this._mergeConfig("contracts.json", configObject, this.env);
+  let configFilePath = this._getFileOrOject(this.configDir, 'contracts.json', 'contracts');
+
+  this.contractsConfig = this._mergeConfig(configFilePath, configObject, this.env);
 };
 
 Config.prototype.loadStorageConfigFile = function() {
+  var versions = utils.recursiveMerge({"ipfs-api": "17.2.4"}, this.embarkConfig.versions || {});
+
   var configObject = {
     "default": {
-      "versions": {
+      "versions": versions,
-        "ipfs-api": "17.2.4"
-      },
       "enabled": true,
       "available_providers": ["ipfs"],
       "ipfs_bin": "ipfs",
@@ -133,7 +156,9 @@ Config.prototype.loadStorageConfigFile = function() {
     }
   };
 
-  this.storageConfig = this._mergeConfig("storage.json", configObject, this.env);
+  let configFilePath = this._getFileOrOject(this.configDir, 'storage.json', 'storage');
+
+  this.storageConfig = this._mergeConfig(configFilePath, configObject, this.env);
 };
 
 Config.prototype.loadCommunicationConfigFile = function() {
@@ -148,7 +173,9 @@ Config.prototype.loadCommunicationConfigFile = function() {
     }
   };
 
-  this.communicationConfig = this._mergeConfig("communication.json", configObject, this.env);
+  let configFilePath = this._getFileOrOject(this.configDir, 'communication.json', 'communication');
+
+  this.communicationConfig = this._mergeConfig(configFilePath, configObject, this.env);
 };
 
 Config.prototype.loadWebServerConfigFile = function() {
@@ -156,7 +183,9 @@ Config.prototype.loadWebServerConfigFile = function() {
     "enabled": true, "host": "localhost", "port": 8000
   };
 
-  this.webServerConfig = this._mergeConfig("webserver.json", configObject, false);
+  let configFilePath = this._getFileOrOject(this.configDir, 'webserver.json', 'webserver');
+
+  this.webServerConfig = this._mergeConfig(configFilePath, configObject, false);
 };
 
 Config.prototype.loadEmbarkConfigFile = function() {

lib/core/fs.js

@@ -51,7 +51,7 @@ function embarkPath(fileOrDir) {
 }
 
 function dappPath() {
-  return process.env.PWD;
+  return utils.joinPath(utils.pwd(), ...arguments);
 }
 
 module.exports = {

lib/core/plugins.js

@@ -46,7 +46,7 @@ Plugins.prototype.loadInternalPlugin = function(pluginName, pluginConfig) {
 };
 
 Plugins.prototype.loadPlugin = function(pluginName, pluginConfig) {
-  var pluginPath = utils.joinPath(process.env.PWD, 'node_modules', pluginName);
+  var pluginPath = utils.joinPath(utils.pwd(), 'node_modules', pluginName);
   var plugin = require(pluginPath);
 
   var pluginWrapper = new Plugin({name: pluginName, pluginModule: plugin, pluginConfig: pluginConfig, logger: this.logger, pluginPath: pluginPath, interceptLogs: this.interceptLogs, events: this.events, config: this.config, isInternal: false});

lib/modules/ipfs/index.js

@@ -50,7 +50,11 @@ class IPFS {
       self.logger.info('IPFS node is offline..');
     });
 
-    this.addCheck('IPFS', function (cb) {
+    if (!self.addCheck) {
+      return;
+    }
+
+    self.addCheck('IPFS', function (cb) {
       self.logger.trace("Checking IPFS version...");
       utils.httpGetJson('http://' + self.host + ':' + self.port + '/api/v0/version', function (err, body) {
         if (err) {
@@ -80,7 +84,7 @@ class IPFS {
       let currentIpfsApiVersion = require('../../../package.json').dependencies["ipfs-api"];
       if (ipfsApiVersion !== currentIpfsApiVersion) {
         self.events.request("version:getPackageLocation", "ipfs-api", ipfsApiVersion, function(err, location) {
-          self.embark.registerImportFile("ipfs-api", utils.joinPath(process.env.PWD, location));
+          self.embark.registerImportFile("ipfs-api", fs.dappPath(location));
         });
       }
     });

lib/modules/solidity/solcW.js

@@ -1,4 +1,5 @@
 let utils = require('../../utils/utils.js');
+let fs = require('../../core/fs.js');
 let solcProcess;
 let compilerLoaded = false;
 let currentSolcVersion = require('../../../package.json').dependencies.solc;
@@ -32,7 +33,7 @@ class SolcW {
           if (err) {
             return done(err);
           }
-          let requirePath = utils.joinPath(process.env.PWD, location);
+          let requirePath = fs.dappPath(location);
           solcProcess.send({action: 'loadCompiler', solcLocation: requirePath});
         });
 

lib/pipeline/pipeline.js

@@ -36,11 +36,8 @@ class Pipeline {
             if (file.filename.indexOf('.js') >= 0) {
               let importsList = {};
 
-              //importsList["Embark/EmbarkJS"] = fs.embarkPath("js/embark.js");
+              importsList["Embark/EmbarkJS"] = fs.dappPath(".embark", 'embark.js');
-
+              importsList["Embark/web3"] = fs.dappPath(".embark", 'web3_instance.js');
-              importsList["Embark/EmbarkJS"] = utils.joinPath(fs.dappPath(), ".embark", 'embark.js');
-              importsList["Embark/web3"] = utils.joinPath(fs.dappPath(), ".embark", 'web3_instance.js');
-              importsList["Embark/contracts/SimpleStorage"] = utils.joinPath(fs.dappPath(), ".embark", 'SimpleStorage.js');
 
               self.plugins.getPluginsProperty('imports', 'imports').forEach(function (importObject) {
                 let [importName, importLocation] = importObject;
@@ -49,7 +46,7 @@ class Pipeline {
 
               for (let contractName in contractsJSON) {
                 let contractCode = self.buildContractJS(contractName);
-                let filePath = utils.joinPath(fs.dappPath(), ".embark", contractName + '.js');
+                let filePath = fs.dappPath(".embark", contractName + '.js');
                 fs.writeFileSync(filePath, contractCode);
                 importsList["Embark/contracts/" + contractName] = filePath;
               }
@@ -63,7 +60,7 @@ class Pipeline {
                 },
 
                 function changeCwd(next) {
-                  realCwd = process.env.PWD;
+                  realCwd = utils.pwd();
                   process.chdir(fs.embarkPath(''));
                   next();
                 },
@@ -186,17 +183,17 @@ class Pipeline {
 
   webpackRun(filename, options, includeModules, importsList, detectErrors, callback) {
     let defaultOptions = {
-      entry: utils.joinPath(fs.dappPath(), filename),
+      entry: fs.dappPath(filename),
       output: {
         libraryTarget: 'umd',
-        path: utils.joinPath(fs.dappPath(), '.embark'),
+        path: fs.dappPath('.embark'),
         filename: filename
       },
       resolve: {
         alias: importsList,
         modules: [
           fs.embarkPath('node_modules'),
-          utils.joinPath(fs.dappPath(), 'node_modules')
+          fs.dappPath('node_modules')
         ]
       },
       externals: function(context, request, callback) {
@@ -248,16 +245,16 @@ class Pipeline {
   }
 
   buildContracts(contractsJSON) {
-    fs.mkdirpSync(utils.joinPath(fs.dappPath(), this.buildDir, 'contracts'));
+    fs.mkdirpSync(fs.dappPath(this.buildDir, 'contracts'));
 
     for (let className in contractsJSON) {
       let contract = contractsJSON[className];
-      fs.writeJSONSync(utils.joinPath(fs.dappPath(), this.buildDir, 'contracts', className + ".json"), contract, {spaces: 2});
+      fs.writeJSONSync(fs.dappPath(this.buildDir, 'contracts', className + ".json"), contract, {spaces: 2});
     }
   }
 
   buildContractJS(contractName) {
-    let contractJSON = fs.readFileSync(utils.joinPath(fs.dappPath(), this.buildDir, 'contracts', contractName + '.json')).toString();
+    let contractJSON = fs.readFileSync(fs.dappPath(this.buildDir, 'contracts', contractName + '.json')).toString();
 
     let contractCode = "";
     contractCode += "import web3 from 'Embark/web3';\n";
@@ -285,7 +282,7 @@ class Pipeline {
             return next(null, utils.joinPath(fs.embarkPath("js/web3-1.0.min.js")));
           } else {
             self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) {
-              return next(null, utils.joinPath(process.env.PWD, location));
+              return next(null, fs.dappPath(location));
             });
           }
         });
@@ -307,9 +304,8 @@ class Pipeline {
         });
       },
       function writeFile(next) {
-        let filePath = utils.joinPath(fs.dappPath(), ".embark", 'web3_instance.js');
+        fs.mkdirpSync(fs.dappPath(".embark"));
-        fs.mkdirpSync(utils.joinPath(fs.dappPath(), ".embark"));
+        fs.writeFileSync(fs.dappPath(".embark", 'web3_instance.js'), code);
-        fs.writeFileSync(filePath, code);
         next();
       }
     ], function(_err, _result) {

lib/utils/utils.js

@@ -123,6 +123,10 @@ function proposeAlternative(word, _dictionary, _exceptions) {
   return propose(word, dictionary, {threshold: 0.3});
 }
 
+function pwd() {
+  return process.env.PWD || process.cwd();
+}
+
 module.exports = {
   joinPath: joinPath,
   filesMatchingPattern: filesMatchingPattern,
@@ -138,5 +142,6 @@ module.exports = {
   exit: exit,
   downloadFile: downloadFile,
   extractTar: extractTar,
-  proposeAlternative: proposeAlternative
+  proposeAlternative: proposeAlternative,
+  pwd: pwd
 };

package.json

@@ -5,8 +5,9 @@
   "scripts": {
     "lint": "./node_modules/.bin/eslint lib/",
     "test": "mocha test/ --no-timeouts",
-    "testdapp": "cd test_app/ && npm install && ../bin/embark test",
+    "testdapp_1": "cd test_apps/test_app/ && npm install && ../../bin/embark test",
-    "fulltest": "npm run lint && npm run test && npm run testdapp"
+    "testdapp_2": "cd test_apps/contracts_app/ && npm install && ../../bin/embark test",
+    "fulltest": "npm run lint && npm run test && npm run testdapp_1 && npm run testdapp_2"
   },
   "bin": {
     "embark": "./bin/embark"
@@ -31,12 +32,12 @@
     "blessed": "^0.1.81",
     "chokidar": "^1.6.0",
     "colors": "^1.1.2",
-    "commander": "^2.8.1",
+    "commander": "^2.15.1",
-    "css-loader": "^0.28.7",
+    "css-loader": "^0.28.11",
-    "ejs": "^2.5.7",
+    "ejs": "^2.5.8",
     "ethereumjs-testrpc": "^6.0.3",
     "file-loader": "^1.1.5",
-    "finalhandler": "^0.5.0",
+    "finalhandler": "^1.1.1",
     "follow-redirects": "^1.2.4",
     "fs-extra": "^2.0.0",
     "globule": "^1.1.0",

templates/boilerplate/config/contracts.json

@@ -1,9 +1,5 @@
 {
   "default": {
-    "versions": {
-      "web3.js": "1.0.0-beta",
-      "solc": "0.4.17"
-    },
     "deployment": {
       "host": "localhost",
       "port": 8545,

templates/boilerplate/config/development/genesis.json

@@ -1,6 +1,8 @@
 {
     "config": {
-      "homesteadBlock": 1
+      "homesteadBlock": 0,
+      "byzantiumBlock": 0,
+      "daoForkSupport": true
     },
     "nonce": "0x0000000000000042",
     "difficulty": "0x0",

templates/boilerplate/config/storage.json

@@ -1,8 +1,5 @@
 {
   "default": {
-    "versions": {
-      "ipfs-api": "17.2.4"
-    },
     "enabled": true,
     "ipfs_bin": "ipfs",
     "provider": "ipfs",

templates/boilerplate/embark.json

@@ -8,5 +8,10 @@
   },
   "buildDir": "dist/",
   "config": "config/",
+  "versions": {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17",
+    "ipfs-api": "17.2.4"
+  },
   "plugins": {}
 }

templates/demo/config/contracts.json

@@ -1,9 +1,5 @@
 {
   "default": {
-    "versions": {
-      "web3.js": "1.0.0-beta",
-      "solc": "0.4.17"
-    },
     "deployment": {
       "host": "localhost",
       "port": 8545,

templates/demo/config/development/genesis.json

@@ -1,6 +1,8 @@
 {
     "config": {
-      "homesteadBlock": 1
+      "homesteadBlock": 0,
+      "byzantiumBlock": 0,
+      "daoForkSupport": true
     },
     "nonce": "0x0000000000000042",
     "difficulty": "0x0",

templates/demo/config/storage.json

@@ -1,8 +1,5 @@
 {
   "default": {
-    "versions": {
-      "ipfs-api": "17.2.4"
-    },
     "enabled": true,
     "ipfs_bin": "ipfs",
     "provider": "ipfs",

templates/demo/embark.json

@@ -7,6 +7,11 @@
   },
   "buildDir": "dist/",
   "config": "config/",
+  "versions": {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17",
+    "ipfs-api": "17.2.4"
+  },
   "plugins": {
   }
 }

templates/simple/chains.json

@@ -0,0 +1 @@
+{}

templates/simple/contracts.json

@@ -0,0 +1,16 @@
+{
+  "default": {
+    "deployment": {
+      "host": "localhost",
+      "port": 8545,
+      "type": "rpc"
+    },
+    "dappConnection": [
+      "$WEB3",
+      "http://localhost:8545"
+    ],
+    "gas": "auto",
+    "contracts": {
+    }
+  }
+}

templates/simple/embark.json

@@ -0,0 +1,16 @@
+{
+  "contracts": ["contracts/**"],
+  "app": {},
+  "buildDir": "build/",
+  "config": {
+    "contracts": "contracts.json",
+    "blockchain": false,
+    "storage": false,
+    "communication": false,
+    "webserver": false
+  },
+  "versions": {
+    "solc": "0.4.17"
+  },
+  "plugins": {}
+}

templates/simple/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "%APP_NAME%",
+  "version": "0.0.1",
+  "description": "",
+  "scripts": {
+    "test": "embark test"
+  },
+  "author": "",
+  "license": "ISC",
+  "homepage": "",
+  "devDependencies": {
+  }
+}

templates/simple/test/contract_spec.js

@@ -0,0 +1,29 @@
+//describe("SimpleStorage", function() {
+//  this.timeout(0);
+//  before(function(done) {
+//    this.timeout(0);
+//    var contractsConfig = {
+//      "SimpleStorage": {
+//        args: [100]
+//      }
+//    };
+//    EmbarkSpec.deployAll(contractsConfig, () => { done() });
+//  });
+//
+//  it("should set constructor value", function(done) {
+//    SimpleStorage.methods.storedData().call().then(function(result) {
+//      assert.equal(result, 100);
+//      done();
+//    });
+//  });
+//
+//  it("set storage value", function(done) {
+//    SimpleStorage.methods.set(150).send().then(function() {
+//      SimpleStorage.methods.get().call().then(function(result) {
+//        assert.equal(result, 150);
+//        done();
+//      });
+//    });
+//  });
+//
+//});

test_app/README.md

@@ -1,8 +0,0 @@
-Test App for integration testing purposes.
-
-```../bin/embark run``` to check if everything is behaving as expected
-
-```../bin/embark test``` to see tests are working as expected
-
-```dist/index.html``` and ```dist/test.html``` to check different functionality
-

test_apps/contracts_app/.gitignore

@@ -0,0 +1,5 @@
+.embark/
+node_modules/
+dist/
+config/production/password
+config/livenet/password

test_apps/contracts_app/README.md

@@ -0,0 +1,6 @@
+Test App for integration testing purposes.
+
+```../../bin/embark run``` to check if everything is behaving as expected
+
+```../../bin/embark test``` to see tests are working as expected
+

test_apps/contracts_app/blockchain.json

@@ -0,0 +1,45 @@
+{
+  "development": {
+    "enabled": true,
+    "networkType": "custom",
+    "genesisBlock": "development/genesis.json",
+    "datadir": ".embark/development/datadir",
+    "mineWhenNeeded": true,
+    "nodiscover": true,
+    "maxpeers": 0,
+    "rpcHost": "localhost",
+    "rpcPort": 8545,
+    "rpcCorsDomain": "http://localhost:8000",
+    "account": {
+      "password": "development/password"
+    },
+    "targetGasLimit": 8000000,
+    "wsOrigins": "http://localhost:8000",
+    "wsRPC": true,
+    "wsHost": "localhost",
+    "wsPort": 8546
+
+  },
+  "testnet": {
+    "networkType": "testnet",
+    "rpcHost": "localhost",
+    "rpcPort": 8545
+  },
+  "livenet": {
+    "networkType": "livenet",
+    "rpcHost": "localhost",
+    "rpcPort": 8545,
+    "rpcCorsDomain": "http://localhost:8000",
+    "account": {
+      "password": "livenet/password"
+    }
+  },
+  "privatenet": {
+    "networkType": "custom",
+    "rpcHost": "localhost",
+    "rpcPort": 8545,
+    "datadir": "yourdatadir",
+    "networkId": "123",
+    "bootnodes": ""
+  }
+}

test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json

@@ -0,0 +1,244 @@
+{
+  "contract_name": "AlreadyDeployedToken",
+  "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6",
+  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "219200",
+      "executionCost": "40465",
+      "totalCost": "259665"
+    },
+    "external": {
+      "_supply()": "392",
+      "allowance(address,address)": "826",
+      "approve(address,uint256)": "22330",
+      "balanceOf(address)": "683",
+      "totalSupply()": "414",
+      "transfer(address,uint256)": "43630",
+      "transferFrom(address,address,uint256)": "64413"
+    },
+    "internal": {
+      "safeToAdd(uint256,uint256)": "24"
+    }
+  },
+  "function_hashes": {
+    "_supply()": "15945790",
+    "allowance(address,address)": "dd62ed3e",
+    "approve(address,uint256)": "095ea7b3",
+    "balanceOf(address)": "70a08231",
+    "totalSupply()": "18160ddd",
+    "transfer(address,uint256)": "a9059cbb",
+    "transferFrom(address,address,uint256)": "23b872dd"
+  },
+  "abi": [
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "approve",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x095ea7b3"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "_supply",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x15945790"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+        {
+          "name": "supply",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x18160ddd"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x23b872dd"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "who",
+          "type": "address"
+        }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x70a08231"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xa9059cbb"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "allowance",
+      "outputs": [
+        {
+          "name": "_allowance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0xdd62ed3e"
+    },
+    {
+      "inputs": [
+        {
+          "name": "initial_balance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Transfer",
+      "type": "event",
+      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Approval",
+      "type": "event",
+      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/AnotherStorage.json

@@ -0,0 +1,50 @@
+{
+  "contract_name": "AnotherStorage",
+  "address": "0xbd1470c4E242141Ce45c82A570755bfe9965e99C",
+  "code": "6060604052341561000f57600080fd5b60405160208061010f8339810160405280805160008054600160a060020a03909216600160a060020a0319909216919091179055505060bc806100536000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029",
+  "runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029",
+  "real_runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029",
+  "swarm_hash": "aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "37600",
+      "executionCost": "20517",
+      "totalCost": "58117"
+    },
+    "external": {
+      "simpleStorageAddress()": "367"
+    }
+  },
+  "function_hashes": {
+    "simpleStorageAddress()": "3610eb0e"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "simpleStorageAddress",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x3610eb0e"
+    },
+    {
+      "inputs": [
+        {
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/Assert.json

@@ -0,0 +1,39 @@
+{
+  "contract_name": "Assert",
+  "address": "0x5c24Fd0BAB4B6EA1C0f057C770815b82EcE9013F",
+  "code": "60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029",
+  "runtime_bytecode": "6060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029",
+  "real_runtime_bytecode": "6060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029",
+  "swarm_hash": "7e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "10600",
+      "executionCost": "61",
+      "totalCost": "10661"
+    },
+    "internal": {
+      "triggerEvent(bool,string memory)": "infinite"
+    }
+  },
+  "function_hashes": {},
+  "abi": [
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "name": "passed",
+          "type": "bool"
+        },
+        {
+          "indexed": false,
+          "name": "message",
+          "type": "string"
+        }
+      ],
+      "name": "TestEvent",
+      "type": "event",
+      "signature": "0xd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/ContractArgs.json

@@ -0,0 +1,94 @@
+{
+  "contract_name": "ContractArgs",
+  "address": "0xD38d37b84d83DAfEADd35D98354d47609456aEA4",
+  "code": "6060604052341561000f57600080fd5b6040516101da3803806101da83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610127806100b36000396000f3006060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029",
+  "runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029",
+  "real_runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029",
+  "swarm_hash": "28b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c73",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "59000",
+      "executionCost": "infinite",
+      "totalCost": "infinite"
+    },
+    "external": {
+      "": "123",
+      "addr_1()": "407",
+      "addr_2()": "429",
+      "value()": "370"
+    }
+  },
+  "function_hashes": {
+    "addr_1()": "6b79ff5b",
+    "addr_2()": "fc25626f",
+    "value()": "3fa4f245"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "value",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x3fa4f245"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "addr_1",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x6b79ff5b"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "addr_2",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0xfc25626f"
+    },
+    {
+      "inputs": [
+        {
+          "name": "_addresses",
+          "type": "address[]"
+        },
+        {
+          "name": "initialValue",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "payable": true,
+      "stateMutability": "payable",
+      "type": "fallback"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/MyToken.json

@@ -0,0 +1,244 @@
+{
+  "contract_name": "MyToken",
+  "address": "0x11B0cb61776C29125cE3C2Eb86611933E8f9d5F1",
+  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "219200",
+      "executionCost": "40465",
+      "totalCost": "259665"
+    },
+    "external": {
+      "_supply()": "392",
+      "allowance(address,address)": "826",
+      "approve(address,uint256)": "22330",
+      "balanceOf(address)": "683",
+      "totalSupply()": "414",
+      "transfer(address,uint256)": "43630",
+      "transferFrom(address,address,uint256)": "64413"
+    },
+    "internal": {
+      "safeToAdd(uint256,uint256)": "24"
+    }
+  },
+  "function_hashes": {
+    "_supply()": "15945790",
+    "allowance(address,address)": "dd62ed3e",
+    "approve(address,uint256)": "095ea7b3",
+    "balanceOf(address)": "70a08231",
+    "totalSupply()": "18160ddd",
+    "transfer(address,uint256)": "a9059cbb",
+    "transferFrom(address,address,uint256)": "23b872dd"
+  },
+  "abi": [
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "approve",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x095ea7b3"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "_supply",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x15945790"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+        {
+          "name": "supply",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x18160ddd"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x23b872dd"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "who",
+          "type": "address"
+        }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x70a08231"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xa9059cbb"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "allowance",
+      "outputs": [
+        {
+          "name": "_allowance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0xdd62ed3e"
+    },
+    {
+      "inputs": [
+        {
+          "name": "initial_balance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Transfer",
+      "type": "event",
+      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Approval",
+      "type": "event",
+      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/MyToken2.json

@@ -0,0 +1,244 @@
+{
+  "contract_name": "MyToken2",
+  "address": "0x32858548ab987Bf2161A666824734eca77667fEc",
+  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "219200",
+      "executionCost": "40465",
+      "totalCost": "259665"
+    },
+    "external": {
+      "_supply()": "392",
+      "allowance(address,address)": "826",
+      "approve(address,uint256)": "22330",
+      "balanceOf(address)": "683",
+      "totalSupply()": "414",
+      "transfer(address,uint256)": "43630",
+      "transferFrom(address,address,uint256)": "64413"
+    },
+    "internal": {
+      "safeToAdd(uint256,uint256)": "24"
+    }
+  },
+  "function_hashes": {
+    "_supply()": "15945790",
+    "allowance(address,address)": "dd62ed3e",
+    "approve(address,uint256)": "095ea7b3",
+    "balanceOf(address)": "70a08231",
+    "totalSupply()": "18160ddd",
+    "transfer(address,uint256)": "a9059cbb",
+    "transferFrom(address,address,uint256)": "23b872dd"
+  },
+  "abi": [
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "approve",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x095ea7b3"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "_supply",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x15945790"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+        {
+          "name": "supply",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x18160ddd"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x23b872dd"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "who",
+          "type": "address"
+        }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x70a08231"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xa9059cbb"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "allowance",
+      "outputs": [
+        {
+          "name": "_allowance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0xdd62ed3e"
+    },
+    {
+      "inputs": [
+        {
+          "name": "initial_balance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Transfer",
+      "type": "event",
+      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Approval",
+      "type": "event",
+      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/Ownable.json

@@ -0,0 +1,58 @@
+{
+  "contract_name": "Ownable",
+  "code": "6060604052341561000f57600080fd5b60008054600160a060020a033316600160a060020a031990911617905561011e8061003b6000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029",
+  "runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029",
+  "real_runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029",
+  "swarm_hash": "67ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "57200",
+      "executionCost": "20473",
+      "totalCost": "77673"
+    },
+    "external": {
+      "owner()": "505",
+      "transferOwnership(address)": "20912"
+    }
+  },
+  "function_hashes": {
+    "owner()": "8da5cb5b",
+    "transferOwnership(address)": "f2fde38b"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/SimpleStorage.json

@@ -0,0 +1,162 @@
+{
+  "contract_name": "SimpleStorage",
+  "address": "0xbA43cfc248f026765Ce3076bDa8B932FE7BA9E17",
+  "code": "6060604052341561000f57600080fd5b60405160208061042d8339810160405280805160008054600160a060020a033316600160a060020a031990911617905560015550506103da806100536000396000f300606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029",
+  "runtime_bytecode": "606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029",
+  "real_runtime_bytecode": "606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029",
+  "swarm_hash": "6bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f6191",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "197200",
+      "executionCost": "40658",
+      "totalCost": "237858"
+    },
+    "external": {
+      "": "211",
+      "get()": "436",
+      "getS()": "infinite",
+      "owner()": "611",
+      "set(uint256)": "infinite",
+      "set2(uint256,uint256)": "20470",
+      "storedData()": "370",
+      "transferOwnership(address)": "21040"
+    }
+  },
+  "function_hashes": {
+    "get()": "6d4ce63c",
+    "getS()": "e93314ab",
+    "owner()": "8da5cb5b",
+    "set(uint256)": "60fe47b1",
+    "set2(uint256,uint256)": "4f829ee8",
+    "storedData()": "2a1afcd9",
+    "transferOwnership(address)": "f2fde38b"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "storedData",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x2a1afcd9"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "x",
+          "type": "uint256"
+        },
+        {
+          "name": "unusedGiveWarning",
+          "type": "uint256"
+        }
+      ],
+      "name": "set2",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x4f829ee8"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "x",
+          "type": "uint256"
+        }
+      ],
+      "name": "set",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x60fe47b1"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "get",
+      "outputs": [
+        {
+          "name": "retVal",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x6d4ce63c"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x8da5cb5b"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "getS",
+      "outputs": [
+        {
+          "name": "d",
+          "type": "string"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "pure",
+      "type": "function",
+      "signature": "0xe93314ab"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xf2fde38b"
+    },
+    {
+      "inputs": [
+        {
+          "name": "initialValue",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "payable": true,
+      "stateMutability": "payable",
+      "type": "fallback"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/SomeContract.json

@@ -0,0 +1,94 @@
+{
+  "contract_name": "SomeContract",
+  "address": "0x8Ceaf75fff52a769582ca880E0be830B95D1C5FC",
+  "code": "6060604052341561000f57600080fd5b6040516101da3803806101da83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610127806100b36000396000f3006060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029",
+  "runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029",
+  "real_runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029",
+  "swarm_hash": "09157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "59000",
+      "executionCost": "infinite",
+      "totalCost": "infinite"
+    },
+    "external": {
+      "": "123",
+      "addr_1()": "407",
+      "addr_2()": "429",
+      "value()": "370"
+    }
+  },
+  "function_hashes": {
+    "addr_1()": "6b79ff5b",
+    "addr_2()": "fc25626f",
+    "value()": "3fa4f245"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "value",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x3fa4f245"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "addr_1",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x6b79ff5b"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "addr_2",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0xfc25626f"
+    },
+    {
+      "inputs": [
+        {
+          "name": "_addresses",
+          "type": "address[]"
+        },
+        {
+          "name": "initialValue",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "payable": true,
+      "stateMutability": "payable",
+      "type": "fallback"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/Test.json

@@ -0,0 +1,72 @@
+{
+  "contract_name": "Test",
+  "address": "0x4CDbA232389410680E90A3450f4b7456febf3312",
+  "code": "6060604052341561000f57600080fd5b6101ff8061001e6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073d9F35C730c43e9f5E8de5AB11289a8f0f494669263771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029",
+  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029",
+  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029",
+  "swarm_hash": "5dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "102200",
+      "executionCost": "142",
+      "totalCost": "102342"
+    },
+    "external": {
+      "addr()": "367",
+      "changeAddress(address)": "20405",
+      "testAdd()": "infinite"
+    }
+  },
+  "function_hashes": {
+    "addr()": "767800de",
+    "changeAddress(address)": "fe64d6ff",
+    "testAdd()": "ae40f72f"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "addr",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x767800de"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "testAdd",
+      "outputs": [
+        {
+          "name": "_result",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "pure",
+      "type": "function",
+      "signature": "0xae40f72f"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "_addr",
+          "type": "address"
+        }
+      ],
+      "name": "changeAddress",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xfe64d6ff"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/Test2.json

@@ -0,0 +1,72 @@
+{
+  "contract_name": "Test2",
+  "address": "0x3Cd5eb0A7da804BE54AAEaA7fd4594F65CCDA089",
+  "code": "6060604052341561000f57600080fd5b6101ff8061001e6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60007368A4e859B23056B6D2967409002861158E1CBF1563771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029",
+  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029",
+  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029",
+  "swarm_hash": "244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b7",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "102200",
+      "executionCost": "142",
+      "totalCost": "102342"
+    },
+    "external": {
+      "addr()": "367",
+      "changeAddress(address)": "20405",
+      "testAdd()": "infinite"
+    }
+  },
+  "function_hashes": {
+    "addr()": "767800de",
+    "changeAddress(address)": "fe64d6ff",
+    "testAdd()": "ae40f72f"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "addr",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x767800de"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "testAdd",
+      "outputs": [
+        {
+          "name": "_result",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "pure",
+      "type": "function",
+      "signature": "0xae40f72f"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "_addr",
+          "type": "address"
+        }
+      ],
+      "name": "changeAddress",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xfe64d6ff"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/Token.json

@@ -0,0 +1,245 @@
+{
+  "contract_name": "Token",
+  "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "real_runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029",
+  "swarm_hash": "296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "219200",
+      "executionCost": "40465",
+      "totalCost": "259665"
+    },
+    "external": {
+      "_supply()": "392",
+      "allowance(address,address)": "826",
+      "approve(address,uint256)": "22330",
+      "balanceOf(address)": "683",
+      "totalSupply()": "414",
+      "transfer(address,uint256)": "43630",
+      "transferFrom(address,address,uint256)": "64413"
+    },
+    "internal": {
+      "safeToAdd(uint256,uint256)": "24"
+    }
+  },
+  "function_hashes": {
+    "_supply()": "15945790",
+    "allowance(address,address)": "dd62ed3e",
+    "approve(address,uint256)": "095ea7b3",
+    "balanceOf(address)": "70a08231",
+    "totalSupply()": "18160ddd",
+    "transfer(address,uint256)": "a9059cbb",
+    "transferFrom(address,address,uint256)": "23b872dd"
+  },
+  "abi": [
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "approve",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x095ea7b3"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "_supply",
+      "outputs": [
+        {
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x15945790"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+        {
+          "name": "supply",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x18160ddd"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0x23b872dd"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "who",
+          "type": "address"
+        }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0x70a08231"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [
+        {
+          "name": "ok",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function",
+      "signature": "0xa9059cbb"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "allowance",
+      "outputs": [
+        {
+          "name": "_allowance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function",
+      "signature": "0xdd62ed3e"
+    },
+    {
+      "inputs": [
+        {
+          "name": "initial_balance",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "constructor",
+      "signature": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Transfer",
+      "type": "event",
+      "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Approval",
+      "type": "event",
+      "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/ZAMyLib.json

@@ -0,0 +1,47 @@
+{
+  "contract_name": "ZAMyLib",
+  "address": "0xd9F35C730c43e9f5E8de5AB11289a8f0f4946692",
+  "code": "60606040523415600e57600080fd5b60898061001c6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029",
+  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029",
+  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029",
+  "swarm_hash": "ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea09",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "27400",
+      "executionCost": "76",
+      "totalCost": "27476"
+    },
+    "external": {
+      "add(uint256,uint256)": "145"
+    }
+  },
+  "function_hashes": {
+    "add(uint256,uint256)": "771602f7"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "_a",
+          "type": "uint256"
+        },
+        {
+          "name": "_b",
+          "type": "uint256"
+        }
+      ],
+      "name": "add",
+      "outputs": [
+        {
+          "name": "_c",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "pure",
+      "type": "function",
+      "signature": "0x771602f7"
+    }
+  ]
+}

test_apps/contracts_app/build/contracts/ZAMyLib2.json

@@ -0,0 +1,47 @@
+{
+  "contract_name": "ZAMyLib2",
+  "address": "0x68A4e859B23056B6D2967409002861158E1CBF15",
+  "code": "60606040523415600e57600080fd5b60898061001c6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029",
+  "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029",
+  "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029",
+  "swarm_hash": "d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af31342",
+  "gas_estimates": {
+    "creation": {
+      "codeDepositCost": "27400",
+      "executionCost": "76",
+      "totalCost": "27476"
+    },
+    "external": {
+      "add(uint256,uint256)": "145"
+    }
+  },
+  "function_hashes": {
+    "add(uint256,uint256)": "771602f7"
+  },
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "name": "_a",
+          "type": "uint256"
+        },
+        {
+          "name": "_b",
+          "type": "uint256"
+        }
+      ],
+      "name": "add",
+      "outputs": [
+        {
+          "name": "_c",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "pure",
+      "type": "function",
+      "signature": "0x771602f7"
+    }
+  ]
+}

test_apps/contracts_app/chains.json

@@ -0,0 +1,55 @@
+{
+  "0x44470396e7e576b12f96d929c1555b2404c47e48bf0232a026b43cebe97dec41": {
+    "contracts": {
+      "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": {
+        "name": "AlreadyDeployedToken",
+        "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6"
+      },
+      "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": {
+        "name": "Assert",
+        "address": "0x5c24Fd0BAB4B6EA1C0f057C770815b82EcE9013F"
+      },
+      "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": {
+        "name": "ContractArgs",
+        "address": "0xD38d37b84d83DAfEADd35D98354d47609456aEA4"
+      },
+      "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": {
+        "name": "ZAMyLib2",
+        "address": "0x68A4e859B23056B6D2967409002861158E1CBF15"
+      },
+      "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": {
+        "name": "Test2",
+        "address": "0x3Cd5eb0A7da804BE54AAEaA7fd4594F65CCDA089"
+      },
+      "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": {
+        "name": "MyToken2",
+        "address": "0x32858548ab987Bf2161A666824734eca77667fEc"
+      },
+      "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": {
+        "name": "SimpleStorage",
+        "address": "0xbA43cfc248f026765Ce3076bDa8B932FE7BA9E17"
+      },
+      "0x7eec94c1dde933c874a6bbf8f128f91bf976a6d955a0aaabb8dc7981701e8725": {
+        "name": "SomeContract",
+        "address": "0x8Ceaf75fff52a769582ca880E0be830B95D1C5FC"
+      },
+      "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": {
+        "name": "MyToken",
+        "address": "0x11B0cb61776C29125cE3C2Eb86611933E8f9d5F1"
+      },
+      "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": {
+        "name": "ZAMyLib",
+        "address": "0xd9F35C730c43e9f5E8de5AB11289a8f0f4946692"
+      },
+      "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": {
+        "name": "Test",
+        "address": "0x4CDbA232389410680E90A3450f4b7456febf3312"
+      },
+      "0x688f68c245dca1dfec941533a78f0079a7214710272e494e112f38e97e685f63": {
+        "name": "AnotherStorage",
+        "address": "0xbd1470c4E242141Ce45c82A570755bfe9965e99C"
+      }
+    },
+    "name": "development"
+  }
+}

test_apps/contracts_app/contracts.json

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

test_apps/contracts_app/development/genesis.json

@@ -1,6 +1,8 @@
 {
     "config": {
-      "homesteadBlock": 1
+      "homesteadBlock": 0,
+      "byzantiumBlock": 0,
+      "daoForkSupport": true
     },
     "nonce": "0x0000000000000042",
     "difficulty": "0x0",

test_apps/contracts_app/embark.json

@@ -0,0 +1,15 @@
+{
+  "contracts": ["contracts/**"],
+  "app": {},
+  "buildDir": "build/",
+  "config": {
+    "contracts": "contracts.json",
+    "storage": false,
+    "communication": false,
+    "webserver": false
+  },
+  "versions": {
+    "web3.js": "1.0.0-beta",
+    "solc": "0.4.17"
+  }
+}

test_apps/contracts_app/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "test_app",
+  "version": "0.0.1",
+  "lockfileVersion": 1
+}

test_apps/contracts_app/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "test_app",
+  "version": "0.0.1",
+  "description": "",
+  "main": "Gruntfile.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "homepage": "",
+  "dependencies": {}
+}