Update to connect to rinkeby in contracts config

This commit is contained in:
emizzle 2019-06-21 17:43:35 +10:00
parent de6f9a8804
commit b96bf067cf
No known key found for this signature in database
GPG Key ID: 1FD4BAB3C37EE9BA
4 changed files with 55 additions and 38 deletions

View File

@ -1 +1,2 @@
/src/embarkArtifacts/*
/src/embarkArtifacts/*
embark/packages

View File

@ -4,34 +4,6 @@ The Embark Plasma Demo is a DApp built using Embark and the [`Embark-Plasma`](ht
> **PLEASE NOTE**
> This is completely alpha software and should not be used in a production environment.
## Vue.js project setup
```
yarn install
```
### Compiles and hot-reloads for development
```
yarn run serve
```
### Compiles and minifies for production
```
yarn run build
```
### Run your tests
```
yarn run test
```
### Lints and fixes files
```
yarn run lint
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
## Embark-Plasma Demo Setup
This is an example client side wallet built in Vue.js which allows you to make interactions with the OMG network from the browser.
@ -61,4 +33,32 @@ From here, you can perform 3 actions:
3. Exit the funds back to Rootchain: Fill in an address that has funds in the OMG Network and click on OK, your exit period will start. Do note that the exit period will be varied based on the configuration of each `elixir-omg` deployment. After the certain amount of time has passed, you will be able to process the exit and receive your funds back.
NOTE: the current wallet does not offer a way to call `processExit()` yet.
NOTE: the current wallet does not offer a way to call `processExit()` yet.
## Vue.js project setup
```
yarn install
```
### Compiles and hot-reloads for development
```
yarn run serve
```
### Compiles and minifies for production
```
yarn run build
```
### Run your tests
```
yarn run test
```
### Lints and fixes files
```
yarn run lint
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).

View File

@ -6,12 +6,12 @@ module.exports = {
rpcPort: 8545, // HTTP-RPC server listening port (default: 8545)
rpcCorsDomain: { // Domains from which to accept cross origin requests (browser enforced). This can also be a comma separated list
auto: true, // When "auto" is true, Embark will automatically set the cors to the address of the webserver
additionalCors: ["http://localhost:3001"] // Additional CORS domains to add to the list. If "auto" is false, only those will be added
additionalCors: ["http://localhost:8080"] // Additional CORS domains to add to the list. If "auto" is false, only those will be added
},
wsRPC: true, // Enable the WS-RPC server
wsOrigins: { // Same thing as "rpcCorsDomain", but for WS origins
auto: true,
additionalCors: ["http://localhost:3001"]
additionalCors: ["http://localhost:8080"]
},
wsHost: "localhost", // WS-RPC server listening interface (default: "localhost")
wsPort: 8546, // WS-RPC server listening port (default: 8546)
@ -154,9 +154,6 @@ module.exports = {
// merges with the settings in default
// used with "embark run testnet" and/or "embark blockchain testnet"
rinkeby: {
networkType: "rinkeby",
syncMode: "light",
networkId: 4,
accounts: [
{
nodeAccounts: true,

View File

@ -53,7 +53,7 @@ module.exports = {
contracts: {
PlasmaCore: {
address: "0x44de0ec539b8c4a4b530c78620fe8320167f2f74",
address: "0x740ecec4c0ee99c285945de8b44e9f5bfb71eea7",
abiDefinition: require("@omisego/omg-js-rootchain/src/contracts/RootChain.json").abi
}
}
@ -75,12 +75,31 @@ module.exports = {
},
rinkeby: {
deployment: {
host: "rinkeby.infura.io/v3/INFURA_API_KEY",
port: false,
type: "rpc",
protocol: "https",
accounts: [
{
mnemonic: "MNEMONIC_HERE",
addressIndex: "0", // Optional. The index to start getting the address
numAddresses: "2", // Optional. The number of addresses to get
hdpath: "m/44'/60'/0'/0/", // Optional. HD derivation path
balance: "100 ether"
}
]
},
contracts: {
PlasmaCore: {
address: "0x44de0ec539b8c4a4b530c78620fe8320167f2f74",
address: "0x740ecec4c0ee99c285945de8b44e9f5bfb71eea7",
abiDefinition: require("@omisego/omg-js-rootchain/src/contracts/RootChain.json").abi
}
}
},
dappConnection: [
"$WEB3", // uses pre existing web3 object if available (e.g in Mist)
"https://rinkeby.infura.io/v3/INFURA_API_KEY"
]
},
// merges with the settings in default