diff --git a/package.json b/package.json index f8dfd2d307..aad040cad9 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "onchange": "^3.2.1", "remix-core": "latest", "remix-lib": "latest", - "remix-solidity": "latest", "remixd": "git+https://github.com/ethereum/remixd.git", "request": "^2.83.0", "rimraf": "^2.6.1", diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 688969377e..8f84eb9e16 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -20,6 +20,16 @@ var css = csjs` align-items: end; justify-content: space-between; } + .caret { + color: ${styles.terminal.icon_Color}; + font-weight: bold; + font-size: small; + cursor: pointer; + float: left; + } + .caret:hover { + color: ${styles.terminal.icon_HoverColor}; + } .txLog { width: 75%; } @@ -34,7 +44,8 @@ var css = csjs` .tx { color: ${styles.terminal.text_Title_TransactionLog}; font-weight: bold; - width: 45%; + float: left; + margin: 0 5px; } .txTable, .tr, .td { border-collapse: collapse; @@ -213,13 +224,13 @@ function renderCall (self, data) { var input = data.tx.input ? helper.shortenHexData(data.tx.input) : '' var tx = yo` +
[call] -
-
from: ${from} -
to: ${to} -
data: ${input} +
from: ${from}
+
to: ${to}
+
data: ${input}
return:
@@ -265,6 +276,7 @@ function renderUnknownTransaction (self, data) { } var tx = yo` +
${context(self, {from, to, data})}
@@ -319,39 +331,45 @@ function context (self, opts) { var value = val ? typeConversion.toInt(val) : 0 if (executionContext.getProvider() === 'vm') { return yo` - - [vm] -
-
from: ${from} -
to: ${to} -
value: ${value} wei -
data: ${input} -
logs: ${logs} -
hash: ${hash} - ` +
+ + + [vm] +
from: ${from}
+
to: ${to}
+
value: ${value} wei
+
data: ${input}
+
logs: ${logs}
+
hash: ${hash}
+
+
` } else if (executionContext.getProvider() !== 'vm' && data.resolvedData) { return yo` - - [block:${block} txIndex:${i}] -
-
from: ${from} -
to: ${to} -
value: ${value} wei -
data: ${input} -
logs: ${logs} -
hash: ${hash} - ` +
+ + + [block:${block} txIndex:${i}] +
from: ${from}
+
to: ${to}
+
value: ${value} wei
+
data: ${input}
+
logs: ${logs}
+
hash: ${hash}
+
+
` } else { to = helper.shortenHexData(to) hash = helper.shortenHexData(data.tx.blockHash) return yo` - - [block:${block} txIndex:${i}] -
-
from: ${from} -
to: ${to} -
value: ${value} wei - ` +
+ + + [block:${block} txIndex:${i}] +
from: ${from}
+
to: ${to}
+
value: ${value} wei
+
+
` } }