Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
c062cde4
Commit
c062cde4
authored
Sep 19, 2017
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change hexToInt => toInt
parent
adcf81d3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
txLogger.js
src/app/execution/txLogger.js
+4
-4
typeConversion.js
src/lib/typeConversion.js
+6
-1
No files found.
src/app/execution/txLogger.js
View file @
c062cde4
...
@@ -263,13 +263,13 @@ function context (self, opts) {
...
@@ -263,13 +263,13 @@ function context (self, opts) {
var
block
=
data
.
tx
.
blockNumber
||
''
var
block
=
data
.
tx
.
blockNumber
||
''
var
i
=
data
.
tx
.
transactionIndex
var
i
=
data
.
tx
.
transactionIndex
if
(
executionContext
.
getProvider
()
===
'vm'
)
{
if
(
executionContext
.
getProvider
()
===
'vm'
)
{
return
yo
`<span><span class=
${
css
.
tx
}
>[vm]</span> from:
${
from
}
, to:
${
to
}
, value:
${
typeConversion
.
hexT
oInt
(
val
)}
wei, data:
${
input
}
,
${
logs
}
logs, hash:
${
hash
}
</span>`
return
yo
`<span><span class=
${
css
.
tx
}
>[vm]</span> from:
${
from
}
, to:
${
to
}
, value:
${
typeConversion
.
t
oInt
(
val
)}
wei, data:
${
input
}
,
${
logs
}
logs, hash:
${
hash
}
</span>`
}
else
if
(
executionContext
.
getProvider
()
!==
'vm'
&&
data
.
resolvedData
)
{
}
else
if
(
executionContext
.
getProvider
()
!==
'vm'
&&
data
.
resolvedData
)
{
return
yo
`<span><span class='
${
css
.
tx
}
'>[block:
${
block
}
txIndex:
${
i
}
]</span> from:
${
from
}
, to:
${
to
}
, value:
${
typeConversion
.
hexT
oInt
(
val
)}
wei,
${
logs
}
logs, data:
${
input
}
, hash:
${
hash
}
</span>`
return
yo
`<span><span class='
${
css
.
tx
}
'>[block:
${
block
}
txIndex:
${
i
}
]</span> from:
${
from
}
, to:
${
to
}
, value:
${
typeConversion
.
t
oInt
(
val
)}
wei,
${
logs
}
logs, data:
${
input
}
, hash:
${
hash
}
</span>`
}
else
{
}
else
{
to
=
helper
.
shortenHexData
(
to
)
to
=
helper
.
shortenHexData
(
to
)
hash
=
helper
.
shortenHexData
(
data
.
tx
.
blockHash
)
hash
=
helper
.
shortenHexData
(
data
.
tx
.
blockHash
)
return
yo
`<span><span class='
${
css
.
tx
}
'>[block:
${
block
}
txIndex:
${
i
}
]</span> from:
${
from
}
, to:
${
to
}
, value:
${
typeConversion
.
hexT
oInt
(
val
)}
wei</span>`
return
yo
`<span><span class='
${
css
.
tx
}
'>[block:
${
block
}
txIndex:
${
i
}
]</span> from:
${
from
}
, to:
${
to
}
, value:
${
typeConversion
.
t
oInt
(
val
)}
wei</span>`
}
}
}
}
...
@@ -367,7 +367,7 @@ function createTable (opts) {
...
@@ -367,7 +367,7 @@ function createTable (opts) {
`
`
if
(
opts
.
logs
)
table
.
appendChild
(
logs
)
if
(
opts
.
logs
)
table
.
appendChild
(
logs
)
var
val
=
typeConversion
.
hexT
oInt
(
opts
.
val
)
var
val
=
typeConversion
.
t
oInt
(
opts
.
val
)
val
=
yo
`
val
=
yo
`
<tr class="
${
css
.
tr
}
">
<tr class="
${
css
.
tr
}
">
<td class="
${
css
.
td
}
"> value </td>
<td class="
${
css
.
td
}
"> value </td>
...
...
src/lib/typeConversion.js
View file @
c062cde4
...
@@ -3,8 +3,13 @@ var ethJSUtil = require('ethereumjs-util')
...
@@ -3,8 +3,13 @@ var ethJSUtil = require('ethereumjs-util')
var
BN
=
ethJSUtil
.
BN
var
BN
=
ethJSUtil
.
BN
module
.
exports
=
{
module
.
exports
=
{
hexToInt
:
(
h
)
=>
{
toInt
:
(
h
)
=>
{
if
(
h
.
indexOf
&&
h
.
indexOf
(
'0x'
)
===
0
)
{
return
(
new
BN
(
h
.
replace
(
'0x'
,
''
),
16
)).
toString
(
10
)
return
(
new
BN
(
h
.
replace
(
'0x'
,
''
),
16
)).
toString
(
10
)
}
else
if
(
h
.
constructor
&&
h
.
constructor
.
name
===
'BigNumber'
||
BN
.
isBN
(
h
))
{
return
h
.
toString
(
10
)
}
return
h
},
},
stringify
:
stringify
stringify
:
stringify
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment