Merge branch 'master' into wb/genesis-time-change

.github/auto-comment.yml

@@ -1,16 +1,16 @@
 pullRequestOpened: |
-  :wave: Thanks for creating a PR!   
+  :wave: Thanks for creating a PR!
 
-  Before we can merge this PR, please make sure that all the following items have been 
+  Before we can merge this PR, please make sure that all the following items have been
   checked off. If any of the checklist items are not applicable, please leave them but
-  write a little note why.   
+  write a little note why.
 
-  - [ ] Wrote tests  
-  - [ ] Updated CHANGELOG_PENDING.md   
-  - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.  
-  - [ ] Updated relevant documentation (`docs/`) and code comments  
-  - [ ] Re-reviewed `Files changed` in the Github PR explorer  
-  - [ ] Applied Appropriate Labels  
+  - [ ] Wrote tests
+  - [ ] Updated CHANGELOG_PENDING.md
+  - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
+  - [ ] Updated relevant documentation (`docs/`) and code comments
+  - [ ] Re-reviewed `Files changed` in the Github PR explorer
+  - [ ] Applied Appropriate Labels
 
 
-  Thank you for your contribution to Tendermint! :rocket:   
+  Thank you for your contribution to Tendermint! :rocket:

.github/linter/markdownlint.yml

@@ -1,8 +0,0 @@
-default: true,
-MD007: { "indent": 4 }
-MD013: false
-MD024: { siblings_only: true }
-MD025: false
-MD033: { no-inline-html: false }
-no-hard-tabs: false
-whitespace: false

.github/linters/markdownlint.yml

@@ -0,0 +1,8 @@
+default: true,
+MD007: {"indent": 4}
+MD013: false
+MD024: {siblings_only: true}
+MD025: false
+MD033: {no-inline-html: false}
+no-hard-tabs: false
+whitespace: false

.github/linters/yaml-lint.yml

@@ -0,0 +1,9 @@
+---
+# Default rules for YAML linting from super-linter.
+# See: See https://yamllint.readthedocs.io/en/stable/rules.html
+extends: default
+rules:
+  document-end: disable
+  document-start: disable
+  line-length: disable
+  truthy: disable

.github/workflows/docker.yml

@@ -1,13 +1,13 @@
 name: Docker
-#  Build & Push rebuilds the tendermint docker image on every push to master and creation of tags
+# Build & Push rebuilds the tendermint docker image on every push to master and creation of tags
 # and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags
 on:
   push:
     branches:
       - master
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
-      - "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
+      - "v[0-9]+.[0-9]+.[0-9]+"  # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v[0-9]+.[0-9]+.[0-9]+-rc*"  # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
 
 jobs:
   build:

.github/workflows/e2e-nightly-34x.yml

@@ -6,7 +6,7 @@
 
 name: e2e-nightly-34x
 on:
-  workflow_dispatch: # allow running workflow manually, in theory
+  workflow_dispatch:  # allow running workflow manually, in theory
   schedule:
     - cron: '0 2 * * *'
 
@@ -59,7 +59,7 @@ jobs:
           SLACK_MESSAGE: Nightly E2E tests failed on v0.34.x
           SLACK_FOOTER: ''
 
-  e2e-nightly-success: # may turn this off once they seem to pass consistently
+  e2e-nightly-success:  # may turn this off once they seem to pass consistently
     needs: e2e-nightly-test
     if: ${{ success() }}
     runs-on: ubuntu-latest

.github/workflows/e2e-nightly-35x.yml

@@ -5,7 +5,7 @@
 
 name: e2e-nightly-35x
 on:
-  workflow_dispatch: # allow running workflow manually
+  workflow_dispatch:  # allow running workflow manually
   schedule:
     - cron: '0 2 * * *'
 
@@ -59,7 +59,7 @@ jobs:
           SLACK_MESSAGE: Nightly E2E tests failed on v0.35.x
           SLACK_FOOTER: ''
 
-  e2e-nightly-success: # may turn this off once they seem to pass consistently
+  e2e-nightly-success:  # may turn this off once they seem to pass consistently
     needs: e2e-nightly-test
     if: ${{ success() }}
     runs-on: ubuntu-latest

.github/workflows/e2e-nightly-master.yml

@@ -5,7 +5,7 @@
 
 name: e2e-nightly-master
 on:
-  workflow_dispatch: # allow running workflow manually
+  workflow_dispatch:  # allow running workflow manually
   schedule:
     - cron: '0 2 * * *'
 
@@ -56,7 +56,7 @@ jobs:
           SLACK_MESSAGE: Nightly E2E tests failed on master
           SLACK_FOOTER: ''
 
-  e2e-nightly-success: # may turn this off once they seem to pass consistently
+  e2e-nightly-success:  # may turn this off once they seem to pass consistently
     needs: e2e-nightly-test
     if: ${{ success() }}
     runs-on: ubuntu-latest

.github/workflows/e2e.yml

@@ -2,7 +2,7 @@ name: e2e
 # Runs the CI end-to-end test network on all pushes to master or release branches
 # and every pull request, but only if any Go files have been changed.
 on:
-  workflow_dispatch: # allow running workflow manually
+  workflow_dispatch:  # allow running workflow manually
   pull_request:
   push:
     branches:
@@ -35,4 +35,3 @@ jobs:
         working-directory: test/e2e
         run: ./run-multiple.sh networks/ci.toml
         if: "env.GIT_DIFF != ''"
-

.github/workflows/fuzz-nightly.yml

@@ -1,7 +1,7 @@
 # Runs fuzzing nightly.
 name: Fuzz Tests
 on:
-  workflow_dispatch: # allow running workflow manually
+  workflow_dispatch:  # allow running workflow manually
   schedule:
     - cron: '0 3 * * *'
   pull_request:

.github/workflows/linkchecker.yml

@@ -1,5 +1,5 @@
 name: Check Markdown links
-on: 
+on:
   schedule:
     - cron: '* */24 * * *'
 jobs:

.github/workflows/linter.yml

@@ -23,10 +23,10 @@ jobs:
       - name: Lint Code Base
         uses: docker://github/super-linter:v4
         env:
-          LINTER_RULES_PATH: .
           VALIDATE_ALL_CODEBASE: true
           DEFAULT_BRANCH: master
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_MD: true
           VALIDATE_OPENAPI: true
           VALIDATE_YAML: true
+          YAML_CONFIG_FILE: yaml-lint.yml

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - "RC[0-9]/**"
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v[0-9]+.[0-9]+.[0-9]+"  # Push events to matching v*, i.e. v1.0, v20.15.10
 
 jobs:
   goreleaser:

.goreleaser.yml

@@ -29,8 +29,8 @@ release:
 
 archives:
   - files:
-    - LICENSE
-    - README.md
-    - UPGRADING.md
-    - SECURITY.md
-    - CHANGELOG.md
+      - LICENSE
+      - README.md
+      - UPGRADING.md
+      - SECURITY.md
+      - CHANGELOG.md

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 Friendly reminder: We have a [bug bounty program](https://hackerone.com/cosmos).
 
+## v0.35.1
+
+January 26, 2022
+
+Special thanks to external contributors on this release: @altergui, @odeke-em,
+@thanethomson
+
+### BREAKING CHANGES
+
+- CLI/RPC/Config
+
+  - [config] [\#7276](https://github.com/tendermint/tendermint/pull/7276) rpc: Add experimental config params to allow for subscription buffer size control (@thanethomson).
+
+- P2P Protocol
+
+  - [p2p] [\#7265](https://github.com/tendermint/tendermint/pull/7265) Peer manager reduces peer score for each failed dial attempts for peers that have not successfully dialed. (@tychoish)
+  - [p2p] [\#7594](https://github.com/tendermint/tendermint/pull/7594) always advertise self, to enable mutual address discovery. (@altergui)
+
+### FEATURES
+
+- [rpc] [\#7270](https://github.com/tendermint/tendermint/pull/7270) Add `header` and `header_by_hash` RPC Client queries. (@fedekunze) (@cmwaters)
+
+### IMPROVEMENTS
+
+- [internal/protoio] [\#7325](https://github.com/tendermint/tendermint/pull/7325) Optimized `MarshalDelimited` by inlining the common case and using a `sync.Pool` in the worst case. (@odeke-em)
+- [\#7338](https://github.com/tendermint/tendermint/pull/7338) pubsub: Performance improvements for the event query API (backport of #7319) (@creachadair)
+- [\#7252](https://github.com/tendermint/tendermint/pull/7252) Add basic metrics to the indexer package. (@creachadair)
+- [\#7338](https://github.com/tendermint/tendermint/pull/7338) Performance improvements for the event query API. (@creachadair)
+
+### BUG FIXES
+
+- [\#7310](https://github.com/tendermint/tendermint/issues/7310) pubsub: Report a non-nil error when shutting down (fixes #7306).
+- [\#7355](https://github.com/tendermint/tendermint/pull/7355) Fix incorrect tests using the PSQL sink. (@creachadair)
+- [\#7683](https://github.com/tendermint/tendermint/pull/7683) rpc: check error code for broadcast_tx_commit. (@tychoish)
+
 ## v0.35.0
 
 November 4, 2021

CHANGELOG_PENDING.md

@@ -47,6 +47,7 @@ Special thanks to external contributors on this release:
 ### FEATURES
 
 - [rpc] [\#7270](https://github.com/tendermint/tendermint/pull/7270) Add `header` and `header_by_hash` RPC Client queries. (@fedekunze)
+- [rpc] [\#7701] Add `ApplicationInfo` to `status` rpc call which contains the application version. (@jonasbostoen)
 - [cli] [#7033](https://github.com/tendermint/tendermint/pull/7033) Add a `rollback` command to rollback to the previous tendermint state in the event of non-determinstic app hash or reverting an upgrade.
 - [mempool, rpc] \#7041  Add removeTx operation to the RPC layer. (@tychoish)
 - [consensus] \#7354 add a new `synchrony` field to the `ConsensusParameter` struct for controlling the parameters of the proposer-based timestamp algorithm. (@williambanfield)

docker-compose.yml

@@ -65,5 +65,5 @@ networks:
     ipam:
       driver: default
       config:
-      -
-        subnet: 192.167.10.0/16
+        -
+          subnet: 192.167.10.0/16

internal/consensus/common_test.go

@@ -594,7 +594,7 @@ func ensureNewTimeout(t *testing.T, timeoutCh <-chan tmpubsub.Message, height in
 	ensureNewEvent(t, timeoutCh, height, round, timeoutDuration)
 }
 
-func ensureNewProposal(t *testing.T, proposalCh <-chan tmpubsub.Message, height int64, round int32) {
+func ensureNewProposal(t *testing.T, proposalCh <-chan tmpubsub.Message, height int64, round int32) types.BlockID {
 	t.Helper()
 	msg := ensureMessageBeforeTimeout(t, proposalCh, ensureTimeout)
 	proposalEvent, ok := msg.Data().(types.EventDataCompleteProposal)
@@ -602,6 +602,7 @@ func ensureNewProposal(t *testing.T, proposalCh <-chan tmpubsub.Message, height
 		msg.Data())
 	require.Equal(t, height, proposalEvent.Height)
 	require.Equal(t, round, proposalEvent.Round)
+	return proposalEvent.BlockID
 }
 
 func ensureNewValidBlock(t *testing.T, validBlockCh <-chan tmpubsub.Message, height int64, round int32) {

internal/consensus/metrics.go

@@ -80,6 +80,11 @@ type Metrics struct {
 	// timestamp and the timestamp of the latest prevote in a round where 100%
 	// of the voting power on the network issued prevotes.
 	FullPrevoteMessageDelay metrics.Gauge
+
+	// ProposalTimestampDifference is the difference between the timestamp in
+	// the proposal message and the local time of the validator at the time
+	// that the validator received the message.
+	ProposalTimestampDifference metrics.Histogram
 }
 
 // PrometheusMetrics returns Metrics build using Prometheus client library.
@@ -226,6 +231,15 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
 			Help: "Difference in seconds between the proposal timestamp and the timestamp " +
 				"of the latest prevote that achieved 100% of the voting power in the prevote step.",
 		}, labels).With(labelsAndValues...),
+		ProposalTimestampDifference: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "proposal_timestamp_difference",
+			Help: "Difference in seconds between the timestamp in the proposal " +
+				"message and the local time when the message was received. " +
+				"Only calculated when a new block is proposed.",
+			Buckets: []float64{-10, -.5, -.025, 0, .1, .5, 1, 1.5, 2, 10},
+		}, append(labels, "is_timely")).With(labelsAndValues...),
 	}
 }
 
@@ -249,15 +263,16 @@ func NopMetrics() *Metrics {
 
 		BlockIntervalSeconds: discard.NewHistogram(),
 
-		NumTxs:                    discard.NewGauge(),
-		BlockSizeBytes:            discard.NewHistogram(),
-		TotalTxs:                  discard.NewGauge(),
-		CommittedHeight:           discard.NewGauge(),
-		BlockSyncing:              discard.NewGauge(),
-		StateSyncing:              discard.NewGauge(),
-		BlockParts:                discard.NewCounter(),
-		QuorumPrevoteMessageDelay: discard.NewGauge(),
-		FullPrevoteMessageDelay:   discard.NewGauge(),
+		NumTxs:                      discard.NewGauge(),
+		BlockSizeBytes:              discard.NewHistogram(),
+		TotalTxs:                    discard.NewGauge(),
+		CommittedHeight:             discard.NewGauge(),
+		BlockSyncing:                discard.NewGauge(),
+		StateSyncing:                discard.NewGauge(),
+		BlockParts:                  discard.NewCounter(),
+		QuorumPrevoteMessageDelay:   discard.NewGauge(),
+		FullPrevoteMessageDelay:     discard.NewGauge(),
+		ProposalTimestampDifference: discard.NewHistogram(),
 	}
 }
 

internal/consensus/state.go

@@ -2017,6 +2017,7 @@ func (cs *State) defaultSetProposal(proposal *types.Proposal, recvTime time.Time
 	proposal.Signature = p.Signature
 	cs.Proposal = proposal
 	cs.ProposalReceiveTime = recvTime
+	cs.calculateProposalTimestampDifferenceMetric()
 	// We don't update cs.ProposalBlockParts if it is already set.
 	// This happens if we're already in cstypes.RoundStepCommit or if there is a valid block in the current round.
 	// TODO: We can check if Proposal is for a different block as this is a sign of misbehavior!
@@ -2562,6 +2563,19 @@ func repairWalFile(src, dst string) error {
 	return nil
 }
 
+func (cs *State) calculateProposalTimestampDifferenceMetric() {
+	if cs.Proposal != nil && cs.Proposal.POLRound == -1 {
+		tp := types.SynchronyParams{
+			Precision:    cs.state.ConsensusParams.Synchrony.Precision,
+			MessageDelay: cs.state.ConsensusParams.Synchrony.MessageDelay,
+		}
+
+		isTimely := cs.Proposal.IsTimely(cs.ProposalReceiveTime, tp, cs.state.InitialHeight)
+		cs.metrics.ProposalTimestampDifference.With("is_timely", fmt.Sprintf("%t", isTimely)).
+			Observe(cs.ProposalReceiveTime.Sub(cs.Proposal.Timestamp).Seconds())
+	}
+}
+
 // proposerWaitTime determines how long the proposer should wait to propose its next block.
 // If the result is zero, a block can be proposed immediately.
 //

internal/consensus/state_test.go

@@ -343,9 +343,7 @@ func TestStateFullRound1(t *testing.T) {
 	cs, vss := makeState(ctx, t, config, logger, 1)
 	height, round := cs.Height, cs.Round
 
-	pv, err := cs.privValidator.GetPubKey(ctx)
-	require.NoError(t, err)
-	voteCh := subscribeToVoter(ctx, t, cs, pv.Address())
+	voteCh := subscribe(ctx, t, cs.eventBus, types.EventQueryVote)
 	propCh := subscribe(ctx, t, cs.eventBus, types.EventQueryCompleteProposal)
 	newRoundCh := subscribe(ctx, t, cs.eventBus, types.EventQueryNewRound)
 
@@ -354,17 +352,16 @@ func TestStateFullRound1(t *testing.T) {
 
 	ensureNewRound(t, newRoundCh, height, round)
 
-	ensureNewProposal(t, propCh, height, round)
-	propBlockHash := cs.GetRoundState().ProposalBlock.Hash()
+	propBlock := ensureNewProposal(t, propCh, height, round)
 
-	ensurePrevoteMatch(t, voteCh, height, round, propBlockHash) // wait for prevote
+	ensurePrevoteMatch(t, voteCh, height, round, propBlock.Hash) // wait for prevote
 
 	ensurePrecommit(t, voteCh, height, round) // wait for precommit
 
 	// we're going to roll right into new height
 	ensureNewRound(t, newRoundCh, height+1, 0)
 
-	validateLastPrecommit(ctx, t, cs, vss[0], propBlockHash)
+	validateLastPrecommit(ctx, t, cs, vss[0], propBlock.Hash)
 }
 
 // nil is proposed, so prevote and precommit nil

internal/rpc/core/status.go

@@ -3,6 +3,7 @@ package core
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"time"
 
 	tmbytes "github.com/tendermint/tendermint/libs/bytes"
@@ -59,8 +60,14 @@ func (env *Environment) Status(ctx context.Context) (*coretypes.ResultStatus, er
 		}
 	}
 
+	var applicationInfo coretypes.ApplicationInfo
+	if abciInfo, err := env.ABCIInfo(ctx); err == nil {
+		applicationInfo.Version = fmt.Sprint(abciInfo.Response.AppVersion)
+	}
+
 	result := &coretypes.ResultStatus{
-		NodeInfo: env.P2PTransport.NodeInfo(),
+		NodeInfo:        env.P2PTransport.NodeInfo(),
+		ApplicationInfo: applicationInfo,
 		SyncInfo: coretypes.SyncInfo{
 			LatestBlockHash:     latestBlockHash,
 			LatestAppHash:       latestAppHash,

networks/remote/ansible/config.yml

@@ -1,8 +1,6 @@
 ---
-
-#Requires BINARY and CONFIGDIR variables set.
-#N=4 hosts by default.
-
+# Requires BINARY and CONFIGDIR variables set.
+# N=4 hosts by default.
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -15,4 +13,3 @@
     - config
     - unsafe_reset
     - start
-

networks/remote/ansible/install.yml

@@ -1,5 +1,4 @@
 ---
-
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -8,4 +7,3 @@
     - service: tendermint
   roles:
     - install
-

networks/remote/ansible/logzio.yml

@@ -1,7 +1,5 @@
 ---
-
-#Note: You need to add LOGZIO_TOKEN variable with your API key. Like tihs: ansible-playbook -e LOGZIO_TOKEN=ABCXYZ123456
-
+# Note: You need to add LOGZIO_TOKEN variable with your API key. Like tihs: ansible-playbook -e LOGZIO_TOKEN=ABCXYZ123456
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -11,4 +9,3 @@
     - JOURNALBEAT_BINARY: "{{lookup('env', 'GOPATH')}}/bin/journalbeat"
   roles:
     - logzio
-

networks/remote/ansible/reset.yml

@@ -1,5 +1,4 @@
 ---
-
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -10,5 +9,3 @@
     - stop
     - unsafe_reset
     - start
-
-

networks/remote/ansible/restart.yml

@@ -1,5 +1,4 @@
 ---
-
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -9,4 +8,3 @@
   roles:
     - stop
     - start
-

networks/remote/ansible/roles/config/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: Copy binary
   copy:
     src: "{{BINARY}}"
@@ -13,5 +12,4 @@
     dest: "/home/{{service}}/.{{service}}/"
     owner: "{{service}}"
     group: "{{service}}"
-  loop: [ 0, 1, 2, 3, 4, 5, 6, 7 ]
-
+  loop: [0, 1, 2, 3, 4, 5, 6, 7]

networks/remote/ansible/roles/install/handlers/main.yml

@@ -1,5 +1,3 @@
 ---
-
 - name: reload services
   systemd: "name={{service}} daemon_reload=yes enabled=yes"
-

networks/remote/ansible/roles/install/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: Create service group
   group: "name={{service}}"
 
@@ -12,4 +11,3 @@
 - name: Create service
   template: "src=systemd.service.j2 dest=/etc/systemd/system/{{service}}.service"
   notify: reload services
-

networks/remote/ansible/roles/logzio/handlers/main.yml

@@ -1,8 +1,6 @@
 ---
-
 - name: reload daemon
   command: "systemctl daemon-reload"
 
 - name: restart journalbeat
   service: name=journalbeat state=restarted
-

networks/remote/ansible/roles/logzio/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: Copy journalbeat binary
   copy: src="{{JOURNALBEAT_BINARY}}" dest=/usr/bin/journalbeat mode=0755
   notify: restart journalbeat
@@ -24,4 +23,3 @@
   notify:
   - reload daemon
   - restart journalbeat
-  

networks/remote/ansible/roles/start/tasks/main.yml

@@ -1,5 +1,3 @@
 ---
-
 - name: start service
   service: "name={{service}} state=started"
-

networks/remote/ansible/roles/status/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: application service status
   command: "service {{service}} status"
   changed_when: false
@@ -7,4 +6,3 @@
 
 - name: Result
   debug: var=status.stdout_lines
-

networks/remote/ansible/roles/stop/tasks/main.yml

@@ -1,5 +1,3 @@
 ---
-
 - name: stop service
   service: "name={{service}} state=stopped"
-

networks/remote/ansible/roles/unsafe_reset/tasks/main.yml

@@ -1,4 +1,3 @@
 - command: "{{service}} unsafe_reset_all {{ (service != 'tendermint') | ternary('node','') }} --home /home/{{service}}/.{{service}}"
   become_user: "{{service}}"
   become: yes
-

networks/remote/ansible/start.yml

@@ -1,5 +1,4 @@
 ---
-
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -8,4 +7,3 @@
     - service: tendermint
   roles:
     - start
-

networks/remote/ansible/status.yml

@@ -1,5 +1,4 @@
 ---
-
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -8,4 +7,3 @@
     - service: tendermint
   roles:
     - status
-

networks/remote/ansible/stop.yml

@@ -1,5 +1,4 @@
 ---
-
 - hosts: all
   user: root
   any_errors_fatal: true
@@ -8,4 +7,3 @@
     - service: tendermint
   roles:
     - stop
-

rpc/coretypes/responses.go

@@ -116,6 +116,10 @@ type SyncInfo struct {
 	BackFillBlocksTotal int64         `json:"backfill_blocks_total,string"`
 }
 
+type ApplicationInfo struct {
+	Version string `json:"version"`
+}
+
 // Info about the node's validator
 type ValidatorInfo struct {
 	Address     bytes.HexBytes
@@ -155,6 +159,7 @@ func (v *ValidatorInfo) UnmarshalJSON(data []byte) error {
 // Node Status
 type ResultStatus struct {
 	NodeInfo        types.NodeInfo        `json:"node_info"`
+	ApplicationInfo ApplicationInfo       `json:"application_info,omitempty"`
 	SyncInfo        SyncInfo              `json:"sync_info"`
 	ValidatorInfo   ValidatorInfo         `json:"validator_info"`
 	LightClientInfo types.LightClientInfo `json:"light_client_info,omitempty"`

types/params.go

@@ -132,7 +132,7 @@ func DefaultSynchronyParams() SynchronyParams {
 	// https://github.com/tendermint/tendermint/issues/7202
 	return SynchronyParams{
 		Precision:    500 * time.Millisecond,
-		MessageDelay: 2 * time.Second,
+		MessageDelay: 3 * time.Second,
 	}
 }