mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Logs and table details: round 1456999

Browse Source
pull/1/head
ninabreznik 7 years ago committed by yann300
parent 9fbb016e5a
commit bf064ac0aa
3 changed files with 38 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 75
      src/app/execution/txLogger.js
  2. 2
      src/app/tabs/run-tab.js
  3. 2
      src/universal-dapp.js

75
src/app/execution/txLogger.js
Unescape View File

@ -19,7 +19,7 @@ var css = csjs`
align-items: baseline;
justify-content: space-between;
}
.txBlock, .txVM {
.tx {
color: ${styles.colors.violet};
width: 45%;
}
@ -112,16 +112,10 @@ function log (self, tx, api) {
function renderKnownTransaction (self, data) {
var from = data.tx.from
var to = ''
if (data.tx.blockHash) {
to = data.tx.to
} else if (data.tx.hash) { // call (constructor of function call)
if (data.resolvedData.fn === '(constructor)') {
to = data.resolvedData.contractName + '.' + data.resolvedData.fn
} else {
to = data.resolvedData.to
}
var to = data.resolvedData.contractName + '.' + data.resolvedData.fn
if (data.resolvedData.to) {
to = to + data.resolvedData.to
var shortTo = to + helper.shortenHexData(data.resolvedData.to)
}
function debug () {
@ -130,7 +124,7 @@ function renderKnownTransaction (self, data) {
var tx = yo`
<span class=${css.container} id="tx${data.tx.hash}">
<div class="${css.log}">
${context(self, data)}
${context(self, {from, to: shortTo, data})}
<div class=${css.buttons}>
<button class=${css.details} onclick=${txDetails}>Details</button>
<button class=${css.debug} onclick=${debug}>Debug</button>
@ -150,7 +144,7 @@ function renderKnownTransaction (self, data) {
from,
to,
gas: data.tx.gas,
hash: data.tx.has,
hash: data.tx.hash,
input: data.tx.input,
logs: JSON.stringify(data.logs) || '0',
val: data.tx.value
@ -171,7 +165,7 @@ function renderUnknownTransaction (self, data) {
var tx = yo`
<span class=${css.container} id="tx${data.tx.hash}">
<div class="${css.log}">
${context(self, data)}
${context(self, {from, to, data})}
<div class=${css.buttons}>
<button class=${css.details} onclick=${txDetails}>Details</button>
<button class=${css.debug} onclick=${debug}>Debug</button>
@ -197,22 +191,25 @@ function renderEmptyBlock (self, data) {
return yo`<span>block ${data.block.number} - O transactions</span>`
}
function context (self, data) {
var from = helper.shortenHexData(data.tx.from)
var to = ''
function context (self, opts) {
var data = opts.data || ''
var from = opts.from ? helper.shortenHexData(opts.from) : ''
var to = opts.to || ''
var val = data.tx.value
var type = opts.type || ''
var hash = data.tx.hash ? helper.shortenHexData(data.tx.hash) : ''
var input = data.tx.input ? helper.shortenHexData(data.tx.input) : ''
var logs = data.logs ? data.logs.length : 0
if (executionContext.getProvider() === 'vm') {
if (data.resolvedData.to) {
to = `${data.resolvedData.contractName}.${data.resolvedData.fn} ${helper.shortenHexData(data.resolvedData.to)}`
} else {
to = `${data.resolvedData.contractName}.${data.resolvedData.fn}`
}
return yo`<span><span class='${css.txVM}'>[vm]</span> from: ${from}, to:${to}, value:${data.tx.value} wei</span>`
return yo`<span><span class=${css.tx}>[vm]</span> from:${from}, to:${to}, value:${value(val)} wei, data:${input}, ${logs} logs, hash:${hash}</span>`
} else if (executionContext.getProvider() !== 'web3' && data.resolvedData) {
return yo`<span><span class=${css.tx}>[web3]</span> from:${from}, to:${to}, value:${value(val)} wei, data:${input}, ${logs} logs, hash:${hash}</span>`
} else {
var hash = helper.shortenHexData(data.tx.blockHash)
var block = data.tx.blockNumber
var i = data.tx.transactionIndex
var val = data.tx.value
return yo`<span><span class='${css.txBlock}'>[block:${block} txIndex:${i}]</span> from:${from}, to:${hash}, value:${value(val)} wei</span>`
to = helper.shortenHexData(to)
hash = helper.shortenHexData(data.tx.blockHash)
var block = data.tx.blockNumber
var i = data.tx.transactionIndex
return yo`<span><span class='${css.tx}'>[block:${block} txIndex:${i}]</span> from:${from}, to:${hash}, value:${value(val)} wei</span>`
}
}
@ -235,6 +232,7 @@ module.exports = TxLogger
function createTable (opts) {
var table = yo`<table class="${css.txTable}" id="txTable"></table>`
var contractAddress = yo`
<tr class="${css.tr}">
<td class="${css.td}"> contractAddress </td>
@ -242,14 +240,7 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.contractAddress) table.appendChild(contractAddress)
var data = helper.shortenHexData(opts.input)
data = yo`
<tr class="${css.tr}">
<td class="${css.td}"> data </td>
<td class="${css.td}">${data}</td>
</tr class="${css.tr}">
`
if (opts.data) table.appendChild(data)
var from = yo`
<tr class="${css.tr}">
<td class="${css.td} ${css.tableTitle}"> from </td>
@ -257,6 +248,7 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.from) table.appendChild(from)
var to = yo`
<tr class="${css.tr}">
<td class="${css.td}"> to </td>
@ -264,6 +256,7 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.to) table.appendChild(to)
var gas = yo`
<tr class="${css.tr}">
<td class="${css.td}"> gas </td>
@ -271,6 +264,7 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.gas) table.appendChild(gas)
var hash = yo`
<tr class="${css.tr}">
<td class="${css.td}"> hash </td>
@ -278,14 +272,15 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.hash) table.appendChild(hash)
var input = helper.shortenHexData(opts.input)
input = yo`
var input = yo`
<tr class="${css.tr}">
<td class="${css.td}"> input </td>
<td class="${css.td}">${input}</td>
<td class="${css.td}">${opts.input}</td>
</tr class="${css.tr}">
`
if (opts.input) table.appendChild(input)
var logs = yo`
<tr class="${css.tr}">
<td class="${css.td}"> logs </td>
@ -293,6 +288,7 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.logs) table.appendChild(logs)
var val = value(opts.val)
val = yo`
<tr class="${css.tr}">
@ -301,5 +297,6 @@ function createTable (opts) {
</tr class="${css.tr}">
`
if (opts.val) table.appendChild(val)
return table
}

2
src/app/tabs/run-tab.js
Unescape View File

@ -300,7 +300,7 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
var args = createButtonInput.value
txFormat.buildData(contract, contracts, true, constructor, args, appAPI.udapp(), (error, data) => {
if (!error) {
appAPI.logMessage('[WEB3] transaction added ...')
appAPI.logMessage('Transaction added ...')
txExecution.createContract(data, appAPI.udapp(), (error, txResult) => {
if (!error) {
var isVM = executionContext.isVM()

2
src/universal-dapp.js
Unescape View File

@ -309,7 +309,7 @@ UniversalDApp.prototype.getCallButton = function (args) {
if (!error) {
txExecution.callFunction(args.address, data, args.funABI, self, (error, txResult) => {
if (!error) {
self._api.logMessage('[WEB3] UDApp transaction added ...')
self._api.logMessage('UDApp transaction added ...')
var isVM = executionContext.isVM()
if (isVM) {
var vmError = txExecution.checkVMError(txResult)

Write Preview
Loading…
Cancel
Save