Iuri Matias
GitHub
commit
d872ce9c51
|
|
@ -1,8 +1,7 @@
|
|||
language: node_js
|
||||
node_js:
|
||||
- "7"
|
||||
- "6"
|
||||
- "5"
|
||||
- "4"
|
||||
addons:
|
||||
code_climate:
|
||||
repo_token: 7454b1a666015e244c384d19f48c34e35d1ae58c3aa428ec542f10bbcb848358
|
||||
|
|
|
|||
|
|
@ -23,7 +23,14 @@ module.exports = (grunt) ->
|
|||
src: ['test/**/*.js']
|
||||
|
||||
jshint:
|
||||
all: ['bin/embark', 'lib/**/*.js', 'js/mine.js', 'js/embark.js']
|
||||
all: ['bin/embark', 'lib/**/*.js']
|
||||
options: grunt.file.readJSON('package.json').jshintConfig
|
||||
with_overrides:
|
||||
options:
|
||||
undef: false
|
||||
esversion: 5
|
||||
files:
|
||||
src: ['js/mine.js', 'js/embark.js']
|
||||
|
||||
grunt.loadTasks "tasks"
|
||||
require('matchdep').filterAll(['grunt-*','!grunt-cli']).forEach(grunt.loadNpmTasks)
|
||||
|
|
|
|||
302
lib/cmd.js
302
lib/cmd.js
|
|
@ -1,168 +1,170 @@
|
|||
var program = require('commander');
|
||||
var colors = require('colors');
|
||||
var shelljs = require('shelljs');
|
||||
var promptly = require('promptly');
|
||||
var path = require('path');
|
||||
var Embark = require('../lib/index');
|
||||
let program = require('commander');
|
||||
let colors = require('colors');
|
||||
let shelljs = require('shelljs');
|
||||
let promptly = require('promptly');
|
||||
let path = require('path');
|
||||
let Embark = require('../lib/index');
|
||||
|
||||
var Cmd = function() {
|
||||
program.version(Embark.version);
|
||||
};
|
||||
|
||||
|
||||
Cmd.prototype.process = function(args) {
|
||||
this.newApp();
|
||||
this.demo();
|
||||
this.build();
|
||||
this.run();
|
||||
this.blockchain();
|
||||
this.simulator();
|
||||
this.test();
|
||||
this.upload();
|
||||
this.otherCommands();
|
||||
|
||||
//If no arguments are passed display help by default
|
||||
if (!process.argv.slice(2).length) {
|
||||
program.help();
|
||||
class Cmd {
|
||||
constructor() {
|
||||
program.version(Embark.version);
|
||||
}
|
||||
|
||||
program.parse(args);
|
||||
};
|
||||
|
||||
Cmd.prototype.newApp = function(name) {
|
||||
process(args) {
|
||||
this.newApp();
|
||||
this.demo();
|
||||
this.build();
|
||||
this.run();
|
||||
this.blockchain();
|
||||
this.simulator();
|
||||
this.test();
|
||||
this.upload();
|
||||
this.otherCommands();
|
||||
|
||||
var validateName = function (value) {
|
||||
try {
|
||||
if(value.match(/^[a-zA-Z\s\-]+$/)) return value;
|
||||
} catch (e) {
|
||||
throw new Error('Name must be only letters, spaces, or dashes');
|
||||
//If no arguments are passed display help by default
|
||||
if (!process.argv.slice(2).length) {
|
||||
program.help();
|
||||
}
|
||||
};
|
||||
|
||||
program
|
||||
.command('new [name]')
|
||||
.description('new application')
|
||||
.action(function (name) {
|
||||
if (name === undefined) {
|
||||
var parentDirectory = path.dirname(__dirname).split("/").pop();
|
||||
return promptly.prompt("Name your app (default is " + parentDirectory + "):", {
|
||||
default: parentDirectory,
|
||||
validator: validateName
|
||||
}, function (err, inputvalue) {
|
||||
if (err) {
|
||||
console.error('Invalid name:', err.message);
|
||||
// Manually call retry
|
||||
// The passed error has a retry method to easily prompt again.
|
||||
err.retry();
|
||||
} else {
|
||||
//slightly different assignment of name since it comes from child prompt
|
||||
Embark.generateTemplate('boilerplate', './', inputvalue);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Embark.generateTemplate('boilerplate', './', name);
|
||||
program.parse(args);
|
||||
}
|
||||
|
||||
newApp(name) {
|
||||
|
||||
let validateName = function (value) {
|
||||
try {
|
||||
if (value.match(/^[a-zA-Z\s\-]+$/)) return value;
|
||||
} catch (e) {
|
||||
throw new Error('Name must be only letters, spaces, or dashes');
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
};
|
||||
program
|
||||
.command('new [name]')
|
||||
.description('new application')
|
||||
.action(function (name) {
|
||||
if (name === undefined) {
|
||||
let parentDirectory = path.dirname(__dirname).split("/").pop();
|
||||
return promptly.prompt("Name your app (default is " + parentDirectory + "):", {
|
||||
default: parentDirectory,
|
||||
validator: validateName
|
||||
}, function (err, inputvalue) {
|
||||
if (err) {
|
||||
console.error('Invalid name:', err.message);
|
||||
// Manually call retry
|
||||
// The passed error has a retry method to easily prompt again.
|
||||
err.retry();
|
||||
} else {
|
||||
//slightly different assignment of name since it comes from child prompt
|
||||
Embark.generateTemplate('boilerplate', './', inputvalue);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Embark.generateTemplate('boilerplate', './', name);
|
||||
}
|
||||
|
||||
Cmd.prototype.demo = function() {
|
||||
program
|
||||
.command('demo')
|
||||
.description('create a working dapp with a SimpleStorage contract')
|
||||
.action(function() {
|
||||
Embark.generateTemplate('demo', './', 'embark_demo');
|
||||
});
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.build = function() {
|
||||
program
|
||||
.command('build [environment]')
|
||||
.description('deploy and build dapp at dist/ (default: development)')
|
||||
.action(function(env, options) {
|
||||
Embark.build({env: env || 'development'});
|
||||
});
|
||||
};
|
||||
demo() {
|
||||
program
|
||||
.command('demo')
|
||||
.description('create a working dapp with a SimpleStorage contract')
|
||||
.action(function () {
|
||||
Embark.generateTemplate('demo', './', 'embark_demo');
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.run = function() {
|
||||
program
|
||||
.command('run [environment]')
|
||||
.option('-p, --port [port]', 'port to run the dev webserver (default: 8000)')
|
||||
.option('-b, --host [host]', 'host to run the dev webserver (default: localhost)')
|
||||
.option('--noserver', 'disable the development webserver')
|
||||
.option('--nodashboard', 'simple mode, disables the dashboard')
|
||||
.option('--no-color', 'no colors in case it\'s needed for compatbility purposes')
|
||||
.description('run dapp (default: development)')
|
||||
.action(function(env, options) {
|
||||
Embark.run({
|
||||
env: env || 'development',
|
||||
serverPort: options.port,
|
||||
serverHost: options.host,
|
||||
runWebserver: !options.noserver,
|
||||
useDashboard: !options.nodashboard
|
||||
});
|
||||
});
|
||||
};
|
||||
build() {
|
||||
program
|
||||
.command('build [environment]')
|
||||
.description('deploy and build dapp at dist/ (default: development)')
|
||||
.action(function (env, options) {
|
||||
Embark.build({env: env || 'development'});
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.blockchain = function() {
|
||||
program
|
||||
.command('blockchain [environment]')
|
||||
.option('-c, --client [client]', 'Use a specific ethereum client or simulator (supported: geth, parity, ethersim, testrpc')
|
||||
.description('run blockchain server (default: development)')
|
||||
.action(function(env ,options) {
|
||||
Embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
Embark.blockchain(env || 'development', options.client || 'geth');
|
||||
});
|
||||
};
|
||||
run() {
|
||||
program
|
||||
.command('run [environment]')
|
||||
.option('-p, --port [port]', 'port to run the dev webserver (default: 8000)')
|
||||
.option('-b, --host [host]', 'host to run the dev webserver (default: localhost)')
|
||||
.option('--noserver', 'disable the development webserver')
|
||||
.option('--nodashboard', 'simple mode, disables the dashboard')
|
||||
.option('--no-color', 'no colors in case it\'s needed for compatbility purposes')
|
||||
.description('run dapp (default: development)')
|
||||
.action(function (env, options) {
|
||||
Embark.run({
|
||||
env: env || 'development',
|
||||
serverPort: options.port,
|
||||
serverHost: options.host,
|
||||
runWebserver: !options.noserver,
|
||||
useDashboard: !options.nodashboard
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.simulator = function() {
|
||||
program
|
||||
.command('simulator [environment]')
|
||||
.description('run a fast ethereum rpc simulator')
|
||||
.option('--testrpc', 'use testrpc as the rpc simulator [default]')
|
||||
.option('-p, --port [port]', 'port to run the rpc simulator (default: 8000)')
|
||||
.option('-h, --host [host]', 'host to run the rpc simulator (default: localhost)')
|
||||
.action(function(env, options) {
|
||||
Embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
Embark.simulator({port: options.port, host: options.host});
|
||||
});
|
||||
};
|
||||
blockchain() {
|
||||
program
|
||||
.command('blockchain [environment]')
|
||||
.option('-c, --client [client]', 'Use a specific ethereum client or simulator (supported: geth, parity, ethersim, testrpc')
|
||||
.description('run blockchain server (default: development)')
|
||||
.action(function (env, options) {
|
||||
Embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
Embark.blockchain(env || 'development', options.client || 'geth');
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.test = function() {
|
||||
program
|
||||
.command('test')
|
||||
.description('run tests')
|
||||
.action(function() {
|
||||
shelljs.exec('mocha test');
|
||||
});
|
||||
};
|
||||
simulator() {
|
||||
program
|
||||
.command('simulator [environment]')
|
||||
.description('run a fast ethereum rpc simulator')
|
||||
.option('--testrpc', 'use testrpc as the rpc simulator [default]')
|
||||
.option('-p, --port [port]', 'port to run the rpc simulator (default: 8000)')
|
||||
.option('-h, --host [host]', 'host to run the rpc simulator (default: localhost)')
|
||||
.action(function (env, options) {
|
||||
Embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
Embark.simulator({port: options.port, host: options.host});
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.upload = function() {
|
||||
program
|
||||
.command('upload [platform] [environment]')
|
||||
.description('upload your dapp to a decentralized storage. possible options: ipfs, swarm (e.g embark upload swarm)')
|
||||
.action(function(platform, env, options) {
|
||||
// TODO: get env in cmd line as well
|
||||
Embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json', interceptLogs: false
|
||||
});
|
||||
Embark.upload(platform);
|
||||
});
|
||||
};
|
||||
test() {
|
||||
program
|
||||
.command('test')
|
||||
.description('run tests')
|
||||
.action(function () {
|
||||
shelljs.exec('mocha test');
|
||||
});
|
||||
}
|
||||
|
||||
Cmd.prototype.otherCommands = function() {
|
||||
program
|
||||
.action(function(env){
|
||||
console.log('unknown command "%s"'.red, env);
|
||||
console.log("type embark --help to see the available commands");
|
||||
process.exit(0);
|
||||
});
|
||||
};
|
||||
upload() {
|
||||
program
|
||||
.command('upload [platform] [environment]')
|
||||
.description('upload your dapp to a decentralized storage. possible options: ipfs, swarm (e.g embark upload swarm)')
|
||||
.action(function (platform, env, options) {
|
||||
// TODO: get env in cmd line as well
|
||||
Embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json', interceptLogs: false
|
||||
});
|
||||
Embark.upload(platform);
|
||||
});
|
||||
}
|
||||
|
||||
otherCommands() {
|
||||
program
|
||||
.action(function (env) {
|
||||
console.log('unknown command "%s"'.red, env);
|
||||
console.log("type embark --help to see the available commands");
|
||||
process.exit(0);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Cmd;
|
||||
|
|
|
|||
|
|
@ -1,88 +1,11 @@
|
|||
var colors = require('colors');
|
||||
var shelljs = require('shelljs');
|
||||
let colors = require('colors');
|
||||
let shelljs = require('shelljs');
|
||||
|
||||
var fs = require('../../core/fs.js');
|
||||
let fs = require('../../core/fs.js');
|
||||
|
||||
var GethCommands = require('./geth_commands.js');
|
||||
let GethCommands = require('./geth_commands.js');
|
||||
|
||||
/*eslint complexity: ["error", 22]*/
|
||||
var Blockchain = function(options) {
|
||||
this.blockchainConfig = options.blockchainConfig;
|
||||
this.env = options.env || 'development';
|
||||
this.client = options.client;
|
||||
|
||||
this.config = {
|
||||
geth_bin: this.blockchainConfig.geth_bin || 'geth',
|
||||
networkType: this.blockchainConfig.networkType || 'custom',
|
||||
genesisBlock: this.blockchainConfig.genesisBlock || false,
|
||||
datadir: this.blockchainConfig.datadir || false,
|
||||
mineWhenNeeded: this.blockchainConfig.mineWhenNeeded || false,
|
||||
rpcHost: this.blockchainConfig.rpcHost || 'localhost',
|
||||
rpcPort: this.blockchainConfig.rpcPort || 8545,
|
||||
rpcCorsDomain: this.blockchainConfig.rpcCorsDomain || false,
|
||||
networkId: this.blockchainConfig.networkId || 12301,
|
||||
port: this.blockchainConfig.port || 30303,
|
||||
nodiscover: this.blockchainConfig.nodiscover || false,
|
||||
mine: this.blockchainConfig.mine || false,
|
||||
account: this.blockchainConfig.account || {},
|
||||
whisper: (this.blockchainConfig.whisper === undefined) || this.blockchainConfig.whisper,
|
||||
maxpeers: ((this.blockchainConfig.maxpeers === 0) ? 0 : (this.blockchainConfig.maxpeers || 25)),
|
||||
bootnodes: this.blockchainConfig.bootnodes || "",
|
||||
rpcApi: (this.blockchainConfig.rpcApi || ['eth', 'web3', 'net']),
|
||||
vmdebug: this.blockchainConfig.vmdebug || false
|
||||
};
|
||||
|
||||
this.client = new options.client({config: this.config, env: this.env});
|
||||
};
|
||||
|
||||
Blockchain.prototype.runCommand = function(cmd) {
|
||||
console.log(("running: " + cmd.underline).green);
|
||||
return shelljs.exec(cmd);
|
||||
};
|
||||
|
||||
Blockchain.prototype.run = function() {
|
||||
var self = this;
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log(("Embark Blockchain Using: " + this.client.name.underline).magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
var address = this.initChainAndGetAddress();
|
||||
this.client.mainCommand(address, function(cmd) {
|
||||
shelljs.exec(cmd, {async : true});
|
||||
});
|
||||
};
|
||||
|
||||
Blockchain.prototype.initChainAndGetAddress = function() {
|
||||
var address = null, result;
|
||||
|
||||
// ensure datadir exists, bypassing the interactive liabilities prompt.
|
||||
this.datadir = '.embark/' + this.env + '/datadir';
|
||||
fs.mkdirpSync(this.datadir);
|
||||
|
||||
// copy mining script
|
||||
fs.copySync(fs.embarkPath("js"), ".embark/" + this.env + "/js", {overwrite: true});
|
||||
|
||||
// check if an account already exists, create one if not, return address
|
||||
result = this.runCommand(this.client.listAccountsCommand());
|
||||
if (result.output === undefined || result.output === '' || result.output.indexOf("Fatal") >= 0) {
|
||||
console.log("no accounts found".green);
|
||||
if (this.config.genesisBlock) {
|
||||
console.log("initializing genesis block".green);
|
||||
result = this.runCommand(this.client.initGenesisCommmand());
|
||||
}
|
||||
|
||||
result = this.runCommand(this.client.newAccountCommand());
|
||||
address = result.output.match(/{(\w+)}/)[1];
|
||||
} else {
|
||||
console.log("already initialized".green);
|
||||
address = result.output.match(/{(\w+)}/)[1];
|
||||
}
|
||||
|
||||
return address;
|
||||
};
|
||||
|
||||
var BlockchainClient = function(blockchainConfig, client, env) {
|
||||
let BlockchainClient = function(blockchainConfig, client, env) {
|
||||
if (client === 'geth') {
|
||||
return new Blockchain({blockchainConfig: blockchainConfig, client: GethCommands, env: env});
|
||||
} else {
|
||||
|
|
@ -90,5 +13,82 @@ var BlockchainClient = function(blockchainConfig, client, env) {
|
|||
}
|
||||
};
|
||||
|
||||
/*eslint complexity: ["error", 22]*/
|
||||
class Blockchain {
|
||||
constructor(options) {
|
||||
this.blockchainConfig = options.blockchainConfig;
|
||||
this.env = options.env || 'development';
|
||||
this.client = options.client;
|
||||
|
||||
this.config = {
|
||||
geth_bin: this.blockchainConfig.geth_bin || 'geth',
|
||||
networkType: this.blockchainConfig.networkType || 'custom',
|
||||
genesisBlock: this.blockchainConfig.genesisBlock || false,
|
||||
datadir: this.blockchainConfig.datadir || false,
|
||||
mineWhenNeeded: this.blockchainConfig.mineWhenNeeded || false,
|
||||
rpcHost: this.blockchainConfig.rpcHost || 'localhost',
|
||||
rpcPort: this.blockchainConfig.rpcPort || 8545,
|
||||
rpcCorsDomain: this.blockchainConfig.rpcCorsDomain || false,
|
||||
networkId: this.blockchainConfig.networkId || 12301,
|
||||
port: this.blockchainConfig.port || 30303,
|
||||
nodiscover: this.blockchainConfig.nodiscover || false,
|
||||
mine: this.blockchainConfig.mine || false,
|
||||
account: this.blockchainConfig.account || {},
|
||||
whisper: (this.blockchainConfig.whisper === undefined) || this.blockchainConfig.whisper,
|
||||
maxpeers: ((this.blockchainConfig.maxpeers === 0) ? 0 : (this.blockchainConfig.maxpeers || 25)),
|
||||
bootnodes: this.blockchainConfig.bootnodes || "",
|
||||
rpcApi: (this.blockchainConfig.rpcApi || ['eth', 'web3', 'net']),
|
||||
vmdebug: this.blockchainConfig.vmdebug || false
|
||||
};
|
||||
}
|
||||
|
||||
static runCommand(cmd) {
|
||||
console.log(("running: " + cmd.underline).green);
|
||||
return shelljs.exec(cmd);
|
||||
}
|
||||
|
||||
run () {
|
||||
let self = this;
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log(("Embark Blockchain Using: " + this.client.name.underline).magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
let address = this.initChainAndGetAddress();
|
||||
this.client.mainCommand(address, function(cmd) {
|
||||
shelljs.exec(cmd, {async : true});
|
||||
});
|
||||
}
|
||||
|
||||
initChainAndGetAddress() {
|
||||
let address = null, result;
|
||||
|
||||
// ensure datadir exists, bypassing the interactive liabilities prompt.
|
||||
this.datadir = '.embark/' + this.env + '/datadir';
|
||||
fs.mkdirpSync(this.datadir);
|
||||
|
||||
// copy mining script
|
||||
fs.copySync(fs.embarkPath("js"), ".embark/" + this.env + "/js", {overwrite: true});
|
||||
|
||||
// check if an account already exists, create one if not, return address
|
||||
result = this.runCommand(this.client.listAccountsCommand());
|
||||
if (result.output === undefined || result.output === '' || result.output.indexOf("Fatal") >= 0) {
|
||||
console.log("no accounts found".green);
|
||||
if (this.config.genesisBlock) {
|
||||
console.log("initializing genesis block".green);
|
||||
result = this.runCommand(this.client.initGenesisCommmand());
|
||||
}
|
||||
|
||||
result = this.runCommand(this.client.newAccountCommand());
|
||||
address = result.output.match(/{(\w+)}/)[1];
|
||||
} else {
|
||||
console.log("already initialized".green);
|
||||
address = result.output.match(/{(\w+)}/)[1];
|
||||
}
|
||||
|
||||
return address;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = BlockchainClient;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,164 +1,166 @@
|
|||
var async = require('async');
|
||||
let async = require('async');
|
||||
|
||||
// TODO: make all of this async
|
||||
var GethCommands = function(options) {
|
||||
this.config = options.config;
|
||||
this.env = options.env || 'development';
|
||||
this.name = "Go-Ethereum (https://github.com/ethereum/go-ethereum)";
|
||||
this.geth_bin = this.config.geth_bin || "geth";
|
||||
};
|
||||
|
||||
GethCommands.prototype.commonOptions = function() {
|
||||
var config = this.config;
|
||||
var cmd = "";
|
||||
|
||||
cmd += this.determineNetworkType(config);
|
||||
|
||||
if (config.datadir) {
|
||||
cmd += "--datadir=\"" + config.datadir + "\" ";
|
||||
class GethCommands {
|
||||
constructor(options) {
|
||||
this.config = options.config;
|
||||
this.env = options.env || 'development';
|
||||
this.name = "Go-Ethereum (https://github.com/ethereum/go-ethereum)";
|
||||
this.geth_bin = this.config.geth_bin || "geth";
|
||||
}
|
||||
|
||||
if (config.light) {
|
||||
cmd += "--light ";
|
||||
commonOptions() {
|
||||
let config = this.config;
|
||||
let cmd = "";
|
||||
|
||||
cmd += this.determineNetworkType(config);
|
||||
|
||||
if (config.datadir) {
|
||||
cmd += "--datadir=\"" + config.datadir + "\" ";
|
||||
}
|
||||
|
||||
if (config.light) {
|
||||
cmd += "--light ";
|
||||
}
|
||||
|
||||
if (config.fast) {
|
||||
cmd += "--fast ";
|
||||
}
|
||||
|
||||
if (config.account && config.account.password) {
|
||||
cmd += "--password " + config.account.password + " ";
|
||||
}
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
if (config.fast) {
|
||||
cmd += "--fast ";
|
||||
determineNetworkType(config) {
|
||||
let cmd = "";
|
||||
if (config.networkType === 'testnet') {
|
||||
cmd += "--testnet ";
|
||||
} else if (config.networkType === 'olympic') {
|
||||
cmd += "--olympic ";
|
||||
} else if (config.networkType === 'custom') {
|
||||
cmd += "--networkid " + config.networkId + " ";
|
||||
}
|
||||
return cmd;
|
||||
}
|
||||
|
||||
if (config.account && config.account.password) {
|
||||
cmd += "--password " + config.account.password + " ";
|
||||
initGenesisCommmand() {
|
||||
let config = this.config;
|
||||
let cmd = this.geth_bin + " " + this.commonOptions();
|
||||
|
||||
if (config.genesisBlock) {
|
||||
cmd += "init \"" + config.genesisBlock + "\" ";
|
||||
}
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
return cmd;
|
||||
};
|
||||
|
||||
GethCommands.prototype.determineNetworkType = function(config) {
|
||||
var cmd = "";
|
||||
if (config.networkType === 'testnet') {
|
||||
cmd += "--testnet ";
|
||||
} else if (config.networkType === 'olympic') {
|
||||
cmd += "--olympic ";
|
||||
} else if (config.networkType === 'custom') {
|
||||
cmd += "--networkid " + config.networkId + " ";
|
||||
}
|
||||
return cmd;
|
||||
};
|
||||
|
||||
GethCommands.prototype.initGenesisCommmand = function() {
|
||||
var config = this.config;
|
||||
var cmd = this.geth_bin + " " + this.commonOptions();
|
||||
|
||||
if (config.genesisBlock) {
|
||||
cmd += "init \"" + config.genesisBlock + "\" ";
|
||||
newAccountCommand() {
|
||||
return this.geth_bin + " " + this.commonOptions() + "account new ";
|
||||
}
|
||||
|
||||
return cmd;
|
||||
};
|
||||
listAccountsCommand() {
|
||||
return this.geth_bin + " " + this.commonOptions() + "account list ";
|
||||
}
|
||||
|
||||
GethCommands.prototype.newAccountCommand = function() {
|
||||
return this.geth_bin + " " + this.commonOptions() + "account new ";
|
||||
};
|
||||
determineRpcOptions(config) {
|
||||
let cmd = "";
|
||||
|
||||
GethCommands.prototype.listAccountsCommand = function() {
|
||||
return this.geth_bin + " " + this.commonOptions() + "account list ";
|
||||
};
|
||||
|
||||
GethCommands.prototype.determineRpcOptions = function(config) {
|
||||
var cmd = "";
|
||||
|
||||
cmd += "--port " + config.port + " ";
|
||||
cmd += "--rpc ";
|
||||
cmd += "--rpcport " + config.rpcPort + " ";
|
||||
cmd += "--rpcaddr " + config.rpcHost + " ";
|
||||
if (config.rpcCorsDomain) {
|
||||
if (config.rpcCorsDomain === '*') {
|
||||
cmd += "--port " + config.port + " ";
|
||||
cmd += "--rpc ";
|
||||
cmd += "--rpcport " + config.rpcPort + " ";
|
||||
cmd += "--rpcaddr " + config.rpcHost + " ";
|
||||
if (config.rpcCorsDomain) {
|
||||
if (config.rpcCorsDomain === '*') {
|
||||
console.log('==================================');
|
||||
console.log('make sure you know what you are doing');
|
||||
console.log('==================================');
|
||||
}
|
||||
cmd += "--rpccorsdomain=\"" + config.rpcCorsDomain + "\" ";
|
||||
} else {
|
||||
console.log('==================================');
|
||||
console.log('make sure you know what you are doing');
|
||||
console.log('warning: cors is not set');
|
||||
console.log('==================================');
|
||||
}
|
||||
cmd += "--rpccorsdomain=\"" + config.rpcCorsDomain + "\" ";
|
||||
} else {
|
||||
console.log('==================================');
|
||||
console.log('warning: cors is not set');
|
||||
console.log('==================================');
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
return cmd;
|
||||
};
|
||||
mainCommand(address, done) {
|
||||
let self = this;
|
||||
let config = this.config;
|
||||
let rpc_api = (this.config.rpcApi || ['eth', 'web3', 'net']);
|
||||
|
||||
GethCommands.prototype.mainCommand = function(address, done) {
|
||||
var self = this;
|
||||
var config = this.config;
|
||||
var rpc_api = (this.config.rpcApi || ['eth', 'web3', 'net']);
|
||||
|
||||
async.series([
|
||||
function commonOptions(callback) {
|
||||
var cmd = self.commonOptions();
|
||||
callback(null, cmd);
|
||||
},
|
||||
function rpcOptions(callback) {
|
||||
var cmd = self.determineRpcOptions(self.config);
|
||||
callback(null, cmd);
|
||||
},
|
||||
function dontGetPeers(callback) {
|
||||
if (config.nodiscover) {
|
||||
return callback(null, "--nodiscover");
|
||||
async.series([
|
||||
function commonOptions(callback) {
|
||||
let cmd = self.commonOptions();
|
||||
callback(null, cmd);
|
||||
},
|
||||
function rpcOptions(callback) {
|
||||
let cmd = self.determineRpcOptions(self.config);
|
||||
callback(null, cmd);
|
||||
},
|
||||
function dontGetPeers(callback) {
|
||||
if (config.nodiscover) {
|
||||
return callback(null, "--nodiscover");
|
||||
}
|
||||
callback(null, "");
|
||||
},
|
||||
function vmDebug(callback) {
|
||||
if (config.vmdebug) {
|
||||
return callback(null, "--vmdebug");
|
||||
}
|
||||
callback(null, "");
|
||||
},
|
||||
function maxPeers(callback) {
|
||||
let cmd = "--maxpeers " + config.maxpeers;
|
||||
callback(null, cmd);
|
||||
},
|
||||
function mining(callback) {
|
||||
if (config.mineWhenNeeded || config.mine) {
|
||||
return callback(null, "--mine ");
|
||||
}
|
||||
callback("");
|
||||
},
|
||||
function bootnodes(callback) {
|
||||
if (config.bootnodes && config.bootnodes !== "" && config.bootnodes !== []) {
|
||||
return callback(null, "--bootnodes " + config.bootnodes);
|
||||
}
|
||||
callback("");
|
||||
},
|
||||
function whisper(callback) {
|
||||
if (config.whisper) {
|
||||
rpc_api.push('shh');
|
||||
return callback(null, "--shh ");
|
||||
}
|
||||
callback("");
|
||||
},
|
||||
function rpcApi(callback) {
|
||||
callback(null, '--rpcapi "' + rpc_api.join(',') + '"');
|
||||
},
|
||||
function accountToUnlock(callback) {
|
||||
let accountAddress = config.account.address || address;
|
||||
if (accountAddress) {
|
||||
return callback(null, "--unlock=" + accountAddress);
|
||||
}
|
||||
callback(null, "");
|
||||
},
|
||||
function mineWhenNeeded(callback) {
|
||||
if (config.mineWhenNeeded) {
|
||||
return callback(null, "js .embark/" + self.env + "/js/mine.js");
|
||||
}
|
||||
callback(null, "");
|
||||
}
|
||||
callback(null, "");
|
||||
},
|
||||
function vmDebug(callback) {
|
||||
if (config.vmdebug) {
|
||||
return callback(null, "--vmdebug");
|
||||
], function (err, results) {
|
||||
if (err) {
|
||||
throw new Error(err.message);
|
||||
}
|
||||
callback(null, "");
|
||||
},
|
||||
function maxPeers(callback) {
|
||||
var cmd = "--maxpeers " + config.maxpeers;
|
||||
callback(null, cmd);
|
||||
},
|
||||
function mining(callback) {
|
||||
if (config.mineWhenNeeded || config.mine) {
|
||||
return callback(null, "--mine ");
|
||||
}
|
||||
callback("");
|
||||
},
|
||||
function bootnodes(callback) {
|
||||
if (config.bootnodes && config.bootnodes !== "" && config.bootnodes !== []) {
|
||||
return callback(null, "--bootnodes " + config.bootnodes);
|
||||
}
|
||||
callback("");
|
||||
},
|
||||
function whisper(callback) {
|
||||
if (config.whisper) {
|
||||
rpc_api.push('shh');
|
||||
return callback(null, "--shh ");
|
||||
}
|
||||
callback("");
|
||||
},
|
||||
function rpcApi(callback) {
|
||||
callback(null, '--rpcapi "' + rpc_api.join(',') + '"');
|
||||
},
|
||||
function accountToUnlock(callback) {
|
||||
var accountAddress = config.account.address || address;
|
||||
if (accountAddress) {
|
||||
return callback(null, "--unlock=" + accountAddress);
|
||||
}
|
||||
callback(null, "");
|
||||
},
|
||||
function mineWhenNeeded(callback) {
|
||||
if (config.mineWhenNeeded) {
|
||||
return callback(null, "js .embark/" + self.env + "/js/mine.js");
|
||||
}
|
||||
callback(null, "");
|
||||
}
|
||||
], function(err, results) {
|
||||
if (err) {
|
||||
throw new Error(err.message);
|
||||
}
|
||||
done(self.geth_bin + " " + results.join(" "));
|
||||
});
|
||||
};
|
||||
done(self.geth_bin + " " + results.join(" "));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = GethCommands;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
var shelljs = require('shelljs');
|
||||
let shelljs = require('shelljs');
|
||||
|
||||
var Simulator = function(options) {
|
||||
this.blockchainConfig = options.blockchainConfig;
|
||||
};
|
||||
class Simulator {
|
||||
constructor(options) {
|
||||
this.blockchainConfig = options.blockchainConfig;
|
||||
}
|
||||
|
||||
Simulator.prototype.run = function(options) {
|
||||
var cmds = [];
|
||||
run(options) {
|
||||
let cmds = [];
|
||||
|
||||
cmds.push("-p " + (this.blockchainConfig.rpcPort || options.port || 8545));
|
||||
cmds.push("-h " + (this.blockchainConfig.rpcHost || options.host || 'localhost'));
|
||||
cmds.push("-a " + (options.num || 10));
|
||||
cmds.push("-p " + (this.blockchainConfig.rpcPort || options.port || 8545));
|
||||
cmds.push("-h " + (this.blockchainConfig.rpcHost || options.host || 'localhost'));
|
||||
cmds.push("-a " + (options.num || 10));
|
||||
|
||||
shelljs.exec('testrpc ' + cmds.join(' '), {async : true});
|
||||
};
|
||||
shelljs.exec('testrpc ' + cmds.join(' '), {async : true});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Simulator;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,35 @@
|
|||
var fs = require('../core/fs.js');
|
||||
var utils = require('../utils/utils.js');
|
||||
let fs = require('../core/fs.js');
|
||||
let utils = require('../utils/utils.js');
|
||||
|
||||
var TemplateGenerator = function(templateName) {
|
||||
this.templateName = templateName;
|
||||
};
|
||||
|
||||
TemplateGenerator.prototype.generate = function(destinationFolder, name) {
|
||||
var templatePath = fs.embarkPath(this.templateName);
|
||||
console.log('Initializing Embark Template....'.green);
|
||||
var fspath = utils.joinPath(destinationFolder, name);
|
||||
|
||||
fs.copySync(templatePath, fspath);
|
||||
utils.cd(fspath);
|
||||
utils.sed('package.json', '%APP_NAME%', name);
|
||||
|
||||
console.log('Installing packages.. this can take a few seconds'.green);
|
||||
utils.runCmd('npm install');
|
||||
console.log('Init complete'.green);
|
||||
console.log('\nApp ready at '.green + fspath);
|
||||
|
||||
if (name === 'embark_demo') {
|
||||
console.log('-------------------'.yellow);
|
||||
console.log('Next steps:'.green);
|
||||
console.log(('-> ' + ('cd ' + fspath).bold.cyan).green);
|
||||
console.log('-> '.green + 'embark blockchain'.bold.cyan + ' or '.green + 'embark simulator'.bold.cyan);
|
||||
console.log('open another console in the same directory and run'.green);
|
||||
console.log('-> '.green + 'embark run'.bold.cyan);
|
||||
console.log('For more info go to http://github.com/iurimatias/embark-framework'.green);
|
||||
class TemplateGenerator {
|
||||
constuctor(templateName) {
|
||||
this.templateName = templateName;
|
||||
}
|
||||
};
|
||||
|
||||
generate(destinationFolder, name) {
|
||||
let templatePath = fs.embarkPath(this.templateName);
|
||||
console.log('Initializing Embark Template....'.green);
|
||||
let fspath = utils.joinPath(destinationFolder, name);
|
||||
|
||||
fs.copySync(templatePath, fspath);
|
||||
utils.cd(fspath);
|
||||
utils.sed('package.json', '%APP_NAME%', name);
|
||||
|
||||
console.log('Installing packages.. this can take a few seconds'.green);
|
||||
utils.runCmd('npm install');
|
||||
console.log('Init complete'.green);
|
||||
console.log('\nApp ready at '.green + fspath);
|
||||
|
||||
if (name === 'embark_demo') {
|
||||
console.log('-------------------'.yellow);
|
||||
console.log('Next steps:'.green);
|
||||
console.log(('-> ' + ('cd ' + fspath).bold.cyan).green);
|
||||
console.log('-> '.green + 'embark blockchain'.bold.cyan + ' or '.green + 'embark simulator'.bold.cyan);
|
||||
console.log('open another console in the same directory and run'.green);
|
||||
console.log('-> '.green + 'embark run'.bold.cyan);
|
||||
console.log('For more info go to http://github.com/iurimatias/embark-framework'.green);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = TemplateGenerator;
|
||||
|
|
|
|||
|
|
@ -1,117 +1,118 @@
|
|||
|
||||
var ABIGenerator = function(options) {
|
||||
this.blockchainConfig = options.blockchainConfig || {};
|
||||
this.storageConfig = options.storageConfig || {};
|
||||
this.communicationConfig = options.communicationConfig || {};
|
||||
this.contractsManager = options.contractsManager;
|
||||
this.rpcHost = options.blockchainConfig && options.blockchainConfig.rpcHost;
|
||||
this.rpcPort = options.blockchainConfig && options.blockchainConfig.rpcPort;
|
||||
this.plugins = options.plugins;
|
||||
};
|
||||
|
||||
ABIGenerator.prototype.generateProvider = function() {
|
||||
var self = this;
|
||||
var result = "";
|
||||
var providerPlugins;
|
||||
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
return "";
|
||||
class ABIGenerator {
|
||||
constructor(options) {
|
||||
this.blockchainConfig = options.blockchainConfig || {};
|
||||
this.storageConfig = options.storageConfig || {};
|
||||
this.communicationConfig = options.communicationConfig || {};
|
||||
this.contractsManager = options.contractsManager;
|
||||
this.rpcHost = options.blockchainConfig && options.blockchainConfig.rpcHost;
|
||||
this.rpcPort = options.blockchainConfig && options.blockchainConfig.rpcPort;
|
||||
this.plugins = options.plugins;
|
||||
}
|
||||
|
||||
if (this.plugins) {
|
||||
providerPlugins = this.plugins.getPluginsFor('clientWeb3Provider');
|
||||
generateProvider() {
|
||||
let self = this;
|
||||
let result = "";
|
||||
let providerPlugins;
|
||||
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if (this.plugins) {
|
||||
providerPlugins = this.plugins.getPluginsFor('clientWeb3Provider');
|
||||
}
|
||||
|
||||
if (this.plugins && providerPlugins.length > 0) {
|
||||
providerPlugins.forEach(function (plugin) {
|
||||
result += plugin.generateProvider(self) + "\n";
|
||||
});
|
||||
} else {
|
||||
result += "\nif (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined') {";
|
||||
result += '\n\tweb3 = new Web3(web3.currentProvider);';
|
||||
result += "\n} else if (typeof Web3 !== 'undefined') {";
|
||||
result += '\n\tweb3 = new Web3(new Web3.providers.HttpProvider("http://' + this.rpcHost + ':' + this.rpcPort + '"));';
|
||||
result += '\n}';
|
||||
result += "\nweb3.eth.defaultAccount = web3.eth.accounts[0];";
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
if (this.plugins && providerPlugins.length > 0) {
|
||||
providerPlugins.forEach(function(plugin) {
|
||||
result += plugin.generateProvider(self) + "\n";
|
||||
});
|
||||
} else {
|
||||
result += "\nif (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined') {";
|
||||
result += '\n\tweb3 = new Web3(web3.currentProvider);';
|
||||
result += "\n} else if (typeof Web3 !== 'undefined') {";
|
||||
result += '\n\tweb3 = new Web3(new Web3.providers.HttpProvider("http://' + this.rpcHost + ':' + this.rpcPort + '"));';
|
||||
result += '\n}';
|
||||
result += "\nweb3.eth.defaultAccount = web3.eth.accounts[0];";
|
||||
}
|
||||
generateContracts(useEmbarkJS) {
|
||||
let self = this;
|
||||
let result = "\n";
|
||||
let contractsPlugins;
|
||||
|
||||
return result;
|
||||
};
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
return "";
|
||||
}
|
||||
|
||||
ABIGenerator.prototype.generateContracts = function(useEmbarkJS) {
|
||||
var self = this;
|
||||
var result = "\n";
|
||||
var contractsPlugins;
|
||||
if (this.plugins) {
|
||||
contractsPlugins = this.plugins.getPluginsFor('contractGeneration');
|
||||
}
|
||||
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
return "";
|
||||
}
|
||||
if (this.plugins && contractsPlugins.length > 0) {
|
||||
contractsPlugins.forEach(function (plugin) {
|
||||
result += plugin.generateContracts({contracts: self.contractsManager.contracts});
|
||||
});
|
||||
} else {
|
||||
for (let className in this.contractsManager.contracts) {
|
||||
let contract = this.contractsManager.contracts[className];
|
||||
|
||||
if (this.plugins) {
|
||||
contractsPlugins = this.plugins.getPluginsFor('contractGeneration');
|
||||
}
|
||||
let abi = JSON.stringify(contract.abiDefinition);
|
||||
let gasEstimates = JSON.stringify(contract.gasEstimates);
|
||||
|
||||
if (this.plugins && contractsPlugins.length > 0) {
|
||||
contractsPlugins.forEach(function(plugin) {
|
||||
result += plugin.generateContracts({contracts: self.contractsManager.contracts});
|
||||
});
|
||||
} else {
|
||||
for(var className in this.contractsManager.contracts) {
|
||||
var contract = this.contractsManager.contracts[className];
|
||||
|
||||
var abi = JSON.stringify(contract.abiDefinition);
|
||||
var gasEstimates = JSON.stringify(contract.gasEstimates);
|
||||
|
||||
if (useEmbarkJS) {
|
||||
result += "\n" + className + " = new EmbarkJS.Contract({abi: " + abi + ", address: '" + contract.deployedAddress + "', code: '" + contract.code + "', gasEstimates: " + gasEstimates + "});";
|
||||
} else {
|
||||
result += "\n" + className + "Abi = " + abi + ";";
|
||||
result += "\n" + className + "Contract = web3.eth.contract(" + className + "Abi);";
|
||||
result += "\n" + className + " = " + className + "Contract.at('" + contract.deployedAddress + "');";
|
||||
if (useEmbarkJS) {
|
||||
result += "\n" + className + " = new EmbarkJS.Contract({abi: " + abi + ", address: '" + contract.deployedAddress + "', code: '" + contract.code + "', gasEstimates: " + gasEstimates + "});";
|
||||
} else {
|
||||
result += "\n" + className + "Abi = " + abi + ";";
|
||||
result += "\n" + className + "Contract = web3.eth.contract(" + className + "Abi);";
|
||||
result += "\n" + className + " = " + className + "Contract.at('" + contract.deployedAddress + "');";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
generateStorageInitialization(useEmbarkJS) {
|
||||
let self = this;
|
||||
let result = "\n";
|
||||
|
||||
ABIGenerator.prototype.generateStorageInitialization = function(useEmbarkJS) {
|
||||
var self = this;
|
||||
var result = "\n";
|
||||
if (!useEmbarkJS || self.storageConfig === {}) return "";
|
||||
|
||||
if (!useEmbarkJS || self.storageConfig === {}) return "";
|
||||
if (self.storageConfig.provider === 'ipfs' && self.storageConfig.enabled === true) {
|
||||
result += "\nEmbarkJS.Storage.setProvider('" + self.storageConfig.provider + "', {server: '" + self.storageConfig.host + "', port: '" + self.storageConfig.port + "'});";
|
||||
}
|
||||
|
||||
if (self.storageConfig.provider === 'ipfs' && self.storageConfig.enabled === true) {
|
||||
result += "\nEmbarkJS.Storage.setProvider('" + self.storageConfig.provider + "', {server: '" + self.storageConfig.host + "', port: '" + self.storageConfig.port + "'});";
|
||||
return result;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
generateCommunicationInitialization(useEmbarkJS) {
|
||||
let self = this;
|
||||
let result = "\n";
|
||||
|
||||
ABIGenerator.prototype.generateCommunicationInitialization = function(useEmbarkJS) {
|
||||
var self = this;
|
||||
var result = "\n";
|
||||
if (!useEmbarkJS || self.communicationConfig === {}) return "";
|
||||
|
||||
if (!useEmbarkJS || self.communicationConfig === {}) return "";
|
||||
if (self.communicationConfig.provider === 'whisper' && self.communicationConfig.enabled === true) {
|
||||
result += "\nEmbarkJS.Messages.setProvider('" + self.communicationConfig.provider + "');";
|
||||
} else if (self.communicationConfig.provider === 'orbit' && self.communicationConfig.enabled === true) {
|
||||
result += "\nEmbarkJS.Messages.setProvider('" + self.communicationConfig.provider + "', {server: '" + self.communicationConfig.host + "', port: '" + self.communicationConfig.port + "'});";
|
||||
}
|
||||
|
||||
if (self.communicationConfig.provider === 'whisper' && self.communicationConfig.enabled === true) {
|
||||
result += "\nEmbarkJS.Messages.setProvider('" + self.communicationConfig.provider + "');";
|
||||
} else if (self.communicationConfig.provider === 'orbit' && self.communicationConfig.enabled === true) {
|
||||
result += "\nEmbarkJS.Messages.setProvider('" + self.communicationConfig.provider + "', {server: '" + self.communicationConfig.host + "', port: '" + self.communicationConfig.port + "'});";
|
||||
return result;
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
generateABI(options) {
|
||||
let result = "";
|
||||
|
||||
ABIGenerator.prototype.generateABI = function(options) {
|
||||
var result = "";
|
||||
result += this.generateProvider();
|
||||
result += this.generateContracts(options.useEmbarkJS);
|
||||
result += this.generateStorageInitialization(options.useEmbarkJS);
|
||||
result += this.generateCommunicationInitialization(options.useEmbarkJS);
|
||||
|
||||
result += this.generateProvider();
|
||||
result += this.generateContracts(options.useEmbarkJS);
|
||||
result += this.generateStorageInitialization(options.useEmbarkJS);
|
||||
result += this.generateCommunicationInitialization(options.useEmbarkJS);
|
||||
|
||||
return result;
|
||||
};
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ABIGenerator;
|
||||
|
|
|
|||
|
|
@ -1,107 +1,108 @@
|
|||
/*jshint esversion: 6, loopfunc: true */
|
||||
var async = require('../utils/async_extend.js');
|
||||
var SolcW = require('./solcW.js');
|
||||
let async = require('../utils/async_extend.js');
|
||||
let SolcW = require('./solcW.js');
|
||||
|
||||
var Compiler = function(options) {
|
||||
this.plugins = options.plugins;
|
||||
this.logger = options.logger;
|
||||
};
|
||||
|
||||
Compiler.prototype.compile_contracts = function(contractFiles, cb) {
|
||||
var self = this;
|
||||
|
||||
var available_compilers = {
|
||||
//".se": this.compile_serpent
|
||||
".sol": this.compile_solidity.bind(this)
|
||||
};
|
||||
|
||||
if (this.plugins) {
|
||||
var compilerPlugins = this.plugins.getPluginsFor('compilers');
|
||||
if (compilerPlugins.length > 0) {
|
||||
compilerPlugins.forEach(function(plugin) {
|
||||
plugin.compilers.forEach(function(compilerObject) {
|
||||
available_compilers[compilerObject.extension] = compilerObject.cb;
|
||||
});
|
||||
});
|
||||
}
|
||||
class Compiler {
|
||||
constructor(options) {
|
||||
this.plugins = options.plugins;
|
||||
this.logger = options.logger;
|
||||
}
|
||||
|
||||
var compiledObject = {};
|
||||
compile_contracts(contractFiles, cb) {
|
||||
|
||||
async.eachObject(available_compilers,
|
||||
function(extension, compiler, callback) {
|
||||
// TODO: warn about files it doesn't know how to compile
|
||||
var matchingFiles = contractFiles.filter(function(file) {
|
||||
return (file.filename.match(/\.[0-9a-z]+$/)[0] === extension);
|
||||
});
|
||||
let available_compilers = {
|
||||
//".se": this.compile_serpent
|
||||
".sol": this.compile_solidity.bind(this)
|
||||
};
|
||||
|
||||
compiler.call(compiler, matchingFiles || [], function(err, compileResult) {
|
||||
Object.assign(compiledObject, compileResult);
|
||||
callback(err, compileResult);
|
||||
});
|
||||
},
|
||||
function (err) {
|
||||
cb(err, compiledObject);
|
||||
if (this.plugins) {
|
||||
let compilerPlugins = this.plugins.getPluginsFor('compilers');
|
||||
if (compilerPlugins.length > 0) {
|
||||
compilerPlugins.forEach(function (plugin) {
|
||||
plugin.compilers.forEach(function (compilerObject) {
|
||||
available_compilers[compilerObject.extension] = compilerObject.cb;
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
Compiler.prototype.compile_solidity = function(contractFiles, cb) {
|
||||
var self = this;
|
||||
var input = {};
|
||||
var solcW;
|
||||
async.waterfall([
|
||||
function prepareInput(callback) {
|
||||
for (var i = 0; i < contractFiles.length; i++){
|
||||
// TODO: this depends on the config
|
||||
var filename = contractFiles[i].filename.replace('app/contracts/','');
|
||||
input[filename] = contractFiles[i].content.toString();
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function loadCompiler(callback) {
|
||||
// TODO: there ino need to load this twice
|
||||
solcW = new SolcW();
|
||||
if (solcW.isCompilerLoaded()) {
|
||||
return callback();
|
||||
}
|
||||
let compiledObject = {};
|
||||
|
||||
self.logger.info("loading solc compiler..");
|
||||
solcW.load_compiler(function(){
|
||||
callback();
|
||||
});
|
||||
},
|
||||
function compileContracts(callback) {
|
||||
self.logger.info("compiling contracts...");
|
||||
solcW.compile({sources: input}, 1, function(output) {
|
||||
if (output.errors) {
|
||||
return callback(new Error ("Solidity errors: " + output.errors).message);
|
||||
async.eachObject(available_compilers,
|
||||
function (extension, compiler, callback) {
|
||||
// TODO: warn about files it doesn't know how to compile
|
||||
let matchingFiles = contractFiles.filter(function (file) {
|
||||
return (file.filename.match(/\.[0-9a-z]+$/)[0] === extension);
|
||||
});
|
||||
|
||||
compiler.call(compiler, matchingFiles || [], function (err, compileResult) {
|
||||
Object.assign(compiledObject, compileResult);
|
||||
callback(err, compileResult);
|
||||
});
|
||||
},
|
||||
function (err) {
|
||||
cb(err, compiledObject);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
compile_solidity(contractFiles, cb) {
|
||||
let self = this;
|
||||
let input = {};
|
||||
let solcW;
|
||||
async.waterfall([
|
||||
function prepareInput(callback) {
|
||||
for (let i = 0; i < contractFiles.length; i++) {
|
||||
// TODO: this depends on the config
|
||||
let filename = contractFiles[i].filename.replace('app/contracts/', '');
|
||||
input[filename] = contractFiles[i].content.toString();
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function loadCompiler(callback) {
|
||||
// TODO: there ino need to load this twice
|
||||
solcW = new SolcW();
|
||||
if (solcW.isCompilerLoaded()) {
|
||||
return callback();
|
||||
}
|
||||
callback(null, output);
|
||||
});
|
||||
},
|
||||
function createCompiledObject(output, callback) {
|
||||
var json = output.contracts;
|
||||
|
||||
compiled_object = {};
|
||||
self.logger.info("loading solc compiler..");
|
||||
solcW.load_compiler(function () {
|
||||
callback();
|
||||
});
|
||||
},
|
||||
function compileContracts(callback) {
|
||||
self.logger.info("compiling contracts...");
|
||||
solcW.compile({sources: input}, 1, function (output) {
|
||||
if (output.errors) {
|
||||
return callback(new Error("Solidity errors: " + output.errors).message);
|
||||
}
|
||||
callback(null, output);
|
||||
});
|
||||
},
|
||||
function createCompiledObject(output, callback) {
|
||||
let json = output.contracts;
|
||||
|
||||
for (var className in json) {
|
||||
var contract = json[className];
|
||||
let compiled_object = {};
|
||||
|
||||
compiled_object[className] = {};
|
||||
compiled_object[className].code = contract.bytecode;
|
||||
compiled_object[className].runtimeBytecode = contract.runtimeBytecode;
|
||||
compiled_object[className].realRuntimeBytecode = contract.runtimeBytecode.slice(0, -68);
|
||||
compiled_object[className].swarmHash = contract.runtimeBytecode.slice(-68).slice(0,64);
|
||||
compiled_object[className].gasEstimates = contract.gasEstimates;
|
||||
compiled_object[className].functionHashes = contract.functionHashes;
|
||||
compiled_object[className].abiDefinition = JSON.parse(contract.interface);
|
||||
for (let className in json) {
|
||||
let contract = json[className];
|
||||
|
||||
compiled_object[className] = {};
|
||||
compiled_object[className].code = contract.bytecode;
|
||||
compiled_object[className].runtimeBytecode = contract.runtimeBytecode;
|
||||
compiled_object[className].realRuntimeBytecode = contract.runtimeBytecode.slice(0, -68);
|
||||
compiled_object[className].swarmHash = contract.runtimeBytecode.slice(-68).slice(0, 64);
|
||||
compiled_object[className].gasEstimates = contract.gasEstimates;
|
||||
compiled_object[className].functionHashes = contract.functionHashes;
|
||||
compiled_object[className].abiDefinition = JSON.parse(contract.interface);
|
||||
}
|
||||
callback(null, compiled_object);
|
||||
}
|
||||
callback(null, compiled_object);
|
||||
}
|
||||
], function(err, result) {
|
||||
cb(err, result);
|
||||
});
|
||||
};
|
||||
], function (err, result) {
|
||||
cb(err, result);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Compiler;
|
||||
|
|
|
|||
|
|
@ -1,247 +1,251 @@
|
|||
var toposort = require('toposort');
|
||||
var async = require('async');
|
||||
let toposort = require('toposort');
|
||||
let async = require('async');
|
||||
|
||||
var Compiler = require('./compiler.js');
|
||||
let Compiler = require('./compiler.js');
|
||||
|
||||
// TODO: create a contract object
|
||||
|
||||
var adjustGas = function(contract) {
|
||||
var maxGas, adjustedGas;
|
||||
if (contract.gas === 'auto') {
|
||||
if (contract.deploy || contract.deploy === undefined) {
|
||||
if (contract.gasEstimates.creation !== undefined) {
|
||||
// TODO: should sum it instead
|
||||
maxGas = Math.max(contract.gasEstimates.creation[0], contract.gasEstimates.creation[1], 500000);
|
||||
} else {
|
||||
maxGas = 500000;
|
||||
}
|
||||
} else {
|
||||
maxGas = 500000;
|
||||
}
|
||||
// TODO: put a check so it doesn't go over the block limit
|
||||
adjustedGas = Math.round(maxGas * 1.40);
|
||||
adjustedGas += 25000;
|
||||
contract.gas = adjustedGas;
|
||||
class ContractsManager {
|
||||
constructor(options) {
|
||||
this.contractFiles = options.contractFiles;
|
||||
this.contractsConfig = options.contractsConfig;
|
||||
this.contracts = {};
|
||||
this.logger = options.logger;
|
||||
this.plugins = options.plugins;
|
||||
|
||||
this.contractDependencies = {};
|
||||
}
|
||||
};
|
||||
|
||||
var ContractsManager = function(options) {
|
||||
this.contractFiles = options.contractFiles;
|
||||
this.contractsConfig = options.contractsConfig;
|
||||
this.contracts = {};
|
||||
this.logger = options.logger;
|
||||
this.plugins = options.plugins;
|
||||
|
||||
this.contractDependencies = {};
|
||||
};
|
||||
|
||||
ContractsManager.prototype.build = function(done) {
|
||||
var self = this;
|
||||
async.waterfall([
|
||||
function compileContracts(callback) {
|
||||
var compiler = new Compiler({plugins: self.plugins, logger: self.logger});
|
||||
compiler.compile_contracts(self.contractFiles, function(err, compiledObject) {
|
||||
build(done) {
|
||||
let self = this;
|
||||
async.waterfall([
|
||||
function compileContracts(callback) {
|
||||
let compiler = new Compiler({plugins: self.plugins, logger: self.logger});
|
||||
compiler.compile_contracts(self.contractFiles, function (err, compiledObject) {
|
||||
self.compiledContracts = compiledObject;
|
||||
callback(err);
|
||||
});
|
||||
},
|
||||
function prepareContractsFromConfig(callback) {
|
||||
var className, contract;
|
||||
for(className in self.contractsConfig.contracts) {
|
||||
contract = self.contractsConfig.contracts[className];
|
||||
},
|
||||
function prepareContractsFromConfig(callback) {
|
||||
let className, contract;
|
||||
for (className in self.contractsConfig.contracts) {
|
||||
contract = self.contractsConfig.contracts[className];
|
||||
|
||||
contract.className = className;
|
||||
contract.args = contract.args || [];
|
||||
contract.className = className;
|
||||
contract.args = contract.args || [];
|
||||
|
||||
self.contracts[className] = contract;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function setDeployIntention(callback) {
|
||||
var className, contract;
|
||||
for(className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
contract.deploy = (contract.deploy === undefined) || contract.deploy;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function prepareContractsFromCompilation(callback) {
|
||||
var className, compiledContract, contractConfig, contract;
|
||||
for(className in self.compiledContracts) {
|
||||
compiledContract = self.compiledContracts[className];
|
||||
contractConfig = self.contractsConfig.contracts[className];
|
||||
|
||||
contract = self.contracts[className] || {className: className, args: []};
|
||||
|
||||
contract.code = compiledContract.code;
|
||||
contract.runtimeBytecode = compiledContract.runtimeBytecode;
|
||||
contract.realRuntimeBytecode = (contract.realRuntimeBytecode || contract.runtimeBytecode);
|
||||
contract.swarmHash = compiledContract.swarmHash;
|
||||
contract.gasEstimates = compiledContract.gasEstimates;
|
||||
contract.functionHashes = compiledContract.functionHashes;
|
||||
contract.abiDefinition = compiledContract.abiDefinition;
|
||||
|
||||
contract.gas = (contractConfig && contractConfig.gas) || self.contractsConfig.gas || 'auto';
|
||||
adjustGas(contract);
|
||||
|
||||
contract.gasPrice = contract.gasPrice || self.contractsConfig.gasPrice;
|
||||
contract.type = 'file';
|
||||
contract.className = className;
|
||||
|
||||
self.contracts[className] = contract;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
/*eslint complexity: ["error", 11]*/
|
||||
function dealWithSpecialConfigs(callback) {
|
||||
var className, contract, parentContractName, parentContract;
|
||||
|
||||
for(className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
|
||||
if (contract.instanceOf === undefined) { continue; }
|
||||
|
||||
parentContractName = contract.instanceOf;
|
||||
parentContract = self.contracts[parentContractName];
|
||||
|
||||
if (parentContract === className) {
|
||||
self.logger.error(className + ": instanceOf is set to itself");
|
||||
continue;
|
||||
self.contracts[className] = contract;
|
||||
}
|
||||
|
||||
if (parentContract === undefined) {
|
||||
self.logger.error(className + ": couldn't find instanceOf contract " + parentContractName);
|
||||
continue;
|
||||
callback();
|
||||
},
|
||||
function setDeployIntention(callback) {
|
||||
let className, contract;
|
||||
for (className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
contract.deploy = (contract.deploy === undefined) || contract.deploy;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function prepareContractsFromCompilation(callback) {
|
||||
let className, compiledContract, contractConfig, contract;
|
||||
for (className in self.compiledContracts) {
|
||||
compiledContract = self.compiledContracts[className];
|
||||
contractConfig = self.contractsConfig.contracts[className];
|
||||
|
||||
if (parentContract.args && parentContract.args.length > 0 && ((contract.args && contract.args.length === 0) || contract.args === undefined)) {
|
||||
contract.args = parentContract.args;
|
||||
contract = self.contracts[className] || {className: className, args: []};
|
||||
|
||||
contract.code = compiledContract.code;
|
||||
contract.runtimeBytecode = compiledContract.runtimeBytecode;
|
||||
contract.realRuntimeBytecode = (contract.realRuntimeBytecode || contract.runtimeBytecode);
|
||||
contract.swarmHash = compiledContract.swarmHash;
|
||||
contract.gasEstimates = compiledContract.gasEstimates;
|
||||
contract.functionHashes = compiledContract.functionHashes;
|
||||
contract.abiDefinition = compiledContract.abiDefinition;
|
||||
|
||||
contract.gas = (contractConfig && contractConfig.gas) || self.contractsConfig.gas || 'auto';
|
||||
self.adjustGas(contract);
|
||||
|
||||
contract.gasPrice = contract.gasPrice || self.contractsConfig.gasPrice;
|
||||
contract.type = 'file';
|
||||
contract.className = className;
|
||||
|
||||
self.contracts[className] = contract;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
/*eslint complexity: ["error", 11]*/
|
||||
function dealWithSpecialConfigs(callback) {
|
||||
let className, contract, parentContractName, parentContract;
|
||||
|
||||
for (className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
|
||||
if (contract.instanceOf === undefined) {
|
||||
continue;
|
||||
}
|
||||
|
||||
parentContractName = contract.instanceOf;
|
||||
parentContract = self.contracts[parentContractName];
|
||||
|
||||
if (parentContract === className) {
|
||||
self.logger.error(className + ": instanceOf is set to itself");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (parentContract === undefined) {
|
||||
self.logger.error(className + ": couldn't find instanceOf contract " + parentContractName);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (parentContract.args && parentContract.args.length > 0 && ((contract.args && contract.args.length === 0) || contract.args === undefined)) {
|
||||
contract.args = parentContract.args;
|
||||
}
|
||||
|
||||
if (contract.code !== undefined) {
|
||||
self.logger.error(className + " has code associated to it but it's configured as an instanceOf " + parentContractName);
|
||||
}
|
||||
|
||||
contract.code = parentContract.code;
|
||||
contract.runtimeBytecode = parentContract.runtimeBytecode;
|
||||
contract.gasEstimates = parentContract.gasEstimates;
|
||||
contract.functionHashes = parentContract.functionHashes;
|
||||
contract.abiDefinition = parentContract.abiDefinition;
|
||||
|
||||
contract.gas = contract.gas || parentContract.gas;
|
||||
contract.gasPrice = contract.gasPrice || parentContract.gasPrice;
|
||||
contract.type = 'instance';
|
||||
|
||||
if (contract.code !== undefined) {
|
||||
self.logger.error(className + " has code associated to it but it's configured as an instanceOf " + parentContractName);
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function removeContractsWithNoCode(callback) {
|
||||
let className, contract;
|
||||
for (className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
|
||||
contract.code = parentContract.code;
|
||||
contract.runtimeBytecode = parentContract.runtimeBytecode;
|
||||
contract.gasEstimates = parentContract.gasEstimates;
|
||||
contract.functionHashes = parentContract.functionHashes;
|
||||
contract.abiDefinition = parentContract.abiDefinition;
|
||||
|
||||
contract.gas = contract.gas || parentContract.gas;
|
||||
contract.gasPrice = contract.gasPrice || parentContract.gasPrice;
|
||||
contract.type = 'instance';
|
||||
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function removeContractsWithNoCode(callback) {
|
||||
var className, contract;
|
||||
for(className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
|
||||
if (contract.code === undefined) {
|
||||
self.logger.error(className + " has no code associated");
|
||||
delete self.contracts[className];
|
||||
}
|
||||
}
|
||||
self.logger.trace(self.contracts);
|
||||
callback();
|
||||
},
|
||||
function determineDependencies(callback) {
|
||||
var className, contract;
|
||||
for(className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
|
||||
if (contract.args === []) continue;
|
||||
|
||||
var ref = contract.args;
|
||||
for (var j = 0; j < ref.length; j++) {
|
||||
var arg = ref[j];
|
||||
if (arg[0] === "$") {
|
||||
self.contractDependencies[className] = self.contractDependencies[className] || [];
|
||||
self.contractDependencies[className].push(arg.substr(1));
|
||||
if (contract.code === undefined) {
|
||||
self.logger.error(className + " has no code associated");
|
||||
delete self.contracts[className];
|
||||
}
|
||||
}
|
||||
self.logger.trace(self.contracts);
|
||||
callback();
|
||||
},
|
||||
function determineDependencies(callback) {
|
||||
let className, contract;
|
||||
for (className in self.contracts) {
|
||||
contract = self.contracts[className];
|
||||
|
||||
if (contract.args === []) continue;
|
||||
|
||||
let ref = contract.args;
|
||||
for (let j = 0; j < ref.length; j++) {
|
||||
let arg = ref[j];
|
||||
if (arg[0] === "$") {
|
||||
self.contractDependencies[className] = self.contractDependencies[className] || [];
|
||||
self.contractDependencies[className].push(arg.substr(1));
|
||||
}
|
||||
}
|
||||
}
|
||||
callback();
|
||||
}
|
||||
callback();
|
||||
}
|
||||
], function(err, result) {
|
||||
if (err) {
|
||||
self.logger.error("Error Compiling/Building contracts: " + err);
|
||||
}
|
||||
self.logger.trace("finished".underline);
|
||||
done(err, self);
|
||||
});
|
||||
};
|
||||
|
||||
ContractsManager.prototype.getContract = function(className) {
|
||||
return this.contracts[className];
|
||||
};
|
||||
|
||||
ContractsManager.prototype.sortContracts = function(contractList) {
|
||||
var converted_dependencies = [], i;
|
||||
|
||||
for(var contract in this.contractDependencies) {
|
||||
var dependencies = this.contractDependencies[contract];
|
||||
for(i=0; i < dependencies.length; i++) {
|
||||
converted_dependencies.push([contract, dependencies[i]]);
|
||||
}
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
self.logger.error("Error Compiling/Building contracts: " + err);
|
||||
}
|
||||
self.logger.trace("finished".underline);
|
||||
done(err, self);
|
||||
});
|
||||
}
|
||||
|
||||
var orderedDependencies = toposort(converted_dependencies).reverse();
|
||||
|
||||
var newList = contractList.sort(function(a,b) {
|
||||
var order_a = orderedDependencies.indexOf(a.className);
|
||||
var order_b = orderedDependencies.indexOf(b.className);
|
||||
return order_a - order_b;
|
||||
});
|
||||
|
||||
return newList;
|
||||
};
|
||||
|
||||
// TODO: should be built contracts
|
||||
ContractsManager.prototype.listContracts = function() {
|
||||
var contracts = [];
|
||||
for(var className in this.contracts) {
|
||||
var contract = this.contracts[className];
|
||||
contracts.push(contract);
|
||||
getContract(className) {
|
||||
return this.contracts[className];
|
||||
}
|
||||
return this.sortContracts(contracts);
|
||||
};
|
||||
|
||||
ContractsManager.prototype.contractsState = function() {
|
||||
var data = [];
|
||||
sortContracts(contractList) {
|
||||
let converted_dependencies = [], i;
|
||||
|
||||
for(var className in this.contracts) {
|
||||
var contract = this.contracts[className];
|
||||
|
||||
var contractData;
|
||||
|
||||
if (contract.deploy === false) {
|
||||
contractData = [
|
||||
className.green,
|
||||
'Interface or set to not deploy'.green,
|
||||
"\t\tn/a".green
|
||||
];
|
||||
} else if (contract.error) {
|
||||
contractData = [
|
||||
className.green,
|
||||
(contract.error).red,
|
||||
'\t\tError'.red
|
||||
];
|
||||
} else {
|
||||
contractData = [
|
||||
className.green,
|
||||
(contract.deployedAddress || '...').green,
|
||||
((contract.deployedAddress !== undefined) ? "\t\tDeployed".green : "\t\tPending".magenta)
|
||||
];
|
||||
for (let contract in this.contractDependencies) {
|
||||
let dependencies = this.contractDependencies[contract];
|
||||
for (i = 0; i < dependencies.length; i++) {
|
||||
converted_dependencies.push([contract, dependencies[i]]);
|
||||
}
|
||||
}
|
||||
|
||||
data.push(contractData);
|
||||
let orderedDependencies = toposort(converted_dependencies).reverse();
|
||||
|
||||
let newList = contractList.sort(function (a, b) {
|
||||
let order_a = orderedDependencies.indexOf(a.className);
|
||||
let order_b = orderedDependencies.indexOf(b.className);
|
||||
return order_a - order_b;
|
||||
});
|
||||
|
||||
return newList;
|
||||
}
|
||||
|
||||
return data;
|
||||
};
|
||||
// TODO: should be built contracts
|
||||
listContracts() {
|
||||
let contracts = [];
|
||||
for (let className in this.contracts) {
|
||||
let contract = this.contracts[className];
|
||||
contracts.push(contract);
|
||||
}
|
||||
return this.sortContracts(contracts);
|
||||
}
|
||||
|
||||
contractsState() {
|
||||
let data = [];
|
||||
|
||||
for (let className in this.contracts) {
|
||||
let contract = this.contracts[className];
|
||||
|
||||
let contractData;
|
||||
|
||||
if (contract.deploy === false) {
|
||||
contractData = [
|
||||
className.green,
|
||||
'Interface or set to not deploy'.green,
|
||||
"\t\tn/a".green
|
||||
];
|
||||
} else if (contract.error) {
|
||||
contractData = [
|
||||
className.green,
|
||||
(contract.error).red,
|
||||
'\t\tError'.red
|
||||
];
|
||||
} else {
|
||||
contractData = [
|
||||
className.green,
|
||||
(contract.deployedAddress || '...').green,
|
||||
((contract.deployedAddress !== undefined) ? "\t\tDeployed".green : "\t\tPending".magenta)
|
||||
];
|
||||
}
|
||||
|
||||
data.push(contractData);
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
adjustGas(contract) {
|
||||
let maxGas, adjustedGas;
|
||||
if (contract.gas === 'auto') {
|
||||
if (contract.deploy || contract.deploy === undefined) {
|
||||
if (contract.gasEstimates.creation !== undefined) {
|
||||
// TODO: should sum it instead
|
||||
maxGas = Math.max(contract.gasEstimates.creation[0], contract.gasEstimates.creation[1], 500000);
|
||||
} else {
|
||||
maxGas = 500000;
|
||||
}
|
||||
} else {
|
||||
maxGas = 500000;
|
||||
}
|
||||
// TODO: put a check so it doesn't go over the block limit
|
||||
adjustedGas = Math.round(maxGas * 1.40);
|
||||
adjustedGas += 25000;
|
||||
contract.gas = adjustedGas;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ContractsManager;
|
||||
|
|
|
|||
|
|
@ -1,166 +1,168 @@
|
|||
var async = require('async');
|
||||
let async = require('async');
|
||||
|
||||
var RunCode = require('../core/runCode.js');
|
||||
let RunCode = require('../core/runCode.js');
|
||||
|
||||
var DeployTracker = require('./deploy_tracker.js');
|
||||
var ABIGenerator = require('./abi.js');
|
||||
let DeployTracker = require('./deploy_tracker.js');
|
||||
let ABIGenerator = require('./abi.js');
|
||||
|
||||
var Deploy = function(options) {
|
||||
this.web3 = options.web3;
|
||||
this.contractsManager = options.contractsManager;
|
||||
this.logger = options.logger;
|
||||
this.env = options.env;
|
||||
class Deploy {
|
||||
constructor(options) {
|
||||
this.web3 = options.web3;
|
||||
this.contractsManager = options.contractsManager;
|
||||
this.logger = options.logger;
|
||||
this.env = options.env;
|
||||
|
||||
this.deployTracker = new DeployTracker({
|
||||
logger: options.logger, chainConfig: options.chainConfig, web3: options.web3, env: this.env
|
||||
});
|
||||
};
|
||||
|
||||
Deploy.prototype.determineArguments = function(suppliedArgs) {
|
||||
var realArgs = [], l, arg, contractName, referedContract;
|
||||
|
||||
for (l = 0; l < suppliedArgs.length; l++) {
|
||||
arg = suppliedArgs[l];
|
||||
if (arg[0] === "$") {
|
||||
contractName = arg.substr(1);
|
||||
referedContract = this.contractsManager.getContract(contractName);
|
||||
realArgs.push(referedContract.deployedAddress);
|
||||
} else {
|
||||
realArgs.push(arg);
|
||||
}
|
||||
this.deployTracker = new DeployTracker({
|
||||
logger: options.logger, chainConfig: options.chainConfig, web3: options.web3, env: this.env
|
||||
});
|
||||
}
|
||||
|
||||
return realArgs;
|
||||
};
|
||||
determineArguments(suppliedArgs) {
|
||||
let realArgs = [], l, arg, contractName, referedContract;
|
||||
|
||||
Deploy.prototype.checkAndDeployContract = function(contract, params, callback) {
|
||||
var self = this;
|
||||
var suppliedArgs;
|
||||
var realArgs;
|
||||
var arg;
|
||||
var l;
|
||||
var contractName;
|
||||
var referedContract;
|
||||
contract.error = false;
|
||||
|
||||
if (contract.deploy === false) {
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
return callback();
|
||||
}
|
||||
|
||||
if (contract.address !== undefined) {
|
||||
|
||||
realArgs = self.determineArguments(params || contract.args);
|
||||
|
||||
contract.deployedAddress = contract.address;
|
||||
self.deployTracker.trackContract(contract.className, contract.realRuntimeBytecode, realArgs, contract.address);
|
||||
self.deployTracker.save();
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
return callback();
|
||||
}
|
||||
|
||||
var trackedContract = self.deployTracker.getContract(contract.className, contract.realRuntimeBytecode, contract.args);
|
||||
|
||||
if (trackedContract && this.web3.eth.getCode(trackedContract.address) !== "0x") {
|
||||
self.logger.info(contract.className.bold.cyan + " already deployed at ".green + trackedContract.address.bold.cyan);
|
||||
contract.deployedAddress = trackedContract.address;
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
return callback();
|
||||
} else {
|
||||
|
||||
realArgs = self.determineArguments(params || contract.args);
|
||||
|
||||
this.deployContract(contract, realArgs, function(err, address) {
|
||||
if (err) {
|
||||
return callback(new Error(err));
|
||||
for (l = 0; l < suppliedArgs.length; l++) {
|
||||
arg = suppliedArgs[l];
|
||||
if (arg[0] === "$") {
|
||||
contractName = arg.substr(1);
|
||||
referedContract = this.contractsManager.getContract(contractName);
|
||||
realArgs.push(referedContract.deployedAddress);
|
||||
} else {
|
||||
realArgs.push(arg);
|
||||
}
|
||||
self.deployTracker.trackContract(contract.className, contract.realRuntimeBytecode, realArgs, address);
|
||||
}
|
||||
|
||||
return realArgs;
|
||||
}
|
||||
|
||||
checkAndDeployContract(contract, params, callback) {
|
||||
let self = this;
|
||||
let suppliedArgs;
|
||||
let realArgs;
|
||||
let arg;
|
||||
let l;
|
||||
let contractName;
|
||||
let referedContract;
|
||||
contract.error = false;
|
||||
|
||||
if (contract.deploy === false) {
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
return callback();
|
||||
}
|
||||
|
||||
if (contract.address !== undefined) {
|
||||
|
||||
realArgs = self.determineArguments(params || contract.args);
|
||||
|
||||
contract.deployedAddress = contract.address;
|
||||
self.deployTracker.trackContract(contract.className, contract.realRuntimeBytecode, realArgs, contract.address);
|
||||
self.deployTracker.save();
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
return callback();
|
||||
}
|
||||
|
||||
if (contract.onDeploy !== undefined) {
|
||||
self.logger.info('executing onDeploy commands');
|
||||
var abiGenerator = new ABIGenerator({contractsManager: self.contractsManager});
|
||||
var abi = abiGenerator.generateContracts(false);
|
||||
var cmds = contract.onDeploy.join(';\n');
|
||||
let trackedContract = self.deployTracker.getContract(contract.className, contract.realRuntimeBytecode, contract.args);
|
||||
|
||||
RunCode.doEval(abi + "\n" + cmds, self.web3);
|
||||
if (trackedContract && this.web3.eth.getCode(trackedContract.address) !== "0x") {
|
||||
self.logger.info(contract.className.bold.cyan + " already deployed at ".green + trackedContract.address.bold.cyan);
|
||||
contract.deployedAddress = trackedContract.address;
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
return callback();
|
||||
} else {
|
||||
|
||||
realArgs = self.determineArguments(params || contract.args);
|
||||
|
||||
this.deployContract(contract, realArgs, function (err, address) {
|
||||
if (err) {
|
||||
return callback(new Error(err));
|
||||
}
|
||||
self.deployTracker.trackContract(contract.className, contract.realRuntimeBytecode, realArgs, address);
|
||||
self.deployTracker.save();
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
|
||||
if (contract.onDeploy !== undefined) {
|
||||
self.logger.info('executing onDeploy commands');
|
||||
let abiGenerator = new ABIGenerator({contractsManager: self.contractsManager});
|
||||
let abi = abiGenerator.generateContracts(false);
|
||||
let cmds = contract.onDeploy.join(';\n');
|
||||
|
||||
RunCode.doEval(abi + "\n" + cmds, self.web3);
|
||||
}
|
||||
|
||||
callback();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
deployContract(contract, params, callback) {
|
||||
let self = this;
|
||||
let contractObject = this.web3.eth.contract(contract.abiDefinition);
|
||||
|
||||
let contractParams = (params || contract.args).slice();
|
||||
|
||||
this.web3.eth.getAccounts(function (err, accounts) {
|
||||
if (err) {
|
||||
return callback(new Error(err));
|
||||
}
|
||||
|
||||
callback();
|
||||
// TODO: probably needs to be defaultAccount
|
||||
// TODO: it wouldn't necessary be the first address
|
||||
// use defined blockchain address or first address
|
||||
contractParams.push({
|
||||
//from: this.web3.eth.coinbase,
|
||||
from: accounts[0],
|
||||
data: "0x" + contract.code,
|
||||
gas: contract.gas,
|
||||
gasPrice: contract.gasPrice
|
||||
});
|
||||
|
||||
self.logger.info("deploying " + contract.className.bold.cyan + " with ".green + contract.gas + " gas".green);
|
||||
contractParams.push(function (err, transaction) {
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
|
||||
if (err) {
|
||||
self.logger.error("error deploying contract: " + contract.className.cyan);
|
||||
let errMsg = err.toString();
|
||||
if (errMsg === 'Error: The contract code couldn\'t be stored, please check your gas amount.') {
|
||||
errMsg = 'The contract code couldn\'t be stored, out of gas or constructor error';
|
||||
}
|
||||
self.logger.error(errMsg);
|
||||
contract.error = errMsg;
|
||||
return callback(new Error(err));
|
||||
} else if (transaction.address !== undefined) {
|
||||
self.logger.info(contract.className.bold.cyan + " deployed at ".green + transaction.address.bold.cyan);
|
||||
contract.deployedAddress = transaction.address;
|
||||
contract.transactionHash = transaction.transactionHash;
|
||||
return callback(null, transaction.address);
|
||||
}
|
||||
});
|
||||
|
||||
contractObject["new"].apply(contractObject, contractParams);
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
deployAll(done) {
|
||||
let self = this;
|
||||
this.logger.info("deploying contracts");
|
||||
|
||||
Deploy.prototype.deployContract = function(contract, params, callback) {
|
||||
var self = this;
|
||||
var contractObject = this.web3.eth.contract(contract.abiDefinition);
|
||||
|
||||
var contractParams = (params || contract.args).slice();
|
||||
|
||||
this.web3.eth.getAccounts(function(err, accounts) {
|
||||
if (err) {
|
||||
return callback(new Error(err));
|
||||
}
|
||||
|
||||
// TODO: probably needs to be defaultAccount
|
||||
// TODO: it wouldn't necessary be the first address
|
||||
// use defined blockchain address or first address
|
||||
contractParams.push({
|
||||
//from: this.web3.eth.coinbase,
|
||||
from: accounts[0],
|
||||
data: "0x" + contract.code,
|
||||
gas: contract.gas,
|
||||
gasPrice: contract.gasPrice
|
||||
});
|
||||
|
||||
self.logger.info("deploying " + contract.className.bold.cyan + " with ".green + contract.gas + " gas".green);
|
||||
contractParams.push(function(err, transaction) {
|
||||
self.logger.contractsState(self.contractsManager.contractsState());
|
||||
|
||||
if (err) {
|
||||
self.logger.error("error deploying contract: " + contract.className.cyan);
|
||||
var errMsg = err.toString();
|
||||
if (errMsg === 'Error: The contract code couldn\'t be stored, please check your gas amount.') {
|
||||
errMsg = 'The contract code couldn\'t be stored, out of gas or constructor error';
|
||||
async.eachOfSeries(this.contractsManager.listContracts(),
|
||||
function (contract, key, callback) {
|
||||
self.logger.trace(arguments);
|
||||
self.checkAndDeployContract(contract, null, callback);
|
||||
},
|
||||
function (err, results) {
|
||||
if (err) {
|
||||
self.logger.error("error deploying contracts");
|
||||
self.logger.error(err.message);
|
||||
self.logger.debug(err.stack);
|
||||
}
|
||||
self.logger.error(errMsg);
|
||||
contract.error = errMsg;
|
||||
return callback(new Error(err));
|
||||
} else if (transaction.address !== undefined) {
|
||||
self.logger.info(contract.className.bold.cyan + " deployed at ".green + transaction.address.bold.cyan);
|
||||
contract.deployedAddress = transaction.address;
|
||||
contract.transactionHash = transaction.transactionHash;
|
||||
return callback(null, transaction.address);
|
||||
self.logger.info("finished deploying contracts");
|
||||
self.logger.trace(arguments);
|
||||
done();
|
||||
}
|
||||
});
|
||||
);
|
||||
|
||||
contractObject["new"].apply(contractObject, contractParams);
|
||||
});
|
||||
};
|
||||
|
||||
Deploy.prototype.deployAll = function(done) {
|
||||
var self = this;
|
||||
this.logger.info("deploying contracts");
|
||||
|
||||
async.eachOfSeries(this.contractsManager.listContracts(),
|
||||
function(contract, key, callback) {
|
||||
self.logger.trace(arguments);
|
||||
self.checkAndDeployContract(contract, null, callback);
|
||||
},
|
||||
function(err, results) {
|
||||
if (err) {
|
||||
self.logger.error("error deploying contracts");
|
||||
self.logger.error(err.message);
|
||||
self.logger.debug(err.stack);
|
||||
}
|
||||
self.logger.info("finished deploying contracts");
|
||||
self.logger.trace(arguments);
|
||||
done();
|
||||
}
|
||||
);
|
||||
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Deploy;
|
||||
|
|
|
|||
|
|
@ -1,88 +1,91 @@
|
|||
var async = require('async');
|
||||
let async = require('async');
|
||||
let Deploy = require('./deploy.js');
|
||||
let ContractsManager = require('./contracts.js');
|
||||
let EventEmitter = require('events');
|
||||
|
||||
var Deploy = require('./deploy.js');
|
||||
var ContractsManager = require('./contracts.js');
|
||||
|
||||
var DeployManager = function(options) {
|
||||
this.config = options.config;
|
||||
this.logger = options.logger;
|
||||
this.blockchainConfig = this.config.blockchainConfig;
|
||||
this.plugins = options.plugins;
|
||||
this.events = options.events;
|
||||
this.web3 = options.web3;
|
||||
this.chainConfig = (options.trackContracts !== false) ? this.config.chainTracker : false;
|
||||
};
|
||||
|
||||
DeployManager.prototype.deployContracts = function(done) {
|
||||
var self = this;
|
||||
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
self.logger.info("Blockchain component is disabled in the config".underline);
|
||||
self.events.emit('blockchainDisabled', {});
|
||||
return done();
|
||||
class DeployManager {
|
||||
constructor(options) {
|
||||
this.config = options.config;
|
||||
this.logger = options.logger;
|
||||
this.blockchainConfig = this.config.blockchainConfig;
|
||||
this.plugins = options.plugins;
|
||||
this.web3 = options.web3;
|
||||
this.chainConfig = (options.trackContracts !== false) ? this.config.chainTracker : false;
|
||||
Object.create(EventEmitter.prototype);
|
||||
}
|
||||
|
||||
async.waterfall([
|
||||
function buildContracts(callback) {
|
||||
var contractsManager = new ContractsManager({
|
||||
contractFiles: self.config.contractsFiles,
|
||||
contractsConfig: self.config.contractsConfig,
|
||||
logger: self.logger,
|
||||
plugins: self.plugins
|
||||
});
|
||||
contractsManager.build(callback);
|
||||
},
|
||||
function checkWeb3IsConnected(contractsManager, callback) {
|
||||
if (!self.web3) {
|
||||
return callback(Error("no web3 instance found"));
|
||||
deployContracts(done) {
|
||||
let self = this;
|
||||
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
self.logger.info("Blockchain component is disabled in the config".underline);
|
||||
this.emit('blockchainDisabled', {});
|
||||
return done();
|
||||
}
|
||||
if (self.web3.currentProvider.isConnected !== undefined && !self.web3.isConnected()) {
|
||||
self.logger.error(("Couldn't connect to an Ethereum node are you sure it's on?").red);
|
||||
self.logger.info("make sure you have an Ethereum node or simulator running. e.g 'embark blockchain'".magenta);
|
||||
return callback(Error("error connecting to blockchain node"));
|
||||
}
|
||||
if (self.web3.currentProvider.isConnected === undefined) {
|
||||
self.web3.version.getNode(function(err, version) {
|
||||
if (err) {
|
||||
|
||||
async.waterfall([
|
||||
function buildContracts(callback) {
|
||||
let contractsManager = new ContractsManager({
|
||||
contractFiles: self.config.contractsFiles,
|
||||
contractsConfig: self.config.contractsConfig,
|
||||
logger: self.logger,
|
||||
plugins: self.plugins
|
||||
});
|
||||
contractsManager.build(callback);
|
||||
},
|
||||
function checkWeb3IsConnected(contractsManager, callback) {
|
||||
if (!self.web3) {
|
||||
return callback(Error("no web3 instance found"));
|
||||
}
|
||||
if (self.web3.currentProvider.isConnected !== undefined && !self.web3.isConnected()) {
|
||||
self.logger.error(("Couldn't connect to an Ethereum node are you sure it's on?").red);
|
||||
self.logger.info("make sure you have an Ethereum node or simulator running. e.g 'embark blockchain'".magenta);
|
||||
return callback(Error("error connecting to blockchain node"));
|
||||
}
|
||||
return callback(null, contractsManager, self.web3);
|
||||
});
|
||||
} else {
|
||||
return callback(null, contractsManager, self.web3);
|
||||
}
|
||||
},
|
||||
function setDefaultAccount(contractsManager, web3, callback) {
|
||||
web3.eth.getAccounts(function(err, accounts) {
|
||||
if (err) {
|
||||
return callback(new Error(err));
|
||||
if (self.web3.currentProvider.isConnected === undefined) {
|
||||
self.web3.version.getNode(function (err, version) {
|
||||
if (err) {
|
||||
return callback(Error("error connecting to blockchain node"));
|
||||
}
|
||||
return callback(null, contractsManager, self.web3);
|
||||
});
|
||||
} else {
|
||||
return callback(null, contractsManager, self.web3);
|
||||
}
|
||||
},
|
||||
function setDefaultAccount(contractsManager, web3, callback) {
|
||||
web3.eth.getAccounts(function (err, accounts) {
|
||||
if (err) {
|
||||
return callback(new Error(err));
|
||||
}
|
||||
let accountConfig = self.config.blockchainConfig.account;
|
||||
let selectedAccount = accountConfig && accountConfig.address;
|
||||
web3.eth.defaultAccount = (selectedAccount || accounts[0]);
|
||||
callback(null, contractsManager, web3);
|
||||
});
|
||||
},
|
||||
function deployAllContracts(contractsManager, web3, callback) {
|
||||
let deploy = new Deploy({
|
||||
web3: web3,
|
||||
contractsManager: contractsManager,
|
||||
logger: self.logger,
|
||||
chainConfig: self.chainConfig,
|
||||
env: self.config.env
|
||||
});
|
||||
deploy.deployAll(function () {
|
||||
self.emit('contractsDeployed', contractsManager);
|
||||
callback(null, contractsManager);
|
||||
});
|
||||
}
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
done(err, null);
|
||||
} else {
|
||||
done(null, result);
|
||||
}
|
||||
var accountConfig = self.config.blockchainConfig.account;
|
||||
var selectedAccount = accountConfig && accountConfig.address;
|
||||
web3.eth.defaultAccount = (selectedAccount || accounts[0]);
|
||||
callback(null, contractsManager, web3);
|
||||
});
|
||||
},
|
||||
function deployAllContracts(contractsManager, web3, callback) {
|
||||
var deploy = new Deploy({
|
||||
web3: web3,
|
||||
contractsManager: contractsManager,
|
||||
logger: self.logger,
|
||||
chainConfig: self.chainConfig,
|
||||
env: self.config.env
|
||||
});
|
||||
deploy.deployAll(function() {
|
||||
self.events.emit('contractsDeployed', contractsManager);
|
||||
callback(null, contractsManager);
|
||||
});
|
||||
}
|
||||
], function(err, result) {
|
||||
if (err) {
|
||||
done(err, null);
|
||||
} else {
|
||||
done(null, result);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
module.exports = DeployManager;
|
||||
|
|
|
|||
|
|
@ -1,56 +1,62 @@
|
|||
var fs = require('../core/fs.js');
|
||||
let fs = require('../core/fs.js');
|
||||
|
||||
var DeployTracker = function(options) {
|
||||
this.logger = options.logger;
|
||||
this.env = options.env;
|
||||
this.chainConfig = options.chainConfig;
|
||||
this.web3 = options.web3;
|
||||
class DeployTracker {
|
||||
constructor(options) {
|
||||
this.logger = options.logger;
|
||||
this.env = options.env;
|
||||
this.chainConfig = options.chainConfig;
|
||||
this.web3 = options.web3;
|
||||
|
||||
if (this.chainConfig === false) {
|
||||
this.currentChain = {contracts: []};
|
||||
return;
|
||||
if (this.chainConfig === false) {
|
||||
this.currentChain = {contracts: []};
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO: need to make this async
|
||||
let block = this.web3.eth.getBlock(0);
|
||||
let chainId = block.hash;
|
||||
|
||||
if (this.chainConfig[chainId] === undefined) {
|
||||
this.chainConfig[chainId] = {contracts: {}};
|
||||
}
|
||||
|
||||
this.currentChain = this.chainConfig[chainId];
|
||||
|
||||
this.currentChain.name = this.env;
|
||||
// TODO: add other params
|
||||
//this.currentChain.networkId = "";
|
||||
//this.currentChain.networkType = "custom"
|
||||
}
|
||||
|
||||
// TODO: need to make this async
|
||||
var block = this.web3.eth.getBlock(0);
|
||||
var chainId = block.hash;
|
||||
|
||||
if (this.chainConfig[chainId] === undefined) {
|
||||
this.chainConfig[chainId] = {contracts: {}};
|
||||
loadConfig(config) {
|
||||
this.chainConfig = config;
|
||||
return this;
|
||||
}
|
||||
|
||||
this.currentChain = this.chainConfig[chainId];
|
||||
trackContract(contractName, code, args, address) {
|
||||
this.currentChain.contracts[this.web3.sha3(code + contractName + args.join(','))] = {
|
||||
name: contractName,
|
||||
address: address
|
||||
};
|
||||
}
|
||||
|
||||
this.currentChain.name = this.env;
|
||||
// TODO: add other params
|
||||
//this.currentChain.networkId = "";
|
||||
//this.currentChain.networkType = "custom"
|
||||
};
|
||||
getContract(contractName, code, args) {
|
||||
let contract = this.currentChain.contracts[this.web3.sha3(code + contractName + args.join(','))];
|
||||
if (contract && contract.address === undefined) {
|
||||
return false;
|
||||
}
|
||||
return contract;
|
||||
}
|
||||
|
||||
DeployTracker.prototype.loadConfig = function(config) {
|
||||
this.chainConfig = config;
|
||||
return this;
|
||||
};
|
||||
|
||||
DeployTracker.prototype.trackContract = function(contractName, code, args, address) {
|
||||
this.currentChain.contracts[this.web3.sha3(code + contractName + args.join(','))] = {
|
||||
name: contractName,
|
||||
address: address
|
||||
};
|
||||
};
|
||||
|
||||
DeployTracker.prototype.getContract = function(contractName, code, args) {
|
||||
var contract = this.currentChain.contracts[this.web3.sha3(code + contractName + args.join(','))];
|
||||
if (contract && contract.address === undefined) { return false; }
|
||||
return contract;
|
||||
};
|
||||
|
||||
// TODO: abstract this
|
||||
// chainConfig can be an abstract PersistentObject
|
||||
DeployTracker.prototype.save = function() {
|
||||
if (this.chainConfig === false) { return; }
|
||||
fs.writeJSONSync("./chains.json", this.chainConfig);
|
||||
};
|
||||
// TODO: abstract this
|
||||
// chainConfig can be an abstract PersistentObject
|
||||
save() {
|
||||
if (this.chainConfig === false) {
|
||||
return;
|
||||
}
|
||||
fs.writeJSONSync("./chains.json", this.chainConfig);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = DeployTracker;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
var solc;
|
||||
let solc;
|
||||
|
||||
process.on('message', function(msg) {
|
||||
process.on('message', function (msg) {
|
||||
if (msg.action === 'loadCompiler') {
|
||||
solc = require('solc');
|
||||
process.send({result: "loadedCompiler"});
|
||||
}
|
||||
|
||||
if (msg.action === 'compile') {
|
||||
var output = solc.compile(msg.obj, msg.optimize);
|
||||
let output = solc.compile(msg.obj, msg.optimize);
|
||||
process.send({result: "compilation", output: output});
|
||||
}
|
||||
});
|
||||
|
||||
process.on('exit', function() {
|
||||
process.on('exit', function () {
|
||||
process.exit(0);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,38 @@
|
|||
var utils = require('../utils/utils.js');
|
||||
var solcProcess;
|
||||
var compilerLoaded = false;
|
||||
let utils = require('../utils/utils.js');
|
||||
let solcProcess;
|
||||
let compilerLoaded = false;
|
||||
|
||||
var SolcW = function() {
|
||||
};
|
||||
class SolcW {
|
||||
|
||||
SolcW.prototype.load_compiler = function(done) {
|
||||
if (compilerLoaded) { done(); }
|
||||
solcProcess = require('child_process').fork(utils.joinPath(__dirname, '/solcP.js'));
|
||||
solcProcess.once('message', function(msg) {
|
||||
if (msg.result !== 'loadedCompiler') {
|
||||
return;
|
||||
load_compiler(done) {
|
||||
if (compilerLoaded) {
|
||||
done();
|
||||
}
|
||||
compilerLoaded = true;
|
||||
done();
|
||||
});
|
||||
solcProcess.send({action: 'loadCompiler'});
|
||||
};
|
||||
solcProcess = require('child_process').fork(utils.joinPath(__dirname, '/solcP.js'));
|
||||
solcProcess.once('message', function (msg) {
|
||||
if (msg.result !== 'loadedCompiler') {
|
||||
return;
|
||||
}
|
||||
compilerLoaded = true;
|
||||
done();
|
||||
});
|
||||
solcProcess.send({action: 'loadCompiler'});
|
||||
}
|
||||
|
||||
SolcW.prototype.isCompilerLoaded = function() {
|
||||
return (compilerLoaded === true);
|
||||
};
|
||||
isCompilerLoaded() {
|
||||
return (compilerLoaded === true);
|
||||
}
|
||||
|
||||
SolcW.prototype.compile = function(obj, optimize, done) {
|
||||
solcProcess.once('message', function(msg) {
|
||||
if (msg.result !== 'compilation') {
|
||||
return;
|
||||
}
|
||||
done(msg.output);
|
||||
});
|
||||
solcProcess.send({action: 'compile', obj: obj, optimize: optimize});
|
||||
};
|
||||
compile(obj, optimize, done) {
|
||||
solcProcess.once('message', function (msg) {
|
||||
if (msg.result !== 'compilation') {
|
||||
return;
|
||||
}
|
||||
done(msg.output);
|
||||
});
|
||||
solcProcess.send({action: 'compile', obj: obj, optimize: optimize});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = SolcW;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +1,36 @@
|
|||
var fs = require('./fs.js');
|
||||
var Plugins = require('./plugins.js');
|
||||
var utils = require('../utils/utils.js');
|
||||
let fs = require('./fs.js');
|
||||
let Plugins = require('./plugins.js');
|
||||
let utils = require('../utils/utils.js');
|
||||
|
||||
// TODO: add wrapper for fs so it can also work in the browser
|
||||
// can work with both read and save
|
||||
var Config = function(options) {
|
||||
this.env = options.env;
|
||||
this.blockchainConfig = {};
|
||||
this.contractsConfig = {};
|
||||
this.pipelineConfig = {};
|
||||
this.webServerConfig = {};
|
||||
this.chainTracker = {};
|
||||
this.assetFiles = {};
|
||||
this.contractsFiles = [];
|
||||
this.configDir = options.configDir || 'config/';
|
||||
this.chainsFile = options.chainsFile || './chains.json';
|
||||
this.plugins = options.plugins;
|
||||
this.logger = options.logger;
|
||||
this.events = options.events;
|
||||
};
|
||||
class Config {
|
||||
constructor(options) {
|
||||
this.env = options.env;
|
||||
this.blockchainConfig = {};
|
||||
this.contractsConfig = {};
|
||||
this.pipelineConfig = {};
|
||||
this.webServerConfig = {};
|
||||
this.chainTracker = {};
|
||||
this.assetFiles = {};
|
||||
this.contractsFiles = [];
|
||||
this.configDir = options.configDir || 'config/';
|
||||
this.chainsFile = options.chainsFile || './chains.json';
|
||||
this.plugins = options.plugins;
|
||||
this.logger = options.logger;
|
||||
this.events = options.events;
|
||||
}
|
||||
}
|
||||
|
||||
Config.prototype.loadConfigFiles = function(options) {
|
||||
var interceptLogs = options.interceptLogs;
|
||||
Config.prototype.loadConfigFiles = function (options) {
|
||||
let interceptLogs = options.interceptLogs;
|
||||
if (options.interceptLogs === undefined) {
|
||||
interceptLogs = true;
|
||||
}
|
||||
|
||||
//Check if the config file exists
|
||||
var embarkConfigExists = fs.existsSync(options.embarkConfig);
|
||||
if(!embarkConfigExists){
|
||||
let embarkConfigExists = fs.existsSync(options.embarkConfig);
|
||||
if (!embarkConfigExists) {
|
||||
this.logger.error('Cannot find file ' + options.embarkConfig + '. Please ensure you are running this command inside the Dapp folder');
|
||||
process.exit(1);
|
||||
}
|
||||
|
|
@ -36,23 +38,22 @@ Config.prototype.loadConfigFiles = function(options) {
|
|||
this.embarkConfig = fs.readJSONSync(options.embarkConfig);
|
||||
this.embarkConfig.plugins = this.embarkConfig.plugins || {};
|
||||
|
||||
this.plugins = new Plugins({plugins: this.embarkConfig.plugins, logger: this.logger, interceptLogs: interceptLogs, events: this.events, config: this});
|
||||
this.plugins = new Plugins({
|
||||
plugins: this.embarkConfig.plugins,
|
||||
logger: this.logger,
|
||||
interceptLogs: interceptLogs,
|
||||
events: this.events,
|
||||
config: this
|
||||
});
|
||||
this.plugins.loadPlugins();
|
||||
|
||||
this.loadEmbarkConfigFile();
|
||||
this.loadBlockchainConfigFile();
|
||||
this.loadStorageConfigFile();
|
||||
this.loadCommunicationConfigFile();
|
||||
|
||||
this.loadPipelineConfigFile();
|
||||
|
||||
this.loadContractsConfigFile();
|
||||
this.load();
|
||||
this.loadWebServerConfigFile();
|
||||
this.loadChainTrackerFile();
|
||||
this.loadPluginContractFiles();
|
||||
};
|
||||
|
||||
Config.prototype.reloadConfig = function() {
|
||||
Config.prototype.load = Config.prototype.reloadConfig = function () {
|
||||
this.loadEmbarkConfigFile();
|
||||
this.loadBlockchainConfigFile();
|
||||
this.loadStorageConfigFile();
|
||||
|
|
@ -62,8 +63,8 @@ Config.prototype.reloadConfig = function() {
|
|||
this.loadChainTrackerFile();
|
||||
};
|
||||
|
||||
Config.prototype.loadBlockchainConfigFile = function() {
|
||||
var defaultBlockchainConfig = fs.readJSONSync(this.configDir + "blockchain.json");
|
||||
Config.prototype.loadBlockchainConfigFile = function () {
|
||||
let defaultBlockchainConfig = fs.readJSONSync(this.configDir + "blockchain.json");
|
||||
this.blockchainConfig = defaultBlockchainConfig[this.env] || {};
|
||||
|
||||
if (this.blockchainConfig.enabled === undefined) {
|
||||
|
|
@ -71,31 +72,32 @@ Config.prototype.loadBlockchainConfigFile = function() {
|
|||
}
|
||||
};
|
||||
|
||||
Config.prototype.loadContractsConfigFile = function() {
|
||||
Config.prototype.loadContractsConfigFile = function () {
|
||||
|
||||
var configObject = {};
|
||||
|
||||
var configPlugins = this.plugins.getPluginsFor('contractsConfig');
|
||||
let configObject = {};
|
||||
let configPlugins = [];
|
||||
this.plugins.emit('get', 'contractsConfig', (kinds) => {
|
||||
configPlugins = kinds;
|
||||
});
|
||||
if (configPlugins.length > 0) {
|
||||
configPlugins.forEach(function(plugin) {
|
||||
plugin.contractsConfigs.forEach(function(pluginConfig) {
|
||||
configPlugins.forEach(function (plugin) {
|
||||
plugin.contractsConfigs.forEach(function (pluginConfig) {
|
||||
configObject = utils.recursiveMerge(configObject, pluginConfig);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
var contractsConfig = fs.readJSONSync(this.configDir + "contracts.json");
|
||||
let contractsConfig = fs.readJSONSync(this.configDir + "contracts.json");
|
||||
configObject = utils.recursiveMerge(configObject, contractsConfig);
|
||||
var defaultContractsConfig = configObject['default'];
|
||||
var envContractsConfig = configObject[this.env];
|
||||
let defaultContractsConfig = configObject['default'];
|
||||
let envContractsConfig = configObject[this.env];
|
||||
|
||||
var mergedConfig = utils.recursiveMerge(defaultContractsConfig, envContractsConfig);
|
||||
this.contractsConfig = mergedConfig;
|
||||
this.contractsConfig = utils.recursiveMerge(defaultContractsConfig, envContractsConfig);
|
||||
};
|
||||
|
||||
|
||||
Config.prototype.loadStorageConfigFile = function() {
|
||||
var configObject = {
|
||||
Config.prototype.loadStorageConfigFile = function () {
|
||||
let configObject = {
|
||||
"default": {
|
||||
"enabled": true,
|
||||
"available_providers": ["ipfs"],
|
||||
|
|
@ -104,11 +106,10 @@ Config.prototype.loadStorageConfigFile = function() {
|
|||
"host": "localhost",
|
||||
"port": 5001
|
||||
},
|
||||
"development": {
|
||||
}
|
||||
"development": {}
|
||||
};
|
||||
|
||||
//var configPlugins = this.plugins.getPluginsFor('storageConfig');
|
||||
//let configPlugins = this.plugins.getPluginsFor('storageConfig');
|
||||
//if (configPlugins.length > 0) {
|
||||
// configPlugins.forEach(function(plugin) {
|
||||
// plugin.contractsConfigs.forEach(function(pluginConfig) {
|
||||
|
|
@ -117,16 +118,16 @@ Config.prototype.loadStorageConfigFile = function() {
|
|||
// });
|
||||
//}
|
||||
|
||||
var storageConfig;
|
||||
let storageConfig;
|
||||
if (fs.existsSync(this.configDir + "storage.json")) {
|
||||
storageConfig = fs.readJSONSync(this.configDir + "storage.json");
|
||||
configObject = utils.recursiveMerge(configObject, storageConfig);
|
||||
}
|
||||
|
||||
var defaultStorageConfig = configObject['default'];
|
||||
var envStorageConfig = configObject[this.env];
|
||||
let defaultStorageConfig = configObject['default'];
|
||||
let envStorageConfig = configObject[this.env];
|
||||
|
||||
var mergedConfig = utils.recursiveMerge(defaultStorageConfig, envStorageConfig);
|
||||
let mergedConfig = utils.recursiveMerge(defaultStorageConfig, envStorageConfig);
|
||||
this.storageConfig = mergedConfig || {};
|
||||
|
||||
if (this.storageConfig.enabled === undefined) {
|
||||
|
|
@ -137,8 +138,8 @@ Config.prototype.loadStorageConfigFile = function() {
|
|||
}
|
||||
};
|
||||
|
||||
Config.prototype.loadCommunicationConfigFile = function() {
|
||||
var configObject = {
|
||||
Config.prototype.loadCommunicationConfigFile = function () {
|
||||
let configObject = {
|
||||
"default": {
|
||||
"enabled": true,
|
||||
"provider": "whisper",
|
||||
|
|
@ -146,7 +147,7 @@ Config.prototype.loadCommunicationConfigFile = function() {
|
|||
}
|
||||
};
|
||||
|
||||
//var configPlugins = this.plugins.getPluginsFor('communicationConfig');
|
||||
//let configPlugins = this.plugins.getPluginsFor('communicationConfig');
|
||||
//if (configPlugins.length > 0) {
|
||||
// configPlugins.forEach(function(plugin) {
|
||||
// plugin.contractsConfigs.forEach(function(pluginConfig) {
|
||||
|
|
@ -155,17 +156,17 @@ Config.prototype.loadCommunicationConfigFile = function() {
|
|||
// });
|
||||
//}
|
||||
|
||||
var communicationConfig;
|
||||
let communicationConfig;
|
||||
|
||||
if (fs.existsSync(this.configDir + "communication.json")) {
|
||||
communicationConfig = fs.readJSONSync(this.configDir + "communication.json");
|
||||
configObject = utils.recursiveMerge(configObject, communicationConfig);
|
||||
}
|
||||
|
||||
var defaultCommunicationConfig = configObject['default'];
|
||||
var envCommunicationConfig = configObject[this.env];
|
||||
let defaultCommunicationConfig = configObject['default'];
|
||||
let envCommunicationConfig = configObject[this.env];
|
||||
|
||||
var mergedConfig = utils.recursiveMerge(defaultCommunicationConfig, envCommunicationConfig);
|
||||
let mergedConfig = utils.recursiveMerge(defaultCommunicationConfig, envCommunicationConfig);
|
||||
this.communicationConfig = mergedConfig || {};
|
||||
|
||||
// TODO: probably not necessary if the default object is done right
|
||||
|
|
@ -177,14 +178,14 @@ Config.prototype.loadCommunicationConfigFile = function() {
|
|||
}
|
||||
};
|
||||
|
||||
Config.prototype.loadWebServerConfigFile = function() {
|
||||
var webServerConfigJSON;
|
||||
Config.prototype.loadWebServerConfigFile = function () {
|
||||
let webServerConfigJSON;
|
||||
if (fs.existsSync(this.configDir + "webserver.json")) {
|
||||
webServerConfigJSON = fs.readJSONSync(this.configDir + "webserver.json");
|
||||
} else {
|
||||
webServerConfigJSON = {};
|
||||
}
|
||||
var defaultWebConfig = {
|
||||
let defaultWebConfig = {
|
||||
"enabled": true,
|
||||
"host": "localhost",
|
||||
"port": 8000
|
||||
|
|
@ -192,28 +193,28 @@ Config.prototype.loadWebServerConfigFile = function() {
|
|||
this.webServerConfig = utils.recursiveMerge(defaultWebConfig, webServerConfigJSON);
|
||||
};
|
||||
|
||||
Config.prototype.loadEmbarkConfigFile = function() {
|
||||
var contracts = this.embarkConfig.contracts;
|
||||
Config.prototype.loadEmbarkConfigFile = function () {
|
||||
let contracts = this.embarkConfig.contracts;
|
||||
this.contractsFiles = this.loadFiles(contracts);
|
||||
|
||||
this.buildDir = this.embarkConfig.buildDir;
|
||||
this.buildDir = this.embarkConfig.buildDir;
|
||||
this.configDir = this.embarkConfig.config;
|
||||
};
|
||||
|
||||
Config.prototype.loadPipelineConfigFile = function() {
|
||||
var assets = this.embarkConfig.app;
|
||||
for(var targetFile in assets) {
|
||||
Config.prototype.loadPipelineConfigFile = function () {
|
||||
let assets = this.embarkConfig.app;
|
||||
for (let targetFile in assets) {
|
||||
this.assetFiles[targetFile] = this.loadFiles(assets[targetFile]);
|
||||
}
|
||||
};
|
||||
|
||||
Config.prototype.loadChainTrackerFile = function() {
|
||||
//var self = this;
|
||||
var chainTracker;
|
||||
Config.prototype.loadChainTrackerFile = function () {
|
||||
//let self = this;
|
||||
let chainTracker;
|
||||
try {
|
||||
chainTracker = fs.readJSONSync(this.chainsFile);
|
||||
}
|
||||
catch(err) {
|
||||
catch (err) {
|
||||
//self.logger.info(this.chainsFile + ' file not found, creating it...');
|
||||
chainTracker = {};
|
||||
fs.writeJSONSync(this.chainsFile, {});
|
||||
|
|
@ -221,65 +222,85 @@ Config.prototype.loadChainTrackerFile = function() {
|
|||
this.chainTracker = chainTracker;
|
||||
};
|
||||
|
||||
Config.prototype.loadFiles = function(files) {
|
||||
var self = this;
|
||||
var originalFiles = utils.filesMatchingPattern(files);
|
||||
var readFiles = [];
|
||||
Config.prototype.loadFiles = function (files) {
|
||||
let self = this;
|
||||
let originalFiles = utils.filesMatchingPattern(files);
|
||||
let readFiles = [];
|
||||
|
||||
// get embark.js object first
|
||||
originalFiles.filter(function(file) {
|
||||
originalFiles.filter(function (file) {
|
||||
return file.indexOf('.') >= 0;
|
||||
}).filter(function(file) {
|
||||
}).filter(function (file) {
|
||||
if (file === 'embark.js') {
|
||||
|
||||
if (self.blockchainConfig.enabled || self.communicationConfig.provider === 'whisper' || self.communicationConfig.available_providers.indexOf('whisper') >= 0) {
|
||||
readFiles.push({filename: 'web3.js', content: fs.readFileSync(fs.embarkPath("js/web3.js")).toString(), path: fs.embarkPath("js/web3.js")});
|
||||
readFiles.push({
|
||||
filename: 'web3.js',
|
||||
content: fs.readFileSync(fs.embarkPath("js/web3.js")).toString(),
|
||||
path: fs.embarkPath("js/web3.js")
|
||||
});
|
||||
}
|
||||
|
||||
if (self.storageConfig.enabled && (self.storageConfig.provider === 'ipfs' || self.storageConfig.available_providers.indexOf('ipfs') >= 0)) {
|
||||
readFiles.push({filename: 'ipfs.js', content: fs.readFileSync(fs.embarkPath("js/ipfs.js")).toString(), path: fs.embarkPath("js/ipfs.js")});
|
||||
readFiles.push({
|
||||
filename: 'ipfs.js',
|
||||
content: fs.readFileSync(fs.embarkPath("js/ipfs.js")).toString(),
|
||||
path: fs.embarkPath("js/ipfs.js")
|
||||
});
|
||||
}
|
||||
|
||||
if (self.communicationConfig.enabled && (self.communicationConfig.provider === 'orbit' || self.communicationConfig.available_providers.indexOf('orbit') >= 0)) {
|
||||
// TODO: remove duplicated files if functionality is the same for storage and orbit
|
||||
readFiles.push({filename: 'ipfs-api.js', content: fs.readFileSync(fs.embarkPath("js/ipfs-api.min.js")).toString(), path: fs.embarkPath("js/ipfs-api.min.js")});
|
||||
readFiles.push({filename: 'orbit.js', content: fs.readFileSync(fs.embarkPath("js/orbit.min.js")).toString(), path: fs.embarkPath("js/orbit.min.js")});
|
||||
readFiles.push({
|
||||
filename: 'ipfs-api.js',
|
||||
content: fs.readFileSync(fs.embarkPath("js/ipfs-api.min.js")).toString(),
|
||||
path: fs.embarkPath("js/ipfs-api.min.js")
|
||||
});
|
||||
readFiles.push({
|
||||
filename: 'orbit.js',
|
||||
content: fs.readFileSync(fs.embarkPath("js/orbit.min.js")).toString(),
|
||||
path: fs.embarkPath("js/orbit.min.js")
|
||||
});
|
||||
}
|
||||
|
||||
readFiles.push({filename: 'embark.js', content: fs.readFileSync(fs.embarkPath("js/build/embark.bundle.js")).toString(), path: fs.embarkPath("js/build/embark.bundle.js")});
|
||||
readFiles.push({
|
||||
filename: 'embark.js',
|
||||
content: fs.readFileSync(fs.embarkPath("js/build/embark.bundle.js")).toString(),
|
||||
path: fs.embarkPath("js/build/embark.bundle.js")
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// get plugins
|
||||
var filesFromPlugins = [];
|
||||
let filesFromPlugins = [];
|
||||
|
||||
var filePlugins = self.plugins.getPluginsFor('pipelineFiles');
|
||||
let filePlugins = self.plugins.getPluginsFor('pipelineFiles');
|
||||
|
||||
if (filePlugins.length > 0) {
|
||||
filePlugins.forEach(function(plugin) {
|
||||
filePlugins.forEach(function (plugin) {
|
||||
try {
|
||||
var fileObjects = plugin.runFilePipeline();
|
||||
for (var i=0; i < fileObjects.length; i++) {
|
||||
var fileObject = fileObjects[i];
|
||||
let fileObjects = plugin.runFilePipeline();
|
||||
for (let i = 0; i < fileObjects.length; i++) {
|
||||
let fileObject = fileObjects[i];
|
||||
filesFromPlugins.push(fileObject);
|
||||
}
|
||||
}
|
||||
catch(err) {
|
||||
catch (err) {
|
||||
self.logger.error(err.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
filesFromPlugins.filter(function(file) {
|
||||
filesFromPlugins.filter(function (file) {
|
||||
if (utils.fileMatchesPattern(files, file.intendedPath)) {
|
||||
readFiles.push(file);
|
||||
}
|
||||
});
|
||||
|
||||
// get user files
|
||||
originalFiles.filter(function(file) {
|
||||
originalFiles.filter(function (file) {
|
||||
return file.indexOf('.') >= 0;
|
||||
}).filter(function(file) {
|
||||
}).filter(function (file) {
|
||||
if (file === 'embark.js') {
|
||||
return;
|
||||
} else if (file === 'abi.js') {
|
||||
|
|
@ -292,15 +313,19 @@ Config.prototype.loadFiles = function(files) {
|
|||
return readFiles;
|
||||
};
|
||||
|
||||
Config.prototype.loadPluginContractFiles = function() {
|
||||
var self = this;
|
||||
Config.prototype.loadPluginContractFiles = function () {
|
||||
let self = this;
|
||||
|
||||
var contractsPlugins = this.plugins.getPluginsFor('contractFiles');
|
||||
let contractsPlugins = this.plugins.getPluginsFor('contractFiles');
|
||||
if (contractsPlugins.length > 0) {
|
||||
contractsPlugins.forEach(function(plugin) {
|
||||
plugin.contractsFiles.forEach(function(file) {
|
||||
var filename = file.replace('./','');
|
||||
self.contractsFiles.push({filename: filename, content: plugin.loadPluginFile(file), path: plugin.pathToFile(file)});
|
||||
contractsPlugins.forEach(function (plugin) {
|
||||
plugin.contractsFiles.forEach(function (file) {
|
||||
let filename = file.replace('./', '');
|
||||
self.contractsFiles.push({
|
||||
filename: filename,
|
||||
content: plugin.loadPluginFile(file),
|
||||
path: plugin.pathToFile(file)
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
class Core {
|
||||
|
||||
var Core = function() {};
|
||||
|
||||
}
|
||||
module.exports = Core;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,244 +1,249 @@
|
|||
var http = require('http');
|
||||
var Web3 = require('web3');
|
||||
var utils = require('../utils/utils.js');
|
||||
let http = require('http');
|
||||
let Web3 = require('web3');
|
||||
let utils = require('../utils/utils.js');
|
||||
let Events = require('./events.js');
|
||||
let Logger = require('./logger.js');
|
||||
let Config = require('./config.js');
|
||||
let DeployManager = require('../contracts/deploy_manager.js');
|
||||
let ABIGenerator = require('../contracts/abi.js');
|
||||
let ServicesMonitor = require('./services_monitor.js');
|
||||
let Pipeline = require('../pipeline/pipeline.js');
|
||||
let Server = require('../pipeline/server.js');
|
||||
let Watch = require('../pipeline/watch.js');
|
||||
let version = require('../../package.json');
|
||||
|
||||
var Events = require('./events.js');
|
||||
var Logger = require('./logger.js');
|
||||
var Config = require('./config.js');
|
||||
class Engine {
|
||||
constructor(options) {
|
||||
this.env = options.env;
|
||||
this.embarkConfig = options.embarkConfig;
|
||||
this.interceptLogs = options.interceptLogs;
|
||||
this.version = version;
|
||||
}
|
||||
|
||||
var DeployManager = require('../contracts/deploy_manager.js');
|
||||
var ABIGenerator = require('../contracts/abi.js');
|
||||
var ServicesMonitor = require('./services_monitor.js');
|
||||
var Pipeline = require('../pipeline/pipeline.js');
|
||||
var Server = require('../pipeline/server.js');
|
||||
var Watch = require('../pipeline/watch.js');
|
||||
var version = require('../../package.json').version;
|
||||
init(_options) {
|
||||
let self = this;
|
||||
let options = _options || {};
|
||||
this.events = new Events();
|
||||
this.logger = options.logger || new Logger({logLevel: 'debug'});
|
||||
this.config = new Config({env: this.env, logger: this.logger, events: this.events});
|
||||
this.config.loadConfigFiles({embarkConfig: this.embarkConfig, interceptLogs: this.interceptLogs});
|
||||
this.plugins = this.config.plugins;
|
||||
|
||||
var Engine = function(options) {
|
||||
this.env = options.env;
|
||||
this.embarkConfig = options.embarkConfig;
|
||||
this.interceptLogs = options.interceptLogs;
|
||||
this.version = version;
|
||||
};
|
||||
this.servicesMonitor = new ServicesMonitor({events: this.events, logger: this.logger});
|
||||
this.servicesMonitor.addCheck('embarkVersion', function (cb) {
|
||||
return cb({name: 'Embark ' + self.version, status: 'green'});
|
||||
}, 0);
|
||||
}
|
||||
|
||||
Engine.prototype.init = function(_options) {
|
||||
var self = this;
|
||||
var options = _options || {};
|
||||
this.events = new Events();
|
||||
this.logger = options.logger || new Logger({logLevel: 'debug'});
|
||||
this.config = new Config({env: this.env, logger: this.logger, events: this.events});
|
||||
this.config.loadConfigFiles({embarkConfig: this.embarkConfig, interceptLogs: this.interceptLogs});
|
||||
this.plugins = this.config.plugins;
|
||||
startMonitor() {
|
||||
let self = this;
|
||||
if (this.plugins) {
|
||||
let servicePlugins = this.plugins.getPluginsFor('serviceChecks');
|
||||
servicePlugins.forEach(function (plugin) {
|
||||
plugin.serviceChecks.forEach(function (pluginCheck) {
|
||||
self.servicesMonitor.addCheck(pluginCheck.checkName, pluginCheck.checkFn, pluginCheck.time);
|
||||
});
|
||||
});
|
||||
}
|
||||
this.servicesMonitor.startMonitor();
|
||||
}
|
||||
|
||||
this.servicesMonitor = new ServicesMonitor({events: this.events, logger: this.logger});
|
||||
this.servicesMonitor.addCheck('embarkVersion', function(cb) {
|
||||
return cb({name: 'Embark ' + self.version, status: 'green'});
|
||||
}, 0);
|
||||
};
|
||||
startService(serviceName, _options) {
|
||||
let options = _options || {};
|
||||
|
||||
Engine.prototype.startMonitor = function() {
|
||||
var self = this;
|
||||
if (this.plugins) {
|
||||
var servicePlugins = this.plugins.getPluginsFor('serviceChecks');
|
||||
servicePlugins.forEach(function(plugin) {
|
||||
plugin.serviceChecks.forEach(function(pluginCheck) {
|
||||
self.servicesMonitor.addCheck(pluginCheck.checkName, pluginCheck.checkFn, pluginCheck.time);
|
||||
let services = {
|
||||
"pipeline": this.pipelineService,
|
||||
"abi": this.abiService,
|
||||
"deployment": this.deploymentService,
|
||||
"fileWatcher": this.fileWatchService,
|
||||
"webServer": this.webServerService,
|
||||
"ipfs": this.ipfsService,
|
||||
"web3": this.web3Service
|
||||
};
|
||||
|
||||
let service = services[serviceName];
|
||||
|
||||
if (!service) {
|
||||
throw new Error("unknown service: " + serviceName);
|
||||
}
|
||||
|
||||
// need to be careful with circular references due to passing the web3 object
|
||||
//this.logger.trace("calling: " + serviceName + "(" + JSON.stringify(options) + ")");
|
||||
return service.apply(this, [options]);
|
||||
}
|
||||
|
||||
pipelineService(options) {
|
||||
let self = this;
|
||||
this.logger.setStatus("Building Assets");
|
||||
let pipeline = new Pipeline({
|
||||
buildDir: this.config.buildDir,
|
||||
contractsFiles: this.config.contractsFiles,
|
||||
assetFiles: this.config.assetFiles,
|
||||
logger: this.logger,
|
||||
plugins: this.plugins
|
||||
});
|
||||
this.events.on('abi', function (abi) {
|
||||
self.currentAbi = abi;
|
||||
pipeline.build(abi);
|
||||
self.events.emit('outputDone');
|
||||
});
|
||||
// TODO: still need to redeploy contracts because the original contracts
|
||||
// config is being corrupted
|
||||
//this.events.on('file-event', function(fileType, path) {
|
||||
// if (fileType === 'asset') {
|
||||
// self.config.reloadConfig();
|
||||
// pipeline.build(self.abi, path);
|
||||
// self.events.emit('outputDone');
|
||||
// }
|
||||
//});
|
||||
}
|
||||
|
||||
abiService(options) {
|
||||
let self = this;
|
||||
let generateABICode = function (contractsManager) {
|
||||
let abiGenerator = new ABIGenerator({
|
||||
blockchainConfig: self.config.blockchainConfig,
|
||||
contractsManager: contractsManager,
|
||||
plugins: self.plugins,
|
||||
storageConfig: self.config.storageConfig,
|
||||
communicationConfig: self.config.communicationConfig
|
||||
});
|
||||
let embarkJSABI = abiGenerator.generateABI({useEmbarkJS: true});
|
||||
let vanillaABI = abiGenerator.generateABI({useEmbarkJS: false});
|
||||
let vanillaContractsABI = abiGenerator.generateContracts(false);
|
||||
|
||||
self.events.emit('abi-contracts-vanila', vanillaContractsABI);
|
||||
self.events.emit('abi-vanila', vanillaABI);
|
||||
self.events.emit('abi', embarkJSABI);
|
||||
};
|
||||
this.events.on('contractsDeployed', generateABICode);
|
||||
this.events.on('blockchainDisabled', generateABICode);
|
||||
}
|
||||
|
||||
deploymentService(options) {
|
||||
let self = this;
|
||||
this.deployManager = new DeployManager({
|
||||
web3: options.web3 || self.web3,
|
||||
trackContracts: options.trackContracts,
|
||||
config: this.config,
|
||||
logger: this.logger,
|
||||
plugins: this.plugins,
|
||||
events: this.events
|
||||
});
|
||||
|
||||
this.events.on('file-event', function (fileType, path) {
|
||||
// TODO: for now need to deploy on asset chanes as well
|
||||
// because the contractsManager config is corrupted after a deploy
|
||||
//if (fileType === 'contract' || fileType === 'config') {
|
||||
self.config.reloadConfig();
|
||||
self.deployManager.deployContracts(function () {
|
||||
});
|
||||
//}
|
||||
});
|
||||
}
|
||||
|
||||
fileWatchService(options) {
|
||||
this.logger.setStatus("Watching for changes");
|
||||
let watch = new Watch({logger: this.logger, events: this.events});
|
||||
watch.start();
|
||||
}
|
||||
|
||||
webServerService(options) {
|
||||
let self = this;
|
||||
let webServerConfig = this.config.webServerConfig;
|
||||
if (!webServerConfig.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
let host = options.host || webServerConfig.host;
|
||||
let port = options.port || webServerConfig.port;
|
||||
|
||||
this.logger.setStatus("Starting Server");
|
||||
let server = new Server({
|
||||
logger: this.logger,
|
||||
host: host,
|
||||
port: port
|
||||
});
|
||||
|
||||
self.servicesMonitor.addCheck('Webserver', function (cb) {
|
||||
let devServer = 'Webserver (http://' + host + ':' + port + ')';
|
||||
return cb({name: devServer, status: 'green'});
|
||||
});
|
||||
|
||||
server.start(function () {
|
||||
});
|
||||
}
|
||||
|
||||
ipfsService(options) {
|
||||
let self = this;
|
||||
self.servicesMonitor.addCheck('IPFS', function (cb) {
|
||||
utils.checkIsAvailable('http://localhost:5001', function (available) {
|
||||
if (available) {
|
||||
//Ideally this method should be in an IPFS API JSONRPC wrapper
|
||||
//The URL should also be flexible to accept non-default IPFS url
|
||||
self.logger.trace("Checking IPFS version...");
|
||||
http.get('http://localhost:5001/api/v0/version', function (res) {
|
||||
let body = '';
|
||||
res.on('data', function (d) {
|
||||
body += d;
|
||||
});
|
||||
res.on('end', function () {
|
||||
try {
|
||||
let parsed = JSON.parse(body);
|
||||
if (parsed.Version) {
|
||||
return cb({name: ("IPFS " + parsed.Version), status: 'green'});
|
||||
}
|
||||
else {
|
||||
return cb({name: "IPFS ", status: 'green'});
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
return cb({name: "IPFS ", status: 'red'});
|
||||
}
|
||||
});
|
||||
res.on('error', function (err) {
|
||||
self.logger.trace("Check IPFS version error: " + err);
|
||||
return cb({name: "IPFS ", status: 'red'});
|
||||
});
|
||||
});
|
||||
}
|
||||
else {
|
||||
return cb({name: "IPFS ", status: 'red'});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
this.servicesMonitor.startMonitor();
|
||||
};
|
||||
|
||||
Engine.prototype.startService = function(serviceName, _options) {
|
||||
var options = _options || {};
|
||||
|
||||
var services = {
|
||||
"pipeline": this.pipelineService,
|
||||
"abi": this.abiService,
|
||||
"deployment": this.deploymentService,
|
||||
"fileWatcher": this.fileWatchService,
|
||||
"webServer": this.webServerService,
|
||||
"ipfs": this.ipfsService,
|
||||
"web3": this.web3Service
|
||||
};
|
||||
|
||||
var service = services[serviceName];
|
||||
|
||||
if (!service) {
|
||||
throw new Error("unknown service: " + serviceName);
|
||||
}
|
||||
|
||||
// need to be careful with circular references due to passing the web3 object
|
||||
//this.logger.trace("calling: " + serviceName + "(" + JSON.stringify(options) + ")");
|
||||
return service.apply(this, [options]);
|
||||
};
|
||||
|
||||
Engine.prototype.pipelineService = function(options) {
|
||||
var self = this;
|
||||
this.logger.setStatus("Building Assets");
|
||||
var pipeline = new Pipeline({
|
||||
buildDir: this.config.buildDir,
|
||||
contractsFiles: this.config.contractsFiles,
|
||||
assetFiles: this.config.assetFiles,
|
||||
logger: this.logger,
|
||||
plugins: this.plugins
|
||||
});
|
||||
this.events.on('abi', function(abi) {
|
||||
self.currentAbi = abi;
|
||||
pipeline.build(abi);
|
||||
self.events.emit('outputDone');
|
||||
});
|
||||
// TODO: still need to redeploy contracts because the original contracts
|
||||
// config is being corrupted
|
||||
//this.events.on('file-event', function(fileType, path) {
|
||||
// if (fileType === 'asset') {
|
||||
// self.config.reloadConfig();
|
||||
// pipeline.build(self.abi, path);
|
||||
// self.events.emit('outputDone');
|
||||
// }
|
||||
//});
|
||||
};
|
||||
|
||||
Engine.prototype.abiService = function(options) {
|
||||
var self = this;
|
||||
var generateABICode = function(contractsManager) {
|
||||
var abiGenerator = new ABIGenerator({
|
||||
blockchainConfig: self.config.blockchainConfig,
|
||||
contractsManager: contractsManager,
|
||||
plugins: self.plugins,
|
||||
storageConfig: self.config.storageConfig,
|
||||
communicationConfig: self.config.communicationConfig
|
||||
});
|
||||
var embarkJSABI = abiGenerator.generateABI({useEmbarkJS: true});
|
||||
var vanillaABI = abiGenerator.generateABI({useEmbarkJS: false});
|
||||
var vanillaContractsABI = abiGenerator.generateContracts(false);
|
||||
|
||||
self.events.emit('abi-contracts-vanila', vanillaContractsABI);
|
||||
self.events.emit('abi-vanila', vanillaABI);
|
||||
self.events.emit('abi', embarkJSABI);
|
||||
};
|
||||
this.events.on('contractsDeployed', generateABICode);
|
||||
this.events.on('blockchainDisabled', generateABICode);
|
||||
};
|
||||
|
||||
Engine.prototype.deploymentService = function(options) {
|
||||
var self = this;
|
||||
this.deployManager = new DeployManager({
|
||||
web3: options.web3 || self.web3,
|
||||
trackContracts: options.trackContracts,
|
||||
config: this.config,
|
||||
logger: this.logger,
|
||||
plugins: this.plugins,
|
||||
events: this.events
|
||||
});
|
||||
|
||||
this.events.on('file-event', function(fileType, path) {
|
||||
// TODO: for now need to deploy on asset chanes as well
|
||||
// because the contractsManager config is corrupted after a deploy
|
||||
//if (fileType === 'contract' || fileType === 'config') {
|
||||
self.config.reloadConfig();
|
||||
self.deployManager.deployContracts(function() {});
|
||||
//}
|
||||
});
|
||||
};
|
||||
|
||||
Engine.prototype.fileWatchService = function(options) {
|
||||
this.logger.setStatus("Watching for changes");
|
||||
var watch = new Watch({logger: this.logger, events: this.events});
|
||||
watch.start();
|
||||
};
|
||||
|
||||
Engine.prototype.webServerService = function(options) {
|
||||
var self = this;
|
||||
var webServerConfig = this.config.webServerConfig;
|
||||
if (!webServerConfig.enabled) { return; }
|
||||
|
||||
var host = options.host || webServerConfig.host;
|
||||
var port = options.port || webServerConfig.port;
|
||||
|
||||
this.logger.setStatus("Starting Server");
|
||||
var server = new Server({
|
||||
logger: this.logger,
|
||||
host: host,
|
||||
port: port
|
||||
});
|
||||
|
||||
self.servicesMonitor.addCheck('Webserver', function(cb) {
|
||||
var devServer = 'Webserver (http://' + host + ':' + port + ')';
|
||||
return cb({name: devServer, status: 'green'});
|
||||
});
|
||||
|
||||
server.start(function(){
|
||||
});
|
||||
};
|
||||
|
||||
Engine.prototype.ipfsService = function(options) {
|
||||
var self = this;
|
||||
self.servicesMonitor.addCheck('IPFS', function(cb) {
|
||||
utils.checkIsAvailable('http://localhost:5001', function(available) {
|
||||
if (available) {
|
||||
//Ideally this method should be in an IPFS API JSONRPC wrapper
|
||||
//The URL should also be flexible to accept non-default IPFS url
|
||||
self.logger.trace("Checking IPFS version...");
|
||||
http.get('http://localhost:5001/api/v0/version', function(res) {
|
||||
var body = '';
|
||||
res.on('data', function(d) {
|
||||
body += d;
|
||||
});
|
||||
res.on('end', function() {
|
||||
try{
|
||||
var parsed = JSON.parse(body);
|
||||
if(parsed.Version){
|
||||
return cb({name: ("IPFS " + parsed.Version), status: 'green'});
|
||||
}
|
||||
else{
|
||||
return cb({name: "IPFS ", status: 'green'});
|
||||
}
|
||||
}
|
||||
catch (e){
|
||||
return cb({name: "IPFS ", status: 'red'});
|
||||
}
|
||||
});
|
||||
res.on('error', function(err) {
|
||||
self.logger.trace("Check IPFS version error: " + err);
|
||||
return cb({name: "IPFS ", status: 'red'});
|
||||
});
|
||||
});
|
||||
}
|
||||
else {
|
||||
return cb({name: "IPFS ", status: 'red'});
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
Engine.prototype.web3Service = function(options) {
|
||||
var self = this;
|
||||
this.web3 = options.web3;
|
||||
if (this.web3 === undefined) {
|
||||
this.web3 = new Web3();
|
||||
var web3Endpoint = 'http://' + this.config.blockchainConfig.rpcHost + ':' + this.config.blockchainConfig.rpcPort;
|
||||
this.web3.setProvider(new this.web3.providers.HttpProvider(web3Endpoint));
|
||||
}
|
||||
|
||||
self.servicesMonitor.addCheck('Ethereum', function(cb) {
|
||||
if (self.web3.isConnected()) {
|
||||
return cb({name: (self.web3.version.node.split("/")[0] + " " + self.web3.version.node.split("/")[1].split("-")[0] + " (Ethereum)"), status: 'green'});
|
||||
} else {
|
||||
return cb({name: "No Blockchain node found", status: 'red'});
|
||||
web3Service(options) {
|
||||
let self = this;
|
||||
this.web3 = options.web3;
|
||||
if (this.web3 === undefined) {
|
||||
this.web3 = new Web3();
|
||||
let web3Endpoint = 'http://' + this.config.blockchainConfig.rpcHost + ':' + this.config.blockchainConfig.rpcPort;
|
||||
this.web3.setProvider(new this.web3.providers.HttpProvider(web3Endpoint));
|
||||
}
|
||||
});
|
||||
|
||||
self.servicesMonitor.addCheck('Whisper', function(cb) {
|
||||
self.web3.version.getWhisper(function(err, res) {
|
||||
if (err) {
|
||||
return cb({name: 'Whisper', status: 'red'});
|
||||
self.servicesMonitor.addCheck('Ethereum', function (cb) {
|
||||
if (self.web3.isConnected()) {
|
||||
return cb({
|
||||
name: (self.web3.version.node.split("/")[0] + " " + self.web3.version.node.split("/")[1].split("-")[0] + " (Ethereum)"),
|
||||
status: 'green'
|
||||
});
|
||||
} else {
|
||||
return cb({name: 'Whisper', status: 'green'});
|
||||
return cb({name: "No Blockchain node found", status: 'red'});
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
self.servicesMonitor.addCheck('Whisper', function (cb) {
|
||||
self.web3.version.getWhisper(function (err, res) {
|
||||
if (err) {
|
||||
return cb({name: 'Whisper', status: 'red'});
|
||||
} else {
|
||||
return cb({name: 'Whisper', status: 'green'});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Engine;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
var EventEmitter = require('events');
|
||||
//TODO: This is deprecated because Embark extends EventEmitter now
|
||||
let events = require('events');
|
||||
|
||||
class EventEmitter {
|
||||
constructor(options) {
|
||||
this.options = options;
|
||||
}
|
||||
}
|
||||
|
||||
EventEmitter.prototype = Object.create(events.EventEmitter.prototype);
|
||||
|
||||
module.exports = EventEmitter;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
var fs = require('fs-extra');
|
||||
var utils = require('../utils/utils.js');
|
||||
let fs = require('fs-extra');
|
||||
let utils = require('../utils/utils.js');
|
||||
|
||||
function mkdirpSync() {
|
||||
return fs.mkdirpSync.apply(fs.mkdirpSync, arguments);
|
||||
|
|
@ -25,7 +25,7 @@ function writeJSONSync() {
|
|||
return fs.writeJSONSync.apply(fs.writeJSONSync, arguments);
|
||||
}
|
||||
|
||||
function existsSync(){
|
||||
function existsSync() {
|
||||
return fs.existsSync.apply(fs.existsSync, arguments);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,52 @@
|
|||
var colors = require('colors');
|
||||
let colors = require('colors');
|
||||
|
||||
var Logger = function(options) {
|
||||
this.logLevels = ['error', 'warn', 'info', 'debug', 'trace'];
|
||||
this.logLevel = options.logLevel || 'info';
|
||||
this.logFunction = options.logFunction || console.log;
|
||||
this.contractsState = options.contractsState || function() {};
|
||||
this.setStatus = options.setStatus || console.log;
|
||||
};
|
||||
class Logger {
|
||||
constructor(options) {
|
||||
this.logLevels = ['error', 'warn', 'info', 'debug', 'trace'];
|
||||
this.logLevel = options.logLevel || 'info';
|
||||
this.logFunction = options.logFunction || console.log;
|
||||
this.contractsState = options.contractsState || function () {
|
||||
};
|
||||
this.setStatus = options.setStatus || console.log;
|
||||
}
|
||||
}
|
||||
|
||||
Logger.prototype.error = function(txt) {
|
||||
if (!(this.shouldLog('error'))) { return; }
|
||||
Logger.prototype.error = function (txt) {
|
||||
if (!(this.shouldLog('error'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt.red);
|
||||
};
|
||||
|
||||
Logger.prototype.warn = function(txt) {
|
||||
if (!(this.shouldLog('warn'))) { return; }
|
||||
Logger.prototype.warn = function (txt) {
|
||||
if (!(this.shouldLog('warn'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt.yellow);
|
||||
};
|
||||
|
||||
Logger.prototype.info = function(txt) {
|
||||
if (!(this.shouldLog('info'))) { return; }
|
||||
Logger.prototype.info = function (txt) {
|
||||
if (!(this.shouldLog('info'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt.green);
|
||||
};
|
||||
|
||||
Logger.prototype.debug = function(txt) {
|
||||
if (!(this.shouldLog('debug'))) { return; }
|
||||
Logger.prototype.debug = function (txt) {
|
||||
if (!(this.shouldLog('debug'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt);
|
||||
};
|
||||
|
||||
Logger.prototype.trace = function(txt) {
|
||||
if (!(this.shouldLog('trace'))) { return; }
|
||||
Logger.prototype.trace = function (txt) {
|
||||
if (!(this.shouldLog('trace'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt);
|
||||
};
|
||||
|
||||
Logger.prototype.shouldLog = function(level) {
|
||||
Logger.prototype.shouldLog = function (level) {
|
||||
return (this.logLevels.indexOf(level) <= this.logLevels.indexOf(this.logLevel));
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +1,59 @@
|
|||
/*jshint esversion: 6, loopfunc: true */
|
||||
var fs = require('./fs.js');
|
||||
var utils = require('../utils/utils.js');
|
||||
let fs = require('./fs.js');
|
||||
let utils = require('../utils/utils.js');
|
||||
let camelcase = require("underscore.string").camelcase;
|
||||
|
||||
// TODO: pass other params like blockchainConfig, contract files, etc..
|
||||
var Plugin = function(options) {
|
||||
this.name = options.name;
|
||||
this.pluginModule = options.pluginModule;
|
||||
this.pluginPath = options.pluginPath;
|
||||
this.pluginConfig = options.pluginConfig;
|
||||
this.shouldInterceptLogs = options.interceptLogs;
|
||||
this.clientWeb3Providers = [];
|
||||
this.contractsGenerators = [];
|
||||
this.pipeline = [];
|
||||
this.pipelineFiles = [];
|
||||
this.console = [];
|
||||
this.contractsConfigs = [];
|
||||
this.contractsFiles = [];
|
||||
this.compilers = [];
|
||||
this.serviceChecks = [];
|
||||
this.pluginTypes = [];
|
||||
this.logger = options.logger;
|
||||
this.events = options.events;
|
||||
this.config = options.config;
|
||||
};
|
||||
class Plugin {
|
||||
constructor(options) {
|
||||
this.config = {};
|
||||
for (let opt in options) {
|
||||
if (options.hasOwnProperty(opt)) {
|
||||
this.config[opt] = options[opt];
|
||||
}
|
||||
}
|
||||
let requiredOptions = ['name', 'pluginModule', 'pluginPath', 'config', 'interceptLogs', 'logger'];
|
||||
|
||||
Plugin.prototype.loadPlugin = function() {
|
||||
for (let i = 0; requiredOptions.length > i; i++) {
|
||||
if (!(utils.contains(Object.keys(this.config), requiredOptions[i]))) {
|
||||
throw new Error('Missing required plugin configuration key: ' + requiredOptions[i]);
|
||||
}
|
||||
}
|
||||
|
||||
this.clientWeb3Providers = [];
|
||||
this.contractsGenerators = [];
|
||||
this.pipeline = [];
|
||||
this.pipelineFiles = [];
|
||||
this.console = [];
|
||||
this.contractsConfigs = [];
|
||||
this.contractsFiles = [];
|
||||
this.compilers = [];
|
||||
this.serviceChecks = [];
|
||||
this.pluginTypes = [];
|
||||
|
||||
if (!(this instanceof Plugin)) {
|
||||
return new Plugin();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Plugin.prototype.runPlugin = Plugin.prototype.run = function () {
|
||||
if (this.shouldInterceptLogs) {
|
||||
this.interceptLogs(this.pluginModule);
|
||||
}
|
||||
(this.pluginModule.call(this, this));
|
||||
let fullyQualifiedPath = this.pathToFile(this.config.pluginModule);
|
||||
this.call(this.loadPluginFile(fullyQualifiedPath), this);
|
||||
};
|
||||
|
||||
Plugin.prototype.loadPluginFile = function(filename) {
|
||||
Plugin.prototype.loadPluginFile = function (filename) {
|
||||
return fs.readFileSync(this.pathToFile(filename)).toString();
|
||||
};
|
||||
|
||||
Plugin.prototype.pathToFile = function(filename) {
|
||||
Plugin.prototype.pathToFile = function (filename) {
|
||||
return utils.joinPath(this.pluginPath, filename);
|
||||
};
|
||||
|
||||
Plugin.prototype.interceptLogs = function(context) {
|
||||
var self = this;
|
||||
Plugin.prototype.interceptLogs = function (context) {
|
||||
let self = this;
|
||||
// TODO: this is a bit nasty, figure out a better way
|
||||
context.console = context.console || console;
|
||||
|
||||
|
|
@ -49,112 +62,125 @@ Plugin.prototype.interceptLogs = function(context) {
|
|||
// //self.logger.error.apply(self.logger, arguments);
|
||||
// self.logger.error(self.name + " > " + txt);
|
||||
//};
|
||||
context.console.log = function(txt) {
|
||||
context.console.log = function (txt) {
|
||||
self.logger.info(self.name + " > " + txt);
|
||||
};
|
||||
context.console.warn = function(txt) {
|
||||
context.console.warn = function (txt) {
|
||||
self.logger.warn(self.name + " > " + txt);
|
||||
};
|
||||
context.console.info = function(txt) {
|
||||
context.console.info = function (txt) {
|
||||
self.logger.info(self.name + " > " + txt);
|
||||
};
|
||||
context.console.debug = function(txt) {
|
||||
context.console.debug = function (txt) {
|
||||
// TODO: ue JSON.stringify
|
||||
self.logger.debug(self.name + " > " + txt);
|
||||
};
|
||||
context.console.trace = function(txt) {
|
||||
context.console.trace = function (txt) {
|
||||
self.logger.trace(self.name + " > " + txt);
|
||||
};
|
||||
};
|
||||
|
||||
Plugin.prototype.register = function (classname, cb) {
|
||||
let camelCasedClassname = camelcase(classname);
|
||||
this[camelCasedClassname].push(cb);
|
||||
this.pluginTypes.push({class: classname, call: cb});
|
||||
};
|
||||
|
||||
["ClientWeb3Provider", "ContractsGeneration", "Pipeline", "Deployer",
|
||||
"ConsoleCommand", "ServiceCheck", "ContractConfiguration", "Compiler"].forEach(function (name) {
|
||||
Plugin.prototype["register" + name] = function (cb) {
|
||||
Plugin.prototype.register.call(name, cb);
|
||||
};
|
||||
});
|
||||
|
||||
// TODO: add deploy provider
|
||||
Plugin.prototype.registerClientWeb3Provider = function(cb) {
|
||||
Plugin.prototype.registerClientWeb3Provider = function (cb) {
|
||||
this.clientWeb3Providers.push(cb);
|
||||
this.pluginTypes.push('clientWeb3Provider');
|
||||
};
|
||||
|
||||
Plugin.prototype.registerContractsGeneration = function(cb) {
|
||||
Plugin.prototype.registerContractsGeneration = function (cb) {
|
||||
this.contractsGenerators.push(cb);
|
||||
this.pluginTypes.push('contractGeneration');
|
||||
};
|
||||
|
||||
Plugin.prototype.registerPipeline = function(matcthingFiles, cb) {
|
||||
Plugin.prototype.registerPipeline = function (matcthingFiles, cb) {
|
||||
// TODO: generate error for more than one pipeline per plugin
|
||||
this.pipeline.push({matcthingFiles: matcthingFiles, cb: cb});
|
||||
this.pluginTypes.push('pipeline');
|
||||
};
|
||||
|
||||
Plugin.prototype.addFileToPipeline = function(file, intendedPath, options) {
|
||||
Plugin.prototype.addFileToPipeline = function (file, intendedPath, options) {
|
||||
this.pipelineFiles.push({file: file, intendedPath: intendedPath, options: options});
|
||||
this.pluginTypes.push('pipelineFiles');
|
||||
};
|
||||
|
||||
Plugin.prototype.addContractFile = function(file) {
|
||||
Plugin.prototype.addContractFile = function (file) {
|
||||
this.contractsFiles.push(file);
|
||||
this.pluginTypes.push('contractFiles');
|
||||
};
|
||||
|
||||
Plugin.prototype.registerConsoleCommand = function(cb) {
|
||||
Plugin.prototype.registerConsoleCommand = function (cb) {
|
||||
this.console.push(cb);
|
||||
this.pluginTypes.push('console');
|
||||
};
|
||||
|
||||
Plugin.prototype.registerServiceCheck = function(checkName, checkFn, time) {
|
||||
Plugin.prototype.registerServiceCheck = function (checkName, checkFn, time) {
|
||||
this.serviceChecks.push({checkName: checkName, checkFn: checkFn, time: time});
|
||||
this.pluginTypes.push('serviceChecks');
|
||||
};
|
||||
|
||||
Plugin.prototype.has = function(pluginType) {
|
||||
Plugin.prototype.has = function (pluginType) {
|
||||
return this.pluginTypes.indexOf(pluginType) >= 0;
|
||||
};
|
||||
|
||||
Plugin.prototype.generateProvider = function(args) {
|
||||
return this.clientWeb3Providers.map(function(cb) {
|
||||
Plugin.prototype.generateProvider = function (args) {
|
||||
return this.clientWeb3Providers.map(function (cb) {
|
||||
return cb.call(this, args);
|
||||
}).join("\n");
|
||||
};
|
||||
|
||||
Plugin.prototype.generateContracts = function(args) {
|
||||
return this.contractsGenerators.map(function(cb) {
|
||||
Plugin.prototype.generateContracts = function (args) {
|
||||
return this.contractsGenerators.map(function (cb) {
|
||||
return cb.call(this, args);
|
||||
}).join("\n");
|
||||
};
|
||||
|
||||
Plugin.prototype.registerContractConfiguration = function(config) {
|
||||
Plugin.prototype.registerContractConfiguration = function (config) {
|
||||
this.contractsConfigs.push(config);
|
||||
this.pluginTypes.push('contractsConfig');
|
||||
};
|
||||
|
||||
Plugin.prototype.registerCompiler = function(extension, cb) {
|
||||
Plugin.prototype.registerCompiler = function (extension, cb) {
|
||||
this.compilers.push({extension: extension, cb: cb});
|
||||
this.pluginTypes.push('compilers');
|
||||
};
|
||||
|
||||
Plugin.prototype.runCommands = function(cmd, options) {
|
||||
return this.console.map(function(cb) {
|
||||
Plugin.prototype.runCommands = function (cmd, options) {
|
||||
return this.console.map(function (cb) {
|
||||
return cb.call(this, cmd, options);
|
||||
}).join("\n");
|
||||
};
|
||||
|
||||
Plugin.prototype.runFilePipeline = function() {
|
||||
var self = this;
|
||||
Plugin.prototype.runFilePipeline = function () {
|
||||
let self = this;
|
||||
|
||||
return this.pipelineFiles.map(function(file) {
|
||||
var obj = {};
|
||||
obj.filename = file.file.replace('./','');
|
||||
obj.content = self.loadPluginFile(file.file).toString();
|
||||
obj.intendedPath = file.intendedPath;
|
||||
obj.options = file.options;
|
||||
obj.path = self.pathToFile(obj.filename);
|
||||
return this.pipelineFiles.map(function (file) {
|
||||
let obj = {};
|
||||
obj.filename = file.file.replace('./', '');
|
||||
obj.content = self.loadPluginFile(file.file).toString();
|
||||
obj.intendedPath = file.intendedPath;
|
||||
obj.options = file.options;
|
||||
obj.path = self.pathToFile(obj.filename);
|
||||
|
||||
return obj;
|
||||
return obj;
|
||||
});
|
||||
};
|
||||
|
||||
Plugin.prototype.runPipeline = function(args) {
|
||||
Plugin.prototype.runPipeline = function (args) {
|
||||
// TODO: should iterate the pipelines
|
||||
var pipeline = this.pipeline[0];
|
||||
var shouldRunPipeline = utils.fileMatchesPattern(pipeline.matcthingFiles, args.targetFile);
|
||||
let pipeline = this.pipeline[0];
|
||||
let shouldRunPipeline = utils.fileMatchesPattern(pipeline.matcthingFiles, args.targetFile);
|
||||
if (shouldRunPipeline) {
|
||||
return pipeline.cb.call(this, args);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,45 +1,53 @@
|
|||
var Plugin = require('./plugin.js');
|
||||
var utils = require('../utils/utils.js');
|
||||
const _ = require('underscore');
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
|
||||
var Plugins = function(options) {
|
||||
this.pluginList = options.plugins || [];
|
||||
this.interceptLogs = options.interceptLogs;
|
||||
this.plugins = [];
|
||||
// TODO: need backup 'NullLogger'
|
||||
this.logger = options.logger;
|
||||
this.events = options.events;
|
||||
this.config = options.config;
|
||||
const getPluginsFor = function (pluginType, plugins) {
|
||||
return _.filter(plugins, pluginType);
|
||||
};
|
||||
|
||||
Plugins.prototype.loadPlugins = function() {
|
||||
var pluginConfig;
|
||||
for (var pluginName in this.pluginList) {
|
||||
pluginConfig = this.pluginList[pluginName];
|
||||
this.loadPlugin(pluginName, pluginConfig);
|
||||
class Plugins extends EventEmitter {
|
||||
constructor(options) {
|
||||
super();
|
||||
//TODO: put an observer on this.plugins and call loadPlugin when a new item is added
|
||||
this.config = {};
|
||||
|
||||
const loadPlugins = this.load;
|
||||
for (let opt in options) {
|
||||
if (options.hasOwnProperty(opt)) {
|
||||
this.config[opt] = options[opt];
|
||||
}
|
||||
}
|
||||
|
||||
let requiredOptions = ['interceptLogs', 'plugins', 'logger'];
|
||||
for (let i = 0; requiredOptions.length > i; i++) {
|
||||
if (!(_.contains(Object.keys(this.config), requiredOptions[i]))) {
|
||||
console.log('Warning: missing required plugin configuration key: ' + requiredOptions[i]);
|
||||
}
|
||||
}
|
||||
this.on('load', () => {
|
||||
this.load();
|
||||
});
|
||||
|
||||
this.on('get', (pluginType, cb) => {
|
||||
let pluginTypes = getPluginsFor(pluginType, this.config.plugins);
|
||||
return cb(pluginTypes);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
Plugins.prototype.listPlugins = function() {
|
||||
var list = [];
|
||||
for (var className in this.pluginList) {
|
||||
list.push(className);
|
||||
load() {
|
||||
let pluginConfig;
|
||||
for (let i = 0; this.config.plugins.length > i; i++) {
|
||||
pluginConfig = this.config.plugins[i].config;
|
||||
let Plugin = require('./plugin');
|
||||
let plugin = new Plugin(pluginConfig);
|
||||
plugin.run();
|
||||
}
|
||||
}
|
||||
return list;
|
||||
};
|
||||
|
||||
Plugins.prototype.loadPlugin = function(pluginName, pluginConfig) {
|
||||
var pluginPath = utils.joinPath(process.env.PWD, 'node_modules', pluginName);
|
||||
var plugin = require(pluginPath);
|
||||
listPlugins() {
|
||||
return this.config.plugins.join(', ');
|
||||
}
|
||||
|
||||
var pluginWrapper = new Plugin({name: pluginName, pluginModule: plugin, pluginConfig: pluginConfig, logger: this.logger, pluginPath: pluginPath, interceptLogs: this.interceptLogs, events: this.events, config: this.config});
|
||||
pluginWrapper.loadPlugin();
|
||||
this.plugins.push(pluginWrapper);
|
||||
};
|
||||
}
|
||||
|
||||
Plugins.prototype.getPluginsFor = function(pluginType) {
|
||||
return this.plugins.filter(function(plugin) {
|
||||
return plugin.has(pluginType);
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = Plugins;
|
||||
module.exports = Plugins;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
var Web3 = require('web3');
|
||||
var web3;
|
||||
let Web3 = require('web3');
|
||||
let web3;
|
||||
|
||||
// ======================
|
||||
// the eval is used for evaluating some of the contact calls for different purposes
|
||||
|
|
@ -8,7 +8,7 @@ var web3;
|
|||
// ======================
|
||||
function doEval(code, _web3) {
|
||||
if (_web3) {
|
||||
web3 = _web3;
|
||||
let web3 = _web3;
|
||||
}
|
||||
return eval(code); // jshint ignore:line
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,28 @@
|
|||
var async = require('../utils/async_extend.js');
|
||||
let async = require('../utils/async_extend.js');
|
||||
|
||||
// TODO: need to separate colors from states
|
||||
// i.e use status: /on|off|warn/ not /red|green/
|
||||
// it's up to the logger or console to determine the color
|
||||
var ServicesMonitor = function(options) {
|
||||
this.events = options.events;
|
||||
this.logger = options.logger;
|
||||
this.checkList = {};
|
||||
this.checkTimers = {};
|
||||
this.checkState = {};
|
||||
this.working = false;
|
||||
};
|
||||
class ServicesMonitor {
|
||||
constructor(options) {
|
||||
this.events = options.events;
|
||||
this.logger = options.logger;
|
||||
this.checkList = {};
|
||||
this.checkTimers = {};
|
||||
this.checkState = {};
|
||||
this.working = false;
|
||||
}
|
||||
}
|
||||
|
||||
ServicesMonitor.prototype.initCheck = function(checkName) {
|
||||
var self = this;
|
||||
var check = this.checkList[checkName];
|
||||
ServicesMonitor.prototype.initCheck = function (checkName) {
|
||||
let self = this;
|
||||
let check = this.checkList[checkName];
|
||||
|
||||
if (!check) { return false; }
|
||||
if (!check) {
|
||||
return false;
|
||||
}
|
||||
|
||||
self.events.on('check:' + checkName, function(obj) {
|
||||
self.events.on('check:' + checkName, function (obj) {
|
||||
// TODO: see todo above
|
||||
if (check && check.status === 'red' && obj.status === 'green') {
|
||||
self.events.emit('check:backOnline:' + checkName);
|
||||
|
|
@ -32,20 +36,20 @@ ServicesMonitor.prototype.initCheck = function(checkName) {
|
|||
});
|
||||
|
||||
if (check.interval !== 0) {
|
||||
self.checkTimers[checkName] = setInterval(function() {
|
||||
check.fn.call(check.fn, function(obj) {
|
||||
self.checkTimers[checkName] = setInterval(function () {
|
||||
check.fn.call(check.fn, function (obj) {
|
||||
self.events.emit('check:' + checkName, obj);
|
||||
});
|
||||
}, check.interval);
|
||||
}
|
||||
|
||||
check.fn.call(check.fn, function(obj) {
|
||||
check.fn.call(check.fn, function (obj) {
|
||||
self.events.emit('check:' + checkName, obj);
|
||||
});
|
||||
};
|
||||
|
||||
ServicesMonitor.prototype.addCheck = function(checkName, checkFn, time) {
|
||||
var self = this;
|
||||
ServicesMonitor.prototype.addCheck = function (checkName, checkFn, time) {
|
||||
let self = this;
|
||||
this.logger.trace('add check: ' + checkName);
|
||||
this.checkList[checkName] = {fn: checkFn, interval: time || 5000};
|
||||
|
||||
|
|
@ -54,22 +58,22 @@ ServicesMonitor.prototype.addCheck = function(checkName, checkFn, time) {
|
|||
}
|
||||
};
|
||||
|
||||
ServicesMonitor.prototype.stopCheck = function(name) {
|
||||
ServicesMonitor.prototype.stopCheck = function (name) {
|
||||
clearInterval(this.checkTimers[name]);
|
||||
delete this.checkTimers[name];
|
||||
delete this.checkList[name];
|
||||
delete this.checkState[name];
|
||||
};
|
||||
|
||||
ServicesMonitor.prototype.startMonitor = function() {
|
||||
var self = this;
|
||||
ServicesMonitor.prototype.startMonitor = function () {
|
||||
let self = this;
|
||||
this.working = true;
|
||||
this.logger.trace('startMonitor');
|
||||
|
||||
async.eachObject(this.checkList, function(checkName, check, callback) {
|
||||
async.eachObject(this.checkList, function (checkName, check, callback) {
|
||||
self.initCheck(checkName);
|
||||
callback();
|
||||
}, function(err) {
|
||||
}, function (err) {
|
||||
if (err) {
|
||||
self.logger.error("error running service check");
|
||||
self.logger.error(err.message);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
var getSimulator = function() {
|
||||
let getSimulator = function () {
|
||||
try {
|
||||
return require('ethereumjs-testrpc');
|
||||
} catch (e) {
|
||||
|
|
@ -17,91 +17,25 @@ var getSimulator = function() {
|
|||
}
|
||||
};
|
||||
|
||||
var Test;
|
||||
Test = (function (options) {
|
||||
var async = require('async');
|
||||
var opts = options === undefined ? {} : options;
|
||||
opts.logLevel = opts.hasOwnProperty('logLevel') ? opts.logLevel : 'debug';
|
||||
opts.simulatorOptions = opts.hasOwnProperty('simulatorOptions') ? opts.simulatorOptions : {};
|
||||
var sim = getSimulator();
|
||||
|
||||
function newWebThree() {
|
||||
class Test {
|
||||
constructor(options) {
|
||||
this.opts = options === undefined ? {} : options;
|
||||
this.opts.logLevel = this.opts.hasOwnProperty('logLevel') ? this.opts.logLevel : 'debug';
|
||||
this.opts.simulatorOptions = this.opts.hasOwnProperty('simulatorOptions') ? this.opts.simulatorOptions : {};
|
||||
this.sim = getSimulator();
|
||||
}
|
||||
|
||||
newWebThree() {
|
||||
try {
|
||||
var Web3 = require('web3');
|
||||
var web3 = new Web3();
|
||||
web3.setProvider(sim.provider(opts.simulatorOptions));
|
||||
let Web3 = require('web3');
|
||||
let web3 = new Web3();
|
||||
web3.setProvider(this.sim.provider(this.opts.simulatorOptions));
|
||||
return web3;
|
||||
} catch (e) {
|
||||
throw new Error(e);
|
||||
}
|
||||
}
|
||||
|
||||
function deployAll(contractsConfig, cb) {
|
||||
var RunCode = require('./runCode.js');
|
||||
var self = this;
|
||||
|
||||
function newEngine () {
|
||||
var Engine = require('./engine.js');
|
||||
return new Engine({
|
||||
env: opts.env || 'test',
|
||||
// TODO: confi will need to detect if this is a obj
|
||||
embarkConfig: opts.embarkConfig || 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
}
|
||||
|
||||
self.web3 = newWebThree();
|
||||
self.engine = newEngine();
|
||||
self.engine.init();
|
||||
|
||||
async.waterfall([
|
||||
function getConfig(callback) {
|
||||
self.engine.config.contractsConfig = {contracts: contractsConfig};
|
||||
callback();
|
||||
},
|
||||
function startServices(callback) {
|
||||
//{abiType: 'contracts', embarkJS: false}
|
||||
self.engine.startService("abi");
|
||||
self.engine.startService("deployment", {
|
||||
web3: self.web3,
|
||||
trackContracts: false
|
||||
});
|
||||
callback();
|
||||
},
|
||||
function deploy(callback) {
|
||||
self.engine.events.on('abi-contracts-vanila', function (vanillaABI) {
|
||||
callback(null, vanillaABI);
|
||||
});
|
||||
self.engine.deployManager.deployContracts(function (err, result) {
|
||||
if (err) {
|
||||
console.log(err);
|
||||
callback(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
console.log("got error");
|
||||
process.exit();
|
||||
}
|
||||
// this should be part of the waterfall and not just something done at the
|
||||
// end
|
||||
self.web3.eth.getAccounts(function (err, accounts) {
|
||||
if (err) {
|
||||
throw new Error(err);
|
||||
}
|
||||
self.web3.eth.defaultAccount = accounts[0];
|
||||
RunCode.doEval(result, self.web3); // jshint ignore:line
|
||||
cb();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
deployAll: deployAll,
|
||||
sim: sim
|
||||
};
|
||||
}());
|
||||
}
|
||||
|
||||
module.exports = Test;
|
||||
|
|
|
|||
|
|
@ -1,52 +1,65 @@
|
|||
var colors = require('colors');
|
||||
let colors = require('colors');
|
||||
|
||||
// TODO: just logFunction changes, probably doesn't need a whole new module just
|
||||
// for this
|
||||
var TestLogger = function(options) {
|
||||
this.logLevels = ['error', 'warn', 'info', 'debug', 'trace'];
|
||||
this.logs = [];
|
||||
this.logLevel = options.logLevel || 'info';
|
||||
};
|
||||
class TestLogger {
|
||||
constructor(options) {
|
||||
this.logLevels = ['error', 'warn', 'info', 'debug', 'trace'];
|
||||
this.logs = [];
|
||||
this.logLevel = options.logLevel || 'info';
|
||||
}
|
||||
|
||||
TestLogger.prototype.logFunction = function() {
|
||||
this.logs.push(arguments);
|
||||
};
|
||||
logFunction() {
|
||||
this.logs.push(arguments);
|
||||
}
|
||||
|
||||
TestLogger.prototype.contractsState = function() {
|
||||
this.logs.push(arguments);
|
||||
};
|
||||
contractsState() {
|
||||
this.logs.push(arguments);
|
||||
}
|
||||
|
||||
TestLogger.prototype.availableServices = function() {
|
||||
this.logs.push(arguments);
|
||||
};
|
||||
availableServices() {
|
||||
this.logs.push(arguments);
|
||||
}
|
||||
|
||||
TestLogger.prototype.error = function(txt) {
|
||||
if (!(this.shouldLog('error'))) { return; }
|
||||
this.logFunction(txt.red);
|
||||
};
|
||||
error(txt) {
|
||||
if (!(this.shouldLog('error'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt.red);
|
||||
}
|
||||
|
||||
TestLogger.prototype.warn = function(txt) {
|
||||
if (!(this.shouldLog('warn'))) { return; }
|
||||
this.logFunction(txt.yellow);
|
||||
};
|
||||
warn(txt) {
|
||||
if (!(this.shouldLog('warn'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt.yellow);
|
||||
}
|
||||
|
||||
TestLogger.prototype.info = function(txt) {
|
||||
if (!(this.shouldLog('info'))) { return; }
|
||||
this.logFunction(txt.green);
|
||||
};
|
||||
info(txt) {
|
||||
if (!(this.shouldLog('info'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt.green);
|
||||
}
|
||||
|
||||
TestLogger.prototype.debug = function(txt) {
|
||||
if (!(this.shouldLog('debug'))) { return; }
|
||||
this.logFunction(txt);
|
||||
};
|
||||
debug(txt) {
|
||||
if (!(this.shouldLog('debug'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt);
|
||||
}
|
||||
|
||||
TestLogger.prototype.trace = function(txt) {
|
||||
if (!(this.shouldLog('trace'))) { return; }
|
||||
this.logFunction(txt);
|
||||
};
|
||||
trace(txt) {
|
||||
if (!(this.shouldLog('trace'))) {
|
||||
return;
|
||||
}
|
||||
this.logFunction(txt);
|
||||
}
|
||||
|
||||
TestLogger.prototype.shouldLog = function(level) {
|
||||
return (this.logLevels.indexOf(level) <= this.logLevels.indexOf(this.logLevel));
|
||||
};
|
||||
shouldLog(level) {
|
||||
return (this.logLevels.indexOf(level) <= this.logLevels.indexOf(this.logLevel));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = TestLogger;
|
||||
|
|
|
|||
|
|
@ -1,28 +1,29 @@
|
|||
|
||||
var CommandHistory = function() {
|
||||
this.history = [];
|
||||
this.pointer = -1;
|
||||
};
|
||||
|
||||
CommandHistory.prototype.addCommand = function(cmd) {
|
||||
this.history.push(cmd);
|
||||
this.pointer = this.history.length;
|
||||
};
|
||||
|
||||
CommandHistory.prototype.getPreviousCommand = function(cmd) {
|
||||
if (this.pointer >= 0) {
|
||||
this.pointer--;
|
||||
class CommandHistory {
|
||||
constructor() {
|
||||
this.history = [];
|
||||
this.pointer = -1;
|
||||
}
|
||||
return this.history[this.pointer];
|
||||
};
|
||||
|
||||
CommandHistory.prototype.getNextCommand = function(cmd) {
|
||||
if (this.pointer >= this.history.length) {
|
||||
this.pointer = this.history.length - 1;
|
||||
return '';
|
||||
addCommand(cmd) {
|
||||
this.history.push(cmd);
|
||||
this.pointer = this.history.length;
|
||||
}
|
||||
this.pointer++;
|
||||
return this.history[this.pointer];
|
||||
};
|
||||
|
||||
getPreviousCommand(cmd) {
|
||||
if (this.pointer >= 0) {
|
||||
this.pointer--;
|
||||
}
|
||||
return this.history[this.pointer];
|
||||
}
|
||||
|
||||
getNextCommand(cmd) {
|
||||
if (this.pointer >= this.history.length) {
|
||||
this.pointer = this.history.length - 1;
|
||||
return '';
|
||||
}
|
||||
this.pointer++;
|
||||
return this.history[this.pointer];
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = CommandHistory;
|
||||
|
|
|
|||
|
|
@ -1,60 +1,65 @@
|
|||
var utils = require('../utils/utils.js');
|
||||
var RunCode = require('../core/runCode.js');
|
||||
let utils = require('../utils/utils.js');
|
||||
let RunCode = require('../core/runCode.js');
|
||||
|
||||
var Console = function(options) {
|
||||
this.plugins = options.plugins;
|
||||
this.version = options.version;
|
||||
};
|
||||
|
||||
Console.prototype.runCode = function(code) {
|
||||
RunCode.doEval(code); // jshint ignore:line
|
||||
};
|
||||
|
||||
Console.prototype.processEmbarkCmd = function(cmd) {
|
||||
if (cmd === 'help') {
|
||||
var helpText = [
|
||||
'Welcome to Embark ' + this.version,
|
||||
'',
|
||||
'possible commands are:',
|
||||
// TODO: only if the blockchain is actually active!
|
||||
// will need to pass te current embark state here
|
||||
'web3 - instantiated web3.js object configured to the current environment',
|
||||
'quit - to immediatly exit',
|
||||
'',
|
||||
'The web3 object and the interfaces for the deployed contracts and their methods are also available'
|
||||
];
|
||||
return helpText.join('\n');
|
||||
} else if (cmd === 'quit') {
|
||||
utils.exit();
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
Console.prototype.executeCmd = function(cmd, callback) {
|
||||
var plugin, pluginOutput;
|
||||
var plugins = this.plugins.getPluginsFor('console');
|
||||
for (var i = 0; i < plugins.length; i++) {
|
||||
plugin = plugins[i];
|
||||
pluginOutput = plugin.runCommands(cmd, {});
|
||||
if (pluginOutput !== false && pluginOutput !== 'false') return callback(pluginOutput);
|
||||
class Console {
|
||||
constructor(options) {
|
||||
this.plugins = options.plugins;
|
||||
this.version = options.version;
|
||||
}
|
||||
|
||||
var output = this.processEmbarkCmd(cmd);
|
||||
if (output) {
|
||||
return callback(output);
|
||||
runCode(code) {
|
||||
RunCode.doEval(code); // jshint ignore:line
|
||||
}
|
||||
|
||||
try {
|
||||
var result = RunCode.doEval(cmd);
|
||||
return callback(result);
|
||||
processEmbarkCmd (cmd) {
|
||||
if (cmd === 'help') {
|
||||
let helpText = [
|
||||
'Welcome to Embark ' + this.version,
|
||||
'',
|
||||
'possible commands are:',
|
||||
// TODO: only if the blockchain is actually active!
|
||||
// will need to pass te current embark state here
|
||||
'web3 - instantiated web3.js object configured to the current environment',
|
||||
'quit - to immediatly exit',
|
||||
'',
|
||||
'The web3 object and the interfaces for the deployed contracts and their methods are also available'
|
||||
];
|
||||
return helpText.join('\n');
|
||||
} else if (cmd === 'quit') {
|
||||
utils.exit();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
catch(e) {
|
||||
if (e.message.indexOf('not defined') > 0) {
|
||||
return callback(("error: " + e.message).red + ("\nType " + "help".bold + " to see the list of available commands").cyan);
|
||||
} else {
|
||||
return callback(e.message);
|
||||
|
||||
executeCmd(cmd, callback) {
|
||||
let plugin, pluginOutput;
|
||||
let plugins = [];
|
||||
this.plugins.emit('get', 'console', (list) => {
|
||||
plugins = list;
|
||||
});
|
||||
for (let i = 0; i < plugins.length; i++) {
|
||||
plugin = plugins[i];
|
||||
pluginOutput = plugin.runCommands(cmd, {});
|
||||
if (pluginOutput !== false && pluginOutput !== 'false') return callback(pluginOutput);
|
||||
}
|
||||
|
||||
let output = this.processEmbarkCmd(cmd);
|
||||
if (output) {
|
||||
return callback(output);
|
||||
}
|
||||
|
||||
try {
|
||||
let result = RunCode.doEval(cmd);
|
||||
return callback(result);
|
||||
}
|
||||
catch (e) {
|
||||
if (e.message.indexOf('not defined') > 0) {
|
||||
return callback(("error: " + e.message).red + ("\nType " + "help".bold + " to see the list of available commands").cyan);
|
||||
} else {
|
||||
return callback(e.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = Console;
|
||||
|
|
|
|||
|
|
@ -1,42 +1,45 @@
|
|||
var async = require('async');
|
||||
let async = require('async');
|
||||
|
||||
var Monitor = require('./monitor.js');
|
||||
var Console = require('./console.js');
|
||||
let Monitor = require('./monitor.js');
|
||||
let Console = require('./console.js');
|
||||
|
||||
var Dashboard = function(options) {
|
||||
this.logger = options.logger;
|
||||
this.plugins = options.plugins;
|
||||
this.version = options.version;
|
||||
this.env = options.env;
|
||||
};
|
||||
class Dashboard {
|
||||
constructor(options) {
|
||||
this.logger = options.logger;
|
||||
this.plugins = options.plugins;
|
||||
this.version = options.version;
|
||||
this.env = options.env;
|
||||
}
|
||||
|
||||
Dashboard.prototype.start = function(done) {
|
||||
var console, monitor;
|
||||
var self = this;
|
||||
start(done) {
|
||||
let console, monitor;
|
||||
let self = this;
|
||||
|
||||
async.waterfall([
|
||||
function startConsole(callback) {
|
||||
console = new Console({plugins: self.plugins, version: self.version});
|
||||
callback();
|
||||
},
|
||||
function startMonitor(callback) {
|
||||
monitor = new Monitor({env: self.env, console: console});
|
||||
self.logger.logFunction = monitor.logEntry;
|
||||
self.logger.contractsState = monitor.setContracts;
|
||||
self.logger.setStatus = monitor.setStatus.bind(monitor);
|
||||
async.waterfall([
|
||||
function startConsole(callback) {
|
||||
console = new Console({plugins: self.plugins, version: self.version});
|
||||
callback();
|
||||
},
|
||||
function startMonitor(callback) {
|
||||
monitor = new Monitor({env: self.env, console: console});
|
||||
self.logger.logFunction = monitor.logEntry;
|
||||
self.logger.contractsState = monitor.setContracts;
|
||||
self.logger.setStatus = monitor.setStatus.bind(monitor);
|
||||
|
||||
self.logger.info('========================'.bold.green);
|
||||
self.logger.info(('Welcome to Embark ' + self.version).yellow.bold);
|
||||
self.logger.info('========================'.bold.green);
|
||||
self.logger.info('========================'.bold.green);
|
||||
self.logger.info(('Welcome to Embark ' + self.version).yellow.bold);
|
||||
self.logger.info('========================'.bold.green);
|
||||
|
||||
// TODO: do this after monitor is rendered
|
||||
callback();
|
||||
}
|
||||
], function() {
|
||||
self.console = console;
|
||||
self.monitor = monitor;
|
||||
done();
|
||||
});
|
||||
};
|
||||
// TODO: do this after monitor is rendered
|
||||
callback();
|
||||
}
|
||||
], function () {
|
||||
self.console = console;
|
||||
self.monitor = monitor;
|
||||
done();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Dashboard;
|
||||
|
|
|
|||
|
|
@ -1,355 +1,357 @@
|
|||
/*jshint esversion: 6 */
|
||||
|
||||
var blessed = require("blessed");
|
||||
var CommandHistory = require('./command_history.js');
|
||||
var version = require('../../package.json').version;
|
||||
let blessed = require("blessed");
|
||||
let CommandHistory = require('./command_history.js');
|
||||
let version = require('../../package.json').version;
|
||||
|
||||
function Dashboard(options) {
|
||||
var title = (options && options.title) || "Embark " + version;
|
||||
this.env = options.env;
|
||||
this.console = options.console;
|
||||
this.history = new CommandHistory();
|
||||
class Dashboard {
|
||||
constructor(options) {
|
||||
let title = (options && options.title) || "Embark " + version;
|
||||
this.env = options.env;
|
||||
this.console = options.console;
|
||||
this.history = new CommandHistory();
|
||||
|
||||
this.color = (options && options.color) || "green";
|
||||
this.minimal = (options && options.minimal) || false;
|
||||
this.color = (options && options.color) || "green";
|
||||
this.minimal = (options && options.minimal) || false;
|
||||
|
||||
this.screen = blessed.screen({
|
||||
smartCSR: true,
|
||||
title: title,
|
||||
dockBorders: false,
|
||||
fullUnicode: true,
|
||||
autoPadding: true
|
||||
});
|
||||
this.screen = blessed.screen({
|
||||
smartCSR: true,
|
||||
title: title,
|
||||
dockBorders: false,
|
||||
fullUnicode: true,
|
||||
autoPadding: true
|
||||
});
|
||||
|
||||
this.layoutLog();
|
||||
this.layoutStatus();
|
||||
this.layoutModules();
|
||||
this.layoutCmd();
|
||||
this.layoutLog();
|
||||
this.layoutStatus();
|
||||
this.layoutModules();
|
||||
this.layoutCmd();
|
||||
|
||||
this.screen.key(["C-c"], function() {
|
||||
process.exit(0);
|
||||
});
|
||||
this.screen.key(["C-c"], function () {
|
||||
process.exit(0);
|
||||
});
|
||||
|
||||
this.logEntry = this.logEntry.bind(this);
|
||||
this.setContracts = this.setContracts.bind(this);
|
||||
this.availableServices = this.availableServices.bind(this);
|
||||
this.logEntry = this.logEntry.bind(this);
|
||||
this.setContracts = this.setContracts.bind(this);
|
||||
this.availableServices = this.availableServices.bind(this);
|
||||
|
||||
this.status.setContent(this.env.green);
|
||||
this.status.setContent(this.env.green);
|
||||
|
||||
this.screen.render();
|
||||
this.input.focus();
|
||||
}
|
||||
|
||||
Dashboard.prototype.availableServices = function(_services) {
|
||||
var services = [];
|
||||
var checkName;
|
||||
for (checkName in _services) {
|
||||
services.push(_services[checkName]);
|
||||
this.screen.render();
|
||||
this.input.focus();
|
||||
}
|
||||
|
||||
this.progress.setContent(services.join('\n'));
|
||||
this.screen.render();
|
||||
};
|
||||
|
||||
Dashboard.prototype.setStatus = function(status) {
|
||||
this.operations.setContent(status);
|
||||
this.screen.render();
|
||||
};
|
||||
|
||||
Dashboard.prototype.setContracts = function(contracts) {
|
||||
var data = [];
|
||||
|
||||
data.push(["Contract Name", "Address", "Status"]);
|
||||
|
||||
contracts.forEach(function(row) {
|
||||
data.push(row);
|
||||
});
|
||||
|
||||
this.moduleTable.setData(data);
|
||||
this.screen.render();
|
||||
};
|
||||
|
||||
Dashboard.prototype.logEntry = function(text) {
|
||||
this.logText.log(text);
|
||||
this.screen.render();
|
||||
};
|
||||
|
||||
Dashboard.prototype.layoutLog = function() {
|
||||
this.log = blessed.box({
|
||||
label: "Logs",
|
||||
padding: 1,
|
||||
width: "100%",
|
||||
height: "55%",
|
||||
left: "0%",
|
||||
top: "42%",
|
||||
border: {
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
availableServices(_services) {
|
||||
let services = [];
|
||||
let checkName;
|
||||
for (checkName in _services) {
|
||||
services.push(_services[checkName]);
|
||||
}
|
||||
});
|
||||
|
||||
this.logText = blessed.log({
|
||||
parent: this.log,
|
||||
tags: true,
|
||||
width: "100%-5",
|
||||
//height: '90%',
|
||||
scrollable: true,
|
||||
input: false,
|
||||
alwaysScroll: true,
|
||||
scrollbar: {
|
||||
ch: " ",
|
||||
inverse: true
|
||||
},
|
||||
keys: false,
|
||||
vi: false,
|
||||
mouse: true
|
||||
});
|
||||
this.progress.setContent(services.join('\n'));
|
||||
this.screen.render();
|
||||
}
|
||||
|
||||
this.screen.append(this.log);
|
||||
};
|
||||
setStatus(status) {
|
||||
this.operations.setContent(status);
|
||||
this.screen.render();
|
||||
}
|
||||
|
||||
Dashboard.prototype.layoutModules = function() {
|
||||
this.modules = blessed.box({
|
||||
label: "Contracts",
|
||||
tags: true,
|
||||
padding: 1,
|
||||
width: "75%",
|
||||
height: "42%",
|
||||
left: "0%",
|
||||
top: "0",
|
||||
border: {
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
setContracts(contracts) {
|
||||
let data = [];
|
||||
|
||||
data.push(["Contract Name", "Address", "Status"]);
|
||||
|
||||
contracts.forEach(function (row) {
|
||||
data.push(row);
|
||||
});
|
||||
|
||||
this.moduleTable.setData(data);
|
||||
this.screen.render();
|
||||
}
|
||||
|
||||
logEntry(text) {
|
||||
this.logText.log(text);
|
||||
this.screen.render();
|
||||
}
|
||||
|
||||
layoutLog() {
|
||||
this.log = blessed.box({
|
||||
label: "Logs",
|
||||
padding: 1,
|
||||
width: "100%",
|
||||
height: "55%",
|
||||
left: "0%",
|
||||
top: "42%",
|
||||
border: {
|
||||
fg: this.color
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.moduleTable = blessed.table({
|
||||
parent: this.modules,
|
||||
height: "100%",
|
||||
width: "100%-5",
|
||||
align: "left",
|
||||
pad: 1,
|
||||
margin: "auto",
|
||||
shrink: true,
|
||||
scrollable: true,
|
||||
alwaysScroll: true,
|
||||
scrollbar: {
|
||||
ch: " ",
|
||||
inverse: true
|
||||
},
|
||||
keys: false,
|
||||
vi: false,
|
||||
mouse: true,
|
||||
data: [["ContractName", "Address", "Status"]]
|
||||
});
|
||||
this.logText = blessed.log({
|
||||
parent: this.log,
|
||||
tags: true,
|
||||
width: "100%-5",
|
||||
//height: '90%',
|
||||
scrollable: true,
|
||||
input: false,
|
||||
alwaysScroll: true,
|
||||
scrollbar: {
|
||||
ch: " ",
|
||||
inverse: true
|
||||
},
|
||||
keys: false,
|
||||
vi: false,
|
||||
mouse: true
|
||||
});
|
||||
|
||||
this.screen.append(this.modules);
|
||||
};
|
||||
this.screen.append(this.log);
|
||||
}
|
||||
|
||||
Dashboard.prototype.layoutAssets = function() {
|
||||
this.assets = blessed.box({
|
||||
label: "Asset Pipeline",
|
||||
tags: true,
|
||||
padding: 1,
|
||||
width: "50%",
|
||||
height: "55%",
|
||||
left: "50%",
|
||||
top: "42%",
|
||||
border: {
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
layoutModules() {
|
||||
this.modules = blessed.box({
|
||||
label: "Contracts",
|
||||
tags: true,
|
||||
padding: 1,
|
||||
width: "75%",
|
||||
height: "42%",
|
||||
left: "0%",
|
||||
top: "0",
|
||||
border: {
|
||||
fg: this.color
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.assetTable = blessed.table({
|
||||
parent: this.assets,
|
||||
height: "100%",
|
||||
width: "100%-5",
|
||||
align: "left",
|
||||
pad: 1,
|
||||
scrollable: true,
|
||||
alwaysScroll: true,
|
||||
scrollbar: {
|
||||
ch: " ",
|
||||
inverse: true
|
||||
},
|
||||
keys: false,
|
||||
vi: false,
|
||||
mouse: true,
|
||||
data: [["Name", "Size"]]
|
||||
});
|
||||
this.moduleTable = blessed.table({
|
||||
parent: this.modules,
|
||||
height: "100%",
|
||||
width: "100%-5",
|
||||
align: "left",
|
||||
pad: 1,
|
||||
margin: "auto",
|
||||
shrink: true,
|
||||
scrollable: true,
|
||||
alwaysScroll: true,
|
||||
scrollbar: {
|
||||
ch: " ",
|
||||
inverse: true
|
||||
},
|
||||
keys: false,
|
||||
vi: false,
|
||||
mouse: true,
|
||||
data: [["ContractName", "Address", "Status"]]
|
||||
});
|
||||
|
||||
this.screen.append(this.assets);
|
||||
};
|
||||
this.screen.append(this.modules);
|
||||
}
|
||||
|
||||
Dashboard.prototype.layoutStatus = function() {
|
||||
|
||||
this.wrapper = blessed.layout({
|
||||
width: "25%",
|
||||
height: "42%",
|
||||
top: "0%",
|
||||
left: "75%",
|
||||
layout: "grid"
|
||||
});
|
||||
|
||||
this.status = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Environment",
|
||||
tags: true,
|
||||
padding: {
|
||||
left: 1
|
||||
},
|
||||
width: "100%",
|
||||
height: "20%",
|
||||
valign: "middle",
|
||||
border: {
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
layoutAssets() {
|
||||
this.assets = blessed.box({
|
||||
label: "Asset Pipeline",
|
||||
tags: true,
|
||||
padding: 1,
|
||||
width: "50%",
|
||||
height: "55%",
|
||||
left: "50%",
|
||||
top: "42%",
|
||||
border: {
|
||||
fg: this.color
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.operations = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Status",
|
||||
tags: true,
|
||||
padding: {
|
||||
left: 1
|
||||
},
|
||||
width: "100%",
|
||||
height: "20%",
|
||||
valign: "middle",
|
||||
border: {
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
this.assetTable = blessed.table({
|
||||
parent: this.assets,
|
||||
height: "100%",
|
||||
width: "100%-5",
|
||||
align: "left",
|
||||
pad: 1,
|
||||
scrollable: true,
|
||||
alwaysScroll: true,
|
||||
scrollbar: {
|
||||
ch: " ",
|
||||
inverse: true
|
||||
},
|
||||
keys: false,
|
||||
vi: false,
|
||||
mouse: true,
|
||||
data: [["Name", "Size"]]
|
||||
});
|
||||
|
||||
this.screen.append(this.assets);
|
||||
}
|
||||
|
||||
layoutStatus() {
|
||||
|
||||
this.wrapper = blessed.layout({
|
||||
width: "25%",
|
||||
height: "42%",
|
||||
top: "0%",
|
||||
left: "75%",
|
||||
layout: "grid"
|
||||
});
|
||||
|
||||
this.status = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Environment",
|
||||
tags: true,
|
||||
padding: {
|
||||
left: 1
|
||||
},
|
||||
width: "100%",
|
||||
height: "20%",
|
||||
valign: "middle",
|
||||
border: {
|
||||
fg: this.color
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.progress = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Available Services",
|
||||
tags: true,
|
||||
padding: this.minimal ? {
|
||||
left: 1
|
||||
} : 1,
|
||||
width: "100%",
|
||||
height: "60%",
|
||||
valign: "top",
|
||||
border: {
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
this.operations = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Status",
|
||||
tags: true,
|
||||
padding: {
|
||||
left: 1
|
||||
},
|
||||
width: "100%",
|
||||
height: "20%",
|
||||
valign: "middle",
|
||||
border: {
|
||||
fg: this.color
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.screen.append(this.wrapper);
|
||||
};
|
||||
|
||||
|
||||
Dashboard.prototype.layoutCmd = function() {
|
||||
this.consoleBox = blessed.box({
|
||||
label: 'Console',
|
||||
tags: true,
|
||||
padding: 0,
|
||||
width: '100%',
|
||||
height: '6%',
|
||||
left: '0%',
|
||||
top: '95%',
|
||||
border: {
|
||||
type: 'line'
|
||||
},
|
||||
style: {
|
||||
fg: 'black',
|
||||
this.progress = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Available Services",
|
||||
tags: true,
|
||||
padding: this.minimal ? {
|
||||
left: 1
|
||||
} : 1,
|
||||
width: "100%",
|
||||
height: "60%",
|
||||
valign: "top",
|
||||
border: {
|
||||
fg: this.color
|
||||
type: "line"
|
||||
},
|
||||
style: {
|
||||
fg: -1,
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.input = blessed.textbox({
|
||||
parent: this.consoleBox,
|
||||
name: 'input',
|
||||
input: true,
|
||||
keys: false,
|
||||
top: 0,
|
||||
left: 1,
|
||||
height: '50%',
|
||||
width: '100%-2',
|
||||
inputOnFocus: true,
|
||||
style: {
|
||||
fg: 'green',
|
||||
bg: 'black',
|
||||
focus: {
|
||||
this.screen.append(this.wrapper);
|
||||
}
|
||||
|
||||
layoutCmd() {
|
||||
this.consoleBox = blessed.box({
|
||||
label: 'Console',
|
||||
tags: true,
|
||||
padding: 0,
|
||||
width: '100%',
|
||||
height: '6%',
|
||||
left: '0%',
|
||||
top: '95%',
|
||||
border: {
|
||||
type: 'line'
|
||||
},
|
||||
style: {
|
||||
fg: 'black',
|
||||
border: {
|
||||
fg: this.color
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
this.input = blessed.textbox({
|
||||
parent: this.consoleBox,
|
||||
name: 'input',
|
||||
input: true,
|
||||
keys: false,
|
||||
top: 0,
|
||||
left: 1,
|
||||
height: '50%',
|
||||
width: '100%-2',
|
||||
inputOnFocus: true,
|
||||
style: {
|
||||
fg: 'green',
|
||||
bg: 'black',
|
||||
fg: 'green'
|
||||
focus: {
|
||||
bg: 'black',
|
||||
fg: 'green'
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
var self = this;
|
||||
let self = this;
|
||||
|
||||
this.input.key(["C-c"], function() {
|
||||
process.exit(0);
|
||||
});
|
||||
this.input.key(["C-c"], function () {
|
||||
process.exit(0);
|
||||
});
|
||||
|
||||
this.input.key(["C-w"], function() {
|
||||
self.input.clearValue();
|
||||
self.input.focus();
|
||||
});
|
||||
this.input.key(["C-w"], function () {
|
||||
self.input.clearValue();
|
||||
self.input.focus();
|
||||
});
|
||||
|
||||
this.input.key(["up"], function() {
|
||||
var cmd = self.history.getPreviousCommand();
|
||||
self.input.setValue(cmd);
|
||||
self.input.focus();
|
||||
});
|
||||
this.input.key(["up"], function () {
|
||||
let cmd = self.history.getPreviousCommand();
|
||||
self.input.setValue(cmd);
|
||||
self.input.focus();
|
||||
});
|
||||
|
||||
this.input.key(["down"], function() {
|
||||
var cmd = self.history.getNextCommand();
|
||||
self.input.setValue(cmd);
|
||||
self.input.focus();
|
||||
});
|
||||
this.input.key(["down"], function () {
|
||||
let cmd = self.history.getNextCommand();
|
||||
self.input.setValue(cmd);
|
||||
self.input.focus();
|
||||
});
|
||||
|
||||
this.input.on('submit', function(data) {
|
||||
if (data !== '') {
|
||||
self.history.addCommand(data);
|
||||
self.logText.log('console> '.bold.green + data);
|
||||
self.console.executeCmd(data, function(result) {
|
||||
self.logText.log(result);
|
||||
});
|
||||
}
|
||||
self.input.clearValue();
|
||||
self.input.focus();
|
||||
});
|
||||
this.input.on('submit', function (data) {
|
||||
if (data !== '') {
|
||||
self.history.addCommand(data);
|
||||
self.logText.log('console> '.bold.green + data);
|
||||
self.console.executeCmd(data, function (result) {
|
||||
self.logText.log(result);
|
||||
});
|
||||
}
|
||||
self.input.clearValue();
|
||||
self.input.focus();
|
||||
});
|
||||
|
||||
this.screen.append(this.consoleBox);
|
||||
};
|
||||
this.screen.append(this.consoleBox);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Dashboard;
|
||||
|
|
|
|||
348
lib/index.js
348
lib/index.js
|
|
@ -1,203 +1,207 @@
|
|||
/*jshint esversion: 6 */
|
||||
var async = require('async');
|
||||
let async = require('async');
|
||||
// require("./utils/debug_util.js")(__filename, async);
|
||||
|
||||
var colors = require('colors');
|
||||
let colors = require('colors');
|
||||
|
||||
var Engine = require('./core/engine.js');
|
||||
let IPFS = require('./upload/ipfs.js');
|
||||
let Swarm = require('./upload/swarm.js');
|
||||
|
||||
var IPFS = require('./upload/ipfs.js');
|
||||
var Swarm = require('./upload/swarm.js');
|
||||
let EventEmitter = require('events').EventEmitter;
|
||||
let Config = require('./core/config');
|
||||
/**
|
||||
* Initialize a new `Embark` instance.
|
||||
*
|
||||
* @return {Embark}
|
||||
* @api public
|
||||
*/
|
||||
|
||||
var version = require('../package.json').version;
|
||||
class Embark {
|
||||
constructor(options) {
|
||||
this.version = require('../package.json').version;
|
||||
|
||||
var Embark = (function () {
|
||||
function initConfig (env, options) {
|
||||
var Events = require('./core/events.js');
|
||||
var Logger = require('./core/logger.js');
|
||||
var Config = require('./core/config.js');
|
||||
this.env = options.environment || options.env || "development";
|
||||
|
||||
this.events = new Events();
|
||||
this.logger = new Logger({logLevel: 'debug'});
|
||||
|
||||
this.config = new Config({env: env, logger: this.logger, events: this.events});
|
||||
this.config = new Config({env: this.env, logger: this.logger, events: this.events});
|
||||
this.config.loadConfigFiles(options);
|
||||
this.plugins = this.config.plugins;
|
||||
}
|
||||
|
||||
function blockchain (env, client) {
|
||||
return require('./cmds/blockchain/blockchain.js')(this.config.blockchainConfig, client, env).run();
|
||||
}
|
||||
this.blockchain = function (env, client) {
|
||||
return require('./cmds/blockchain/blockchain.js')(Embark.prototype.config.blockchainConfig, client, env).run();
|
||||
};
|
||||
|
||||
function simulator (options) {
|
||||
var Simulator = require('./cmds/simulator.js');
|
||||
var simulator = new Simulator({blockchainConfig: this.config.blockchainConfig});
|
||||
simulator.run(options);
|
||||
}
|
||||
this.simulator = function (options) {
|
||||
let Simulator = require('./cmds/simulator.js');
|
||||
let simulator = new Simulator({blockchainConfig: Embark.prototype.config.blockchainConfig});
|
||||
simulator.run(options);
|
||||
};
|
||||
|
||||
function generateTemplate (templateName, destinationFolder, name) {
|
||||
var TemplateGenerator = require('./cmds/template_generator.js');
|
||||
var templateGenerator = new TemplateGenerator(templateName);
|
||||
templateGenerator.generate(destinationFolder, name);
|
||||
}
|
||||
this.generateTemplate = function (templateName, destinationFolder, name) {
|
||||
let TemplateGenerator = require('./cmds/template_generator.js');
|
||||
let templateGenerator = new TemplateGenerator(templateName);
|
||||
templateGenerator.generate(destinationFolder, name);
|
||||
};
|
||||
|
||||
function run (options) {
|
||||
var Dashboard = require('./dashboard/dashboard.js');
|
||||
this.run = function (options) {
|
||||
let Dashboard = require('./dashboard/dashboard.js');
|
||||
let Engine = require('./core/engine');
|
||||
let engine = new Engine({
|
||||
env: options.env,
|
||||
embarkConfig: options.embarkConfig || 'embark.json'
|
||||
});
|
||||
|
||||
var env = options.env;
|
||||
engine.init();
|
||||
|
||||
var engine = new Engine({
|
||||
env: options.env,
|
||||
embarkConfig: options.embarkConfig || 'embark.json'
|
||||
});
|
||||
engine.init();
|
||||
if (!options.useDashboard) {
|
||||
console.log('========================'.bold.green);
|
||||
console.log(('Welcome to Embark ' + Embark.version).yellow.bold);
|
||||
console.log('========================'.bold.green);
|
||||
}
|
||||
|
||||
if (!options.useDashboard) {
|
||||
console.log('========================'.bold.green);
|
||||
console.log(('Welcome to Embark ' + Embark.version).yellow.bold);
|
||||
console.log('========================'.bold.green);
|
||||
}
|
||||
|
||||
async.parallel([
|
||||
function startDashboard(callback) {
|
||||
if (!options.useDashboard) {
|
||||
return callback();
|
||||
}
|
||||
|
||||
var dashboard = new Dashboard({
|
||||
logger: engine.logger,
|
||||
plugins: engine.plugins,
|
||||
version: engine.version,
|
||||
env: engine.env
|
||||
});
|
||||
dashboard.start(function() {
|
||||
engine.events.on('abi-vanila', function(abi) {
|
||||
dashboard.console.runCode(abi);
|
||||
});
|
||||
|
||||
engine.logger.info('dashboard start');
|
||||
engine.events.on('servicesState', function(servicesState) {
|
||||
dashboard.monitor.availableServices(servicesState);
|
||||
});
|
||||
|
||||
callback();
|
||||
});
|
||||
},
|
||||
function (callback) {
|
||||
var pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
engine.startMonitor();
|
||||
engine.startService("web3");
|
||||
engine.startService("pipeline");
|
||||
engine.startService("abi");
|
||||
engine.startService("deployment");
|
||||
engine.startService("ipfs");
|
||||
|
||||
engine.events.on('check:backOnline:Ethereum', function() {
|
||||
engine.logger.info('Ethereum node detected..');
|
||||
engine.config.reloadConfig();
|
||||
engine.deployManager.deployContracts(function() {
|
||||
engine.logger.info('Deployment Done');
|
||||
});
|
||||
});
|
||||
|
||||
engine.deployManager.deployContracts(function(err) {
|
||||
engine.startService("fileWatcher");
|
||||
if (options.runWebserver) {
|
||||
engine.startService("webServer", {
|
||||
host: options.serverHost,
|
||||
port: options.serverPort
|
||||
});
|
||||
async.parallel([
|
||||
function startDashboard(callback) {
|
||||
if (!options.useDashboard) {
|
||||
return callback();
|
||||
}
|
||||
callback(err);
|
||||
});
|
||||
}
|
||||
], function(err, result) {
|
||||
if (err) {
|
||||
engine.logger.error(err.message);
|
||||
engine.logger.info(err.stack);
|
||||
} else {
|
||||
engine.logger.setStatus("Ready".green);
|
||||
engine.logger.info("Looking for documentation? you can find it at ".cyan + "http://embark.readthedocs.io/".green.underline);
|
||||
engine.logger.info("Ready".underline);
|
||||
engine.events.emit('firstDeploymentDone');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function build (options) {
|
||||
let dashboard = new Dashboard({
|
||||
logger: engine.logger,
|
||||
plugins: engine.plugins,
|
||||
version: engine.version,
|
||||
env: engine.env
|
||||
});
|
||||
dashboard.start(function () {
|
||||
Embark.on('abi-vanila', function (abi) {
|
||||
dashboard.console.runCode(abi);
|
||||
});
|
||||
|
||||
var engine = new Engine({
|
||||
env: options.env,
|
||||
embarkConfig: 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
engine.init();
|
||||
engine.logger.info('dashboard start');
|
||||
Embark.on('servicesState', function (servicesState) {
|
||||
dashboard.monitor.availableServices(servicesState);
|
||||
});
|
||||
|
||||
async.waterfall([
|
||||
function startServices(callback) {
|
||||
var pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
callback();
|
||||
});
|
||||
},
|
||||
function (callback) {
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
engine.startMonitor();
|
||||
engine.startService("web3");
|
||||
engine.startService("pipeline");
|
||||
engine.startService("abi");
|
||||
engine.startService("deployment");
|
||||
engine.startService("ipfs");
|
||||
|
||||
Embark.on('check:backOnline:Ethereum', function () {
|
||||
engine.logger.info('Ethereum node detected..');
|
||||
engine.config.reloadConfig();
|
||||
engine.deployManager.deployContracts(function () {
|
||||
engine.logger.info('Deployment Done');
|
||||
});
|
||||
});
|
||||
|
||||
engine.deployManager.deployContracts(function (err) {
|
||||
engine.startService("fileWatcher");
|
||||
if (options.runWebserver) {
|
||||
engine.startService("webServer", {
|
||||
host: options.serverHost,
|
||||
port: options.serverPort
|
||||
});
|
||||
}
|
||||
callback(err);
|
||||
});
|
||||
}
|
||||
|
||||
engine.startService("web3");
|
||||
engine.startService("pipeline");
|
||||
engine.startService("abi");
|
||||
engine.startService("deployment");
|
||||
callback();
|
||||
},
|
||||
function deploy(callback) {
|
||||
engine.deployManager.deployContracts(function(err) {
|
||||
callback(err);
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
engine.logger.error(err.message);
|
||||
engine.logger.info(err.stack);
|
||||
} else {
|
||||
engine.logger.setStatus("Ready".green);
|
||||
engine.logger.info("Looking for documentation? you can find it at ".cyan + "http://embark.readthedocs.io/".green.underline);
|
||||
engine.logger.info("Ready".underline);
|
||||
engine.events.emit('firstDeploymentDone');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
this.build = function (options) {
|
||||
let Engine = require('./core/engine');
|
||||
|
||||
let engine = new Engine({
|
||||
env: options.env,
|
||||
embarkConfig: 'embark.json',
|
||||
interceptLogs: false
|
||||
});
|
||||
engine.init();
|
||||
|
||||
async.waterfall([
|
||||
function startServices(callback) {
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
engine.startService("web3");
|
||||
engine.startService("pipeline");
|
||||
engine.startService("abi");
|
||||
engine.startService("deployment");
|
||||
callback();
|
||||
},
|
||||
function deploy(callback) {
|
||||
engine.deployManager.deployContracts(function (err) {
|
||||
callback(err);
|
||||
});
|
||||
}
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
engine.logger.error(err.message);
|
||||
engine.logger.debug(err.stack);
|
||||
} else {
|
||||
engine.logger.info("finished building".underline);
|
||||
}
|
||||
// needed due to child processes
|
||||
process.exit();
|
||||
});
|
||||
};
|
||||
|
||||
this.initTests = function () {
|
||||
let Test = require('./core/test.js');
|
||||
return new Test(options);
|
||||
};
|
||||
|
||||
// TODO: should deploy if it hasn't already
|
||||
this.upload = function (platform) {
|
||||
if (platform === 'ipfs') {
|
||||
let ipfs = new IPFS({
|
||||
buildDir: 'dist/',
|
||||
plugins: Embark.prototype.plugins,
|
||||
storageConfig: Embark.prototype.config.storageConfig
|
||||
});
|
||||
}
|
||||
], function(err, result) {
|
||||
if (err) {
|
||||
engine.logger.error(err.message);
|
||||
engine.logger.debug(err.stack);
|
||||
ipfs.deploy();
|
||||
} else if (platform === 'swarm') {
|
||||
let swarm = new Swarm({
|
||||
buildDir: 'dist/',
|
||||
plugins: Embark.prototype.plugins,
|
||||
storageConfig: Embark.prototype.config.storageConfig
|
||||
});
|
||||
swarm.deploy();
|
||||
} else {
|
||||
engine.logger.info("finished building".underline);
|
||||
console.log(("unknown platform: " + platform).red);
|
||||
console.log('try "embark upload ipfs" or "embark upload swarm"'.green);
|
||||
}
|
||||
// needed due to child processes
|
||||
process.exit();
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
function initTests () {
|
||||
var Test = require('./core/test.js');
|
||||
return new Test(options);
|
||||
}
|
||||
|
||||
// TODO: should deploy if it hasn't already
|
||||
function upload (platform) {
|
||||
if (platform === 'ipfs') {
|
||||
var ipfs = new IPFS({buildDir: 'dist/', plugins: this.plugins, storageConfig: this.config.storageConfig});
|
||||
ipfs.deploy();
|
||||
} else if (platform === 'swarm') {
|
||||
var swarm = new Swarm({buildDir: 'dist/', plugins: this.plugins, storageConfig: this.config.storageConfig});
|
||||
swarm.deploy();
|
||||
} else {
|
||||
console.log(("unknown platform: " + platform).red);
|
||||
console.log('try "embark upload ipfs" or "embark upload swarm"'.green);
|
||||
if (!(this instanceof Embark)) {
|
||||
return new Embark();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
version: version,
|
||||
initConfig: initConfig,
|
||||
blockchain: blockchain,
|
||||
simulator: simulator,
|
||||
generateTemplate: generateTemplate,
|
||||
run: run,
|
||||
build: build,
|
||||
initTests: initTests,
|
||||
upload: upload
|
||||
};
|
||||
|
||||
})();
|
||||
Embark.prototype = Object.create(EventEmitter.prototype);
|
||||
|
||||
module.exports = Embark;
|
||||
|
|
|
|||
|
|
@ -1,80 +1,83 @@
|
|||
/*jshint esversion: 6, loopfunc: true */
|
||||
var fs = require('../core/fs.js');
|
||||
let fs = require('../core/fs.js');
|
||||
|
||||
var Pipeline = function(options) {
|
||||
this.buildDir = options.buildDir;
|
||||
this.contractsFiles = options.contractsFiles;
|
||||
this.assetFiles = options.assetFiles;
|
||||
this.logger = options.logger;
|
||||
this.plugins = options.plugins;
|
||||
};
|
||||
class Pipeline {
|
||||
|
||||
Pipeline.prototype.build = function(abi, path) {
|
||||
var self = this;
|
||||
for(var targetFile in this.assetFiles) {
|
||||
constructor(options) {
|
||||
this.buildDir = options.buildDir;
|
||||
this.contractsFiles = options.contractsFiles;
|
||||
this.assetFiles = options.assetFiles;
|
||||
this.logger = options.logger;
|
||||
this.plugins = options.plugins;
|
||||
}
|
||||
|
||||
var contentFiles = this.assetFiles[targetFile].map(file => {
|
||||
self.logger.trace("reading " + file.filename);
|
||||
build(abi, path) {
|
||||
let self = this;
|
||||
for (let targetFile in this.assetFiles) {
|
||||
|
||||
var pipelinePlugins = this.plugins.getPluginsFor('pipeline');
|
||||
let contentFiles = this.assetFiles[targetFile].map(file => {
|
||||
self.logger.trace("reading " + file.filename);
|
||||
|
||||
if (file.filename === 'embark.js') {
|
||||
return {content: file.content + "\n" + abi, filename: file.filename, path: file.path, modified: true};
|
||||
} else if (file.filename === 'abi.js') {
|
||||
return {content: abi, filename: file.filename, path: file.path, modified: true};
|
||||
} else if (['web3.js', 'ipfs.js', 'ipfs-api.js', 'orbit.js'].indexOf(file.filename) >= 0) {
|
||||
file.modified = true;
|
||||
return file;
|
||||
} else {
|
||||
let pipelinePlugins = this.plugins.getPluginsFor('pipeline');
|
||||
|
||||
if (pipelinePlugins.length > 0) {
|
||||
pipelinePlugins.forEach(function(plugin) {
|
||||
try {
|
||||
if (file.options && file.options.skipPipeline) {
|
||||
return;
|
||||
if (file.filename === 'embark.js') {
|
||||
return {content: file.content + "\n" + abi, filename: file.filename, path: file.path, modified: true};
|
||||
} else if (file.filename === 'abi.js') {
|
||||
return {content: abi, filename: file.filename, path: file.path, modified: true};
|
||||
} else if (['web3.js', 'ipfs.js', 'ipfs-api.js', 'orbit.js'].indexOf(file.filename) >= 0) {
|
||||
file.modified = true;
|
||||
return file;
|
||||
} else {
|
||||
|
||||
if (pipelinePlugins.length > 0) {
|
||||
pipelinePlugins.forEach(function (plugin) {
|
||||
try {
|
||||
if (file.options && file.options.skipPipeline) {
|
||||
return;
|
||||
}
|
||||
file.content = plugin.runPipeline({targetFile: file.filename, source: file.content});
|
||||
file.modified = true;
|
||||
}
|
||||
file.content = plugin.runPipeline({targetFile: file.filename, source: file.content});
|
||||
file.modified = true;
|
||||
}
|
||||
catch(err) {
|
||||
self.logger.error(err.message);
|
||||
}
|
||||
});
|
||||
catch (err) {
|
||||
self.logger.error(err.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return file;
|
||||
}
|
||||
});
|
||||
|
||||
let dir = targetFile.split('/').slice(0, -1).join('/');
|
||||
self.logger.trace("creating dir " + this.buildDir + dir);
|
||||
fs.mkdirpSync(this.buildDir + dir);
|
||||
|
||||
// if it's a directory
|
||||
if (targetFile.slice(-1) === '/' || targetFile.indexOf('.') === -1) {
|
||||
let targetDir = targetFile;
|
||||
|
||||
if (targetDir.slice(-1) !== '/') {
|
||||
targetDir = targetDir + '/';
|
||||
}
|
||||
|
||||
return file;
|
||||
contentFiles.map(function (file) {
|
||||
let filename = file.filename.replace('app/', '');
|
||||
filename = filename.replace(targetDir, '');
|
||||
self.logger.info("writing file " + (self.buildDir + targetDir + filename).bold.dim);
|
||||
|
||||
fs.copySync(self.buildDir + targetDir + filename, file.path, {overwrite: true});
|
||||
});
|
||||
} else {
|
||||
let content = contentFiles.map(function (file) {
|
||||
return file.content;
|
||||
}).join("\n");
|
||||
|
||||
self.logger.info("writing file " + (this.buildDir + targetFile).bold.dim);
|
||||
fs.writeFileSync(this.buildDir + targetFile, content);
|
||||
}
|
||||
});
|
||||
|
||||
var dir = targetFile.split('/').slice(0, -1).join('/');
|
||||
self.logger.trace("creating dir " + this.buildDir + dir);
|
||||
fs.mkdirpSync(this.buildDir + dir);
|
||||
|
||||
// if it's a directory
|
||||
if (targetFile.slice(-1) === '/' || targetFile.indexOf('.') === -1) {
|
||||
var targetDir = targetFile;
|
||||
|
||||
if (targetDir.slice(-1) !== '/') {
|
||||
targetDir = targetDir + '/';
|
||||
}
|
||||
|
||||
contentFiles.map(function(file) {
|
||||
var filename = file.filename.replace('app/', '');
|
||||
filename = filename.replace(targetDir, '');
|
||||
self.logger.info("writing file " + (self.buildDir + targetDir + filename).bold.dim);
|
||||
|
||||
fs.copySync(self.buildDir + targetDir + filename, file.path, {overwrite: true});
|
||||
});
|
||||
} else {
|
||||
var content = contentFiles.map(function(file) {
|
||||
return file.content;
|
||||
}).join("\n");
|
||||
|
||||
self.logger.info("writing file " + (this.buildDir + targetFile).bold.dim);
|
||||
fs.writeFileSync(this.buildDir + targetFile, content);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = Pipeline;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,27 @@
|
|||
var finalhandler = require('finalhandler');
|
||||
var http = require('http');
|
||||
var serveStatic = require('serve-static');
|
||||
let finalhandler = require('finalhandler');
|
||||
let http = require('http');
|
||||
let serveStatic = require('serve-static');
|
||||
|
||||
var Server = function(options) {
|
||||
this.dist = options.dist || 'dist/';
|
||||
this.port = options.port || 8000;
|
||||
this.hostname = options.host || 'localhost';
|
||||
this.logger = options.logger;
|
||||
};
|
||||
class Server {
|
||||
constructor(options) {
|
||||
this.dist = options.dist || 'dist/';
|
||||
this.port = options.port || 8000;
|
||||
this.hostname = options.host || 'localhost';
|
||||
this.logger = options.logger;
|
||||
}
|
||||
|
||||
Server.prototype.start = function(callback) {
|
||||
var serve = serveStatic(this.dist, {'index': ['index.html', 'index.htm']});
|
||||
start(callback) {
|
||||
let serve = serveStatic(this.dist, {'index': ['index.html', 'index.htm']});
|
||||
|
||||
var server = http.createServer(function onRequest (req, res) {
|
||||
serve(req, res, finalhandler(req, res));
|
||||
});
|
||||
let server = http.createServer(function onRequest(req, res) {
|
||||
serve(req, res, finalhandler(req, res));
|
||||
});
|
||||
|
||||
this.logger.info("webserver available at " + ("http://" + this.hostname + ":" + this.port).bold.underline.green);
|
||||
server.listen(this.port, this.hostname) ;
|
||||
callback();
|
||||
};
|
||||
this.logger.info("webserver available at " + ("http://" + this.hostname + ":" + this.port).bold.underline.green);
|
||||
server.listen(this.port, this.hostname);
|
||||
callback();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Server;
|
||||
|
|
|
|||
|
|
@ -1,101 +1,104 @@
|
|||
/*jshint esversion: 6 */
|
||||
var chokidar = require('chokidar');
|
||||
let chokidar = require('chokidar');
|
||||
|
||||
var fs = require('../core/fs.js');
|
||||
let fs = require('../core/fs.js');
|
||||
|
||||
// TODO: this should be receiving the config object not re-reading the
|
||||
// embark.json file
|
||||
var Watch = function(options) {
|
||||
this.logger = options.logger;
|
||||
this.events = options.events;
|
||||
};
|
||||
|
||||
Watch.prototype.start = function() {
|
||||
var self = this;
|
||||
// TODO: should come from the config object instead of reading the file
|
||||
// directly
|
||||
var embarkConfig = fs.readJSONSync('embark.json');
|
||||
|
||||
this.watchAssets(embarkConfig, function() {
|
||||
self.logger.trace('ready to watch asset changes');
|
||||
});
|
||||
|
||||
this.watchContracts(embarkConfig, function() {
|
||||
self.logger.trace('ready to watch contract changes');
|
||||
});
|
||||
|
||||
this.watchConfigs(function() {
|
||||
self.logger.trace('ready to watch config changes');
|
||||
});
|
||||
|
||||
this.logger.info("ready to watch file changes");
|
||||
};
|
||||
|
||||
Watch.prototype.watchAssets = function(embarkConfig, callback) {
|
||||
var self = this;
|
||||
var appConfig = embarkConfig.app;
|
||||
var filesToWatch = [];
|
||||
|
||||
for(var targetFile in appConfig) {
|
||||
filesToWatch.push(appConfig[targetFile]);
|
||||
class Watch {
|
||||
constructor(options) {
|
||||
this.logger = options.logger;
|
||||
this.events = options.events;
|
||||
}
|
||||
|
||||
this.watchFiles(
|
||||
filesToWatch,
|
||||
function(eventName, path) {
|
||||
self.logger.info(`${eventName}: ${path}`);
|
||||
self.events.emit('file-' + eventName, 'asset', path);
|
||||
self.events.emit('file-event', 'asset', path);
|
||||
},
|
||||
function() {
|
||||
callback();
|
||||
start() {
|
||||
let self = this;
|
||||
// TODO: should come from the config object instead of reading the file
|
||||
// directly
|
||||
let embarkConfig = fs.readJSONSync("embark.json");
|
||||
|
||||
this.watchAssets(embarkConfig, function () {
|
||||
self.logger.trace('ready to watch asset changes');
|
||||
});
|
||||
|
||||
this.watchContracts(embarkConfig, function () {
|
||||
self.logger.trace('ready to watch contract changes');
|
||||
});
|
||||
|
||||
this.watchConfigs(function () {
|
||||
self.logger.trace('ready to watch config changes');
|
||||
});
|
||||
|
||||
this.logger.info("ready to watch file changes");
|
||||
}
|
||||
|
||||
watchAssets(embarkConfig, callback) {
|
||||
let self = this;
|
||||
let appConfig = embarkConfig.app;
|
||||
let filesToWatch = [];
|
||||
|
||||
for (let targetFile in appConfig) {
|
||||
filesToWatch.push(appConfig[targetFile]);
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
Watch.prototype.watchContracts = function(embarkConfig, callback) {
|
||||
var self = this;
|
||||
this.watchFiles(
|
||||
[embarkConfig.contracts],
|
||||
function(eventName, path) {
|
||||
self.logger.info(`${eventName}: ${path}`);
|
||||
self.events.emit('file-' + eventName, 'contract', path);
|
||||
self.events.emit('file-event', 'contract', path);
|
||||
},
|
||||
function() {
|
||||
callback();
|
||||
}
|
||||
);
|
||||
};
|
||||
this.watchFiles(
|
||||
filesToWatch,
|
||||
function (eventName, path) {
|
||||
self.logger.info(`${eventName}: ${path}`);
|
||||
self.events.emit('file-' + eventName, 'asset', path);
|
||||
self.events.emit('file-event', 'asset', path);
|
||||
},
|
||||
function () {
|
||||
callback();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Watch.prototype.watchConfigs = function(callback) {
|
||||
var self = this;
|
||||
this.watchFiles(
|
||||
"config/**/contracts.json",
|
||||
function(eventName, path) {
|
||||
self.logger.info(`${eventName}: ${path}`);
|
||||
self.events.emit('file-' + eventName, 'config', path);
|
||||
self.events.emit('file-event', 'config', path);
|
||||
},
|
||||
function() {
|
||||
callback();
|
||||
}
|
||||
);
|
||||
};
|
||||
watchContracts(embarkConfig, callback) {
|
||||
let self = this;
|
||||
this.watchFiles(
|
||||
[embarkConfig.contracts],
|
||||
function (eventName, path) {
|
||||
self.logger.info(`${eventName}: ${path}`);
|
||||
self.events.emit('file-' + eventName, 'contract', path);
|
||||
self.events.emit('file-event', 'contract', path);
|
||||
},
|
||||
function () {
|
||||
callback();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Watch.prototype.watchFiles = function(files, changeCallback, doneCallback) {
|
||||
this.logger.trace('watchFiles');
|
||||
this.logger.trace(files);
|
||||
watchConfigs(callback) {
|
||||
let self = this;
|
||||
this.watchFiles(
|
||||
"config/**/contracts.json",
|
||||
function (eventName, path) {
|
||||
self.logger.info(`${eventName}: ${path}`);
|
||||
self.events.emit('file-' + eventName, 'config', path);
|
||||
self.events.emit('file-event', 'config', path);
|
||||
},
|
||||
function () {
|
||||
callback();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
var configWatcher = chokidar.watch(files, {
|
||||
ignored: /[\/\\]\./, persistent: true, ignoreInitial: true, followSymlinks: true
|
||||
});
|
||||
watchFiles(files, changeCallback, doneCallback) {
|
||||
this.logger.trace('watchFiles');
|
||||
this.logger.trace(files);
|
||||
|
||||
configWatcher
|
||||
.on('add', path => changeCallback('add', path))
|
||||
.on('change', path => changeCallback('change', path))
|
||||
.on('unlink', path => changeCallback('remove', path))
|
||||
.on('ready', doneCallback);
|
||||
};
|
||||
let configWatcher = chokidar.watch(files, {
|
||||
ignored: /[\/\\]\./, persistent: true, ignoreInitial: true, followSymlinks: true
|
||||
});
|
||||
|
||||
configWatcher
|
||||
.on('add', path => changeCallback('add', path))
|
||||
.on('change', path => changeCallback('change', path))
|
||||
.on('unlink', path => changeCallback('remove', path))
|
||||
.on('ready', doneCallback);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = Watch;
|
||||
|
|
|
|||
|
|
@ -1,56 +1,60 @@
|
|||
var colors = require('colors');
|
||||
var async = require('async');
|
||||
var shelljs = require('shelljs');
|
||||
let colors = require('colors');
|
||||
let async = require('async');
|
||||
let shelljs = require('shelljs');
|
||||
|
||||
var IPFS = function(options) {
|
||||
this.options = options;
|
||||
this.buildDir = options.buildDir || 'dist/';
|
||||
this.plugins = options.plugins;
|
||||
this.storageConfig = options.storageConfig;
|
||||
this.configIpfsBin = this.storageConfig.ipfs_bin || "ipfs";
|
||||
};
|
||||
class IPFS {
|
||||
|
||||
IPFS.prototype.deploy = function() {
|
||||
var self = this;
|
||||
async.waterfall([
|
||||
function findBinary(callback) {
|
||||
var ipfs_bin = shelljs.exec('which ' + self.configIpfsBin).output.split("\n")[0];
|
||||
constructor(options) {
|
||||
this.options = options;
|
||||
this.buildDir = options.buildDir || 'dist/';
|
||||
this.plugins = options.plugins;
|
||||
this.storageConfig = options.storageConfig;
|
||||
this.configIpfsBin = this.storageConfig.ipfs_bin || "ipfs";
|
||||
}
|
||||
|
||||
if (ipfs_bin === 'ipfs not found' || ipfs_bin === ''){
|
||||
console.log(('=== WARNING: ' + self.configIpfsBin + ' not found or not in the path. Guessing ~/go/bin/ipfs for path').yellow);
|
||||
ipfs_bin = "~/go/bin/ipfs";
|
||||
deploy() {
|
||||
let self = this;
|
||||
async.waterfall([
|
||||
function findBinary(callback) {
|
||||
let ipfs_bin = shelljs.exec('which ' + self.configIpfsBin).output.split("\n")[0];
|
||||
|
||||
if (ipfs_bin === 'ipfs not found' || ipfs_bin === '') {
|
||||
console.log(('=== WARNING: ' + self.configIpfsBin + ' not found or not in the path. Guessing ~/go/bin/ipfs for path').yellow);
|
||||
ipfs_bin = "~/go/bin/ipfs";
|
||||
}
|
||||
|
||||
return callback(null, ipfs_bin);
|
||||
},
|
||||
function runCommand(ipfs_bin, callback) {
|
||||
let cmd = ipfs_bin + " add -r " + self.buildDir;
|
||||
console.log(("=== adding " + self.buildDir + " to ipfs").green);
|
||||
console.log(cmd.green);
|
||||
let result = shelljs.exec(cmd);
|
||||
|
||||
return callback(null, result);
|
||||
},
|
||||
function getHashFromOutput(result, callback) {
|
||||
let rows = result.output.split("\n");
|
||||
let dir_row = rows[rows.length - 2];
|
||||
let dir_hash = dir_row.split(" ")[1];
|
||||
|
||||
return callback(null, dir_hash);
|
||||
},
|
||||
function printUrls(dir_hash, callback) {
|
||||
console.log(("=== DApp available at http://localhost:8080/ipfs/" + dir_hash + "/").green);
|
||||
console.log(("=== DApp available at http://gateway.ipfs.io/ipfs/" + dir_hash + "/").green);
|
||||
|
||||
return callback();
|
||||
}
|
||||
|
||||
return callback(null, ipfs_bin);
|
||||
},
|
||||
function runCommand(ipfs_bin, callback) {
|
||||
var cmd = ipfs_bin + " add -r " + self.buildDir;
|
||||
console.log(("=== adding " + self.buildDir + " to ipfs").green);
|
||||
console.log(cmd.green);
|
||||
var result = shelljs.exec(cmd);
|
||||
|
||||
return callback(null, result);
|
||||
},
|
||||
function getHashFromOutput(result, callback) {
|
||||
var rows = result.output.split("\n");
|
||||
var dir_row = rows[rows.length - 2];
|
||||
var dir_hash = dir_row.split(" ")[1];
|
||||
|
||||
return callback(null, dir_hash);
|
||||
},
|
||||
function printUrls(dir_hash, callback) {
|
||||
console.log(("=== DApp available at http://localhost:8080/ipfs/" + dir_hash + "/").green);
|
||||
console.log(("=== DApp available at http://gateway.ipfs.io/ipfs/" + dir_hash + "/").green);
|
||||
|
||||
return callback();
|
||||
}
|
||||
], function(err, result) {
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
console.log("error uploading to ipfs".red);
|
||||
console.log(err);
|
||||
}
|
||||
});
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = IPFS;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +1,57 @@
|
|||
var colors = require('colors');
|
||||
var async = require('async');
|
||||
var shelljs = require('shelljs');
|
||||
let colors = require('colors');
|
||||
let async = require('async');
|
||||
let shelljs = require('shelljs');
|
||||
|
||||
var Swarm = function(options) {
|
||||
this.options = options;
|
||||
this.buildDir = options.buildDir || 'dist/';
|
||||
};
|
||||
class Swarm {
|
||||
constructor(options) {
|
||||
this.options = options;
|
||||
this.buildDir = options.buildDir || 'dist/';
|
||||
}
|
||||
|
||||
Swarm.prototype.deploy = function() {
|
||||
var self = this;
|
||||
async.waterfall([
|
||||
function findBinary(callback) {
|
||||
var swarm_bin = shelljs.exec('which swarm').output.split("\n")[0];
|
||||
deploy() {
|
||||
let self = this;
|
||||
async.waterfall([
|
||||
function findBinary(callback) {
|
||||
let swarm_bin = shelljs.exec('which swarm').output.split("\n")[0];
|
||||
|
||||
if (swarm_bin==='swarm not found' || swarm_bin === ''){
|
||||
console.log('=== WARNING: Swarm not in an executable path. Guessing ~/go/bin/swarm for path'.yellow);
|
||||
swarm_bin = "~/go/bin/swarm";
|
||||
if (swarm_bin === 'swarm not found' || swarm_bin === '') {
|
||||
console.log('=== WARNING: Swarm not in an executable path. Guessing ~/go/bin/swarm for path'.yellow);
|
||||
swarm_bin = "~/go/bin/swarm";
|
||||
}
|
||||
|
||||
return callback(null, swarm_bin);
|
||||
},
|
||||
function runCommand(swarm_bin, callback) {
|
||||
let cmd = swarm_bin + " --defaultpath " + self.buildDir + "index.html --recursive up " + self.buildDir;
|
||||
console.log(("=== adding " + self.buildDir + " to swarm").green);
|
||||
console.log(cmd.green);
|
||||
let result = shelljs.exec(cmd);
|
||||
|
||||
return callback(null, result);
|
||||
},
|
||||
function getHashFromOutput(result, callback) {
|
||||
if (result.code !== 0) {
|
||||
return callback("couldn't upload, is the swarm daemon running?");
|
||||
}
|
||||
|
||||
let rows = result.output.split("\n");
|
||||
let dir_hash = rows.reverse()[1];
|
||||
|
||||
return callback(null, dir_hash);
|
||||
},
|
||||
function printUrls(dir_hash, callback) {
|
||||
console.log(("=== DApp available at http://localhost:8500/bzz:/" + dir_hash + "/").green);
|
||||
|
||||
return callback();
|
||||
}
|
||||
|
||||
return callback(null, swarm_bin);
|
||||
},
|
||||
function runCommand(swarm_bin, callback) {
|
||||
var cmd = swarm_bin + " --defaultpath " + self.buildDir + "index.html --recursive up " + self.buildDir;
|
||||
console.log(("=== adding " + self.buildDir + " to swarm").green);
|
||||
console.log(cmd.green);
|
||||
var result = shelljs.exec(cmd);
|
||||
|
||||
return callback(null, result);
|
||||
},
|
||||
function getHashFromOutput(result, callback) {
|
||||
if (result.code !== 0) {
|
||||
return callback("couldn't upload, is the swarm daemon running?");
|
||||
}
|
||||
|
||||
var rows = result.output.split("\n");
|
||||
var dir_hash = rows.reverse()[1];
|
||||
|
||||
return callback(null, dir_hash);
|
||||
},
|
||||
function printUrls(dir_hash, callback) {
|
||||
console.log(("=== DApp available at http://localhost:8500/bzz:/" + dir_hash + "/").green);
|
||||
|
||||
return callback();
|
||||
}
|
||||
], function(err, result) {
|
||||
], function (err, result) {
|
||||
if (err) {
|
||||
console.log("error uploading to swarm".red);
|
||||
console.log(err);
|
||||
}
|
||||
});
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Swarm;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
var async = require('async');
|
||||
let async = require('async');
|
||||
|
||||
function asyncEachObject(object, iterator, callback) {
|
||||
async.each(
|
||||
Object.keys(object || {}),
|
||||
function(key, next){
|
||||
function (key, next) {
|
||||
iterator(key, object[key], next);
|
||||
},
|
||||
callback
|
||||
);
|
||||
}
|
||||
|
||||
async.eachObject = asyncEachObject;
|
||||
|
||||
module.exports = async;
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ function extend(filename, async) {
|
|||
return;
|
||||
}
|
||||
async._waterfall = async.waterfall;
|
||||
async.waterfall = function(_tasks, callback) {
|
||||
var tasks = _tasks.map(function(t) {
|
||||
var fn = function() {
|
||||
async.waterfall = function (_tasks, callback) {
|
||||
let tasks = _tasks.map(function (t) {
|
||||
let fn = function () {
|
||||
console.log("async " + filename + ": " + t.name);
|
||||
t.apply(t, arguments);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/*global exit */
|
||||
var path = require('path');
|
||||
var globule = require('globule');
|
||||
var merge = require('merge');
|
||||
var http = require('http');
|
||||
var shelljs = require('shelljs');
|
||||
let path = require('path');
|
||||
let globule = require('globule');
|
||||
let merge = require('merge');
|
||||
let http = require('http');
|
||||
let shelljs = require('shelljs');
|
||||
|
||||
function joinPath() {
|
||||
return path.join.apply(path.join, arguments);
|
||||
|
|
@ -22,15 +22,15 @@ function recursiveMerge(target, source) {
|
|||
}
|
||||
|
||||
function checkIsAvailable(url, callback) {
|
||||
http.get(url, function(res) {
|
||||
http.get(url, function (res) {
|
||||
callback(true);
|
||||
}).on('error', function(res) {
|
||||
}).on('error', function (res) {
|
||||
callback(false);
|
||||
});
|
||||
}
|
||||
|
||||
function runCmd(cmd, options) {
|
||||
var result = shelljs.exec(cmd, options || {silent: true});
|
||||
let result = shelljs.exec(cmd, options || {silent: true});
|
||||
if (result.code !== 0) {
|
||||
console.log("error doing.. " + cmd);
|
||||
console.log(result.output);
|
||||
|
|
@ -53,6 +53,7 @@ function exit(code) {
|
|||
process.exit(code);
|
||||
}
|
||||
|
||||
//TODO: Maybe desired to just `module.exports = this` ?
|
||||
module.exports = {
|
||||
joinPath: joinPath,
|
||||
filesMatchingPattern: filesMatchingPattern,
|
||||
|
|
|
|||
16
package.json
16
package.json
|
|
@ -31,6 +31,8 @@
|
|||
"shelljs": "^0.5.0",
|
||||
"solc": "0.4.8",
|
||||
"toposort": "^1.0.0",
|
||||
"underscore": "^1.8.3",
|
||||
"underscore.string": "^3.3.4",
|
||||
"web3": "^0.18.2"
|
||||
},
|
||||
"author": "Iuri Matias <iuri.matias@gmail.com>",
|
||||
|
|
@ -59,5 +61,19 @@
|
|||
"mocha-sinon": "^1.1.4",
|
||||
"sinon": "^1.15.4",
|
||||
"toposort": "^1.0.0"
|
||||
},
|
||||
"jshintConfig": {
|
||||
"indent": 2,
|
||||
"white": true,
|
||||
"node": true,
|
||||
"undef": true,
|
||||
"-W058": true,
|
||||
"-W014": true,
|
||||
"expr": true,
|
||||
"esversion": 6,
|
||||
"unused": false,
|
||||
"globals": {
|
||||
"node": true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
18
test/abi.js
18
test/abi.js
|
|
@ -1,23 +1,23 @@
|
|||
/*globals describe, it*/
|
||||
var ABIGenerator = require('../lib/contracts/abi.js');
|
||||
var assert = require('assert');
|
||||
let ABIGenerator = require('../lib/contracts/abi.js');
|
||||
let assert = require('assert');
|
||||
|
||||
// TODO: instead 'eval' the code with a fake web3 object
|
||||
// and check the generate code interacts as expected
|
||||
describe('embark.ABIGenerator', function() {
|
||||
this.timeout(0);
|
||||
describe('#generateProvider', function() {
|
||||
var generator = new ABIGenerator({blockchainConfig: {rpcHost: 'somehost', rpcPort: '1234'}, contractsManager: {}});
|
||||
let generator = new ABIGenerator({blockchainConfig: {rpcHost: 'somehost', rpcPort: '1234'}, contractsManager: {}});
|
||||
|
||||
it('should generate code to connect to a provider', function() {
|
||||
var providerCode = "\nif (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined') {\n\tweb3 = new Web3(web3.currentProvider);\n} else if (typeof Web3 !== 'undefined') {\n\tweb3 = new Web3(new Web3.providers.HttpProvider(\"http://somehost:1234\"));\n}\nweb3.eth.defaultAccount = web3.eth.accounts[0];";
|
||||
let providerCode = "\nif (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined') {\n\tweb3 = new Web3(web3.currentProvider);\n} else if (typeof Web3 !== 'undefined') {\n\tweb3 = new Web3(new Web3.providers.HttpProvider(\"http://somehost:1234\"));\n}\nweb3.eth.defaultAccount = web3.eth.accounts[0];";
|
||||
|
||||
assert.equal(generator.generateProvider(), providerCode);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#generateContracts', function() {
|
||||
var generator = new ABIGenerator({blockchainConfig: {}, contractsManager: {
|
||||
let generator = new ABIGenerator({blockchainConfig: {}, contractsManager: {
|
||||
contracts: {
|
||||
SimpleStorage: {
|
||||
abiDefinition: [{"constant":true,"inputs":[],"name":"storedData","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"x","type":"uint256"}],"name":"set","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"get","outputs":[{"name":"retVal","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[{"name":"initialValue","type":"uint256"}],"type":"constructor"}],
|
||||
|
|
@ -35,19 +35,19 @@ describe('embark.ABIGenerator', function() {
|
|||
}});
|
||||
|
||||
describe('with EmbarkJS', function() {
|
||||
var withEmbarkJS = true;
|
||||
let withEmbarkJS = true;
|
||||
|
||||
it('should generate contract code', function() {
|
||||
var contractCode = "\n\nSimpleStorage = new EmbarkJS.Contract({abi: [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}], address: '0x123', code: '12345', gasEstimates: 12000});\nFoo = new EmbarkJS.Contract({abi: [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}], address: '0x124', code: '123456', gasEstimates: 12000});";
|
||||
let contractCode = "\n\nSimpleStorage = new EmbarkJS.Contract({abi: [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}], address: '0x123', code: '12345', gasEstimates: 12000});\nFoo = new EmbarkJS.Contract({abi: [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}], address: '0x124', code: '123456', gasEstimates: 12000});";
|
||||
assert.equal(generator.generateContracts(withEmbarkJS), contractCode);
|
||||
});
|
||||
});
|
||||
|
||||
describe('with default interface', function() {
|
||||
var withEmbarkJS = false;
|
||||
let withEmbarkJS = false;
|
||||
|
||||
it('should generate contract code', function() {
|
||||
var contractCode = "\n\nSimpleStorageAbi = [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}];\nSimpleStorageContract = web3.eth.contract(SimpleStorageAbi);\nSimpleStorage = SimpleStorageContract.at('0x123');\nFooAbi = [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}];\nFooContract = web3.eth.contract(FooAbi);\nFoo = FooContract.at('0x124');";
|
||||
let contractCode = "\n\nSimpleStorageAbi = [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}];\nSimpleStorageContract = web3.eth.contract(SimpleStorageAbi);\nSimpleStorage = SimpleStorageContract.at('0x123');\nFooAbi = [{\"constant\":true,\"inputs\":[],\"name\":\"storedData\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"retVal\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"inputs\":[{\"name\":\"initialValue\",\"type\":\"uint256\"}],\"type\":\"constructor\"}];\nFooContract = web3.eth.contract(FooAbi);\nFoo = FooContract.at('0x124');";
|
||||
assert.equal(generator.generateContracts(withEmbarkJS), contractCode);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
/*globals describe, it*/
|
||||
var Blockchain = require('../lib/cmds/blockchain/blockchain.js');
|
||||
var assert = require('assert');
|
||||
const Blockchain = require('../lib/cmds/blockchain/blockchain');
|
||||
|
||||
describe('embark.Blockchain', function() {
|
||||
//var Client = function() {};
|
||||
const assert = require('assert');
|
||||
|
||||
describe('embark.Blockchain', function () {
|
||||
//let Client = function() {};
|
||||
//Client.prototype.name = "ClientName";
|
||||
|
||||
describe('#initializer', function() {
|
||||
//var client = new Client();
|
||||
describe('#initializer', function () {
|
||||
//let client = new Client();
|
||||
|
||||
describe('with empty config', function() {
|
||||
it('should have a default config', function() {
|
||||
var config = {
|
||||
describe('with empty config', function () {
|
||||
it('should have a default config', function () {
|
||||
let config = {
|
||||
networkType: 'custom',
|
||||
genesisBlock: false,
|
||||
geth_bin: 'geth',
|
||||
|
|
@ -31,15 +32,15 @@ describe('embark.Blockchain', function() {
|
|||
account: {},
|
||||
bootnodes: ""
|
||||
};
|
||||
var blockchain = Blockchain(config, 'geth');
|
||||
let blockchain = new Blockchain(config, 'geth');
|
||||
|
||||
assert.deepEqual(blockchain.config, config);
|
||||
});
|
||||
});
|
||||
|
||||
describe('with config', function() {
|
||||
it('should take config params', function() {
|
||||
var config = {
|
||||
describe('with config', function () {
|
||||
it('should take config params', function () {
|
||||
let config = {
|
||||
networkType: 'livenet',
|
||||
genesisBlock: 'foo/bar/genesis.json',
|
||||
geth_bin: 'geth',
|
||||
|
|
@ -59,7 +60,7 @@ describe('embark.Blockchain', function() {
|
|||
account: {},
|
||||
bootnodes: ""
|
||||
};
|
||||
var blockchain = Blockchain(config, 'geth');
|
||||
let blockchain = new Blockchain(config, 'geth');
|
||||
|
||||
assert.deepEqual(blockchain.config, config);
|
||||
});
|
||||
|
|
|
|||
55
test/cmd.js
55
test/cmd.js
|
|
@ -1,5 +1,5 @@
|
|||
var Embark = require('../lib/index');
|
||||
var Cmd = require('../lib/cmd');
|
||||
let Embark = require('../lib/index');
|
||||
let Cmd = require('../lib/cmd');
|
||||
|
||||
// Function to send a line to stdin
|
||||
function sendLine(line) {
|
||||
|
|
@ -8,8 +8,8 @@ function sendLine(line) {
|
|||
});
|
||||
}
|
||||
|
||||
var passingLines = function () {
|
||||
var lines = [];
|
||||
let passingLines = function () {
|
||||
let lines = [];
|
||||
lines.push('Initializing Embark Template....');
|
||||
lines.push('Installing packages.. this can take a few seconds');
|
||||
lines.push('Init complete');
|
||||
|
|
@ -21,35 +21,32 @@ describe('embark.Cmd', function () {
|
|||
|
||||
describe('#new', function () {
|
||||
it('it should create an app with a name', function (done) {
|
||||
// var cmd = new Cmd(Embark);
|
||||
// var pl = passingLines();
|
||||
// var appname = 'deleteapp';
|
||||
// cmd.newApp(appname, function (output) {
|
||||
// var lines = output.split('\n');
|
||||
// console.log(lines);
|
||||
// assert.equal(lines[0], pl[0]);
|
||||
// assert.equal(lines[1], pl[1]);
|
||||
// assert.equal(lines[2], pl[2]);
|
||||
// assert.equal(lines[3], 'App ready at ./' + appname);
|
||||
// });
|
||||
|
||||
//TODO: future branch will test this in vorpal vs commander
|
||||
let cmd = new Cmd(Embark);
|
||||
let pl = passingLines();
|
||||
let appname = 'deleteapp';
|
||||
cmd.newApp(appname, function (output) {
|
||||
let lines = output.split('\n');
|
||||
console.log(lines);
|
||||
assert.equal(lines[0], pl[0]);
|
||||
assert.equal(lines[1], pl[1]);
|
||||
assert.equal(lines[2], pl[2]);
|
||||
assert.equal(lines[3], 'App ready at ./' + appname);
|
||||
});
|
||||
done();
|
||||
});
|
||||
|
||||
it('it should prompt when given an empty app name', function (done) {
|
||||
// var cmd = new Cmd(Embark);
|
||||
// var pl = passingLines();
|
||||
// var appname = 'deleteapp';
|
||||
//
|
||||
// cmd.newApp(undefined, function (output) {
|
||||
// var lines = output.split('\n');
|
||||
// console.log(lines);
|
||||
// sendLine(appname + '\n');
|
||||
// assert.equal(lines[0], pl[0]);
|
||||
// done();
|
||||
// });
|
||||
let cmd = new Cmd(Embark);
|
||||
let pl = passingLines();
|
||||
let appname = 'deleteapp';
|
||||
|
||||
cmd.newApp(undefined, function (output) {
|
||||
let lines = output.split('\n');
|
||||
console.log(lines);
|
||||
sendLine(appname + '\n');
|
||||
assert.equal(lines[0], pl[0]);
|
||||
});
|
||||
done();
|
||||
});
|
||||
})
|
||||
});
|
||||
});
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
/*globals describe, it*/
|
||||
var Compiler = require('../lib/contracts/compiler.js');
|
||||
var TestLogger = require('../lib/core/test_logger.js');
|
||||
var assert = require('assert');
|
||||
var fs = require('fs');
|
||||
let Compiler = require('../lib/contracts/compiler.js');
|
||||
let TestLogger = require('../lib/core/test_logger.js');
|
||||
let assert = require('assert');
|
||||
let fs = require('fs');
|
||||
|
||||
var readFile = function(file) {
|
||||
let readFile = function(file) {
|
||||
return {filename: file, content: fs.readFileSync(file).toString()};
|
||||
};
|
||||
|
||||
describe('embark.Compiler', function() {
|
||||
var compiler = new Compiler({logger: new TestLogger({})});
|
||||
let compiler = new Compiler({logger: new TestLogger({})});
|
||||
|
||||
describe('#compile_solidity', function() {
|
||||
this.timeout(0);
|
||||
|
||||
var expectedObject = {};
|
||||
let expectedObject = {};
|
||||
|
||||
expectedObject["SimpleStorage"] = {"code":"606060405234610000576040516020806100f083398101604052515b60008190555b505b60bf806100316000396000f300606060405263ffffffff60e060020a6000350416632a1afcd98114603657806360fe47b11460525780636d4ce63c146061575b6000565b346000576040607d565b60408051918252519081900360200190f35b34600057605f6004356083565b005b346000576040608c565b60408051918252519081900360200190f35b60005481565b60008190555b50565b6000545b905600a165627a7a72305820a250be048d43f54e9afbb37211dc73ba843d23b95863b60afe703903500077220029","realRuntimeBytecode": "606060405263ffffffff60e060020a6000350416632a1afcd98114603657806360fe47b11460525780636d4ce63c146061575b6000565b346000576040607d565b60408051918252519081900360200190f35b34600057605f6004356083565b005b346000576040608c565b60408051918252519081900360200190f35b60005481565b60008190555b50565b6000545b905600a165627a7a72305820","runtimeBytecode":"606060405263ffffffff60e060020a6000350416632a1afcd98114603657806360fe47b11460525780636d4ce63c146061575b6000565b346000576040607d565b60408051918252519081900360200190f35b34600057605f6004356083565b005b346000576040608c565b60408051918252519081900360200190f35b60005481565b60008190555b50565b6000545b905600a165627a7a72305820a250be048d43f54e9afbb37211dc73ba843d23b95863b60afe703903500077220029","swarmHash": "a250be048d43f54e9afbb37211dc73ba843d23b95863b60afe70390350007722","gasEstimates":{"creation":[20131,38200],"external":{"get()":269,"set(uint256)":20163,"storedData()":224},"internal":{}},"functionHashes":{"get()":"6d4ce63c","set(uint256)":"60fe47b1","storedData()":"2a1afcd9"},"abiDefinition":[{"constant":true,"inputs":[],"name":"storedData","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"x","type":"uint256"}],"name":"set","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"get","outputs":[{"name":"retVal","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[{"name":"initialValue","type":"uint256"}],"payable":false,"type":"constructor"}]};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
/*globals describe, it*/
|
||||
var Config = require('../lib/core/config.js');
|
||||
var Plugins = require('../lib/core/plugins.js');
|
||||
var assert = require('assert');
|
||||
var fs = require('fs');
|
||||
let Config = require('../lib/core/config.js');
|
||||
let Plugins = require('../lib/core/plugins.js');
|
||||
let assert = require('assert');
|
||||
|
||||
describe('embark.Config', function() {
|
||||
var config = new Config({
|
||||
let config = new Config({
|
||||
env: 'myenv',
|
||||
configDir: './test/test1/config/'
|
||||
});
|
||||
|
|
@ -14,7 +13,7 @@ describe('embark.Config', function() {
|
|||
describe('#loadBlockchainConfigFile', function() {
|
||||
it('should load blockchain config correctly', function() {
|
||||
config.loadBlockchainConfigFile();
|
||||
var expectedConfig = {
|
||||
let expectedConfig = {
|
||||
"enabled": true,
|
||||
"networkType": "custom",
|
||||
"genesisBlock": "config/development/genesis.json",
|
||||
|
|
@ -36,7 +35,7 @@ describe('embark.Config', function() {
|
|||
describe('#loadContractsConfigFile', function() {
|
||||
it('should load contract config correctly', function() {
|
||||
config.loadContractsConfigFile();
|
||||
var expectedConfig = {
|
||||
let expectedConfig = {
|
||||
"gas": "auto",
|
||||
"contracts": {
|
||||
"SimpleStorage": {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
/*globals describe, it*/
|
||||
var Console = require('../lib/dashboard/console.js');
|
||||
var Plugins = require('../lib/core/plugins.js');
|
||||
var assert = require('assert');
|
||||
var version = require('../package.json').version;
|
||||
let Console = require('../lib/dashboard/console.js');
|
||||
let Plugins = require('../lib/core/plugins.js');
|
||||
let assert = require('assert');
|
||||
let version = require('../package.json').version;
|
||||
|
||||
describe('embark.Console', function() {
|
||||
var plugins = new Plugins({plugins: {}});
|
||||
var console = new Console({plugins: plugins, version: version});
|
||||
let plugins = new Plugins({plugins: {}});
|
||||
let console = new Console({plugins: plugins, version: version});
|
||||
|
||||
describe('#executeCmd', function() {
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ describe('embark.Console', function() {
|
|||
|
||||
it('it should provide a help text', function(done) {
|
||||
console.executeCmd('help', function(output) {
|
||||
var lines = output.split('\n');
|
||||
let lines = output.split('\n');
|
||||
assert.equal(lines[0], 'Welcome to Embark ' + version);
|
||||
assert.equal(lines[2], 'possible commands are:');
|
||||
done();
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
/*globals describe, it*/
|
||||
var ContractsManager = require('../lib/contracts/contracts.js');
|
||||
var Logger = require('../lib/core/logger.js');
|
||||
var assert = require('assert');
|
||||
var fs = require('fs');
|
||||
let ContractsManager = require('../lib/contracts/contracts.js');
|
||||
let Logger = require('../lib/core/logger.js');
|
||||
let assert = require('assert');
|
||||
let fs = require('fs');
|
||||
|
||||
var readFile = function(file) {
|
||||
let readFile = function(file) {
|
||||
return {filename: file, content: fs.readFileSync(file).toString()};
|
||||
};
|
||||
|
||||
describe('embark.Contratcs', function() {
|
||||
|
||||
this.timeout(0);
|
||||
describe('simple', function() {
|
||||
var contractsManager = new ContractsManager({
|
||||
let contractsManager = new ContractsManager({
|
||||
contractFiles: [
|
||||
readFile('test/contracts/simple_storage.sol'),
|
||||
readFile('test/contracts/token.sol')
|
||||
|
|
@ -41,7 +41,7 @@ describe('embark.Contratcs', function() {
|
|||
throw err;
|
||||
}
|
||||
|
||||
var contracts = contractsManager.listContracts();
|
||||
let contracts = contractsManager.listContracts();
|
||||
assert.equal(contracts.length, 2);
|
||||
|
||||
assert.equal(contracts[0].deploy, true);
|
||||
|
|
@ -70,7 +70,7 @@ describe('embark.Contratcs', function() {
|
|||
});
|
||||
|
||||
describe('config with contract instances', function() {
|
||||
var contractsManager = new ContractsManager({
|
||||
let contractsManager = new ContractsManager({
|
||||
contractFiles: [
|
||||
readFile('test/contracts/simple_storage.sol'),
|
||||
readFile('test/contracts/token_storage.sol')
|
||||
|
|
@ -110,7 +110,7 @@ describe('embark.Contratcs', function() {
|
|||
throw err;
|
||||
}
|
||||
|
||||
var contracts = contractsManager.listContracts();
|
||||
let contracts = contractsManager.listContracts();
|
||||
assert.equal(contracts.length, 4);
|
||||
|
||||
assert.equal(contracts[0].className, "MySimpleStorage");
|
||||
|
|
@ -127,7 +127,7 @@ describe('embark.Contratcs', function() {
|
|||
//assert.equal(contracts[3].code, '');
|
||||
//assert.equal(contracts[3].runtimeBytecode, '');
|
||||
|
||||
var parentContract = contracts[2];
|
||||
let parentContract = contracts[2];
|
||||
|
||||
//MySimpleStorage
|
||||
assert.equal(contracts[0].deploy, true);
|
||||
|
|
|
|||
Loading…
Reference in New Issue