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
72d97a3f
Commit
72d97a3f
authored
Dec 31, 2019
by
Iuri Matias
Committed by
yann300
Feb 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace executionContext for network module with blockchain object
parent
a5160fc3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
10 deletions
+17
-10
app.js
src/app.js
+1
-1
network-module.js
src/app/tabs/network-module.js
+9
-9
blockchain.js
src/app/tabs/runTab/model/blockchain.js
+7
-0
No files found.
src/app.js
View file @
72d97a3f
...
@@ -234,7 +234,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
...
@@ -234,7 +234,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
const
{
eventsDecoder
,
txlistener
}
=
makeUdapp
(
blockchain
,
compilersArtefacts
,
(
domEl
)
=>
mainview
.
getTerminal
().
logHtml
(
domEl
))
const
{
eventsDecoder
,
txlistener
}
=
makeUdapp
(
blockchain
,
compilersArtefacts
,
(
domEl
)
=>
mainview
.
getTerminal
().
logHtml
(
domEl
))
// ----------------- network service (resolve network id / name) ----------------------------
// ----------------- network service (resolve network id / name) ----------------------------
const
networkModule
=
new
NetworkModule
(
executionContext
)
const
networkModule
=
new
NetworkModule
(
blockchain
)
// ----------------- convert offset to line/column service ----------------------------
// ----------------- convert offset to line/column service ----------------------------
var
offsetToLineColumnConverter
=
new
OffsetToLineColumnConverter
()
var
offsetToLineColumnConverter
=
new
OffsetToLineColumnConverter
()
registry
.
put
({
api
:
offsetToLineColumnConverter
,
name
:
'offsettolinecolumnconverter'
})
registry
.
put
({
api
:
offsetToLineColumnConverter
,
name
:
'offsettolinecolumnconverter'
})
...
...
src/app/tabs/network-module.js
View file @
72d97a3f
...
@@ -14,11 +14,11 @@ export const profile = {
...
@@ -14,11 +14,11 @@ export const profile = {
// - methods: ['getNetworkProvider', 'getEndpoint', 'detectNetwork', 'addNetwork', 'removeNetwork']
// - methods: ['getNetworkProvider', 'getEndpoint', 'detectNetwork', 'addNetwork', 'removeNetwork']
export
class
NetworkModule
extends
Plugin
{
export
class
NetworkModule
extends
Plugin
{
constructor
(
executionContext
)
{
constructor
(
blockchain
)
{
super
(
profile
)
super
(
profile
)
this
.
executionContext
=
executionContext
this
.
blockchain
=
blockchain
// TODO: See with remix-lib to make sementic coherent
// TODO: See with remix-lib to make sementic coherent
this
.
executionContext
.
event
.
register
(
'contextChanged'
,
(
provider
)
=>
{
this
.
blockchain
.
event
.
register
(
'contextChanged'
,
(
provider
)
=>
{
this
.
emit
(
'providerChanged'
,
provider
)
this
.
emit
(
'providerChanged'
,
provider
)
})
})
/*
/*
...
@@ -37,13 +37,13 @@ export class NetworkModule extends Plugin {
...
@@ -37,13 +37,13 @@ export class NetworkModule extends Plugin {
/** Return the current network provider (web3, vm, injected) */
/** Return the current network provider (web3, vm, injected) */
getNetworkProvider
()
{
getNetworkProvider
()
{
return
this
.
executionContext
.
getProvider
()
return
this
.
blockchain
.
getProvider
()
}
}
/** Return the current network */
/** Return the current network */
detectNetwork
()
{
detectNetwork
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
executionContext
.
detectNetwork
((
error
,
network
)
=>
{
this
.
blockchain
.
detectNetwork
((
error
,
network
)
=>
{
error
?
reject
(
error
)
:
resolve
(
network
)
error
?
reject
(
error
)
:
resolve
(
network
)
})
})
})
})
...
@@ -51,20 +51,20 @@ export class NetworkModule extends Plugin {
...
@@ -51,20 +51,20 @@ export class NetworkModule extends Plugin {
/** Return the url only if network provider is 'web3' */
/** Return the url only if network provider is 'web3' */
getEndpoint
()
{
getEndpoint
()
{
const
provider
=
this
.
executionContext
.
getProvider
()
const
provider
=
this
.
blockchain
.
getProvider
()
if
(
provider
!==
'web3'
)
{
if
(
provider
!==
'web3'
)
{
throw
new
Error
(
'no endpoint: current provider is either injected or vm'
)
throw
new
Error
(
'no endpoint: current provider is either injected or vm'
)
}
}
return
this
.
executionContext
.
web3
().
currentProvider
.
host
return
this
.
blockchain
.
web3
().
currentProvider
.
host
}
}
/** Add a custom network to the list of available networks */
/** Add a custom network to the list of available networks */
addNetwork
(
customNetwork
)
{
addNetwork
(
customNetwork
)
{
this
.
executionContext
.
addProvider
(
customNetwork
)
this
.
blockchain
.
addProvider
(
customNetwork
)
}
}
/** Remove a network to the list of availble networks */
/** Remove a network to the list of availble networks */
removeNetwork
(
name
)
{
removeNetwork
(
name
)
{
this
.
executionContext
.
removeProvider
(
name
)
this
.
blockchain
.
removeProvider
(
name
)
}
}
}
}
src/app/tabs/runTab/model/blockchain.js
View file @
72d97a3f
...
@@ -321,6 +321,13 @@ class Blockchain {
...
@@ -321,6 +321,13 @@ class Blockchain {
this
.
udapp
.
resetEnvironment
()
this
.
udapp
.
resetEnvironment
()
}
}
addNetwork
(
customNetwork
)
{
this
.
executionContext
.
addProvider
(
customNetwork
)
}
removeNetwork
(
name
)
{
this
.
executionContext
.
removeProvider
(
name
)
}
}
}
module
.
exports
=
Blockchain
module
.
exports
=
Blockchain
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