embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-20 01:18:52 +00:00
Code Issues Projects Releases Wiki Activity

refactor(@embark/ethereum-blockchain-client): reintroduce account determination

Browse Source
This commit is contained in:
Pascal Precht 2019-08-12 10:42:45 +02:00 committed by Iuri Matias
parent 29ee9edf83
commit b3bf223cb8
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ class EthereumBlockchainClient {
this.embark.registerActionForEvent('deployment:contract:beforeDeploy', this.determineArguments.bind(this));
this.embark.registerActionForEvent('deployment:contract:beforeDeploy', this.doLinking.bind(this));
this.embark.registerActionForEvent('deployment:contract:beforeDeploy', checkContractSize.bind(this));
this.embark.registerActionForEvent('deployment:contract:beforeDeploy', this.determineAccounts.bind(this));
this.events.request("blockchain:client:register", "ethereum", this.getClient.bind(this));
this.events.request("deployment:deployer:register", "ethereum", this.deployer.bind(this));
}
@ -190,6 +191,31 @@ class EthereumBlockchainClient {
});
}
async determineAccounts(params, callback) {
let provider = await this.events.request2("blockchain:client:provider", "ethereum");
let web3 = new Web3(provider)
let accounts = await web3.eth.getAccounts();
let deploymentAccount = accounts[0];
let contract = params.contract;
// applying deployer account configuration, if any
if (typeof contract.fromIndex === 'number') {
deploymentAccount = accounts[contract.fromIndex];
if (deploymentAccount === undefined) {
return callback(__("error deploying") + " " + contract.className + ": " + __("no account found at index") + " " + contract.fromIndex + __(" check the config"));
}
}
if (typeof contract.from === 'string' && typeof contract.fromIndex !== 'undefined') {
self.logger.warn(__('Both "from" and "fromIndex" are defined for contract') + ' "' + contract.className + '". ' + __('Using "from" as deployer account.'));
}
if (typeof contract.from === 'string') {
deploymentAccount = contract.from;
}
contract.deploymentAccount = deploymentAccount;
callback(null, params);
}
addContractJSONToPipeline(params, cb) {
console.dir("-- addContractJSONToPipeline")
// TODO: check if this is correct json object to generate