Config update, embarkjs dependency update

This commit is contained in:
emizzle 2019-09-10 16:57:23 +10:00
parent e81436d7f5
commit d9613cd0fa
No known key found for this signature in database
GPG Key ID: 1FD4BAB3C37EE9BA
4 changed files with 37 additions and 8 deletions

View File

@ -4,8 +4,8 @@ module.exports = {
// order of connections the dapp should connect to
dappConnection: [
"$WEB3", // uses pre existing web3 object if available (e.g in Mist)
"ws://localhost:8546",
"http://localhost:8545"
"ws://localhost:8556",
"http://localhost:8555"
],
// Automatically call `ethereum.enable` if true.
@ -39,11 +39,11 @@ module.exports = {
// default environment, merges with the settings in default
// assumed to be the intended environment by `embark run`
development: {
dappConnection: [
"ws://localhost:8546",
"http://localhost:8545",
"$WEB3" // uses pre existing web3 object if available (e.g in Mist)
]
// dappConnection: [
// "ws://localhost:8556",
// "http://localhost:8555",
// "$WEB3" // uses pre existing web3 object if available (e.g in Mist)
// ]
},
// merges with the settings in default

View File

@ -25,6 +25,7 @@
"dependencies": {
"core-js": "^2.6.5",
"embark-plasma": "^1.0.1",
"embarkjs": "^4.1.1",
"vue": "^2.6.10",
"vue-material": "^1.0.0-beta-11"
},

View File

@ -165,7 +165,6 @@ import Transfer from "./components/Transfer.vue";
import Exit from "./components/Exit.vue";
import OmgUtil from "@omisego/omg-js-util";
import EmbarkJS from "./embarkArtifacts/embarkjs";
import web3 from "./embarkArtifacts/modules/web3";
import pify from "pify";
window.EmbarkJS = EmbarkJS;

View File

@ -1584,11 +1584,25 @@ async-each@^1.0.1:
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
async-es@2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/async-es/-/async-es-2.6.1.tgz#72e763072a4bb536e6834b4481d965617b528fc3"
integrity sha512-3TRUpnT+8BEgZagVqDstkJTEAw45paBCfNG5W5WX2eimZSXt+K5RnjjB2KlYfx1rgn/fu7wPMq1BlQmwg8yeWQ==
dependencies:
lodash-es "^4.17.10"
async-limiter@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
async@2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
dependencies:
lodash "^4.17.10"
async@^1.5.2, async@~1.5.2:
version "1.5.2"
resolved "https://registry.npm.taobao.org/async/download/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@ -3426,6 +3440,16 @@ embarkjs-plasma@1.0.0, embarkjs-plasma@^1.0.0:
human-standard-token-abi "2.0.0"
web3 "1.0.0-beta.55"
embarkjs@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/embarkjs/-/embarkjs-4.1.1.tgz#b1f1f5d1fd7e1201eb149cf57ec50f3647bb30bb"
integrity sha512-WIjDG1DD2F1/Ls5kU2jD70s5gL7l3hDdxV9qYOyF01Udi84QJNLMrXBfAIlAbF59S4ZrCAiQDMF9x9i1AHnM7g==
dependencies:
"@babel/runtime-corejs2" "7.3.1"
async "2.6.1"
async-es "2.6.1"
colors "1.3.2"
emoji-regex@^7.0.1:
version "7.0.3"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@ -5863,6 +5887,11 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"
lodash-es@^4.17.10:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
lodash.defaultsdeep@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"