status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #793 from embark-framework/feature/metamask-eip-1102 

Ready for EIP 1102
This commit is contained in:
Iuri Matias 2018-09-07 18:46:39 -04:00 committed by GitHub
parent a622f22dcd 93424f5c78
commit 12fbb46aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/boilerplate/config/contracts.js
View File

@ -43,6 +43,11 @@ module.exports = {
// default environment, merges with the settings in default // default environment, merges with the settings in default
// assumed to be the intended environment by `embark run` // assumed to be the intended environment by `embark run`
development: { development: {
dappConnection: [
"ws://localhost:8546",
"http://localhost:8545",
"$WEB3" // uses pre existing web3 object if available (e.g in Mist)
]
}, },
// merges with the settings in default // merges with the settings in default

5
templates/demo/config/contracts.js
View File

@ -43,6 +43,11 @@ module.exports = {
// default environment, merges with the settings in default // default environment, merges with the settings in default
// assumed to be the intended environment by `embark run` // assumed to be the intended environment by `embark run`
development: { development: {
dappConnection: [
"ws://localhost:8546",
"http://localhost:8545",
"$WEB3" // uses pre existing web3 object if available (e.g in Mist)
]
}, },
// merges with the settings in default // merges with the settings in default

5
templates/simple/contracts.js
View File

@ -43,6 +43,11 @@ module.exports = {
// default environment, merges with the settings in default // default environment, merges with the settings in default
// assumed to be the intended environment by `embark run` // assumed to be the intended environment by `embark run`
development: { development: {
dappConnection: [
"ws://localhost:8546",
"http://localhost:8545",
"$WEB3" // uses pre existing web3 object if available (e.g in Mist)
]
}, },
// merges with the settings in default // merges with the settings in default