status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

adjust contracts events emission

This commit is contained in:
Iuri Matias 2018-05-20 19:59:35 -04:00 committed by Jonathan Rainville
parent a664492d1f
commit 250e0b8798
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/contracts/deploy.js
View File

@ -81,6 +81,7 @@ class Deploy {
self.logger.error(__("error deploying %s", contract.className)); self.logger.error(__("error deploying %s", contract.className));
self.logger.error(e.message); self.logger.error(e.message);
contract.error = e.message; contract.error = e.message;
self.events.emit("deploy:contract:error", contract);
self.events.emit('contractsState', self.contractsManager.contractsState()); self.events.emit('contractsState', self.contractsManager.contractsState());
return callback(e.message); return callback(e.message);
} }
@ -91,10 +92,6 @@ class Deploy {
return callback(); return callback();
} }
//if (!this.deployTracker) {
// return self.contractToDeploy(contract, params, callback);
//}
// TODO: this should be a plugin API instead, if not existing, it should by default deploy the contract // TODO: this should be a plugin API instead, if not existing, it should by default deploy the contract
self.events.request("deploy:contract:shouldDeploy", contract, function(trackedContract) { self.events.request("deploy:contract:shouldDeploy", contract, function(trackedContract) {
if (!trackedContract) { if (!trackedContract) {
@ -115,6 +112,7 @@ class Deploy {
const self = this; const self = this;
self.logger.info(contract.className.bold.cyan + __(" already deployed at ").green + trackedContract.address.bold.cyan); self.logger.info(contract.className.bold.cyan + __(" already deployed at ").green + trackedContract.address.bold.cyan);
contract.deployedAddress = trackedContract.address; contract.deployedAddress = trackedContract.address;
self.events.emit("deploy:contract:deployed", contract);
self.events.emit('contractsState', self.contractsManager.contractsState()); self.events.emit('contractsState', self.contractsManager.contractsState());
// always run contractCode so other functionality like 'afterDeploy' can also work // always run contractCode so other functionality like 'afterDeploy' can also work
@ -131,6 +129,8 @@ class Deploy {
this.deployContract(contract, contract.realArgs, function (err, address) { this.deployContract(contract, contract.realArgs, function (err, address) {
if (err) { if (err) {
self.events.emit("deploy:contract:error", contract);
self.events.emit('contractsState', self.contractsManager.contractsState());
return callback(new Error(err)); return callback(new Error(err));
} }
contract.address = address; contract.address = address;
@ -277,13 +277,11 @@ class Deploy {
gasPrice: contract.gasPrice gasPrice: contract.gasPrice
}, function(error, receipt) { }, function(error, receipt) {
if (error) { if (error) {
self.events.emit('contractsState', self.contractsManager.contractsState());
return next(new Error("error deploying =" + contract.className + "= due to error: " + error.message)); return next(new Error("error deploying =" + contract.className + "= due to error: " + error.message));
} }
self.logger.info(contract.className.bold.cyan + " " + __("deployed at").green + " " + receipt.contractAddress.bold.cyan); self.logger.info(contract.className.bold.cyan + " " + __("deployed at").green + " " + receipt.contractAddress.bold.cyan);
contract.deployedAddress = receipt.contractAddress; contract.deployedAddress = receipt.contractAddress;
contract.transactionHash = receipt.transactionHash; contract.transactionHash = receipt.transactionHash;
self.events.emit('contractsState', self.contractsManager.contractsState());
return next(null, receipt.contractAddress); return next(null, receipt.contractAddress);
}); });
} }