Merge pull request #1358 from ethereum/fixReceipt

Use tx and receipt to build logs

.circleci/config.yml

@@ -26,10 +26,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dep-bundle-11-{{ checksum "package.json" }}
+            - dep-bundle-12-{{ checksum "package.json" }}
       - run: npm install
       - save_cache:
-          key: dep-bundle-11-{{ checksum "package.json" }}
+          key: dep-bundle-12-{{ checksum "package.json" }}
           paths:
             - ~/repo/node_modules
       - run: npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build
@@ -46,10 +46,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dep-bundle-6-{{ checksum "package.json" }}
+            - dep-bundle-7-{{ checksum "package.json" }}
       - run: npm install
       - save_cache:
-          key: dep-bundle-6-{{ checksum "package.json" }}
+          key: dep-bundle-7-{{ checksum "package.json" }}
           paths:
             - ~/repo/node_modules
       - run: npm run build_debugger

src/app/execution/txLogger.js

@@ -180,12 +180,12 @@ class TxLogger {
       }
     })
 
-    opts.events.txListener.register('newTransaction', (tx) => {
+    opts.events.txListener.register('newTransaction', (tx, receipt) => {
-      log(this, tx, opts.api)
+      log(this, tx, receipt, opts.api)
     })
 
     opts.events.txListener.register('newCall', (tx) => {
-      log(this, tx, opts.api)
+      log(this, tx, null, opts.api)
     })
   }
 }
@@ -199,17 +199,17 @@ function debug (e, data, self) {
   }
 }
 
-function log (self, tx, api) {
+function log (self, tx, receipt, api) {
   var resolvedTransaction = api.resolvedTransaction(tx.hash)
   if (resolvedTransaction) {
     api.parseLogs(tx, resolvedTransaction.contractName, api.compiledContracts(), (error, logs) => {
       if (!error) {
-        self.logKnownTX({ tx: tx, resolvedData: resolvedTransaction, logs: logs })
+        self.logKnownTX({ tx: tx, receipt: receipt, resolvedData: resolvedTransaction, logs: logs })
       }
     })
   } else {
     // contract unknown - just displaying raw tx.
-    self.logUnknownTX({ tx: tx })
+    self.logUnknownTX({ tx: tx, receipt: receipt })
   }
 }
 
@@ -221,7 +221,7 @@ function renderKnownTransaction (self, data) {
   var tx = yo`
     <span id="tx${data.tx.hash}">
       <div class="${css.log}" onclick=${e => txDetails(e, tx, data, obj)}>
-        ${checkTxStatus(data.tx, txType)}
+        ${checkTxStatus(data.receipt, txType)}
         ${context(self, {from, to, data})}
         <div class=${css.buttons}>
           <div class=${css.debug} onclick=${(e) => debug(e, data, self)}>Debug</div>
@@ -267,7 +267,7 @@ function renderUnknownTransaction (self, data) {
   var tx = yo`
     <span id="tx${data.tx.hash}">
       <div class="${css.log}" onclick=${e => txDetails(e, tx, data, obj)}>
-        ${checkTxStatus(data.tx, txType)}
+        ${checkTxStatus(data.receipt, txType)}
         ${context(self, {from, to, data})}
         <div class=${css.buttons}>
           <div class=${css.debug} onclick=${(e) => debug(e, data, self)}>Debug</div>
@@ -370,8 +370,8 @@ function txDetails (e, tx, data, obj) {
     log.removeChild(arrow)
     log.appendChild(arrowUp)
     table = createTable({
-      hash: data.tx.transactionHash,
+      hash: data.tx.hash,
-      status: data.tx.status,
+      status: data.receipt.status,
       isCall: data.tx.isCall,
       contractAddress: data.tx.contractAddress,
       data: data.tx,