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

create separate function for secure send

This commit is contained in:
Jonathan Rainville 2018-08-13 13:04:42 -04:00 committed by Iuri Matias
parent a7b0cea09b
commit 083c936351
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/modules/blockchain_connector/index.js
View File

@ -230,7 +230,7 @@ class BlockchainConnector {
}).catch(cb);
}
deployContractFromObject(deployContractObject, params, cb) {
secureSend(toSend, params, cb) {
const self = this;
let hash;
let calledBacked = false;
@ -263,28 +263,37 @@ class BlockchainConnector {
});
}, 500);
deployContractObject.send({
toSend.estimateGas()
.then(gasEstimated => {
params.gas = gasEstimated + 1000;
params.from = params.from || self.defaultAccount();
return toSend.send(params, function(err, transactionHash) {
if (err) {
return callback(err);
}
hash = transactionHash;
}).on('receipt', function(receipt) {
if (receipt.contractAddress !== undefined) {
callback(null, receipt);
}
}).then(function(_contract) {
if (!hash) {
return; // Somehow we didn't get the receipt yet... Interval will catch it
}
self.web3.eth.getTransactionReceipt(hash, callback);
}).catch(callback);
});
}
deployContractFromObject(deployContractObject, params, cb) {
this.secureSend(deployContractObject, {
from: params.from, gas: params.gas, gasPrice: params.gasPrice
}, function (err, transactionHash) {
if (err) {
return callback(err);
}
hash = transactionHash;
}).on('receipt', function (receipt) {
if (receipt.contractAddress !== undefined) {
callback(null, receipt);
}
}).then(function (_contract) {
if (!hash) {
return; // Somehow we didn't get the receipt yet... Interval will catch it
}
self.web3.eth.getTransactionReceipt(hash, callback);
}).catch(callback);
}, cb);
}
determineDefaultAccount(cb) {
const self = this;
self.getAccounts(function (err, accounts) {
self.getAccounts(function(err, accounts) {
if (err) {
self.logger.error(err);
return cb(new Error(err));