Update init to be inline with embarkjs-plasma

.eslintignore

@@ -1,5 +1,5 @@
 /src/embarkArtifacts/*
-embark/packages/*
+/embark/packages/*
 embarkjs-plasma
 embark-plasma
 /node_modules/*

embark.json

@@ -6,12 +6,11 @@
   "buildDir": "dist/",
   "config": "config/",
   "versions": {
-    "web3": "1.0.0-beta",
+    "web3": "1.2.1",
     "solc": "0.5.0",
     "ipfs-api": "17.2.4"
   },
   "plugins": {
-    "embarkjs-connector-web3": {},
     "embark-plasma": {
       "WATCHER_URL": "http://watcher.samrong.omg.network/",
       "CHILDCHAIN_URL": "http://samrong.omg.network/",

package.json

@@ -34,7 +34,6 @@
     "@vue/cli-plugin-eslint": "^3.9.2",
     "@vue/cli-service": "^3.9.2",
     "babel-eslint": "^10.0.1",
-    "embarkjs-connector-web3": "^4.1.0-beta.2",
     "embarkjs-plasma": "^1.0.0",
     "eslint": "^5.16.0",
     "eslint-plugin-react": "^7.13.0",

src/App.vue

@@ -17,8 +17,8 @@ limitations under the License.
   <div id="app">
     <div v-if="inited">
       <md-toolbar class="md-transparent">
-        <img class="logo md-image" src="./assets/status_logo.png">
-        <img class="logo sink md-image" src="./assets/OmiseGO_Logo.svg">
+        <img class="logo md-image" src="./assets/status_logo.png" />
+        <img class="logo sink md-image" src="./assets/OmiseGO_Logo.svg" />
       </md-toolbar>
       <div class="md-layout md-gutter">
         <md-card class="md-layout-item md-size-25 actions">
@@ -120,7 +120,7 @@ limitations under the License.
           </div>
         </md-table>
       </div>
-      <EventLog ref="eventLog"/>
+      <EventLog ref="eventLog" />
 
       <Deposit
         v-if="isShowDeposit"
@@ -167,6 +167,7 @@ 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;
 
 export default {
   name: "app",
@@ -211,7 +212,7 @@ export default {
       try {
         await pify(EmbarkJS.onReady)();
 
-        await EmbarkJS.Plasma.init(web3, false);
+        await EmbarkJS.Plasma.init();
 
         const {
           rootChain,

src/components/EventLog.vue

@@ -23,7 +23,7 @@ limitations under the License.
       <md-table-head>Log</md-table-head>
     </md-table-row>
     <div v-if="logs.length" class="logs">
-      <div v-bind:key="log.message" v-for="log in logs">
+      <div v-bind:key="log.timestamp" v-for="log in logs">
         <md-table-row style="height:100%;">
           <md-table-cell class="log" v-bind:class="log.level">{{ log.message }}</md-table-cell>
         </md-table-row>
@@ -54,10 +54,10 @@ export default {
       this.logs.push(message);
     },
     info(message) {
-      this.log({ message, level: "info" });
+      this.log({ message, level: "info", timestamp: Date.now() });
     },
     error(message) {
-      this.log({ message, level: "error" });
+      this.log({ message, level: "error", timestamp: Date.now() });
     },
     removeLog(log) {
       this.logs = this.logs.filter(item => item !== log);

yarn.lock

@@ -3387,7 +3387,7 @@ embark-plasma@^1.0.1:
     embarkjs-plasma "1.0.0"
     ethers "4.0.28"
 
-embark-utils@^4.1.0-beta.2, embark-utils@^4.1.0-beta.3:
+embark-utils@^4.1.0-beta.2:
   version "4.1.0-beta.3"
   resolved "https://registry.yarnpkg.com/embark-utils/-/embark-utils-4.1.0-beta.3.tgz#bf243c1d81856ebebf9c646dbb00b53569072bec"
   integrity sha512-Ur/MK7Ypf6IYdjB8+mFZpv2QpyR/tebT1VYoihIziicH2r7WBnNI1Oy2y1EgmZGTPzx2aMKRXxhpvgKlDmoCfg==
@@ -3412,13 +3412,6 @@ embark-utils@^4.1.0-beta.2, embark-utils@^4.1.0-beta.3:
     web3-eth "1.0.0-beta.37"
     web3-eth-abi "1.0.0-beta.37"
 
-embarkjs-connector-web3@^4.1.0-beta.2:
-  version "4.1.0-beta.3"
-  resolved "https://registry.yarnpkg.com/embarkjs-connector-web3/-/embarkjs-connector-web3-4.1.0-beta.3.tgz#cb7f91623241fa975291d7fccd2cfa0318988ac9"
-  integrity sha512-BaqNMAtL850Zqjq3AmEF1n6s5cfCHqQfcd06/aQe3LNy1ez3U77tzf9LJHtVpnNiF+XM4Sv9geGPTCOpXuVfkw==
-  dependencies:
-    embark-utils "^4.1.0-beta.3"
-
 embarkjs-plasma@1.0.0, embarkjs-plasma@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/embarkjs-plasma/-/embarkjs-plasma-1.0.0.tgz#7a4e88e19549f5ab053a09f70b007d9a578b6b39"