Merge branch 'main' into fix-mempool-flaky-test

tendermint · Dec 2, 2022 · b696444 · b696444
2 parents 0c8d12e + 0952a99
commit b696444
Show file tree

Hide file tree

Showing 47 changed files with 312 additions and 167 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -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

diff --git a/.github/workflows/docs-deployment.yml b/.github/workflows/docs-deployment.yml
@@ -35,6 +35,8 @@ jobs:
  # versions will be available for the build.
  fetch-depth: 0
  - name: Build documentation
+ env:
+ NODE_OPTIONS: "--openssl-legacy-provider"
  run: |
  git config --global --add safe.directory "$PWD"
  make build-docs

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/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 Friendly reminder, we have a [bug bounty program](https://hackerone.com/cosmos).
 
+## v0.34.24
+
+*Nov 22, 2022*
+
+Apart from one minor bug fix, this release aims to optimize the output of the
+RPC (both HTTP and WebSocket endpoints). See our [upgrading
+guidelines](./UPGRADING.md#v03424) for more details.
+
+### IMPROVEMENTS
+
+- `[rpc]` [\#9724](https://github.com/tendermint/tendermint/issues/9724) Remove
+ useless whitespace in RPC output (@adizere, @thanethomson)
+
+### BUG FIXES
+
+- `[rpc]` [\#9692](https://github.com/tendermint/tendermint/issues/9692) Remove
+ `Cache-Control` header response from `/check_tx` endpoint (@JayT106)
+
 ## v0.34.23
 
 *Nov 9, 2022*

diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -34,6 +34,7 @@
 - [p2p/pex] \#6509 Improve addrBook.hash performance (@cuonglm)
 - [crypto/merkle] \#6443 & \#6513 Improve HashAlternatives performance (@cuonglm, @marbar3778)
 - [rpc] \#9650 Enable caching of RPC responses (@JayT106)
+- [consensus] \#9760 Save peer LastCommit correctly to achieve 50% reduction in gossiped precommits. (@williambanfield)
 
 ### BUG FIXES
 

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -41,6 +41,14 @@ Tendermint Core.
  this should have no effect on the wire-level encoding for UTF8-encoded
  strings.
 
+## v0.34.24
+
+Note that in [\#9724](https://github.com/tendermint/tendermint/pull/9724) we
+un-prettified the JSON output (i.e. removed all indentation) of the HTTP and
+WebSocket RPC for performance and subscription stability reasons. We recommend
+using a tool such as [jq](https://github.com/stedolan/jq) to obtain prettified
+output if you rely on that prettified output in some way.
+
 ## v0.34.20
 
 ### Feature: Priority Mempool

diff --git a/abci/types/messages.go b/abci/types/messages.go
@@ -4,6 +4,7 @@ import (
  "io"
 
  "github.com/cosmos/gogoproto/proto"
+
  "github.com/tendermint/tendermint/libs/protoio"
 )
 

diff --git a/consensus/msgs.go b/consensus/msgs.go
@@ -5,6 +5,7 @@ import (
  "fmt"
 
  "github.com/cosmos/gogoproto/proto"
+
  cstypes "github.com/tendermint/tendermint/consensus/types"
  "github.com/tendermint/tendermint/libs/bits"
  tmmath "github.com/tendermint/tendermint/libs/math"

diff --git a/consensus/reactor.go b/consensus/reactor.go
@@ -1351,6 +1351,7 @@ func (ps *PeerState) ApplyNewRoundStepMessage(msg *NewRoundStepMessage) {
  psRound := ps.PRS.Round
  psCatchupCommitRound := ps.PRS.CatchupCommitRound
  psCatchupCommit := ps.PRS.CatchupCommit
+ lastPrecommits := ps.PRS.Precommits
 
  startTime := tmtime.Now().Add(-1 * time.Duration(msg.SecondsSinceStartTime) * time.Second)
  ps.PRS.Height = msg.Height
@@ -1378,7 +1379,7 @@ func (ps *PeerState) ApplyNewRoundStepMessage(msg *NewRoundStepMessage) {
  // Shift Precommits to LastCommit.
  if psHeight+1 == msg.Height && psRound == msg.LastCommitRound {
  ps.PRS.LastCommitRound = msg.LastCommitRound
- ps.PRS.LastCommit = ps.PRS.Precommits
+ ps.PRS.LastCommit = lastPrecommits
  } else {
  ps.PRS.LastCommitRound = msg.LastCommitRound
  ps.PRS.LastCommit = nil

diff --git a/consensus/replay.go b/consensus/replay.go
@@ -254,7 +254,7 @@ func (h *Handshaker) Handshake(proxyApp proxy.AppConns) error {
 
  h.logger.Info("ABCI Handshake App Info",
  "height", blockHeight,
- "hash", appHash,
+ "hash", log.NewLazySprintf("%X", appHash),
  "software-version", res.Version,
  "protocol-version", res.AppVersion,
  )
@@ -271,7 +271,7 @@ func (h *Handshaker) Handshake(proxyApp proxy.AppConns) error {
  }
 
  h.logger.Info("Completed ABCI Handshake - Tendermint and App are synced",
- "appHeight", blockHeight, "appHash", appHash)
+ "appHeight", blockHeight, "appHash", log.NewLazySprintf("%X", appHash))
 
  // TODO: (on restart) replay mempool
 

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -9,8 +9,8 @@ module.exports = {
  editLinks: true,
  label: 'core',
  algolia: {
- id: "BH4D9OD16A",
- key: "59f0e2deb984aa9cdf2b3a5fd24ac501",
+ id: "QQFROLBNZC",
+ key: "f1b68b96fb31d8aa4a54412c44917a26",
  index: "tendermint"
  },
  versions: [

diff --git a/docs/pre.sh b/docs/pre.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-cp -a ../rpc/openapi/ .vuepress/public/rpc/
+mkdir -p .vuepress/public/rpc/
+cp -a ../rpc/openapi/* .vuepress/public/rpc/