-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #940 from cffls/qa
Merge develop into qa
- Loading branch information
Showing
53 changed files
with
1,323 additions
and
991 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,22 @@ | ||
| defaultStake: 10000 | ||
| defaultFee: 2000 | ||
| borChainId: "15001" | ||
| borChainId: 15001 | ||
| heimdallChainId: heimdall-15001 | ||
| contractsBranch: jc/v0.3.1-backport | ||
| contractsBranch: 2ed59de3641c407c64def1b40bcd090cb9cc048a | ||
| genesisContractsBranch: master | ||
| sprintSize: | ||
| - '64' | ||
| blockNumber: | ||
| - '0' | ||
| blockTime: | ||
| - '2' | ||
| numOfValidators: 3 | ||
| numOfNonValidators: 0 | ||
| ethURL: http://ganache:9545 | ||
| ethHostUser: ubuntu | ||
| devnetType: docker | ||
| borDockerBuildContext: "https://github.com/maticnetwork/bor.git#develop" | ||
| heimdallDockerBuildContext: "../../heimdall" | ||
| heimdallDockerBuildContext: "../../heimdall" | ||
| sprintSizeBlockNumber: | ||
| - '0' | ||
| numOfArchiveNodes: 0 |
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,49 @@ | ||
| # Description | ||
|
|
||
| Please provide a detailed description of what was done in this PR | ||
|
|
||
| # Changes | ||
|
|
||
| - [ ] Bugfix (non-breaking change that solves an issue) | ||
| - [ ] Hotfix (change that solves an urgent issue, and requires immediate attention) | ||
| - [ ] New feature (non-breaking change that adds functionality) | ||
| - [ ] Breaking change (change that is not backwards-compatible and/or changes current functionality) | ||
| - [ ] Changes only for a subset of nodes | ||
|
|
||
| # Breaking changes | ||
|
|
||
| Please complete this section if any breaking changes have been made, otherwise delete it | ||
|
|
||
| # Nodes audience | ||
|
|
||
| In case this PR includes changes that must be applied only to a subset of nodes, please specify how you handled it (e.g. by adding a flag with a default value...) | ||
|
|
||
| # Checklist | ||
|
|
||
| - [ ] I have added at least 2 reviewer or the whole pos-v1 team | ||
| - [ ] I have added sufficient documentation in code | ||
| - [ ] I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply | ||
|
|
||
| # Cross repository changes | ||
|
|
||
| - [ ] This PR requires changes to bor | ||
| - In case link the PR here: | ||
| - [ ] This PR requires changes to matic-cli | ||
| - In case link the PR here: | ||
|
|
||
| ## Testing | ||
|
|
||
| - [ ] I have added unit tests | ||
| - [ ] I have added tests to CI | ||
| - [ ] I have tested this code manually on local environment | ||
| - [ ] I have tested this code manually on remote devnet using express-cli | ||
| - [ ] I have tested this code manually on mumbai | ||
| - [ ] I have created new e2e tests into express-cli | ||
|
|
||
| ### Manual tests | ||
|
|
||
| Please complete this section with the steps you performed if you ran manual tests for this functionality, otherwise delete it | ||
|
|
||
| # Additional comments | ||
|
|
||
| Please post additional comments in this section if you have them, otherwise delete it |
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,90 @@ | ||
| name: Security CI | ||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| snyk: | ||
| name: Snyk and Publish | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout Source | ||
| uses: actions/checkout@master | ||
| - name: Run Snyk to check for vulnerabilities | ||
| uses: snyk/actions/golang@master | ||
| continue-on-error: true | ||
| env: | ||
| SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} | ||
| with: | ||
| args: --org=${{ secrets.SNYK_ORG }} --severity-threshold=medium --sarif-file-output=snyk.sarif | ||
| - name: Upload result to GitHub Code Scanning | ||
| uses: github/codeql-action/upload-sarif@v2 | ||
| with: | ||
| sarif_file: snyk.sarif | ||
|
|
||
| snyk-code: | ||
| name: Snyk Code and Publish | ||
| runs-on: ubuntu-latest | ||
| continue-on-error: true | ||
| steps: | ||
| - name: Checkout Source | ||
| uses: actions/checkout@master | ||
| - name: Run Snyk SAST to check for code vulnerabilities | ||
| uses: snyk/actions/golang@master | ||
| continue-on-error: true | ||
| env: | ||
| SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} | ||
| with: | ||
| args: --org=${{ secrets.SNYK_ORG }} --sarif-file-output=snyk.sarif | ||
| command: code test | ||
| - name: Upload result to GitHub Code Scanning | ||
| uses: github/codeql-action/upload-sarif@v2 | ||
| with: | ||
| sarif_file: snyk.sarif | ||
|
|
||
| govuln: | ||
| name: Run govuln check and Publish | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Running govulncheck | ||
| uses: Templum/[email protected] | ||
| continue-on-error: true | ||
| env: | ||
| DEBUG: "true" | ||
| with: | ||
| go-version: 1.18 | ||
| vulncheck-version: latest | ||
| package: ./... | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| fail-on-vuln: true | ||
|
|
||
| - name: Upload govulncheck report | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: raw-report | ||
| path: raw-report.json | ||
|
|
||
| sonarqube: | ||
| name: SonarQube | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| # Disabling shallow clone is recommended for improving relevancy of reporting. | ||
| fetch-depth: 0 | ||
|
|
||
| # Triggering SonarQube analysis as results of it are required by Quality Gate check. | ||
| - name: SonarQube Scan | ||
| uses: sonarsource/sonarqube-scan-action@master | ||
| env: | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} | ||
|
|
||
| # Check the Quality Gate status. | ||
| - name: SonarQube Quality Gate check | ||
| id: sonarqube-quality-gate-check | ||
| uses: sonarsource/sonarqube-quality-gate-action@master | ||
| # Force to fail step after specific time. | ||
| timeout-minutes: 5 | ||
| env: | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} |
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 |
|---|---|---|
|
|
@@ -17,3 +17,5 @@ logs | |
|
|
||
| data/ | ||
| dist/ | ||
|
|
||
| .dccache | ||
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,25 @@ | ||
| # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. | ||
| version: v1.25.0 | ||
| # ignores vulnerabilities until expiry date; change duration by modifying expiry date | ||
| ignore: | ||
| 'snyk:lic:golang:github.com:hashicorp:hcl:MPL-2.0': | ||
| - '*': | ||
| reason: 'As open source org, we have no issues with licenses' | ||
| created: 2022-11-11T09:31:08.546Z | ||
| 'snyk:lic:golang:github.com:hashicorp:go-bexpr:MPL-2.0': | ||
| - '*': | ||
| reason: 'As open source org, we have no issues with licenses' | ||
| created: 2022-11-11T09:31:21.042Z | ||
| 'snyk:lic:golang:github.com:richardknop:machinery:MPL-2.0': | ||
| - '*': | ||
| reason: 'As open source org, we have no issues with licenses' | ||
| created: 2022-11-11T09:31:31.555Z | ||
| 'snyk:lic:golang:github.com:maticnetwork:polyproto:GPL-3.0': | ||
| - '*': | ||
| reason: 'As open source org, we have no issues with licenses' | ||
| created: 2022-11-11T09:31:55.207Z | ||
| 'snyk:lic:golang:github.com:maticnetwork:heimdall:GPL-3.0': | ||
| - '*': | ||
| reason: 'As open source org, we have no issues with licenses' | ||
| created: 2022-11-11T09:32:07.833Z | ||
| patch: {} |
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 |
|---|---|---|
|
|
@@ -39,6 +39,7 @@ $ heimdalld rest-server | |
| ### Run bridge | ||
| ```bash | ||
| $ heimdalld bridge | ||
| ``` | ||
|
|
||
| ### Develop using Docker | ||
|
|
||
|
|
||
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,14 @@ | ||
| # Polygon Technology Security Information | ||
|
|
||
| ## Link to vulnerability disclosure details (Bug Bounty) | ||
| - Websites and Applications: https://hackerone.com/polygon-technology | ||
| - Smart Contracts: https://immunefi.com/bounty/polygon | ||
|
|
||
| ## Languages that our team speaks and understands. | ||
| Preferred-Languages: en | ||
|
|
||
| ## Security-related job openings at Polygon. | ||
| https://polygon.technology/careers | ||
|
|
||
| ## Polygon security contact details | ||
| [email protected] |
Oops, something went wrong.