reload config; create a config so it doens't damage original
This commit is contained in:
parent
be6ada2909
commit
5a2cf62ee5
|
@ -216,10 +216,13 @@ class ContractDeployer {
|
||||||
},
|
},
|
||||||
function estimateCorrectGas(next) {
|
function estimateCorrectGas(next) {
|
||||||
if (contract.gas === 'auto') {
|
if (contract.gas === 'auto') {
|
||||||
return deployObject.estimateGas().then((gasValue) => {
|
return self.blockchain.estimateDeployContractGas(deployObject, (err, gasValue) => {
|
||||||
|
if (err) {
|
||||||
|
return next(err);
|
||||||
|
}
|
||||||
contract.gas = gasValue;
|
contract.gas = gasValue;
|
||||||
next();
|
next();
|
||||||
}).catch(next);
|
});
|
||||||
}
|
}
|
||||||
next();
|
next();
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
let toposort = require('toposort');
|
let toposort = require('toposort');
|
||||||
let async = require('async');
|
let async = require('async');
|
||||||
|
const cloneDeep = require('clone-deep');
|
||||||
|
|
||||||
let utils = require('../utils/utils.js');
|
let utils = require('../utils/utils.js');
|
||||||
const constants = require('../constants');
|
const constants = require('../constants');
|
||||||
|
@ -10,7 +11,7 @@ class ContractsManager {
|
||||||
constructor(options) {
|
constructor(options) {
|
||||||
const self = this;
|
const self = this;
|
||||||
this.contractFiles = options.contractFiles;
|
this.contractFiles = options.contractFiles;
|
||||||
this.contractsConfig = options.contractsConfig;
|
this.contractsConfig = cloneDeep(options.contractsConfig || {});
|
||||||
this.contracts = {};
|
this.contracts = {};
|
||||||
this.logger = options.logger;
|
this.logger = options.logger;
|
||||||
this.plugins = options.plugins;
|
this.plugins = options.plugins;
|
||||||
|
@ -58,7 +59,20 @@ class ContractsManager {
|
||||||
|
|
||||||
build(done) {
|
build(done) {
|
||||||
let self = this;
|
let self = this;
|
||||||
|
self.contracts = {};
|
||||||
async.waterfall([
|
async.waterfall([
|
||||||
|
function loadContractFiles(callback) {
|
||||||
|
self.events.request("config:contractsFiles", (contractsFiles) => {
|
||||||
|
self.contractsFiles = contractsFiles;
|
||||||
|
callback();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
function loadContractConfigs(callback) {
|
||||||
|
self.events.request("config:contractsConfig", (contractsConfig) => {
|
||||||
|
self.contractsConfig = cloneDeep(contractsConfig);
|
||||||
|
callback();
|
||||||
|
});
|
||||||
|
},
|
||||||
function compileContracts(callback) {
|
function compileContracts(callback) {
|
||||||
self.events.emit("status", __("Compiling..."));
|
self.events.emit("status", __("Compiling..."));
|
||||||
if (process.env.isTest && self.compiledContracts && Object.keys(self.compiledContracts).length) {
|
if (process.env.isTest && self.compiledContracts && Object.keys(self.compiledContracts).length) {
|
||||||
|
|
|
@ -7,6 +7,7 @@ const deepEqual = require('deep-equal');
|
||||||
const constants = require('../constants');
|
const constants = require('../constants');
|
||||||
|
|
||||||
var Config = function(options) {
|
var Config = function(options) {
|
||||||
|
const self = this;
|
||||||
this.env = options.env;
|
this.env = options.env;
|
||||||
this.blockchainConfig = {};
|
this.blockchainConfig = {};
|
||||||
this.contractsConfig = {};
|
this.contractsConfig = {};
|
||||||
|
@ -22,6 +23,14 @@ var Config = function(options) {
|
||||||
this.events = options.events;
|
this.events = options.events;
|
||||||
this.embarkConfig = {};
|
this.embarkConfig = {};
|
||||||
this.context = options.context || [constants.contexts.any];
|
this.context = options.context || [constants.contexts.any];
|
||||||
|
|
||||||
|
self.events.setCommandHandler("config:contractsConfig", (cb) => {
|
||||||
|
cb(self.contractsConfig);
|
||||||
|
});
|
||||||
|
|
||||||
|
self.events.setCommandHandler("config:contractsFiles", (cb) => {
|
||||||
|
cb(self.contractsFiles);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Config.prototype.loadConfigFiles = function(options) {
|
Config.prototype.loadConfigFiles = function(options) {
|
||||||
|
|
Loading…
Reference in New Issue