Skip to content

B
baas-ide
Commit bb92e7a1 authored by Alex Beregszaszi's avatar Alex Beregszaszi Committed by GitHub
Browse files
Options

Merge pull request #130 from ethereum/fix-vm-tx

Fix gas limit & out-of-gas conditions in VM mode
parents 36682d21 71ea03c5
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/universal-dapp.js
View file @ bb92e7a1
...@@ -486,7 +486,7 @@ UniversalDApp.prototype.getCallButton = function (args) { ...@@ -486,7 +486,7 @@ UniversalDApp.prototype.getCallButton = function (args) {
if (err) { if (err) {
replaceOutput($result, $('<span/>').text(err).addClass('error')); replaceOutput($result, $('<span/>').text(err).addClass('error'));
// VM only // VM only
} else if (self.options.vm && result.vm.exception && result.vm.exceptionError) { } else if (self.options.vm && result.vm.exception === 0 && result.vm.exceptionError) {
replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error')); replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error'));
// VM only // VM only
} else if (self.options.vm && result.vm.return === undefined) { } else if (self.options.vm && result.vm.return === undefined) {
...@@ -672,9 +672,9 @@ UniversalDApp.prototype.runTx = function (data, args, cb) { ...@@ -672,9 +672,9 @@ UniversalDApp.prototype.runTx = function (data, args, cb) {
var address = self.options.getAddress ? self.options.getAddress() : self.getAccounts()[0]; var address = self.options.getAddress ? self.options.getAddress() : self.getAccounts()[0];
var account = self.accounts[address]; var account = self.accounts[address];
tx = new EthJSTX({ tx = new EthJSTX({
nonce: new Buffer([account.nonce++]), // @todo count beyond 255 nonce: new BN(account.nonce++),
gasPrice: 1, gasPrice: new BN(1),
gasLimit: gasLimit, gasLimit: new BN(gasLimit, 10),
to: to, to: to,
value: new BN(value, 10), value: new BN(value, 10),
data: new Buffer(data.slice(2), 'hex') data: new Buffer(data.slice(2), 'hex')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment