diff --git a/README.md b/README.md index 1cade5e..38d98d1 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,24 @@ - Set [GOPATH environment variable](https://github.com/golang/go/wiki/SettingGOPATH) - [dep](https://golang.github.io/dep/docs/installation.html) -## Easy install +## Easy install We now provide a super simple way to run the test-suite. It only depends on docker! ``` > make install +> docker-compose pull +> docker-compose up -d +> sleep 5 +> make deploy-and-test +> docker-compose down +``` + +If you want to run each step manually, you can do something like but note that this currently deploys the contracts twice +``` +> make install +> docker-compose pull > docker-compose up -d cliquebait > make deploy-contracts > make write-plasma-toml @@ -23,6 +34,7 @@ We now provide a super simple way to run the test-suite. It only depends on dock > docker-compose down ``` + ## Setting up `plasma-mvp-sidechain` (only once) 1. Install original sources of `plasma-mvp-sidechain` and switch to our custom branch as follow: @@ -103,8 +115,8 @@ Make sure you have the tendermint node up `PLASMA_ADDRESS` is visible after running `plasmad start`. In following example it is `0xe545eaf693277ead76f5d9b4665291b0ac38853c`: ``` -plasmad start -I[2046-04-02|14:05:54.360] Starting ABCI with Tendermint module=main +plasmad start +I[2046-04-02|14:05:54.360] Starting ABCI with Tendermint module=main I[2046-04-02|14:05:54.388] binding to contract address 0xe545eaf693277ead76f5d9b4665291b0ac38853c module=main ... diff --git a/docker-compose.yml b/docker-compose.yml index ee85e23..ae189b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: ports: - "8545:8545" plasma: - image: docker.kube-system.svc.cluster.local/foam/plasma-mvp-sidechain:latest + image: foamspace/plasma-mvp-sidechain:latest ports: - "1317:1317" - "26657:26657" diff --git a/plasma.toml b/plasma.toml index 14aae73..d344a62 100644 --- a/plasma.toml +++ b/plasma.toml @@ -1,6 +1,6 @@ plasma_block_commitment_rate = "2s" is_operator = "false" -ethereum_plasma_contract_address = "0x788008b8fa2306388fbdabca2af413977df6098a" +ethereum_plasma_contract_address = "0x9284f22bd1613789ace60c54e9295a480e7a3e1d" ethereum_operator_privatekey = "" ethereum_nodeurl = "http://cliquebait:8545" -ethereum_finality = "18" \ No newline at end of file +ethereum_finality = "3" \ No newline at end of file