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

fix(embark/contracts): add the contracts back to the autocomplete

This commit is contained in:
Jonathan Rainville 2019-03-13 12:26:28 -04:00 committed by Iuri Matias
parent dd1133d9cf
commit 618ceb6ff2
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/embark/src/lib/modules/deployment/contract_deployer.js
View File

@ -207,13 +207,26 @@ class ContractDeployer {
} }
contractAlreadyDeployed(contract, trackedContract, callback) { contractAlreadyDeployed(contract, trackedContract, callback) {
const self = this;
this.logFunction(contract)(contract.className.bold.cyan + __(" already deployed at ").green + trackedContract.address.bold.cyan); this.logFunction(contract)(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); this.events.emit("deploy:contract:deployed", contract);
self.events.request('code-generator:contract:custom', contract, (contractCode) => { this.registerContract(contract, callback);
self.events.request('runcode:eval', contractCode, callback); }
registerContract(contract, callback) {
this.events.request('code-generator:contract:custom', contract, (contractCode) => {
this.events.request('runcode:eval', contractCode, (err) => {
if (err) {
return callback(err);
}
this.events.request('runcode:eval', contract.className, (err, result) => {
if (err) {
return callback(err);
}
this.events.emit("runcode:register", contract.className, result, callback);
});
});
}); });
} }
@ -339,14 +352,11 @@ class ContractDeployer {
if(receipt) self.events.emit("deploy:contract:receipt", receipt); if(receipt) self.events.emit("deploy:contract:receipt", receipt);
self.events.emit("deploy:contract:deployed", contract); self.events.emit("deploy:contract:deployed", contract);
self.registerContract(contract, () => {
self.events.request('code-generator:contract:custom', contract, (contractCode) => {
self.events.request('runcode:eval', contractCode, () => {
self.plugins.runActionsForEvent('deploy:contract:deployed', {contract: contract}, () => { self.plugins.runActionsForEvent('deploy:contract:deployed', {contract: contract}, () => {
return next(null, receipt); return next(null, receipt);
}); });
}); });
});
}, hash => { }, hash => {
self.logFunction(contract)(__("deploying") + " " + contract.className.bold.cyan + " " + __("with").green + " " + contract.gas + " " + __("gas at the price of").green + " " + contract.gasPrice + " " + __("Wei, estimated cost:").green + " " + estimatedCost + " Wei".green + " (txHash: " + hash.bold.cyan + ")"); self.logFunction(contract)(__("deploying") + " " + contract.className.bold.cyan + " " + __("with").green + " " + contract.gas + " " + __("gas at the price of").green + " " + contract.gasPrice + " " + __("Wei, estimated cost:").green + " " + estimatedCost + " Wei".green + " (txHash: " + hash.bold.cyan + ")");
}); });