-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* starter * testing client with ganache * Squashed 'contracts/' content from commit ab4fd0e git-subtree-dir: contracts git-subtree-split: ab4fd0e * contract wrappers and bindings * subscribed to deposits/exists. Some tests * added wrappers to the contracts folder * Squashed 'contracts/' changes from ab4fd0e..dc28e6a dc28e6a [Audit Milestone] No rootchain finality checks (#79) b7ddf5c Simple Merkle Tree (#77) 62a9462 position in the exit struct. removed helpers (#78) git-subtree-dir: contracts git-subtree-split: dc28e6a * added clean to npm script. temp removed wrappers * Squashed 'contracts/' changes from dc28e6a..4fcc49e 4fcc49e doc typo (#83) 088adc7 [Audit milestone] Fee withdrawal for validators (#80) bc1b116 Finalize Revert (#82) git-subtree-dir: contracts git-subtree-split: 4fcc49e * updated wrappers * Squashed 'contracts/' changes from 4fcc49e..1b58d54 1b58d54 added eth blocknum to the deposit struct (#85) git-subtree-dir: contracts git-subtree-split: 1b58d54 * deposits with finality checks * removed err from HasTxBeenExited * refactors and added tests. Fixed deposit encoding/decoding * typo * changed rlp to json * gopkg fix, updated travis travis travis fix rearrange travis avoid timeout npm install longer sleep time cd back changed back to sleep 5 * Squashed 'contracts/' changes from 1b58d54..7404701 7404701 Hamdi/fee challenge (#87) git-subtree-dir: contracts git-subtree-split: 7404701 * subtree mods * Squashed 'contracts/' changes from 7404701..c2932c6 c2932c6 renamed docs and fixed a typo (#89) 646fcd9 Colin/deposit priority (#90) git-subtree-dir: contracts git-subtree-split: c2932c6 * first revision of the eth module * hastxbeenexited more robust like getdeposit * travis * race condition * addressed feedback
- Loading branch information
1 parent
4912ed6
commit 961e30d
Showing
44 changed files
with
11,765 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,4 @@ | ||
vendor/ | ||
.DS_Store | ||
vendor/ | ||
contracts/abi | ||
contracts/node_modules |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
language: go | ||
|
||
go: | ||
- 1.10.x | ||
- 1.11.x | ||
|
||
env: | ||
- DEP_VERSION="0.4.1" | ||
|
@@ -15,7 +15,16 @@ before_install: | |
install: | ||
- dep ensure -vendor-only | ||
|
||
before_script: | ||
- npm install -g [email protected] [email protected] | ||
|
||
script: | ||
- ganache-cli -m=plasma > /dev/null & | ||
- sleep 5 | ||
- cd contracts/ | ||
- npm install | ||
- truffle migrate | ||
- cd ../ | ||
- go test -race -coverprofile=coverage.txt -covermode=atomic -v ./... | ||
|
||
after_success: | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
*.sol linguist-language=Solidity |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
node_modules/ | ||
coverage/ | ||
coverage.json | ||
build/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
module.exports = { | ||
copyNodeModules: true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
language: node_js | ||
|
||
node_js: "node" | ||
|
||
before_script: | ||
- npm install -g [email protected] [email protected] | ||
- npm install | ||
|
||
script: | ||
- ganache-cli -m "they only media any modify banner suffer pole tag rule creek harvest" > /dev/null & | ||
- sleep 5 | ||
- truffle migrate | ||
- truffle test | ||
|
||
after_script: | ||
- npm run coverage && cat coverage/lcov.info | coveralls |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Contributing | ||
|
||
Thank you for considering making contributions to Fourth State's Plasma MVP implementation! We welcome contributions from anyone! See the [open issues](https://github.com/FourthState/plasma-mvp-rootchain/issues) for things we need help with! | ||
|
||
Contribute to design discussions and conversation by joining our [Discord Server](https://discord.gg/YTB5A4P). | ||
|
||
## How to get started: | ||
|
||
Fork, then clone the repo: | ||
|
||
If you have ssh keys: | ||
``git clone [email protected]:your-username/plasma-mvp-rootchain`` | ||
|
||
Otherwise: | ||
``git clone https://github.com/your-username/plasma-mvp-rootchain`` | ||
|
||
Install dependencies with: | ||
``npm install`` | ||
|
||
**Note**: requires Solidity 0.4.24 and Truffle 4.1.14 | ||
|
||
Make sure the tests pass: | ||
1. Start ganache-cli: ``ganache-cli -m=plasma_mvp`` | ||
2. Run tests: ``truffle test`` | ||
|
||
Create a branch that is named off the feature you are trying to implement. See these [guidelines](https://nvie.com/posts/a-successful-git-branching-model/) | ||
|
||
Make your changes. Add tests and comment those changes. | ||
|
||
If your tests pass, push to your fork and [submit a pull request](https://github.com/FourthState/plasma-mvp-rootchain/pulls) to the master branch. | ||
|
||
## Proposals: | ||
|
||
If you would like to propose a protocol change, open up an issue. If the reviewers decide the proposed change is in line with the project's aim, then a writeup should also be added to the [research repository](https://github.com/FourthState/plasma-research). It is also advisable to publish the proposed change to [Eth Research](https://ethresear.ch/), so other plasma implementations can benefit from the proposed change. | ||
|
Oops, something went wrong.