Merge remote-tracking branch 'comet/main' into sergio/merge-main-into…

…-abci++vef
ssrivatsan97 · Jan 13, 2023 · bf96a1a · bf96a1a
2 parents b575c25 + fe8a789
commit bf96a1a
Show file tree

Hide file tree

Showing 161 changed files with 3,187 additions and 2,437 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,6 +7,6 @@
 # global owners are only requested if there isn't a more specific
 # codeowner specified below. For this reason, the global codeowners
 # are often repeated in package-level definitions.
-* @ebuchman @tendermint/tendermint-engineering @adizere @lasarojc
+* @CometBFT/engineering
 
-/spec @ebuchman @tendermint/tendermint-research @tendermint/tendermint-engineering @adizere @lasarojc
+/spec @CometBFT/research @CometBFT/engineering
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,8 +7,8 @@ updates:
  target-branch: "main"
  open-pull-requests-limit: 10
  labels:
- - T:dependencies
- - S:automerge
+ - dependencies
+ - automerge
 
  - package-ecosystem: github-actions
  directory: "/"
@@ -17,8 +17,8 @@ updates:
  target-branch: "v0.37.x"
  open-pull-requests-limit: 10
  labels:
- - T:dependencies
- - S:automerge
+ - dependencies
+ - automerge
 
  - package-ecosystem: github-actions
  directory: "/"
@@ -27,14 +27,8 @@ updates:
  target-branch: "v0.34.x"
  open-pull-requests-limit: 10
  labels:
- - T:dependencies
- - S:automerge
-
- - package-ecosystem: npm
- directory: "/docs"
- schedule:
- interval: weekly
- open-pull-requests-limit: 10
+ - dependencies
+ - automerge
 
  ###################################
  ##
@@ -47,8 +41,8 @@ updates:
  target-branch: "main"
  open-pull-requests-limit: 10
  labels:
- - T:dependencies
- - S:automerge
+ - dependencies
+ - automerge
 
  - package-ecosystem: gomod
  directory: "/"
@@ -59,8 +53,8 @@ updates:
  # branches.
  open-pull-requests-limit: 0
  labels:
- - T:dependencies
- - S:automerge
+ - dependencies
+ - automerge
 
  - package-ecosystem: gomod
  directory: "/"
@@ -71,5 +65,5 @@ updates:
  # branches.
  open-pull-requests-limit: 0
  labels:
- - T:dependencies
- - S:automerge
+ - dependencies
+ - automerge
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -2,13 +2,13 @@ queue_rules:
  - name: default
  conditions:
  - base=main
- - label=S:automerge
+ - label=automerge
 
 pull_request_rules:
  - name: Automerge to main
  conditions:
  - base=main
- - label=S:automerge
+ - label=automerge
  actions:
  queue:
  method: squash
@@ -20,15 +20,15 @@ pull_request_rules:
  - name: backport patches to v0.37.x branch
  conditions:
  - base=main
- - label=S:backport-to-v0.37.x
+ - label=backport-to-v0.37.x
  actions:
  backport:
  branches:
  - v0.37.x
  - name: backport patches to v0.34.x branch
  conditions:
  - base=main
- - label=S:backport-to-v0.34.x
+ - label=backport-to-v0.34.x
  actions:
  backport:
  branches:

diff --git a/.github/workflows/e2e-manual-multiversion.yml b/.github/workflows/e2e-manual-multiversion.yml
@@ -0,0 +1,38 @@
+# Manually run the nightly E2E tests for a particular branch, but test with
+# multiple versions.
+name: e2e-manual-multiversion
+on:
+ workflow_dispatch:
+
+jobs:
+ e2e-manual-multiversion-test:
+ # Run parallel jobs for the listed testnet groups (must match the
+ # ./build/generator -g flag)
+ strategy:
+ fail-fast: false
+ matrix:
+ group: ['00', '01', '02', '03', '04']
+ runs-on: ubuntu-latest
+ timeout-minutes: 60
+ steps:
+ - uses: actions/setup-go@v3
+ with:
+ go-version: '1.18'
+
+ - uses: actions/checkout@v3
+
+ - name: Build
+ working-directory: test/e2e
+ # Run make jobs in parallel, since we can't run steps in parallel.
+ run: make -j2 docker generator runner tests
+
+ - name: Generate testnets
+ working-directory: test/e2e
+ # When changing -g, also change the matrix groups above
+ # Generate multi-version tests with double the quantity of E2E nodes
+ # based on the current branch as compared to the latest version.
+ run: ./build/generator -g 5 -m "latest:1,local:2" -d networks/nightly/
+
+ - name: Run ${{ matrix.p2p }} p2p testnets
+ working-directory: test/e2e
+ run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
@@ -11,7 +11,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- group: ['00', '01', '02', '03']
+ group: ['00', '01', '02', '03', '04']
  runs-on: ubuntu-latest
  timeout-minutes: 60
  steps:

diff --git a/.github/workflows/e2e-nightly-34x.yml b/.github/workflows/e2e-nightly-34x.yml
@@ -30,8 +30,7 @@ jobs:
  - name: Capture git repo info
  id: git-info
  run: |
- echo "::set-output name=branch::`git branch --show-current`"
- echo "::set-output name=commit::`git rev-parse HEAD`"
+ echo "branch=`git branch --show-current`" >> $GITHUB_OUTPUT
 
  - name: Build
  working-directory: test/e2e
@@ -49,7 +48,6 @@ jobs:
 
  outputs:
  git-branch: ${{ steps.git-info.outputs.branch }}
- git-commit: ${{ steps.git-info.outputs.commit }}
 
  e2e-nightly-fail:
  needs: e2e-nightly-test
@@ -63,7 +61,7 @@ jobs:
  SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
  BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
  RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
- COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ needs.e2e-nightly-test.outputs.git-commit }}"
+ COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test.outputs.git-branch }}"
  with:
  payload: |
  {
@@ -72,7 +70,7 @@ jobs:
  "type": "section",
  "text": {
  "type": "mrkdwn",
- "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> related to the failure."
+ "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMITS_URL }}|latest commits> possibly related to the failure."
  }
  }
  ]

diff --git a/.github/workflows/e2e-nightly-37x.yml b/.github/workflows/e2e-nightly-37x.yml
@@ -30,8 +30,7 @@ jobs:
  - name: Capture git repo info
  id: git-info
  run: |
- echo "::set-output name=branch::`git branch --show-current`"
- echo "::set-output name=commit::`git rev-parse HEAD`"
+ echo "branch=`git branch --show-current`" >> $GITHUB_OUTPUT
 
  - name: Build
  working-directory: test/e2e
@@ -49,7 +48,6 @@ jobs:
 
  outputs:
  git-branch: ${{ steps.git-info.outputs.branch }}
- git-commit: ${{ steps.git-info.outputs.commit }}
 
  e2e-nightly-fail:
  needs: e2e-nightly-test
@@ -63,7 +61,7 @@ jobs:
  SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
  BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
  RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
- COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ needs.e2e-nightly-test.outputs.git-commit }}"
+ COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ needs.e2e-nightly-test.outputs.git-branch }}"
  with:
  payload: |
  {
@@ -72,7 +70,7 @@ jobs:
  "type": "section",
  "text": {
  "type": "mrkdwn",
- "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> related to the failure."
+ "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMITS_URL }}|latest commits> possibly related to the failure."
  }
  }
  ]

diff --git a/.github/workflows/e2e-nightly-main.yml b/.github/workflows/e2e-nightly-main.yml
@@ -52,7 +52,7 @@ jobs:
  SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
  BRANCH: ${{ github.ref_name }}
  RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
- COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"
+ COMMITS_URL: "${{ github.server_url }}/${{ github.repository }}/commits/${{ github.ref_name }}"
  with:
  payload: |
  {
@@ -61,7 +61,7 @@ jobs:
  "type": "section",
  "text": {
  "type": "mrkdwn",
- "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> related to the failure."
+ "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMITS_URL }}|latest commits> possibly related to the failure."
  }
  }
  ]

diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml
@@ -64,7 +64,7 @@ jobs:
 
  - name: Set crashers count
  working-directory: test/fuzz
- run: echo "::set-output name=count::$(find . -type d -name 'crashers' | xargs -I % sh -c 'ls % | wc -l' | awk '{total += $1} END {print total}')"
+ run: echo "count=$(find . -type d -name 'crashers' | xargs -I % sh -c 'ls % | wc -l' | awk '{total += $1} END {print total}')" >> $GITHUB_OUTPUT
  id: set-crashers-count
 
  outputs:

diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
@@ -0,0 +1,31 @@
+name: Check for Go vulnerabilities
+# Runs https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck to proactively
+# check for vulnerabilities in code packages if there were any changes made to
+# any Go code or dependencies.
+#
+# Run `make vulncheck` from the root of the repo to run this workflow locally.
+on:
+ pull_request:
+ push:
+ branches:
+ - main
+ - release/**
+
+jobs:
+ govulncheck:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/setup-go@v3
+ with:
+ go-version: "1.18"
+ - uses: actions/checkout@v3
+ - uses: technote-space/get-diff-action@v6
+ with:
+ PATTERNS: |
+ **/*.go
+ go.mod
+ go.sum
+ Makefile
+ - name: govulncheck
+ run: make vulncheck
+ if: "env.GIT_DIFF != ''"
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -21,7 +21,7 @@ jobs:
  go-version: '1.18'
 
  - name: Build
- uses: goreleaser/goreleaser-action@v3
+ uses: goreleaser/goreleaser-action@v4
  if: ${{ github.event_name == 'pull_request' }}
  with:
  version: latest
@@ -31,7 +31,7 @@ jobs:
  - run: echo https://github.com/tendermint/tendermint/blob/${GITHUB_REF#refs/tags/}/CHANGELOG_PENDING.md > ../release_notes.md
 
  - name: Release
- uses: goreleaser/goreleaser-action@v3
+ uses: goreleaser/goreleaser-action@v4
  if: startsWith(github.ref, 'refs/tags/')
  with:
  version: latest

diff --git a/.github/workflows/proto-lint.yml b/.github/workflows/proto-lint.yml
@@ -15,7 +15,7 @@ jobs:
  timeout-minutes: 5
  steps:
  - uses: actions/checkout@v3
- - uses: bufbuild/buf-setup-action@v1.9.0
+ - uses: bufbuild/buf-setup-action@v1.11.0
  - uses: bufbuild/buf-lint-action@v1
  with:
  input: 'proto'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
  go-version: '1.18'
 
  - name: Build
- uses: goreleaser/goreleaser-action@v3
+ uses: goreleaser/goreleaser-action@v4
  if: ${{ github.event_name == 'pull_request' }}
  with:
  version: latest
@@ -28,7 +28,7 @@ jobs:
  - run: echo https://github.com/tendermint/tendermint/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md
 
  - name: Release
- uses: goreleaser/goreleaser-action@v3
+ uses: goreleaser/goreleaser-action@v4
  if: startsWith(github.ref, 'refs/tags/')
  with:
  version: latest

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -7,7 +7,7 @@ jobs:
  stale:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/stale@v6
+ - uses: actions/stale@v7
  with:
  repo-token: ${{ secrets.GITHUB_TOKEN }}
  stale-pr-message: "This pull request has been automatically marked as stale because it has not had

diff --git a/.github/workflows/docker.yml → .github/workflows/tendermint-docker.yml b/.github/workflows/docker.yml → .github/workflows/tendermint-docker.yml
@@ -1,6 +1,6 @@
 name: Docker
 # Build & Push rebuilds the Tendermint docker image on every push to main and creation of tags
-# and pushes the image to https://hub.docker.com/r/tendermint/tendermint
+# and pushes the image to https://hub.docker.com/r/cometbft/tendermint
 on:
  push:
  branches:
@@ -19,7 +19,7 @@ jobs:
  - name: Prepare
  id: prep
  run: |
- DOCKER_IMAGE=tendermint/tendermint
+ DOCKER_IMAGE=cometbft/tendermint
  VERSION=noop
  if [[ $GITHUB_REF == refs/tags/* ]]; then
  VERSION=${GITHUB_REF#refs/tags/}
@@ -33,7 +33,7 @@ jobs:
  if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
  TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION}"
  fi
- echo ::set-output name=tags::${TAGS}
+ echo "tags=${TAGS}" >> $GITHUB_OUTPUT
 
  - name: Set up QEMU
  uses: docker/setup-qemu-action@master