embarklabs
/
embark-plasma-demo
mirror of https://github.com/embarklabs/embark-plasma-demo.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update init to be inline with embarkjs-plasma

This commit is contained in:
emizzle 2019-09-06 17:36:12 +10:00
parent 5fa7ed85d5
commit e81436d7f5
No known key found for this signature in database
GPG Key ID: 1FD4BAB3C37EE9BA
6 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintignore
View File

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

3
embark.json
View File

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

1
package.json
View File

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

9
src/App.vue
View File

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

6
src/components/EventLog.vue
View File

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

9
yarn.lock
View File

@ -3387,7 +3387,7 @@ embark-plasma@^1.0.1:
embarkjs-plasma "1.0.0" embarkjs-plasma "1.0.0"
ethers "4.0.28" 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" version "4.1.0-beta.3"
resolved "https://registry.yarnpkg.com/embark-utils/-/embark-utils-4.1.0-beta.3.tgz#bf243c1d81856ebebf9c646dbb00b53569072bec" resolved "https://registry.yarnpkg.com/embark-utils/-/embark-utils-4.1.0-beta.3.tgz#bf243c1d81856ebebf9c646dbb00b53569072bec"
integrity sha512-Ur/MK7Ypf6IYdjB8+mFZpv2QpyR/tebT1VYoihIziicH2r7WBnNI1Oy2y1EgmZGTPzx2aMKRXxhpvgKlDmoCfg== 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 "1.0.0-beta.37"
web3-eth-abi "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: embarkjs-plasma@1.0.0, embarkjs-plasma@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/embarkjs-plasma/-/embarkjs-plasma-1.0.0.tgz#7a4e88e19549f5ab053a09f70b007d9a578b6b39" resolved "https://registry.yarnpkg.com/embarkjs-plasma/-/embarkjs-plasma-1.0.0.tgz#7a4e88e19549f5ab053a09f70b007d9a578b6b39"