mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

separate runInVm code from runInNode

Browse Source
pull/1/head
Iuri Matias 7 years ago
parent ef10574667
commit 9937c9c4a9
1 changed files with 127 additions and 121 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 248
      src/app/execution/txRunner.js

248
src/app/execution/txRunner.js
Unescape View File

@ -43,149 +43,155 @@ TxRunner.prototype.rawRun = function (args, cb) {
run(this, args, Date.now(), cb) run(this, args, Date.now(), cb)
} }
TxRunner.prototype.execute = function (args, callback) { function executeTx (tx, gasPrice, api, callback) {
var self = this if (gasPrice) tx.gasPrice = executionContext.web3().toHex(gasPrice)
function execute (gasPrice) {
if (gasPrice) tx.gasPrice = executionContext.web3().toHex(gasPrice)
if (self._api.personalMode()) { if (api.personalMode()) {
modal.promptPassphrase(null, 'Personal mode is enabled. Please provide passphrase of account ' + tx.from, '', (value) => { modal.promptPassphrase(null, 'Personal mode is enabled. Please provide passphrase of account ' + tx.from, '', (value) => {
sendTransaction(executionContext.web3().personal.sendTransaction, tx, value, callback) sendTransaction(executionContext.web3().personal.sendTransaction, tx, value, callback)
}, () => { }, () => {
return callback('Canceled by user.') return callback('Canceled by user.')
}) })
} else { } else {
sendTransaction(executionContext.web3().eth.sendTransaction, tx, null, callback) sendTransaction(executionContext.web3().eth.sendTransaction, tx, null, callback)
}
} }
}
TxRunner.prototype.execute = function (args, callback) {
var self = this
var from = args.from
var to = args.to
var data = args.data var data = args.data
if (data.slice(0, 2) !== '0x') { if (data.slice(0, 2) !== '0x') {
data = '0x' + data data = '0x' + data
} }
var value = args.value
var gasLimit = args.gasLimit
var tx
if (!executionContext.isVM()) { if (!executionContext.isVM()) {
tx = { self.runInNode(args.from, args.to, data, args.value, args.gasLimit, args.useCall, callback)
from: from, } else {
to: to, self.runInVm(args.from, args.to, data, args.value, args.gasLimit, args.useCall, callback)
data: data, }
value: value }
TxRunner.prototype.runInVm = function (from, to, data, value, gasLimit, useCall, callback) {
const self = this
try {
var account = self.vmaccounts[from]
if (!account) {
return callback('Invalid account selected')
} }
var tx = new EthJSTX({
nonce: new BN(account.nonce++),
gasPrice: new BN(1),
gasLimit: new BN(gasLimit, 10),
to: to,
value: new BN(value, 10),
data: new Buffer(data.slice(2), 'hex')
})
tx.sign(account.privateKey)
if (args.useCall) { const coinbases = [ '0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a', '0x8945a1288dc78a6d8952a92c77aee6730b414778', '0x94d76e24f818426ae84aa404140e8d5f60e10e7e' ]
tx.gas = gasLimit const difficulties = [ new BN('69762765929000', 10), new BN('70762765929000', 10), new BN('71762765929000', 10) ]
executionContext.web3().eth.call(tx, function (error, result) { var block = new EthJSBlock({
callback(error, { header: {
result: result, timestamp: new Date().getTime() / 1000 | 0,
transactionHash: result.transactionHash number: self.blockNumber,
}) coinbase: coinbases[self.blockNumber % coinbases.length],
}) difficulty: difficulties[self.blockNumber % difficulties.length],
gasLimit: new BN(gasLimit, 10).imuln(2)
},
transactions: [],
uncleHeaders: []
})
if (!useCall) {
++self.blockNumber
} else { } else {
executionContext.web3().eth.estimateGas(tx, function (err, gasEstimation) { executionContext.vm().stateManager.checkpoint()
if (err) { }
return callback(err, gasEstimation)
}
var blockGasLimit = executionContext.currentblockGasLimit()
// NOTE: estimateGas very likely will return a large limit if execution of the code failed
// we want to be able to run the code in order to debug and find the cause for the failure
var warnEstimation = " An important gas estimation might also be the sign of a problem in the contract code. Please check loops and be sure you did not sent value to a non payable function (that's also the reason of strong gas estimation)." executionContext.vm().runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}, function (err, result) {
if (gasEstimation > gasLimit) { if (useCall) {
return callback('Gas required exceeds limit: ' + gasLimit + '. ' + warnEstimation) executionContext.vm().stateManager.revert(function () {})
} }
if (gasEstimation > blockGasLimit) { err = err ? err.message : err
return callback('Gas required exceeds block gas limit: ' + gasLimit + '. ' + warnEstimation) result.status = '0x' + result.vm.exception.toString(16)
} callback(err, {
result: result,
transactionHash: ethJSUtil.bufferToHex(new Buffer(tx.hash()))
})
})
} catch (e) {
callback(e, null)
}
}
tx.gas = gasEstimation TxRunner.prototype.runInNode = function (from, to, data, value, gasLimit, useCall, callback) {
const self = this
var tx = {
from: from,
to: to,
data: data,
value: value
}
if (!self._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) { if (useCall) {
self._api.detectNetwork((err, network) => { tx.gas = gasLimit
if (err) { executionContext.web3().eth.call(tx, function (error, result) {
console.log(err) callback(error, {
} else { result: result,
if (network.name === 'Main') { transactionHash: result.transactionHash
var content = confirmDialog(tx, gasEstimation, self)
modalDialog('Confirm transaction', content,
{ label: 'Confirm',
fn: () => {
self._api.config.setUnpersistedProperty('doNotShowTransactionConfirmationAgain', content.querySelector('input#confirmsetting').checked)
if (!content.gasPriceStatus) {
callback('Given gas grice is not correct')
} else {
var gasPrice = executionContext.web3().toWei(content.querySelector('#gasprice').value, 'gwei')
execute(gasPrice)
}
}}, {
label: 'Cancel',
fn: () => {
return callback('Transaction canceled by user.')
}
})
} else {
execute()
}
}
})
} else {
execute()
}
}) })
} })
} else { } else {
try { executionContext.web3().eth.estimateGas(tx, function (err, gasEstimation) {
var account = self.vmaccounts[from] if (err) {
if (!account) { return callback(err, gasEstimation)
return callback('Invalid account selected')
} }
tx = new EthJSTX({ var blockGasLimit = executionContext.currentblockGasLimit()
nonce: new BN(account.nonce++), // NOTE: estimateGas very likely will return a large limit if execution of the code failed
gasPrice: new BN(1), // we want to be able to run the code in order to debug and find the cause for the failure
gasLimit: new BN(gasLimit, 10),
to: to,
value: new BN(value, 10),
data: new Buffer(data.slice(2), 'hex')
})
tx.sign(account.privateKey)
const coinbases = [ '0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a', '0x8945a1288dc78a6d8952a92c77aee6730b414778', '0x94d76e24f818426ae84aa404140e8d5f60e10e7e' ] var warnEstimation = " An important gas estimation might also be the sign of a problem in the contract code. Please check loops and be sure you did not sent value to a non payable function (that's also the reason of strong gas estimation)."
const difficulties = [ new BN('69762765929000', 10), new BN('70762765929000', 10), new BN('71762765929000', 10) ] if (gasEstimation > gasLimit) {
var block = new EthJSBlock({ return callback('Gas required exceeds limit: ' + gasLimit + '. ' + warnEstimation)
header: {
timestamp: new Date().getTime() / 1000 | 0,
number: self.blockNumber,
coinbase: coinbases[self.blockNumber % coinbases.length],
difficulty: difficulties[self.blockNumber % difficulties.length],
gasLimit: new BN(gasLimit, 10).imuln(2)
},
transactions: [],
uncleHeaders: []
})
if (!args.useCall) {
++self.blockNumber
} else {
executionContext.vm().stateManager.checkpoint()
} }
if (gasEstimation > blockGasLimit) {
return callback('Gas required exceeds block gas limit: ' + gasLimit + '. ' + warnEstimation)
}
tx.gas = gasEstimation
executionContext.vm().runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}, function (err, result) { if (!self._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) {
if (args.useCall) { self._api.detectNetwork((err, network) => {
executionContext.vm().stateManager.revert(function () {}) if (err) {
} console.log(err)
err = err ? err.message : err } else {
result.status = '0x' + result.vm.exception.toString(16) if (network.name === 'Main') {
callback(err, { var content = confirmDialog(tx, gasEstimation, self)
result: result, modalDialog('Confirm transaction', content,
transactionHash: ethJSUtil.bufferToHex(new Buffer(tx.hash())) { label: 'Confirm',
fn: () => {
self._api.config.setUnpersistedProperty('doNotShowTransactionConfirmationAgain', content.querySelector('input#confirmsetting').checked)
if (!content.gasPriceStatus) {
callback('Given gas grice is not correct')
} else {
var gasPrice = executionContext.web3().toWei(content.querySelector('#gasprice').value, 'gwei')
executeTx(tx, gasPrice, self._api, callback)
}
}}, {
label: 'Cancel',
fn: () => {
return callback('Transaction canceled by user.')
}
})
} else {
executeTx(tx, null, self._api, callback)
}
}
}) })
}) } else {
} catch (e) { executeTx(tx, null, self._api, callback)
callback(e, null) }
} })
} }
} }

Write Preview
Loading…
Cancel
Save