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

re-add gas estimates; get accounts through await instead of a callback

This commit is contained in:
Iuri Matias 2019-08-06 17:14:19 -04:00
parent a14bebabf6
commit 7093844566
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
packages/embark/src/lib/modules/ethereum-blockchain-client/index.js
View File

@ -23,27 +23,35 @@ class EthereumBlockchainClient {
let provider = await this.events.request2("blockchain:client:provider", "ethereum");
var web3 = new Web3(provider)
// var web3 = new Web3("ws://localhost:8556")
web3.eth.getAccounts().then((accounts) => {
let account = accounts[0];
// let contractObject = this.blockchain.ContractObject({abi: contract.abiDefinition});
console.dir("== ethereum contract deployer")
let contractObj = new web3.eth.Contract(contract.abiDefinition, contract.address);
// let deployObject = this.blockchain.deployContractObject(contractObject, {arguments: contractParams, data: dataCode});
let contractObject = contractObj.deploy({ arguments: (contract.args || []), data: ("0x" + contract.code) });
// this.blockchain.deployContractFromObject(deployObject,
console.dir({ arguments: contract.args, data: ("0x" + contract.code) });
console.dir("------- send")
// web3.eth.getAccounts().then((accounts) => {
let accounts = await web3.eth.getAccounts();
let account = accounts[0];
// let contractObject = this.blockchain.ContractObject({abi: contract.abiDefinition});
console.dir("== ethereum contract deployer")
let contractObj = new web3.eth.Contract(contract.abiDefinition, contract.address);
// let deployObject = this.blockchain.deployContractObject(contractObject, {arguments: contractParams, data: dataCode});
let contractObject = contractObj.deploy({ arguments: (contract.args || []), data: ("0x" + contract.code) });
embarkJsUtils.secureSend(web3, contractObject, {
from: account, gas: 800000
}, true, (err, receipt) => {
contract.deployedAddress = receipt.contractAddress;
contract.transactionHash = receipt.transactionHash;
done();
}, (hash) => {
console.dir('hash is ' + hash);
});
})
if (contract.gas === 'auto' || !contract.gas) {
let gasValue = await contractObject.estimateGas();
let increase_per = 1 + (Math.random() / 10.0);
contract.gas = Math.floor(gasValue * increase_per);
}
// this.blockchain.deployContractFromObject(deployObject,
console.dir({ arguments: contract.args, data: ("0x" + contract.code) });
console.dir("------- send")
embarkJsUtils.secureSend(web3, contractObject, {
from: account, gas: 800000
}, true, (err, receipt) => {
contract.deployedAddress = receipt.contractAddress;
contract.transactionHash = receipt.transactionHash;
done();
}, (hash) => {
console.dir('hash is ' + hash);
});
// })
}
async doLinking(params, callback) {