Merge pull request #96 from poanetwork/develop

Merge develop to master branch

.env.example

@@ -1,11 +1,12 @@
+#BRIDGE_MODE=ERC_TO_ERC
 HOME_POLLING_INTERVAL=5000
 FOREIGN_POLLING_INTERVAL=1000
 ALLOW_HTTP=no
 HOME_RPC_URL=https://kovan.infura.io/mew
 FOREIGN_RPC_URL=https://kovan.infura.io/mew
 HOME_BRIDGE_ADDRESS=0x86b621b839Ff86Bb59fA57015b02318f9a870d80
 FOREIGN_BRIDGE_ADDRESS=0x8dDCa2eB86D22FcB93342753515986e258A90169
-POA20_ADDRESS=0x7AA0A62497B5f4120fbe5D26c95bC612c2b96C14
+ERC20_TOKEN_ADDRESS=0x7AA0A62497B5f4120fbe5D26c95bC612c2b96C14
 
 VALIDATOR_ADDRESS=0xb8988B690910913c97A090c3a6f80FAD8b3A4683
 VALIDATOR_ADDRESS_PRIVATE_KEY=
@@ -32,3 +33,4 @@ USER_ADDRESS=0x59c4474184579b9c31b5e51445b6eef91cebf370
 USER_ADDRESS_PRIVATE_KEY=
 HOME_MIN_AMOUNT_PER_TX=0.001
 FOREIGN_MIN_AMOUNT_PER_TX=0.001
+BRIDGEABLE_TOKEN_ADDRESS=

.eslintignore

@@ -1,2 +1,3 @@
 node_modules
-e2e/submodules
+submodules
+coverage

.eslintrc

@@ -12,6 +12,7 @@
     "no-console": "off",
     "no-param-reassign": "off",
     "no-plusplus": "off",
+    "no-restricted-syntax": "off",
     "no-shadow": "off",
     "no-use-before-define": ["error", { "functions": false }],
     "import/no-dynamic-require": "off"

.gitignore

@@ -3,3 +3,4 @@ node_modules
 .idea
 .nyc_output
 coverage/
+logs/

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "e2e/submodules/poa-bridge-contracts"]
-	path = e2e/submodules/poa-bridge-contracts
+	path = submodules/poa-bridge-contracts
 	url = https://github.com/poanetwork/poa-bridge-contracts.git

.travis.yml

@@ -15,3 +15,6 @@ script:
   - npm run lint
   - npm test
   - cd e2e && ./run-tests.sh
+
+env:
+  - HOME_RPC_URL=http://example.com FOREIGN_RPC_URL=http://example.com

CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -0,0 +1,28 @@
+## Contributing
+
+Thank your for contributing to this project! We welcome collaborators and expect users to follow our [code of conduct](CODE_OF_CONDUCT.md) when submitting code or comments.
+
+1. Fork the repo ( https://github.com/poanetwork/bridge-nodejs/fork ).
+2. Create your feature branch (`git checkout -b my-new-feature`).
+3. Write tests that cover your work.
+4. Commit your changes (`git commit -am 'Add some feature'`).
+5. Push to your branch (`git push origin my-new-feature`).
+6. Create a new PR (Pull Request).
+
+### General
+
+* Commits should be one logical change that still allows all tests to pass.  We prefer smaller commits if there could be two levels of logic grouping.  The goal is to provide future contributors (including your future self) the reasoning behind your changes and allow them to cherry-pick, patch or port those changes in isolation to other branches or forks.
+* If during your PR you reveal a pre-existing bug and know how to fix it:
+  1. If you can isolate the bug, fix it in a separate PR.
+  2. If the fix depends on your other commits, add it in a separate commit to the same PR.  
+
+    In either case, try to write a regression test that fails because of the bug but passes with your fix.
+
+### Issues
+Creating and discussing [Issues](https://github.com/poanetwork/bridge-nodejs/issues) provides significant value to the project. If you find a bug you can report it in an Issue.     
+
+### Pull Requests
+All pull requests should include: 
+* A clear, readable description of the purpose of the PR
+* A clear, readable description of changes
+* Any additional concerns or comments (optional)

Dockerfile

@@ -13,8 +13,8 @@ COPY package-lock.json .
 RUN npm install
 COPY . .
 CMD echo "To start a bridge process run:" \
-  "docker-compose run bridge npm run watcher:deposit" \
+  "docker-compose run bridge npm run watcher:signature-request" \
   "docker-compose run bridge npm run watcher:collected-signatures" \
-  "docker-compose run bridge npm run watcher:withdraw" \
+  "docker-compose run bridge npm run watcher:affirmation-request" \
   "docker-compose run bridge npm run sender:home" \
   "docker-compose run bridge npm run sender:foreign"