Merge pull request #124 from ethereum/fix-estimategas

UDapp: don't supply a hardcoded limit to estimageGas, but judge based on the response

Merge pull request #124 from ethereum/fix-estimategas
d66a7a48 · Alex Beregszaszi · GitHub · 8dbcb742 · f1b0430e · d66a7a48
Commit d66a7a48 authored Jul 14, 2016 by Alex Beregszaszi Committed by GitHub Jul 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

universal-dapp.js src/universal-dapp.js +4 -1

No files found.
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -635,7 +635,6 @@ UniversalDApp.prototype.runTx = function (data, args, cb) {
      from: self.options.getAddress ? self.options.getAddress() : self.web3.eth.accounts[0],
      to: to,
      data: data,
-      gas: gas,
      value: value
    };
    if (constant && !isConstructor) {
@@ -646,6 +645,10 @@ UniversalDApp.prototype.runTx = function (data, args, cb) {
          return cb(err, resp);
        }

+        if (resp > gas) {
+          return cb('Gas required exceeds limit: ' + resp);
+        }
+
        tx.gas = resp;

        self.web3.eth.sendTransaction(tx, function (err, resp) {