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

fix merge errors

This commit is contained in:
Iuri Matias 2015-07-09 07:31:37 -04:00
parent 0655957e0f
commit 3d7c1c629c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/deploy.js
View File

@ -40,7 +40,8 @@ Deploy.prototype.deploy_contracts = function(env) {
if (contract.address !== undefined) {
this.deployedContracts[className] = contract.address;
console.log("contract " + className + " at " + contractAddress);
//console.log("contract " + className + " at " + contractAddress);
console.log("contract " + className + " at " + contract.address);
}
else {
contractObject = web3.eth.contract(contract.compiled.info.abiDefinition);
@ -63,14 +64,15 @@ Deploy.prototype.deploy_contracts = function(env) {
gasPrice: contract.gasPrice
});
var transactionHash = contractObject["new"].apply(contractObject, contractParams).transactionHash;
this.deployedContracts[className] = transactionHash;
// TODO: get this with sync until a different mechanism is implemented
//this.deployedContracts[className] = contractAddress;
//console.log("address is " + contractAddress);
var transactionHash = contractObject["new"].apply(contractObject, contractParams).transactionHash;
this.deployedContracts[className] = transactionHash;
// TODO: get this with sync until a different mechanism is implemented
//this.deployedContracts[className] = contractAddress;
//console.log("address is " + contractAddress);
console.log("deployed " + className + " with transaction hash " + transactionHash);
//console.log("deployed " + className + " at " + contractAddress);
console.log("deployed " + className + " with transaction hash " + transactionHash);
//console.log("deployed " + className + " at " + contractAddress);
}
}
};