Skip to content

Commit 2899432

Browse files
authored
Merge pull request #145 from poanetwork/develop
Bridge UI for new bridge contracts
2 parents 9651de4 + 5c21fc8 commit 2899432

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1910
-2305
lines changed

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
node_modules
2+
e2e-script
3+
.git
4+
.env
5+
.dockerignore

.env.example

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,22 @@ REACT_APP_HOME_BRIDGE_ADDRESS=0xABb4C1399DcC28FBa3Beb76CAE2b50Be3e087353
22
REACT_APP_FOREIGN_BRIDGE_ADDRESS=0xE405F6872cE38a7a4Ff63DcF946236D458c2ca3a
33
REACT_APP_FOREIGN_HTTP_PARITY_URL=https://kovan.infura.io/mew
44
REACT_APP_HOME_HTTP_PARITY_URL=https://sokol.poa.network
5-
REACT_APP_GAS_PRICE_SPEED_TYPE=fast
5+
REACT_APP_HOME_NATIVE_NAME=POA
6+
7+
REACT_APP_HOME_NETWORK_NAME="POA Sokol"
8+
REACT_APP_FOREIGN_NETWORK_NAME=Kovan
9+
10+
REACT_APP_HOME_EXPLORER_TX_TEMPLATE=https://blockscout.com/poa/sokol/tx/%s
11+
REACT_APP_FOREIGN_EXPLORER_TX_TEMPLATE=https://blockscout.com/eth/kovan/tx/%s
12+
REACT_APP_HOME_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/poa/sokol/address/%s
13+
REACT_APP_FOREIGN_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/eth/kovan/address/%s
14+
15+
REACT_APP_HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
16+
REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
17+
REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
18+
REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
19+
20+
REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
21+
REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
22+
REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
23+
REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
.env.production.local
1919
.idea
2020

21+
# contracts build
22+
/src/contracts
23+
2124
npm-debug.log*
2225
yarn-debug.log*
2326
yarn-error.log*

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "submodules/poa-bridge-contracts"]
2+
path = submodules/poa-bridge-contracts
3+
url = https://github.com/poanetwork/poa-bridge-contracts.git

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v8.12

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ language: node_js
22
node_js:
33
- "8"
44
sudo: required
5+
6+
services:
7+
- docker
8+
59
dist: trusty
610
addons:
711
apt:
@@ -29,7 +33,7 @@ before_script:
2933
- sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
3034

3135
script:
32-
- npm run startBridge & npm run startE2e
3336
- npm run coverage
37+
- cd e2e-script && ./run-tests.sh
3438
after_script:
3539
- npm run coveralls

CODE_OF_CONDUCT.md

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
education, socio-economic status, nationality, personal appearance, race,
10+
religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at ziggy@poa.network. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
## Contributing
2+
3+
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.
4+
5+
1. Fork the repo ( https://github.com/poanetwork/bridge_ui/fork ).
6+
2. Create your feature branch (`git checkout -b my-new-feature`).
7+
3. Write tests that cover your work.
8+
4. Commit your changes (`git commit -am 'Add some feature'`).
9+
5. Push to your branch (`git push origin my-new-feature`).
10+
6. Create a new PR (Pull Request).
11+
12+
### General
13+
14+
* 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.
15+
* If during your PR you reveal a pre-existing bug and know how to fix it:
16+
1. If you can isolate the bug, fix it in a separate PR.
17+
2. If the fix depends on your other commits, add it in a separate commit to the same PR.
18+
19+
In either case, try to write a regression test that fails because of the bug but passes with your fix.
20+
21+
### Issues
22+
Creating and discussing [Issues](https://github.com/poanetwork/bridge-ui/issues) provides significant value to the project. If you find a bug you can report it in an Issue.
23+
24+
### Pull Requests
25+
All pull requests should include:
26+
* A clear, readable description of the purpose of the PR
27+
* A clear, readable description of changes
28+
* Any additional concerns or comments (optional)

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM node:8 as build-deps
2+
3+
WORKDIR /bridge
4+
COPY package.json .
5+
COPY package-lock.json .
6+
COPY . .
7+
RUN npm install

0 commit comments

Comments
 (0)