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
326c9e70
Unverified
Commit
326c9e70
authored
Mar 28, 2018
by
yann300
Committed by
GitHub
Mar 28, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1205 from ethereum/addEtherscanLink
log transaction broadcasted
parents
df0a9d32
ff370fab
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
4 deletions
+21
-4
config.yml
.circleci/config.yml
+4
-4
app.js
src/app.js
+3
-0
terminal.js
src/app/panels/terminal.js
+6
-0
universal-dapp.js
src/universal-dapp.js
+8
-0
No files found.
.circleci/config.yml
View file @
326c9e70
...
@@ -26,10 +26,10 @@ jobs:
...
@@ -26,10 +26,10 @@ jobs:
-
checkout
-
checkout
-
restore_cache
:
-
restore_cache
:
keys
:
keys
:
-
dep-bundle-
4
-{{ checksum "package.json" }}
-
dep-bundle-
5
-{{ checksum "package.json" }}
-
run
:
npm install
-
run
:
npm install
-
save_cache
:
-
save_cache
:
key
:
dep-bundle-
4
-{{ checksum "package.json" }}
key
:
dep-bundle-
5
-{{ checksum "package.json" }}
paths
:
paths
:
-
~/repo/node_modules
-
~/repo/node_modules
-
run
:
npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build
-
run
:
npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build
...
@@ -46,10 +46,10 @@ jobs:
...
@@ -46,10 +46,10 @@ jobs:
-
checkout
-
checkout
-
restore_cache
:
-
restore_cache
:
keys
:
keys
:
-
dep-bundle-
4
-{{ checksum "package.json" }}
-
dep-bundle-
5
-{{ checksum "package.json" }}
-
run
:
npm install
-
run
:
npm install
-
save_cache
:
-
save_cache
:
key
:
dep-bundle-
4
-{{ checksum "package.json" }}
key
:
dep-bundle-
5
-{{ checksum "package.json" }}
paths
:
paths
:
-
~/repo/node_modules
-
~/repo/node_modules
-
run
:
npm run build_debugger
-
run
:
npm run build_debugger
...
...
src/app.js
View file @
326c9e70
...
@@ -302,6 +302,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
...
@@ -302,6 +302,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
logMessage
:
(
msg
)
=>
{
logMessage
:
(
msg
)
=>
{
self
.
_components
.
editorpanel
.
log
({
type
:
'log'
,
value
:
msg
})
self
.
_components
.
editorpanel
.
log
({
type
:
'log'
,
value
:
msg
})
},
},
logHtmlMessage
:
(
msg
)
=>
{
self
.
_components
.
editorpanel
.
log
({
type
:
'html'
,
value
:
msg
})
},
config
:
self
.
_api
.
config
,
config
:
self
.
_api
.
config
,
detectNetwork
:
(
cb
)
=>
{
detectNetwork
:
(
cb
)
=>
{
executionContext
.
detectNetwork
(
cb
)
executionContext
.
detectNetwork
(
cb
)
...
...
src/app/panels/terminal.js
View file @
326c9e70
...
@@ -66,6 +66,7 @@ class Terminal {
...
@@ -66,6 +66,7 @@ class Terminal {
self
.
_INDEX
.
allMain
=
[]
self
.
_INDEX
.
allMain
=
[]
self
.
_INDEX
.
commands
=
{}
self
.
_INDEX
.
commands
=
{}
self
.
_INDEX
.
commandsMain
=
{}
self
.
_INDEX
.
commandsMain
=
{}
self
.
registerCommand
(
'html'
,
self
.
_blocksRenderer
(
'html'
),
{
activate
:
true
})
self
.
registerCommand
(
'log'
,
self
.
_blocksRenderer
(
'log'
),
{
activate
:
true
})
self
.
registerCommand
(
'log'
,
self
.
_blocksRenderer
(
'log'
),
{
activate
:
true
})
self
.
registerCommand
(
'info'
,
self
.
_blocksRenderer
(
'info'
),
{
activate
:
true
})
self
.
registerCommand
(
'info'
,
self
.
_blocksRenderer
(
'info'
),
{
activate
:
true
})
self
.
registerCommand
(
'error'
,
self
.
_blocksRenderer
(
'error'
),
{
activate
:
true
})
self
.
registerCommand
(
'error'
,
self
.
_blocksRenderer
(
'error'
),
{
activate
:
true
})
...
@@ -448,6 +449,11 @@ class Terminal {
...
@@ -448,6 +449,11 @@ class Terminal {
},
0
)
},
0
)
}
}
_blocksRenderer
(
mode
)
{
_blocksRenderer
(
mode
)
{
if
(
mode
===
'html'
)
{
return
function
logger
(
args
,
scopedCommands
,
append
)
{
if
(
args
.
length
)
append
(
args
[
0
])
}
}
mode
=
{
log
:
styles
.
terminal
.
text_RegularLog
,
info
:
styles
.
terminal
.
text_InfoLog
,
error
:
styles
.
terminal
.
text_ErrorLog
}[
mode
]
// defaults
mode
=
{
log
:
styles
.
terminal
.
text_RegularLog
,
info
:
styles
.
terminal
.
text_InfoLog
,
error
:
styles
.
terminal
.
text_ErrorLog
}[
mode
]
// defaults
if
(
mode
)
{
if
(
mode
)
{
return
function
logger
(
args
,
scopedCommands
,
append
)
{
return
function
logger
(
args
,
scopedCommands
,
append
)
{
...
...
src/universal-dapp.js
View file @
326c9e70
...
@@ -51,6 +51,14 @@ UniversalDApp.prototype.reset = function (contracts, transactionContextAPI) {
...
@@ -51,6 +51,14 @@ UniversalDApp.prototype.reset = function (contracts, transactionContextAPI) {
executionContext
.
vm
().
stateManager
.
cache
.
flush
(
function
()
{})
executionContext
.
vm
().
stateManager
.
cache
.
flush
(
function
()
{})
}
}
this
.
txRunner
=
new
TxRunner
(
this
.
accounts
,
this
.
_api
)
this
.
txRunner
=
new
TxRunner
(
this
.
accounts
,
this
.
_api
)
this
.
txRunner
.
event
.
register
(
'transactionBroadcasted'
,
(
txhash
)
=>
{
this
.
_api
.
detectNetwork
((
error
,
network
)
=>
{
if
(
!
error
&&
network
)
{
var
txLink
=
executionContext
.
txDetailsLink
(
network
.
name
,
txhash
)
if
(
txLink
)
this
.
_api
.
logHtmlMessage
(
yo
`<a href="
${
txLink
}
" target="_blank">
${
txLink
}
</a>`
)
}
})
})
}
}
UniversalDApp
.
prototype
.
newAccount
=
function
(
password
,
cb
)
{
UniversalDApp
.
prototype
.
newAccount
=
function
(
password
,
cb
)
{
...
...
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