Skip to content

Commit

Permalink
fix(contracts): replace $accounts for onDeploy too
Browse files Browse the repository at this point in the history
This was intended from the start, but was only done for args
  • Loading branch information
jrainville committed Nov 7, 2018
1 parent 3cf9ea6 commit 8831dfb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/modules/deployment/contract_deployer.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ContractDeployer {
}

// TODO: determining the arguments could also be in a module since it's not
// part of ta 'normal' contract deployment
// part of a 'normal' contract deployment
determineArguments(suppliedArgs, contract, accounts, callback) {
const self = this;

Expand Down
18 changes: 16 additions & 2 deletions lib/modules/specialconfigs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,23 @@ class SpecialConfigs {
replaceWithAddresses(cmd, cb) {
const self = this;

let regex = /\$\w+/g;
stringReplaceAsync.seq(cmd, regex, (match) => {
let regex = /\$\w+\[?\d?\]?/g;
stringReplaceAsync.seq(cmd, regex, (match, index) => {
return (new Promise((resolve, reject) => {
if (match.startsWith('$accounts')) {
let accountIndex = cmd.substring(index + 10, index + 12);
accountIndex = parseInt(accountIndex, 10);
return self.events.request('blockchain:getAccounts', (err, accounts) => {
if (err) {
return reject('Error getting accounts: ' + err.message || err);
}
if (!accounts[accountIndex]) {
return reject(__('No corresponding account at index %d', accountIndex));
}
resolve(accounts[accountIndex]);
});
}

let referedContractName = match.slice(1);
self.events.request('contracts:contract', referedContractName, (referedContract) => {
if (!referedContract) {
Expand Down

0 comments on commit 8831dfb

Please sign in to comment.