additional fixes

.github/dependabot.yml

@@ -11,17 +11,6 @@ updates:
       - T:dependencies
       - S:automerge
 
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: weekly
-      day: monday
-    target-branch: "v0.34.x"
-    open-pull-requests-limit: 10
-    labels:
-      - T:dependencies
-      - S:automerge
-
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
@@ -38,7 +27,7 @@ updates:
     schedule:
       interval: weekly
       day: monday
-    target-branch: "v0.36.x"
+    target-branch: "v0.34.x"
     open-pull-requests-limit: 10
     labels:
       - T:dependencies
@@ -84,13 +73,3 @@ updates:
     labels:
       - T:dependencies
       - S:automerge
-
-  - package-ecosystem: gomod
-    directory: "/"
-    schedule:
-      interval: daily
-    target-branch: "v0.36.x"
-    open-pull-requests-limit: 10
-    labels:
-      - T:dependencies
-      - S:automerge

.github/mergify.yml

@@ -33,11 +33,3 @@ pull_request_rules:
       backport:
         branches:
           - v0.35.x
-  - name: backport patches to v0.36.x branch
-    conditions:
-      - base=master
-      - label=S:backport-to-v0.36.x
-    actions:
-      backport:
-        branches:
-          - v0.36.x

.github/workflows/check-generated.yml

@@ -25,9 +25,6 @@ jobs:
       - name: "Check generated mocks"
         run: |
           set -euo pipefail
-
-          readonly MOCKERY=2.12.3  # N.B. no leading "v"
-          curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
           make mockery 2>/dev/null
 
           if ! git diff --stat --exit-code ; then

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

@@ -1,7 +1,8 @@
-# Runs randomly generated E2E testnets nightly on the 0.34.x branch.
+# Runs randomly generated E2E testnets nightly
+# on the 0.34.x release branch
 
-# !! This file should be kept in sync with the e2e-nightly-master.yml file,
-# modulo changes to the version labels.
+# !! If you change something in this file, you probably want
+# to update the e2e-nightly-master workflow as well!
 
 name: e2e-nightly-34x
 on:

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

@@ -1,7 +1,7 @@
-# Runs randomly generated E2E testnets nightly on the v0.35.x branch.
+# Runs randomly generated E2E testnets nightly on v0.35.x.
 
-# !! This file should be kept in sync with the e2e-nightly-master.yml file,
-# modulo changes to the version labels.
+# !! If you change something in this file, you probably want
+# to update the e2e-nightly-master workflow as well!
 
 name: e2e-nightly-35x
 on:

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

@@ -1,74 +0,0 @@
-# Runs randomly generated E2E testnets nightly on the v0.36.x branch.
-
-# !! This file should be kept in sync with the e2e-nightly-master.yml file,
-# modulo changes to the version labels.
-
-name: e2e-nightly-36x
-on:
-  schedule:
-    - cron: '0 2 * * *'
-
-jobs:
-  e2e-nightly-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']
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.18'
-
-      - uses: actions/checkout@v3
-        with:
-          ref: 'v0.36.x'
-
-      - 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
-        run: ./build/generator -g 4 -d networks/nightly
-
-      - name: Run testnets in group ${{ matrix.group }}
-        working-directory: test/e2e
-        run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
-
-  e2e-nightly-fail-2:
-    needs: e2e-nightly-test
-    if: ${{ failure() }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: tendermint-internal
-          SLACK_USERNAME: Nightly E2E Tests
-          SLACK_ICON_EMOJI: ':skull:'
-          SLACK_COLOR: danger
-          SLACK_MESSAGE: Nightly E2E tests failed on v0.36.x
-          SLACK_FOOTER: ''
-
-  e2e-nightly-success:  # may turn this off once they seem to pass consistently
-    needs: e2e-nightly-test
-    if: ${{ success() }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Notify Slack on success
-        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: tendermint-internal
-          SLACK_USERNAME: Nightly E2E Tests
-          SLACK_ICON_EMOJI: ':white_check_mark:'
-          SLACK_COLOR: good
-          SLACK_MESSAGE: Nightly E2E tests passed on v0.36.x
-          SLACK_FOOTER: ''

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

@@ -1,8 +1,7 @@
 # Runs randomly generated E2E testnets nightly on master
 
-# !! Relevant changes to this file should be propagated to the e2e-nightly-<V>x
-# files for the supported backport branches, when appropriate, modulo version
-# markers.
+# !! If you change something in this file, you probably want
+# to update the e2e-nightly-34x workflow as well!
 
 name: e2e-nightly-master
 on:

.github/workflows/proto-lint.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.5.0
+      - uses: bufbuild/buf-setup-action@v1.4.0
       - uses: bufbuild/buf-lint-action@v1
         with:
           input: 'proto'

RELEASES.md

@@ -1,9 +1,8 @@
 # Releases
 
-Tendermint uses modified [semantic versioning](https://semver.org/) with each
-release following a `vX.Y.Z` format. Tendermint is currently on major version
-0 and uses the minor version to signal breaking changes. The `master` branch is
-used for active development and thus it is not advisable to build against it.
+Tendermint uses [semantic versioning](https://semver.org/) with each release following
+a `vX.Y.Z` format. The `master` branch is used for active development and thus it's
+advisable not to build against it.
 
 The latest changes are always initially merged into `master`.
 Releases are specified using tags and are built from long-lived "backport" branches
@@ -30,8 +29,8 @@ merging the pull request.
 
 ### Creating a backport branch
 
-If this is the first release candidate for a minor version release, e.g.
-v0.25.0, you get to have the honor of creating the backport branch!
+If this is the first release candidate for a major release, you get to have the
+honor of creating the backport branch!
 
 Note that, after creating the backport branch, you'll also need to update the
 tags on `master` so that `go mod` is able to order the branches correctly. You
@@ -78,8 +77,7 @@ the 0.35.x line.
 
 After doing these steps, go back to `master` and do the following:
 
-1. Tag `master` as the dev branch for the _next_ minor version release and push
-   it up to GitHub.
+1. Tag `master` as the dev branch for the _next_ major release and push it up to GitHub.
    For example:
    ```sh
    git tag -a v0.36.0-dev -m "Development base for Tendermint v0.36."
@@ -101,7 +99,7 @@ After doing these steps, go back to `master` and do the following:
 
 ## Release candidates
 
-Before creating an official release, especially a minor release, we may want to create a
+Before creating an official release, especially a major release, we may want to create a
 release candidate (RC) for our friends and partners to test out. We use git tags to
 create RCs, and we build them off of backport branches.
 
@@ -111,7 +109,7 @@ Tags for RCs should follow the "standard" release naming conventions, with `-rcX
 (Note that branches and tags _cannot_ have the same names, so it's important that these branches
 have distinct names from the tags/release names.)
 
-If this is the first RC for a minor release, you'll have to make a new backport branch (see above).
+If this is the first RC for a major release, you'll have to make a new backport branch (see above).
 Otherwise:
 
 1. Start from the backport branch (e.g. `v0.35.x`).
@@ -142,13 +140,11 @@ Note that this process should only be used for "true" RCs--
 release candidates that, if successful, will be the next release.
 For more experimental "RCs," create a new, short-lived branch and tag that instead.
 
-## Minor release
+## Major release
 
-This minor release process assumes that this release was preceded by release candidates.
+This major release process assumes that this release was preceded by release candidates.
 If there were no release candidates, begin by creating a backport branch, as described above.
 
-Before performing these steps, be sure the [Minor Release Checklist](#minor-release-checklist) has been completed.
-
 1. Start on the backport branch (e.g. `v0.35.x`)
 2. Run integration tests (`make test_integrations`) and the e2e nightlies.
 3. Prepare the release:
@@ -180,16 +176,16 @@ Before performing these steps, be sure the [Minor Release Checklist](#minor-rele
    - Commit these changes to `master` and backport them into the backport
      branch for this release.
 
-## Patch release
+## Minor release (point releases)
 
-Patch releases are done differently from minor releases: They are built off of
+Minor releases are done differently from major releases: They are built off of
 long-lived backport branches, rather than from master.  As non-breaking changes
 land on `master`, they should also be backported into these backport branches.
 
-Patch releases don't have release candidates by default, although any tricky
+Minor releases don't have release candidates by default, although any tricky
 changes may merit a release candidate.
 
-To create a patch release:
+To create a minor release:
 
 1. Checkout the long-lived backport branch: `git checkout v0.35.x`
 2. Run integration tests (`make test_integrations`) and the nightlies.
@@ -201,143 +197,11 @@ To create a patch release:
    - Bump the TMDefaultVersion in `version.go`
    - Bump the ABCI version number, if necessary.
      (Note that ABCI follows semver, and that ABCI versions are the only versions
-     which can change during patch releases, and only field additions are valid patch changes.)
+     which can change during minor releases, and only field additions are valid minor changes.)
 4. Open a PR with these changes that will land them back on `v0.35.x`
 5. Once this change has landed on the backport branch, make sure to pull it locally, then push a tag.
    - `git tag -a v0.35.1 -m 'Release v0.35.1'`
    - `git push origin v0.35.1`
 6. Create a pull request back to master with the CHANGELOG & version changes from the latest release.
-   - Remove all `R:patch` labels from the pull requests that were included in the release.
+   - Remove all `R:minor` labels from the pull requests that were included in the release.
    - Do not merge the backport branch into master.
-
-## Minor Release Checklist
-
-The following set of steps are performed on all releases that increment the
-_minor_ version, e.g. v0.25 to v0.26. These steps ensure that Tendermint is
-well tested, stable, and suitable for adoption by the various diverse projects
-that rely on Tendermint.
-
-### Feature Freeze
-
-Ahead of any minor version release of Tendermint, the software enters 'Feature
-Freeze' for at least two weeks. A feature freeze means that _no_ new features
-are added to the code being prepared for release. No code changes should be made
-to the code being released that do not directly improve pressing issues of code
-quality. The following must not be merged during a feature freeze:
-
-* Refactors that are not related to specific bug fixes.
-* Dependency upgrades.
-* New test code that does not test a discovered regression.
-* New features of any kind.
-* Documentation or spec improvements that are not related to the newly developed
-code.
-
-This period directly follows the creation of the [backport
-branch](#creating-a-backport-branch). The Tendermint team instead directs all
-attention to ensuring that the existing code is stable and reliable. Broken
-tests are fixed, flakey-tests are remedied, end-to-end test failures are
-thoroughly diagnosed and all efforts of the team are aimed at improving the
-quality of the code. During this period, the upgrade harness tests are run
-repeatedly and a variety of in-house testnets are run to ensure Tendermint
-functions at the scale it will be used by application developers and node
-operators.
-
-### Nightly End-To-End Tests
-
-The Tendermint team maintains [a set of end-to-end
-tests](https://github.com/tendermint/tendermint/blob/master/test/e2e/README.md#L1)
-that run each night on the latest commit of the project and on the code in the
-tip of each supported backport branch. These tests start a network of containerized
-Tendermint processes and run automated checks that the network functions as
-expected in both stable and unstable conditions. During the feature freeze,
-these tests are run nightly and must pass consistently for a release of
-Tendermint to be considered stable.
-
-### Upgrade Harness
-
-> TODO(williambanfield): Change to past tense and clarify this section once
-> upgrade harness is complete.
-
-The Tendermint team is creating an upgrade test harness to exercise the
-workflow of stopping an instance of Tendermint running one version of the
-software and starting up the same application running the next version. To
-support upgrade testing, we will add the ability to terminate the Tendermint
-process at specific pre-defined points in its execution so that we can verify
-upgrades work in a representative sample of stop conditions.
-
-### Large Scale Testnets
-
-The Tendermint end-to-end tests run a small network (~10s of nodes) to exercise
-basic consensus interactions. Real world deployments of Tendermint often have over 
-a hundred nodes just in the validator set, with many others acting as full
-nodes and sentry nodes. To gain more assurance before a release, we will also run
-larger-scale test networks to shake out emergent behaviors at scale.
-
-Large-scale test networks are run on a set of virtual machines (VMs). Each VM
-is equipped with 4 Gigabytes of RAM and 2 CPU cores. The network runs a very
-simple key-value store application. The application adds artificial delays to
-different ABCI calls to simulate a slow application. Each testnet is briefly
-run with no load being generated to collect a baseline performance. Once
-baseline is captured, a consistent load is applied across the network. This
-load takes the form of 10% of the running nodes all receiving a consistent
-stream of two hundred transactions per minute each.
-
-During each test net, the following metrics are monitored and collected on each
-node:
-
-* Consensus rounds per height
-* Maximum connected peers, Minimum connected peers, Rate of change of peer connections
-* Memory resident set size
-* CPU utilization
-* Blocks produced per minute
-* Seconds for each step of consensus (Propose, Prevote, Precommit, Commit)
-* Latency to receive block proposals
-
-For these tests we intentionally target low-powered host machines (with low core
-counts and limited memory) to ensure we observe similar kinds of resource contention 
-and limitation that real-world  deployments of Tendermint experience in production. 
-
-#### 200 Node Testnet
-
-To test the stability and performance of Tendermint in a real world scenario,
-a 200 node test network is run. The network comprises 5 seed nodes, 100
-validators and 95 non-validating full nodes. All nodes begin by dialing
-a subset of the seed nodes to discover peers. The network is run for several
-days, with metrics being collected continuously. In cases of changes to performance
-critical systems, testnets of larger sizes should be considered.
-
-#### Rotating Node Testnet
-
-Real-world deployments of Tendermint frequently see new nodes arrive and old
-nodes exit the network. The rotating node testnet ensures that Tendermint is
-able to handle this reliably. In this test, a network with 10 validators and
-3 seed nodes is started. A rolling set of 25 full nodes are started and each
-connects to the network by dialing one of the seed nodes. Once the node is able
-to blocksync to the head of the chain and begins producing blocks using
-Tendermint consensus it is stopped. Once stopped, a new node is started and
-takes its place. This network is run for several days.
-
-#### Network Partition Testnet
-
-Tendermint is expected to recover from network partitions. A partition where no
-subset of the nodes is left with the super-majority of the stake is expected to
-stop making blocks. Upon alleviation of the partition, the network is expected
-to once again become fully connected and capable of producing blocks. The
-network partition testnet ensures that Tendermint is able to handle this
-reliably at scale. In this test, a network with 100 validators and 95 full
-nodes is started. All validators have equal stake. Once the network is
-producing blocks, a set of firewall rules is deployed to create a partitioned
-network with 50% of the stake on one side and 50% on the other. Once the
-network stops producing blocks, the firewall rules are removed and the nodes
-are monitored to ensure they reconnect and that the network again begins
-producing blocks.
-
-#### Absent Stake Testnet
-
-Tendermint networks often run with _some_ portion of the voting power offline.
-The absent stake testnet ensures that large networks are able to handle this
-reliably. A set of 150 validator nodes and three seed nodes is started. The set
-of 150 validators is configured to only possess a cumulative stake of 67% of
-the total stake. The remaining 33% of the stake is configured to belong to
-a validator that is never actually run in the test network. The network is run
-for multiple days, ensuring that it is able to produce blocks without issue.

cmd/tendermint/commands/testnet.go

@@ -239,6 +239,7 @@ Example:
 		for i := 0; i < nValidators+nNonValidators; i++ {
 			nodeDir := filepath.Join(outputDir, fmt.Sprintf("%s%d", nodeDirPrefix, i))
 			config.SetRoot(nodeDir)
+			config.P2P.AllowDuplicateIP = true
 			if populatePersistentPeers {
 				persistentPeersWithoutSelf := make([]string, 0)
 				for j := 0; j < len(persistentPeers); j++ {

config/config.go

@@ -638,6 +638,9 @@ type P2PConfig struct { //nolint: maligned
 	// other peers)
 	PrivatePeerIDs string `mapstructure:"private-peer-ids"`
 
+	// Toggle to disable guard against peers connecting from the same ip.
+	AllowDuplicateIP bool `mapstructure:"allow-duplicate-ip"`
+
 	// Time to wait before flushing messages out on the connection
 	FlushThrottleTimeout time.Duration `mapstructure:"flush-throttle-timeout"`
 
@@ -654,6 +657,10 @@ type P2PConfig struct { //nolint: maligned
 	HandshakeTimeout time.Duration `mapstructure:"handshake-timeout"`
 	DialTimeout      time.Duration `mapstructure:"dial-timeout"`
 
+	// Testing params.
+	// Force dial to fail
+	TestDialFail bool `mapstructure:"test-dial-fail"`
+
 	// Makes it possible to configure which queue backend the p2p
 	// layer uses. Options are: "fifo" and "priority",
 	// with the default being "priority".
@@ -678,8 +685,10 @@ func DefaultP2PConfig() *P2PConfig {
 		SendRate:                5120000, // 5 mB/s
 		RecvRate:                5120000, // 5 mB/s
 		PexReactor:              true,
+		AllowDuplicateIP:        false,
 		HandshakeTimeout:        20 * time.Second,
 		DialTimeout:             3 * time.Second,
+		TestDialFail:            false,
 		QueueType:               "priority",
 	}
 }
@@ -706,6 +715,7 @@ func (cfg *P2PConfig) ValidateBasic() error {
 func TestP2PConfig() *P2PConfig {
 	cfg := DefaultP2PConfig()
 	cfg.ListenAddress = "tcp://127.0.0.1:36656"
+	cfg.AllowDuplicateIP = true
 	cfg.FlushThrottleTimeout = 10 * time.Millisecond
 	return cfg
 }

config/toml.go

@@ -319,6 +319,9 @@ pex = {{ .P2P.PexReactor }}
 # Warning: IPs will be exposed at /net_info, for more information https://github.com/tendermint/tendermint/issues/3055
 private-peer-ids = "{{ .P2P.PrivatePeerIDs }}"
 
+# Toggle to disable guard against peers connecting from the same ip.
+allow-duplicate-ip = {{ .P2P.AllowDuplicateIP }}
+
 # Peer connection configuration.
 handshake-timeout = "{{ .P2P.HandshakeTimeout }}"
 dial-timeout = "{{ .P2P.DialTimeout }}"

docs/package-lock.json

@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@vuepress/plugin-html-redirect": "^0.1.4",
-        "watchpack": "^2.4.0"
+        "watchpack": "^2.3.1"
       }
     },
     "node_modules/@algolia/cache-browser-local-storage": {
@@ -13471,9 +13471,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -24873,9 +24873,9 @@
       }
     },
     "watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
       "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",

docs/package.json

@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@vuepress/plugin-html-redirect": "^0.1.4",
-    "watchpack": "^2.4.0"
+    "watchpack": "^2.3.1"
   },
   "scripts": {
     "preserve": "./pre.sh",

docs/roadmap/roadmap.md

@@ -90,7 +90,7 @@ Has the same feature set as V0.37 but with a focus towards testing, protocol cor
 
 ## Post 1.0 Work
 
-- Improved block propagation with erasure coding and/or compact blocks. [More](https://github.com/tendermint/tendermint/issues/7932)
+- Improved block propagation with erasure coding and/or compact blocks. [More](https://github.com/tendermint/spec/issues/347)
 - Consensus engine refactor
 - Fork accountability protocol
 - Bidirectional ABCI

go.mod

@@ -23,11 +23,11 @@ require (
 	github.com/ory/dockertest v3.3.5+incompatible
 	github.com/prometheus/client_golang v1.12.2
 	github.com/rs/cors v1.8.2
-	github.com/rs/zerolog v1.27.0
+	github.com/rs/zerolog v1.26.1
 	github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.12.0
-	github.com/stretchr/testify v1.7.2
+	github.com/stretchr/testify v1.7.1
 	github.com/tendermint/tm-db v0.6.6
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
@@ -229,7 +229,7 @@ require (
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v3 v3.0.0 // indirect
 	honnef.co/go/tools v0.3.1 // indirect
 	mvdan.cc/gofumpt v0.3.1 // indirect
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect

go.sum

@@ -228,7 +228,6 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
@@ -966,9 +965,8 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U=
 github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
 github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
-github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs=
-github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -1067,9 +1065,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
 github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
@@ -1850,9 +1847,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

internal/consensus/state.go

@@ -519,10 +519,11 @@ func (cs *State) getOnStopCh() chan *cstypes.RoundState {
 func (cs *State) OnStop() {
 	// If the node is committing a new block, wait until it is finished!
 	if cs.GetRoundState().Step == cstypes.RoundStepCommit {
+		ct := time.Until(cs.commitTime(time.Now()))
 		select {
 		case <-cs.getOnStopCh():
-		case <-time.After(cs.state.ConsensusParams.Timeout.Commit):
-			cs.logger.Error("OnStop: timeout waiting for commit to finish", "time", cs.state.ConsensusParams.Timeout.Commit)
+		case <-time.After(ct):
+			cs.logger.Error("OnStop: timeout waiting for commit to finish", "time", ct)
 		}
 	}
 
@@ -1389,7 +1390,7 @@ func (cs *State) defaultDecideProposal(ctx context.Context, height int64, round
 	p := proposal.ToProto()
 
 	// wait the max amount we would wait for a proposal
-	ctxto, cancel := context.WithTimeout(ctx, cs.state.ConsensusParams.Timeout.Propose)
+	ctxto, cancel := context.WithTimeout(ctx, cs.proposeTimeout(round))
 	defer cancel()
 	if err := cs.privValidator.SignProposal(ctxto, cs.state.ChainID, p); err == nil {
 		proposal.Signature = p.Signature
@@ -2796,7 +2797,8 @@ func (cs *State) voteTimeout(round int32) time.Duration {
 }
 
 func (cs *State) commitTime(t time.Time) time.Time {
-	c := cs.state.ConsensusParams.Timeout.Commit
+	tp := cs.state.ConsensusParams.Timeout.TimeoutParamsOrDefaults()
+	c := tp.Commit
 	if cs.config.UnsafeCommitTimeoutOverride != 0 {
 		c = cs.config.UnsafeProposeTimeoutOverride
 	}
@@ -2804,10 +2806,12 @@ func (cs *State) commitTime(t time.Time) time.Time {
 }
 
 func (cs *State) bypassCommitTimeout() bool {
+	tp := cs.state.ConsensusParams.Timeout.TimeoutParamsOrDefaults()
+	b := tp.BypassCommitTimeout
 	if cs.config.UnsafeBypassCommitTimeoutOverride != nil {
 		return *cs.config.UnsafeBypassCommitTimeoutOverride
 	}
-	return cs.state.ConsensusParams.Timeout.BypassCommitTimeout
+	return b
 }
 
 func (cs *State) calculateProposalTimestampDifferenceMetric() {

rpc/jsonrpc/server/http_json_handler.go

@@ -81,15 +81,9 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han
 	}
 }
 
-func ensureBodyClose(next http.HandlerFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		defer r.Body.Close()
-		next(w, r)
-	}
-}
-
 func handleInvalidJSONRPCPaths(next http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		// Since the pattern "/" matches all paths not matched by other registered patterns,
 		//  we check whether the path is indeed "/", otherwise return a 404 error
 		if r.URL.Path != "/" {
 			http.NotFound(w, r)

rpc/jsonrpc/server/http_json_handler_test.go

@@ -223,7 +223,7 @@ func TestRPCNotificationInBatch(t *testing.T) {
 
 func TestUnknownRPCPath(t *testing.T) {
 	mux := testMux()
-	req, _ := http.NewRequest("GET", "http://localhost/unknownrpcpath", strings.NewReader(""))
+	req, _ := http.NewRequest("GET", "http://localhost/unknownrpcpath", nil)
 	rec := httptest.NewRecorder()
 	mux.ServeHTTP(rec, req)
 	res := rec.Result()

rpc/jsonrpc/server/rpc_func.go

@@ -26,11 +26,11 @@ func RegisterRPCFuncs(mux *http.ServeMux, funcMap map[string]*RPCFunc, logger lo
 		if fn.ws {
 			continue // skip websocket endpoints, not usable via GET calls
 		}
-		mux.HandleFunc("/"+name, ensureBodyClose(makeHTTPHandler(fn, logger)))
+		mux.HandleFunc("/"+name, makeHTTPHandler(fn, logger))
 	}
 
 	// Endpoints for POST.
-	mux.HandleFunc("/", ensureBodyClose(handleInvalidJSONRPCPaths(makeJSONRPCHandler(funcMap, logger))))
+	mux.HandleFunc("/", handleInvalidJSONRPCPaths(makeJSONRPCHandler(funcMap, logger)))
 }
 
 // Function introspection

scripts/confix/testdata/diff-35-36.txt

@@ -16,7 +16,6 @@
 -M p2p.max-num-inbound-peers
 -M p2p.max-num-outbound-peers
 -M p2p.persistent-peers-max-dial-period
--M p2p.seeds
 -M p2p.unconditional-peer-ids
 -M p2p.use-legacy
 +M rpc.event-log-max-items

scripts/confix/testdata/v36-config.toml

@@ -157,7 +157,7 @@ experimental-disable-websocket = false
 # the latest (up to EventLogMaxItems) will be available for subscribers to
 # fetch via the /events method.  If 0 (the default) the event log and the
 # /events RPC method are disabled.
-event-log-window-size = "30s"
+event-log-window-size = "0s"
 
 # The maxiumum number of events that may be retained by the event log.  If
 # this value is 0, no upper limit is set. Otherwise, items in excess of
@@ -221,6 +221,13 @@ laddr = "tcp://0.0.0.0:26656"
 # example: 159.89.10.97:26656
 external-address = ""
 
+# Comma separated list of seed nodes to connect to
+# We only use these if we can’t connect to peers in the addrbook
+# NOTE: not used by the new PEX reactor. Please use BootstrapPeers instead.
+# TODO: Remove once p2p refactor is complete
+# ref: https:#github.com/tendermint/tendermint/issues/5670
+seeds = ""
+
 # Comma separated list of peers to be added to the peer store
 # on startup. Either BootstrapPeers or PersistentPeers are
 # needed for peer discovery

scripts/mockery_generate.sh

@@ -1,15 +1,3 @@
 #!/bin/sh
-#
-# Invoke Mockery v2 to update generated mocks for the given type.
-#
-# This script runs a locally-installed "mockery" if available, otherwise it
-# runs the published Docker container. This legerdemain is so that the CI build
-# and a local build can work off the same script.
-#
-if ! which mockery ; then
-  mockery() {
-    docker run --rm -v "$PWD":/w --workdir=/w vektra/mockery:v2.12.3
-  }
-fi
 
-mockery --disable-version-string --case underscore --name "$@"
+go run github.com/vektra/mockery/v2 --disable-version-string --case underscore --name $*

test/e2e/generator/generate.go

@@ -14,14 +14,14 @@ var (
 	// testnetCombinations defines global testnet options, where we generate a
 	// separate testnet for each combination (Cartesian product) of options.
 	testnetCombinations = map[string][]interface{}{
-		"topology": {"single", "quad", "large"},
+		"topology":      {"single", "quad", "large"},
+		"initialHeight": {0, 1000},
 		"initialState": {
 			map[string]string{},
 			map[string]string{"initial01": "a", "initial02": "b", "initial03": "c"},
 		},
 		"validators": {"genesis", "initchain"},
 		"abci":       {"builtin", "outofprocess"},
-		"txSize":     {1024, 2048, 4096, 8192},
 	}
 
 	// The following specify randomly chosen values for testnet nodes.
@@ -63,11 +63,11 @@ var (
 	}
 
 	// the following specify random chosen values for the entire testnet
-	initialHeight = uniformChoice{0, 1000}
-	evidence      = uniformChoice{0, 1, 10}
-	ipv6          = uniformChoice{false, true}
-	keyType       = uniformChoice{types.ABCIPubKeyTypeEd25519, types.ABCIPubKeyTypeSecp256k1}
-	abciDelays    = uniformChoice{"none", "small", "large"}
+	evidence   = uniformChoice{0, 1, 10}
+	txSize     = uniformChoice{1024, 4096} // either 1kb or 4kb
+	ipv6       = uniformChoice{false, true}
+	keyType    = uniformChoice{types.ABCIPubKeyTypeEd25519, types.ABCIPubKeyTypeSecp256k1}
+	abciDelays = uniformChoice{"none", "small", "large"}
 
 	voteExtensionEnableHeightOffset = uniformChoice{int64(0), int64(10), int64(100)}
 	voteExtensionEnabled            = uniformChoice{true, false}
@@ -109,6 +109,7 @@ type Options struct {
 func generateTestnet(r *rand.Rand, opt map[string]interface{}) (e2e.Manifest, error) {
 	manifest := e2e.Manifest{
 		IPv6:             ipv6.Choose(r).(bool),
+		InitialHeight:    int64(opt["initialHeight"].(int)),
 		InitialState:     opt["initialState"].(map[string]string),
 		Validators:       &map[string]int64{},
 		ValidatorUpdates: map[string]map[string]int64{},
@@ -116,11 +117,9 @@ func generateTestnet(r *rand.Rand, opt map[string]interface{}) (e2e.Manifest, er
 		KeyType:          keyType.Choose(r).(string),
 		Evidence:         evidence.Choose(r).(int),
 		QueueType:        "priority",
-		TxSize:           opt["txSize"].(int),
+		TxSize:           txSize.Choose(r).(int),
 	}
 
-	manifest.InitialHeight = int64(initialHeight.Choose(r).(int))
-
 	if voteExtensionEnabled.Choose(r).(bool) {
 		manifest.VoteExtensionsEnableHeight = manifest.InitialHeight + voteExtensionEnableHeightOffset.Choose(r).(int64)
 	}

test/fuzz/oss-fuzz-build.sh

@@ -3,6 +3,15 @@
 # See https://github.com/google/oss-fuzz/blob/master/projects/tendermint/build.sh
 set -euo pipefail
 
+# Upgrade to Go 1.18. Remove when it's the default.
+apt-get update && apt-get install -y wget
+wget https://go.dev/dl/go1.18.2.linux-amd64.tar.gz
+
+mkdir -p temp-go
+rm -rf /root/.go/*
+tar -C temp-go/ -xzf go1.18.2.linux-amd64.tar.gz
+mv temp-go/go/* /root/.go/
+
 export FUZZ_ROOT="github.com/tendermint/tendermint"
 
 build_go_fuzzer() {