|
|
@ -62,34 +62,13 @@ TxRunner.prototype.execute = function (args, callback) { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (args.useCall) { |
|
|
|
if (args.useCall) { |
|
|
|
function execute () { |
|
|
|
tx.gas = gasLimit |
|
|
|
executionContext.web3().eth.call(tx, function (error, result) { |
|
|
|
executionContext.web3().eth.call(tx, function (error, result) { |
|
|
|
callback(error, { |
|
|
|
callback(error, { |
|
|
|
result: result, |
|
|
|
result: result, |
|
|
|
transactionHash: result.transactionHash |
|
|
|
transactionHash: result.transactionHash |
|
|
|
}) |
|
|
|
}) |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
tx.gas = gasLimit |
|
|
|
|
|
|
|
if (!self.config.get('doNotShowAgain')) { |
|
|
|
|
|
|
|
self.detectNetwork((err, network) => { |
|
|
|
|
|
|
|
if (err) { |
|
|
|
|
|
|
|
console.log(err) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
if (network.name === 'Main') { |
|
|
|
|
|
|
|
modalDialog('Confirm transaction', remixdDialog(tx, self), |
|
|
|
|
|
|
|
{ label: 'Confirm', |
|
|
|
|
|
|
|
fn: () => { |
|
|
|
|
|
|
|
execute() |
|
|
|
|
|
|
|
}}) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
execute() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
execute() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
function execute () { |
|
|
|
function execute () { |
|
|
|
var sendTransaction = self.personalMode ? executionContext.web3().personal.sendTransaction : executionContext.web3().eth.sendTransaction |
|
|
|
var sendTransaction = self.personalMode ? executionContext.web3().personal.sendTransaction : executionContext.web3().eth.sendTransaction |
|
|
|