embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #935 from embark-framework/simple_template_fixes 

fix blockchain defaults for config-less dapps
This commit is contained in:
Iuri Matias 2018-09-29 19:24:23 -04:00 committed by GitHub
parent 20341541f2 352f409fd2
commit d1d71ecd77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/config.js
View File

@ -195,7 +195,7 @@ Config.prototype.loadBlockchainConfigFile = function() {
Config.prototype.loadContractsConfigFile = function() { Config.prototype.loadContractsConfigFile = function() {
var defaultVersions = { var defaultVersions = {
"web3": "1.0.0-beta", "web3": "1.0.0-beta",
"solc": "0.4.17" "solc": "0.4.25"
}; };
var versions = utils.recursiveMerge(defaultVersions, this.embarkConfig.versions || {}); var versions = utils.recursiveMerge(defaultVersions, this.embarkConfig.versions || {});

15
lib/modules/blockchain_process/blockchain.js
View File

@ -10,7 +10,7 @@ const DevFunds = require('./dev_funds.js');
const {defaultHost, dockerHostSwap} = require('../../utils/host'); const {defaultHost, dockerHostSwap} = require('../../utils/host');
/*eslint complexity: ["error", 36]*/ /*eslint complexity: ["error", 37]*/
var Blockchain = function(options) { var Blockchain = function(options) {
this.blockchainConfig = options.blockchainConfig; this.blockchainConfig = options.blockchainConfig;
this.env = options.env || 'development'; this.env = options.env || 'development';
@ -59,11 +59,18 @@ var Blockchain = function(options) {
verbosity: this.blockchainConfig.verbosity verbosity: this.blockchainConfig.verbosity
}; };
if (this.blockchainConfig === {} || JSON.stringify(this.blockchainConfig) === '{"enabled":true}') { if (this.blockchainConfig === {} || this.blockchainConfig.default) {
this.config.account = {}; this.config.account = {};
this.config.account.password = fs.embarkPath("templates/boilerplate/config/development/password"); if (this.env === 'development') {
this.config.genesisBlock = fs.embarkPath("templates/boilerplate/config/development/genesis.json"); this.isDev = true;
} else {
this.config.account.password = fs.embarkPath("templates/boilerplate/config/privatenet/password");
this.config.genesisBlock = fs.embarkPath("templates/boilerplate/config/privatenet/genesis.json");
}
this.config.datadir = fs.dappPath(".embark/development/datadir"); this.config.datadir = fs.dappPath(".embark/development/datadir");
this.config.wsOrigins = "http://localhost:8000";
this.config.rpcCorsDomain = "http://localhost:8000";
this.config.targetGasLimit = 8000000;
} }
const spaceMessage = 'The path for %s in blockchain config contains spaces, please remove them'; const spaceMessage = 'The path for %s in blockchain config contains spaces, please remove them';

2
test/config.js
View File

@ -42,7 +42,7 @@ describe('embark.Config', function () {
it('should load contract config correctly', function () { it('should load contract config correctly', function () {
config.loadContractsConfigFile(); config.loadContractsConfigFile();
let expectedConfig = { let expectedConfig = {
versions: {'web3': '1.0.0-beta', solc: '0.4.17'}, versions: {'web3': '1.0.0-beta', solc: '0.4.25'},
deployment: {host: 'localhost', port: 8545, type: 'rpc'}, deployment: {host: 'localhost', port: 8545, type: 'rpc'},
dappConnection: ['$WEB3', 'localhost:8545'], dappConnection: ['$WEB3', 'localhost:8545'],
"gas": "auto", "gas": "auto",