From 5d3aaaa74615e0ca25d2f771221da4084adab70e Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 6 Aug 2018 14:28:45 +0200 Subject: [PATCH 1/3] Fix_ErrorWhileCallingUnknownContract --- src/app/execution/txLogger.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 5a2faf8611..62724759df 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -157,6 +157,7 @@ class TxLogger { }, { activate: true, filterFn: filterTx }) this.logUnknownTX = this._deps.editorPanel.registerCommand('unknownTransaction', (args, cmds, append) => { + // triggered for transaction AND call var data = args[0] var el = renderUnknownTransaction(this, data) append(el) @@ -277,11 +278,11 @@ function renderUnknownTransaction (self, data) { var from = data.tx.from var to = data.tx.to var obj = {from, to} - var txType = 'unknownTx' + var txType = 'unknown' + (data.tx.isCall ? 'Call' : 'Tx') var tx = yo`
txDetails(e, tx, data, obj)}> - ${checkTxStatus(data.receipt, txType)} + ${checkTxStatus(data.tx, txType)} ${context(self, {from, to, data})}
debug(e, data, self)}>Debug
@@ -304,7 +305,7 @@ function checkTxStatus (tx, type) { if (tx.status === '0x1') { return yo`` } - if (type === 'call') { + if (type === 'call' || type === 'unknownCall') { return yo`call` } else { return yo`` From ecceea10822d4e51ea7628a4618ea8efd0e8ff3c Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 14 Aug 2018 13:46:29 +0200 Subject: [PATCH 2/3] typo --- src/app/panels/editor-panel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js index 45fab49aee..57ac7ad288 100644 --- a/src/app/panels/editor-panel.js +++ b/src/app/panels/editor-panel.js @@ -24,7 +24,7 @@ class EditorPanel { var self = this self._deps = { config: self._components.registry.get('config').api, - txlistener: self._components.registry.get('txlistener').api, + txListener: self._components.registry.get('txlistener').api, fileManager: self._components.registry.get('filemanager').api, udapp: self._components.registry.get('udapp').api } From 4814d86d7b7cfa18ee469aa64978d341498db3d5 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 14 Aug 2018 13:47:09 +0200 Subject: [PATCH 3/3] fix display status not available if receipt not available --- src/app/execution/txLogger.js | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 62724759df..7558c869a9 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -49,6 +49,8 @@ var css = csjs` .failed { color: ${styles.terminal.icon_Color_Log_Failed}; } + .notavailable { + } .call { font-size: 7px; background-color: ${styles.terminal.icon_BackgroundColor_Log_Call}; @@ -282,7 +284,7 @@ function renderUnknownTransaction (self, data) { var tx = yo`
txDetails(e, tx, data, obj)}> - ${checkTxStatus(data.tx, txType)} + ${checkTxStatus(data.receipt || data.tx, txType)} ${context(self, {from, to, data})}
debug(e, data, self)}>Debug
@@ -307,8 +309,10 @@ function checkTxStatus (tx, type) { } if (type === 'call' || type === 'unknownCall') { return yo`call` - } else { + } else if (tx.status === '0x0') { return yo`` + } else { + return yo`` } } @@ -407,18 +411,22 @@ function txDetails (e, tx, data, obj) { function createTable (opts) { var table = yo`
` - if (opts.status) { + if (!opts.isCall) { var msg = '' - if (opts.status === '0x0') { - msg = ' Transaction mined but execution failed' - } else if (opts.status === '0x1') { - msg = ' Transaction mined and execution succeed' + if (opts.status) { + if (opts.status === '0x0') { + msg = ' Transaction mined but execution failed' + } else if (opts.status === '0x1') { + msg = ' Transaction mined and execution succeed' + } + } else { + msg = ' Status not available at the moment' } table.appendChild(yo` - - status - ${opts.status}${msg} - `) + + status + ${opts.status}${msg} + `) } var transactionHash = yo`