Merge pull request #318 from ethereum/fixTxResult

Fix running tx using web3

Merge pull request #318 from ethereum/fixTxResult
3199cf11 · chriseth · GitHub · 20d8b428 · 23d216fd · 3199cf11
Commit 3199cf11 authored Nov 10, 2016 by chriseth Committed by GitHub Nov 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

No files found.
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -669,13 +669,14 @@ UniversalDApp.prototype.clickContractAt = function (self, $output, contract) {
 }

 function tryTillResponse (web3, txhash, done) {
-  web3.eth.getTransactionReceipt(txhash, function (err, address) {
-    if (!err && !address) {
+  web3.eth.getTransactionReceipt(txhash, function (err, result) {
+    if (!err && !result) {
      // Try again with a bit of delay
      setTimeout(function () { tryTillResponse(web3, txhash, done) }, 500)
    } else {
      done(err, {
-        result: address
+        result: result,
+        transactionHash: result.transactionHash
      })
    }
  })