-
Notifications
You must be signed in to change notification settings - Fork 227
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge the develop branch to the master branch, preparation to v5.4.0
- Loading branch information
Showing
42 changed files
with
721 additions
and
1,482 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,16 +1,16 @@ | ||
node_modules | ||
deploy/node_modules | ||
**/node_modules | ||
.git | ||
.gitignore | ||
.dockerignore | ||
deploy/.env | ||
deploy/*.config | ||
deploy/*.env | ||
deploy/*.env* | ||
!deploy/.env.example | ||
docker-compose.yml | ||
Dockerfile | ||
*.log | ||
flats | ||
contracts.sublime-project | ||
contracts.sublime-workspace | ||
upgrade/.env* | ||
upgrade/*.env* | ||
!upgrade/.env.example | ||
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
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,92 @@ | ||
name: tokenbridge-contracts | ||
|
||
on: [push] | ||
|
||
jobs: | ||
lint: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/setup-node@v1 | ||
with: | ||
node-version: 10 | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
id: npm-cache | ||
with: | ||
path: node_modules | ||
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} | ||
- run: npm install | ||
if: ${{ !steps.npm-cache.outputs.cache-hit }} | ||
- run: npm run lint | ||
test: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/setup-node@v1 | ||
with: | ||
node-version: 10 | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
id: npm-cache | ||
with: | ||
path: node_modules | ||
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} | ||
- run: npm install | ||
if: ${{ !steps.npm-cache.outputs.cache-hit }} | ||
- run: npm run test | ||
gasreport: | ||
runs-on: ubuntu-latest | ||
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags') | ||
steps: | ||
- uses: actions/setup-node@v1 | ||
with: | ||
node-version: 10 | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
id: npm-cache | ||
with: | ||
path: node_modules | ||
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} | ||
- run: npm install | ||
if: ${{ !steps.npm-cache.outputs.cache-hit }} | ||
- run: npm run test:gasreport:ci | ||
env: | ||
CC_SECRET: ${{ secrets.CC_SECRET }} | ||
coverage: | ||
runs-on: ubuntu-latest | ||
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags') | ||
steps: | ||
- uses: actions/setup-node@v1 | ||
with: | ||
node-version: 10 | ||
- uses: actions/checkout@v2 | ||
- uses: actions/cache@v2 | ||
id: npm-cache | ||
with: | ||
path: node_modules | ||
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} | ||
- run: npm install | ||
if: ${{ !steps.npm-cache.outputs.cache-hit }} | ||
- run: npm run coverage | ||
- name: Coveralls | ||
uses: coverallsapp/github-action@master | ||
with: | ||
github-token: ${{ secrets.GITHUB_TOKEN }} | ||
publish: | ||
runs-on: ubuntu-latest | ||
needs: | ||
- lint | ||
- test | ||
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags') | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- if: startsWith(github.ref, 'refs/tags') | ||
run: echo "::set-env name=DOCKER_TAGS::${GITHUB_REF#refs/tags/},latest" | ||
- if: startsWith(github.ref, 'refs/heads') | ||
run: echo "::set-env name=DOCKER_TAGS::${GITHUB_REF#refs/heads/}-${GITHUB_SHA::8}" | ||
- uses: docker/build-push-action@v1 | ||
with: | ||
username: ${{ secrets.DOCKER_USERNAME }} | ||
password: ${{ secrets.DOCKER_PASSWORD }} | ||
repository: poanetwork/tokenbridge-contracts | ||
always_pull: true | ||
tags: ${{ env.DOCKER_TAGS }} |
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
This file was deleted.
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
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
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,42 @@ | ||
FROM node:10 | ||
|
||
RUN apt-get update | ||
RUN apt-get install -y netcat | ||
RUN apt-get clean | ||
|
||
WORKDIR /contracts | ||
|
||
COPY package.json . | ||
COPY package-lock.json . | ||
RUN npm install | ||
|
||
COPY ./deploy/package.json ./deploy/ | ||
COPY ./deploy/package-lock.json ./deploy/ | ||
RUN cd ./deploy; npm install; cd .. | ||
|
||
COPY ./upgrade/package.json ./upgrade/ | ||
COPY ./upgrade/package-lock.json ./upgrade/ | ||
RUN cd ./upgrade; npm install; cd .. | ||
|
||
COPY ./scripts ./scripts | ||
|
||
COPY truffle-config.js truffle-config.js | ||
COPY ./contracts ./contracts | ||
RUN npm run compile | ||
|
||
COPY flatten.sh flatten.sh | ||
RUN bash flatten.sh | ||
|
||
COPY .eslintignore .eslintignore | ||
COPY .eslintrc .eslintrc | ||
COPY .prettierrc .prettierrc | ||
|
||
COPY ./upgrade ./upgrade | ||
COPY deploy.sh deploy.sh | ||
COPY ./deploy ./deploy | ||
COPY .solhint.json .solhint.json | ||
COPY codechecks.yml codechecks.yml | ||
COPY ./test ./test | ||
|
||
ENV PATH="/contracts/:${PATH}" | ||
ENV NOFLAT=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
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
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
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
This file was deleted.
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
Oops, something went wrong.