feat: merge cometbft v0.34.30 #6
Merged
Conversation
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
Signed-off-by: Thane Thomson <[email protected]>
…tbft#413) * docs: Fix version compatibility notice in readme Signed-off-by: Thane Thomson <[email protected]> * Fix grammar Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> (cherry picked from commit 1481f33) Co-authored-by: Thane Thomson <[email protected]>
* docs: Fix wording in upgrading guidelines Signed-off-by: Thane Thomson <[email protected]> * Simplify RPC reference from core docs Signed-off-by: Thane Thomson <[email protected]> * Fix incorrect link in godoc Signed-off-by: Thane Thomson <[email protected]> * docs: Fix OpenAPI docs rendering Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]>
* ci: Add release version check (cometbft#427) * ci: Add release version check Signed-off-by: Thane Thomson <[email protected]> * Fix workflow trigger Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> (cherry picked from commit 9d957b9) * Use Go 1.19 in v0.34.x Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: Thane Thomson <[email protected]>
…ometbft#437) Follow-up to cometbft#427. The workflow in cometbft#427 is merely informational, which is helpful, but can be bypassed. It's probably best to enforce this check when we push tags. If the check fails, it will prevent the cutting of a release, meaning we'll have to delete the tag, fix the version number, and tag again. --- #### PR checklist - [ ] Tests written/updated - [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog) - [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments (cherry picked from commit 0d3c2f3) Co-authored-by: Thane Thomson <[email protected]>
…metbft#457) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
cometbft#454) (cometbft#481) * docs: Emphasize docs on attack exposure for RPC in production (cometbft#454) For some reason this topic keeps coming up and I'd like us to emphasize this part of the documentation to put this topic to rest. Operators are, and have always been, ultimately responsible for securing their RPC endpoints if they choose to make them available publicly. [Rendered](https://github.com/cometbft/cometbft/blob/thane/docs/rpc-production/docs/core/running-in-production.md#rpc) --- #### PR checklist - [ ] Tests written/updated - [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog) - [x] Updated relevant documentation (`docs/` or `spec/`) and code comments (cherry picked from commit 93c0edd) # Conflicts: # docs/core/running-in-production.md * Resolve conflicts Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: Thane Thomson <[email protected]>
* Votes can't have zero height * Fix UUT to make UT pass * Trying 1.19.7 explicitly
…metbft#503) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…etbft#502) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sergio Mena <[email protected]>
Co-authored-by: Thane Thomson <[email protected]> (cherry picked from commit dea72b6) Co-authored-by: Ruslan Akhtariev <[email protected]>
* Reorganize existing guides (cometbft#492) * Moves all guides to a guids folder * Moves the actual intro to the README.md of the intro folder * Add guides to the guide README.md * Fixing links in docs/README.md (cherry picked from commit fa98b5e) # Conflicts: # docs/README.md # docs/guides/java.md # docs/guides/kotlin.md # docs/introduction/README.md # docs/introduction/what-is-cometbft.md * solving conflicts * Add guides to the guide README.md --------- Co-authored-by: Lasaro <[email protected]>
* Update go-built-in.md (cometbft#438) (cherry picked from commit 06eeaaa) # Conflicts: # docs/tutorials/go-built-in.md * Revert "Update go-built-in.md (cometbft#438)" This reverts commit b197c08. * Update go-built-in.md (cometbft#438) --------- Co-authored-by: Aliasgar Merchant <[email protected]> Co-authored-by: Sergio Mena <[email protected]> Co-authored-by: Adi Seredinschi <[email protected]> Co-authored-by: lasarojc <[email protected]>
…s and error (backport cometbft#496) (cometbft#520) * ABCI calls should crash/exit in all cases when the call itself reports and error (cometbft#496) * Review call hierarchies of ABCI methods to make sure they panic on error * Added changelog * Trying 1.20.2 explicitly (cherry picked from commit 2ab8598) # Conflicts: # .github/workflows/govulncheck.yml # state/execution.go * Revert "ABCI calls should crash/exit in all cases when the call itself reports and error (cometbft#496)" This reverts commit d2fae79. * [partial cherry-pick] ABCI calls should crash/exit in all cases when the call itself reports and error (cometbft#496) * Review call hierarchies of ABCI methods to make sure they panic on error * Added changelog * Trying 1.20.2 explicitly --------- Co-authored-by: Sergio Mena <[email protected]>
…ometbft#533) In (*PeerState).PickSendVote, there is a Debug-level log that includes the PeerState value as a logging field. By default, zerolog json-encodes a struct passed as a log field (when the struct doesn't implement zerolog.LogObjectMarshaler). Because PeerState didn't have a MarshalJSON method, the JSON encoder fell back to reflection to encode the PeerState value. Reflection did not acquire the lock, and there were data races resulting from an unsynchronized read while logging the PeerState, and concurrent (locked) writes at least during (*PeerState).SetHasProposal and (*PeerState).SetHasVote. Given that there was only one call to (*PeerState).ToJSON in the cometbft repo, it seemed appropriate to just rename ToJSON to MarshalJSON, as opposed to leaving ToJSON for backwards compatibility. Any third party calls to ToJSON should be able to easily change the method being called. Example data race (which is no longer reproducible with this change): ``` ================== WARNING: DATA RACE Read at 0x00c0004a4870 by goroutine 131: reflect.Value.Bool() /opt/homebrew/Cellar/go/1.20.1/libexec/src/reflect/value.go:288 +0x7c encoding/json.boolEncoder() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:539 +0x88 encoding/json.structEncoder.encode() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:759 +0x1bc encoding/json.structEncoder.encode-fm() <autogenerated>:1 +0x94 encoding/json.structEncoder.encode() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:759 +0x1bc encoding/json.structEncoder.encode-fm() <autogenerated>:1 +0x94 encoding/json.ptrEncoder.encode() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:943 +0x2a4 encoding/json.ptrEncoder.encode-fm() <autogenerated>:1 +0x6c encoding/json.(*encodeState).reflectValue() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:358 +0x74 encoding/json.(*encodeState).marshal() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:330 +0x1a0 encoding/json.Marshal() /opt/homebrew/Cellar/go/1.20.1/libexec/src/encoding/json/encode.go:161 +0xa0 github.com/rs/zerolog.init.1.func1() /Users/hh/go/pkg/mod/github.com/rs/[email protected]/encoder_json.go:21 +0x4c github.com/rs/zerolog/internal/json.Encoder.AppendInterface() /Users/hh/go/pkg/mod/github.com/rs/[email protected]/internal/json/types.go:366 +0x5c github.com/rs/zerolog.appendFieldList() /Users/hh/go/pkg/mod/github.com/rs/[email protected]/fields.go:273 +0x2b8c github.com/rs/zerolog.appendFields() /Users/hh/go/pkg/mod/github.com/rs/[email protected]/fields.go:21 +0x160 github.com/rs/zerolog.(*Event).Fields() /Users/hh/go/pkg/mod/github.com/rs/[email protected]/event.go:165 +0x90 cosmossdk.io/log.zeroLogWrapper.Debug() /Users/hh/go/pkg/mod/cosmossdk.io/[email protected]/logger.go:89 +0x18 github.com/cosmos/cosmos-sdk/server/log.(*CometZeroLogWrapper).Debug() <autogenerated>:1 +0x74 github.com/cometbft/cometbft/consensus.(*PeerState).PickSendVote() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:1138 +0x1bc github.com/cometbft/cometbft/consensus.(*Reactor).gossipVotesForHeight() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:794 +0x260 github.com/cometbft/cometbft/consensus.(*Reactor).gossipVotesRoutine() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:724 +0x2cc github.com/cometbft/cometbft/consensus.(*Reactor).AddPeer.func2() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:199 +0x58 Previous write at 0x00c0004a4870 by goroutine 130: github.com/cometbft/cometbft/consensus.(*PeerState).SetHasProposal() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:1096 +0x118 github.com/cometbft/cometbft/consensus.(*Reactor).gossipDataRoutine() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:617 +0xab8 github.com/cometbft/cometbft/consensus.(*Reactor).AddPeer.func1() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:198 +0x58 Goroutine 131 (running) created at: github.com/cometbft/cometbft/consensus.(*Reactor).AddPeer() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:199 +0x240 github.com/cometbft/cometbft/p2p.(*Switch).addPeer() /Users/hh/go/src/github.com/cometbft/cometbft/p2p/switch.go:855 +0x7b4 github.com/cometbft/cometbft/p2p.(*Switch).acceptRoutine() /Users/hh/go/src/github.com/cometbft/cometbft/p2p/switch.go:707 +0x704 github.com/cometbft/cometbft/p2p.(*Switch).OnStart.func1() /Users/hh/go/src/github.com/cometbft/cometbft/p2p/switch.go:241 +0x34 Goroutine 130 (running) created at: github.com/cometbft/cometbft/consensus.(*Reactor).AddPeer() /Users/hh/go/src/github.com/cometbft/cometbft/consensus/reactor.go:198 +0x164 github.com/cometbft/cometbft/p2p.(*Switch).addPeer() /Users/hh/go/src/github.com/cometbft/cometbft/p2p/switch.go:855 +0x7b4 github.com/cometbft/cometbft/p2p.(*Switch).acceptRoutine() /Users/hh/go/src/github.com/cometbft/cometbft/p2p/switch.go:707 +0x704 github.com/cometbft/cometbft/p2p.(*Switch).OnStart.func1() /Users/hh/go/src/github.com/cometbft/cometbft/p2p/switch.go:241 +0x34 ================== ``` --- #### PR checklist - [ ] Tests written/updated - [x] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog) - [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments (cherry picked from commit 587bc0b) Co-authored-by: Mark Rushakoff <[email protected]> Co-authored-by: Thane Thomson <[email protected]>
1. `InitialHeight` is specified twice 2. The contents of `Execute` refer to the parameter `state` not `s` (cherry picked from commit 9c5158a) Co-authored-by: Rootul P <[email protected]>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* removing non updated java and kotlin guides * upgradeing guides order * removing stale java and kotlin guides
…ometbft#472) (cometbft#561) * Fixes for OpenAPI (RPC) documents and QA docs restructuring (cometbft#472) * openapi doc fixes and QA docs fixes * rename title Co-authored-by: Thane Thomson <[email protected]> * fix text Co-authored-by: Thane Thomson <[email protected]> * add backquotes Co-authored-by: Thane Thomson <[email protected]> * update contact --------- Co-authored-by: Thane Thomson <[email protected]> (cherry picked from commit 3cd1037) # Conflicts: # docs/qa/CometBFT-QA-37.md # docs/qa/README.md # docs/qa/TMCore-QA-37.md # docs/qa/img37/200nodes_cmt037/all_experiments.png # docs/qa/img37/200nodes_cmt037/avg_mempool_size.png # docs/qa/img37/200nodes_cmt037/block_rate.png # docs/qa/img37/200nodes_cmt037/cpu.png # docs/qa/img37/200nodes_cmt037/e_75cb89a8-f876-4698-82f3-8aaab0b361af.png # docs/qa/img37/200nodes_cmt037/memory.png # docs/qa/img37/200nodes_cmt037/mempool_size.png # docs/qa/img37/200nodes_cmt037/peers.png # docs/qa/img37/200nodes_cmt037/rounds.png # docs/qa/img37/200nodes_cmt037/total_txs_rate.png # docs/qa/img37/200nodes_tm037/avg_mempool_size.png # docs/qa/img37/200nodes_tm037/block_rate_regular.png # docs/qa/img37/200nodes_tm037/cpu.png # docs/qa/img37/200nodes_tm037/memory.png # docs/qa/img37/200nodes_tm037/mempool_size.png # docs/qa/img37/200nodes_tm037/peers.png # docs/qa/img37/200nodes_tm037/rounds.png # docs/qa/img37/200nodes_tm037/total_txs_rate_regular.png # docs/qa/img37/200nodes_tm037/v037_200node_latencies.png # docs/qa/img37/200nodes_tm037/v037_latency_throughput.png # docs/qa/img37/200nodes_tm037/v037_r200c2_heights.png # docs/qa/img37/200nodes_tm037/v037_r200c2_load1.png # docs/qa/img37/200nodes_tm037/v037_r200c2_mempool_size.png # docs/qa/img37/200nodes_tm037/v037_r200c2_mempool_size_avg.png # docs/qa/img37/200nodes_tm037/v037_r200c2_peers.png # docs/qa/img37/200nodes_tm037/v037_r200c2_rounds.png # docs/qa/img37/200nodes_tm037/v037_r200c2_rss.png # docs/qa/img37/200nodes_tm037/v037_r200c2_rss_avg.png # docs/qa/img37/200nodes_tm037/v037_r200c2_total-txs.png # docs/qa/img37/200nodes_tm037/v037_report_tabbed.txt # docs/qa/img37/200nodes_tm037/v037_rotating_heights.png # docs/qa/img37/200nodes_tm037/v037_rotating_heights_ephe.png # docs/qa/img37/200nodes_tm037/v037_rotating_latencies.png # docs/qa/img37/200nodes_tm037/v037_rotating_load1.png # docs/qa/img37/200nodes_tm037/v037_rotating_peers.png # docs/qa/img37/200nodes_tm037/v037_rotating_rss_avg.png # docs/qa/img37/200nodes_tm037/v037_rotating_total-txs.png # rpc/openapi/openapi.yaml * mergify conflic fixes for v0.34 (cometbft#561) --------- Co-authored-by: Andy Nogueira <[email protected]>
…tbft#313) (cometbft#573) * e2e: add manifest fields to enable Prometheus on nodes (cometbft#313) * Add Prometheus and PrometheusListenAddr flags * Add Prometheus flag at root level, for all nodes * Add comment * Add PrometheusProxyPort; remove PrometheusListenAddr * Update startup log message * Update startup log message * Don't print the whole line in docker template * Remove flag from ManifestNode * Do not generate PrometheusProxyPort if config is disabled (cherry picked from commit a95a1df) # Conflicts: # test/e2e/pkg/testnet.go * Solve merge conflicts --------- Co-authored-by: Hernán Vanzetto <[email protected]> Co-authored-by: hvanz <[email protected]>
…metbft#570) * e2e: add prometheus flag to Generator CLI (cometbft#563) * Add prometheus flag to CLI * Fix CLI help message * Enable prometheus in nightly tests (cherry picked from commit 01c0188) # Conflicts: # .github/workflows/e2e-manual-multiversion.yml # .github/workflows/e2e-manual.yml # .github/workflows/e2e-nightly-34x.yml # .github/workflows/e2e-nightly-37x.yml # .github/workflows/e2e-nightly-main.yml * Solve merge conflicts * revert to 4 groups --------- Co-authored-by: Hernán Vanzetto <[email protected]> Co-authored-by: hvanz <[email protected]>
Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v7...v8) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Minor edit to RPC block search test * Applied @sergio-mena s comments (cherry picked from commit 9b9bd1a) Co-authored-by: Jasmina Malicevic <[email protected]>
…metbft#627) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
) Co-authored-by: Thane Thomson <[email protected]> (cherry picked from commit ba0d03b) Co-authored-by: Ari Rubinstein <[email protected]>
…ometbft#672) * cmd: Remove snake case deprecation warning (cometbft#626) * cmd: Remove snake case deprecation warning Signed-off-by: Thane Thomson <[email protected]> * cmd: Add snake_case aliases for commands that do not have Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> (cherry picked from commit c1214b2) # Conflicts: # cmd/cometbft/commands/reindex_event.go # cmd/cometbft/commands/root.go * Resolve conflicts Signed-off-by: Thane Thomson <[email protected]> * cmd: Restore short description for reindex-event to conform to v0.34 convention Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: Thane Thomson <[email protected]>
* Repro in e2e tests * Change something in the code * Fix race condition in `SwitchToConsensus` * Revert "Repro in e2e tests" This reverts commit 4f441f8. * RAII lock (cherry picked from commit 6a96eca) Co-authored-by: Sergio Mena <[email protected]>
* Update govulncheck.yml (cometbft#685) Always use the latest go patch. (cherry picked from commit 82a0d66) # Conflicts: # .github/workflows/govulncheck.yml * Use go 1.19 --------- Co-authored-by: Lasaro <[email protected]>
) Bumps [docker/login-action](https://github.com/docker/login-action) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1361) Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 4 to 5. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](goreleaser/goreleaser-action@v4...v5) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sergio Mena <[email protected]>
…bft#1362) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.2.1 to 5.0.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v4.2.1...v5.0.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sergio Mena <[email protected]>
…metbft#1360) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.10.0 to 3.0.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2.10.0...v3.0.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sergio Mena <[email protected]>
* update language (cometbft#1263) Using "a validator should" instead of 'we' (cherry picked from commit 3d1c36d) # Conflicts: # docs/core/configuration.md * Update docs/core/configuration.md --------- Co-authored-by: Aliasgar Merchant <[email protected]> Co-authored-by: lasaro <[email protected]>
* Bump go.mod Go version to v1.20 Signed-off-by: Thane Thomson <[email protected]> * go mod tidy Signed-off-by: Thane Thomson <[email protected]> * Bump Go version for CI workflows to v1.20 Signed-off-by: Thane Thomson <[email protected]> * Bump Go version used in Dockerfiles Signed-off-by: Thane Thomson <[email protected]> * Bump Go version in docs Signed-off-by: Thane Thomson <[email protected]> * Add changelog entry Signed-off-by: Thane Thomson <[email protected]> * Use latest golangci-lint, adapting config from main Signed-off-by: Thane Thomson <[email protected]> * p2p: Ignore lints for now Signed-off-by: Thane Thomson <[email protected]> * Fix loop variable aliasing --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: Sergio Mena <[email protected]>
Co-authored-by: Philip Offtermatt <[email protected]> Co-authored-by: lasaro <[email protected]> Co-authored-by: Sergio Mena <[email protected]>
…bft#1405) (cometbft#1407) * doc: improve documentation of BlockParams.MaxBytes (manual backport of cometbft#1405) * Applying @sergio-mena suggestion Co-authored-by: Sergio Mena <[email protected]> * Applying @jmalicevic suggestion Co-authored-by: Jasmina Malicevic <[email protected]> --------- Co-authored-by: Sergio Mena <[email protected]> Co-authored-by: Jasmina Malicevic <[email protected]>
…metbft#1447) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.26.1 to 1.27.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.26.1...v1.27.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…cometbft#1448) Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.11.0 to 0.12.0. - [Release notes](https://github.com/styfle/cancel-workflow-action/releases) - [Commits](styfle/cancel-workflow-action@0.11.0...0.12.0) --- updated-dependencies: - dependency-name: styfle/cancel-workflow-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…g (backport cometbft#1493) (cometbft#1496) * build(deps): Bump pillow from 9.3.0 to 10.0.1 in /scripts/qa/reporting (cometbft#1493) Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@9.3.0...10.0.1) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c1abe91) # Conflicts: # scripts/qa/reporting/requirements.txt * Resolve conflicts Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thane Thomson <[email protected]>
…metbft#1519) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.27.0 to 1.27.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.27.0...v1.27.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…metbft#1554) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.27.1 to 1.27.2. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.27.1...v1.27.2) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…metbft#1600) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.27.2 to 1.28.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.27.2...v1.28.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…-2023-2153 and https://pkg.go.dev/vuln/GO-2023-2102 (cometbft#1591) * Updates grpc and net dependencies to avoid https://pkg.go.dev/vuln/GO-2023-2153 and https://pkg.go.dev/vuln/GO-2023-2102 * ignore goconst lints in test code * Replicating part of cometbft#1531 to fix lint error * ignoring a specific lint error
…ometbft#1568) * mempool: Add metric size of pool in bytes (cometbft#1512) * mempool: Add metric `SizeBytes` * Safe concurrent read of txsBytes * Add changelog (cherry picked from commit b50bca3) # Conflicts: # mempool/metrics.gen.go # mempool/metrics.go * Solving conflict * removing generated metrics file * fix rebase merge --------- Co-authored-by: Hernán Vanzetto <[email protected]> Co-authored-by: lasarojc <[email protected]>
* Update SECURITY.md (cometbft#1626) Signed-off-by: Thane Thomson <[email protected]> (cherry picked from commit 62a97f2) # Conflicts: # SECURITY.md * Resolve conflicts Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: Thane Thomson <[email protected]>
…4.x (cometbft#1630) * Backports cometbft#1558 and cometbft#1584 to 0.37.x (cometbft#1611) Backports cometbft#1558 and cometbft#1584 to 0.38.x (cometbft#1592) * mempool: Limit gossip connections to persistent and non-persistent peers (experimental) (cometbft#1584) * Experimental - Reduce # of connections effectively used to gossip transactions out (cometbft#1558) * maxpeers for mempool * mempool: fix max_peers bcast routine active flag * Use semaphore to limit concurrency * Rename MaxPeers to MaxOutboundPeers * Add max_outbound_peers to config toml template * Rename in error message * Renams the parameter to highlight its experimental nature. Extend the AddPeer method to return an error. Moves the semaphone to outside the broadcast routine * reverting the addition of error to AddPeer. It fails if the context is done and handling this case will be done some other time, when an actual context is passed into acquire. * reverting the addition of error to AddPeer. It fails if the context is done and handling this case will be done some other time, when an actual context is passed into acquire. * Fixing lint issue * renaming semaphore to something more meaningful * make default value 0, which is the same as the current behavior. 10 is the recommended value. * adding new flag to manifest.go * Adding changelog * Improve the description of the parameter in the generated config file. * Add metric to track the current number of active connections. * Change metric to gauge type and rename it. * e2e: Allow disabling the PEX reactor on all nodes in the testnet * Apply suggestions from code review * Update config/config.go comment * fix lint error * Improve config description * Rename metric (remove experimental prefix) * Add unit test * Improve unit test * Update mempool/reactor.go comment --------- * Updating test file, leaving it broken for now * mempool: Limit gossip connections to persistent and non-persistent peers (experimental) (cometbft#1584) * Ignore persistent peers from limiting of outbound connections * Update 1558-experimental-gossip-limiting.md Update changeling * Fix typo in mempool/metrics.go * Use two independent configs and semaphores for persistent and non-persistent peers * Forgot to rename in test * Update metric description * Rename semaphores * Add comment to unit test --------- * Reverting to old way of reporting errors * Reverting change that shouldn't have been included in cherry-pick * Reverting tests to use older functions * fix rebase merge --------- Co-authored-by: Adi Seredinschi <[email protected]> Co-authored-by: Ethan Buchman <[email protected]> Co-authored-by: Daniel Cason <[email protected]> Co-authored-by: hvanz <[email protected]> Co-authored-by: Andy Nogueira <[email protected]> Co-authored-by: Sergio Mena <[email protected]> * Comment that feature only applies to v0 mempool * Fix new metric * This commit makes the test be the same as in main, that is, it ignores the order of transactions in the receiving reactor. (cometbft#1629) * Update .changelog/unreleased/improvements/1558-experimental-gossip-limiting.md Co-authored-by: Thane Thomson <[email protected]> --------- Co-authored-by: Adi Seredinschi <[email protected]> Co-authored-by: Ethan Buchman <[email protected]> Co-authored-by: Daniel Cason <[email protected]> Co-authored-by: Andy Nogueira <[email protected]> Co-authored-by: Sergio Mena <[email protected]> Co-authored-by: lasaro <[email protected]> Co-authored-by: Thane Thomson <[email protected]>
…t#1642) Signed-off-by: Thane Thomson <[email protected]>
* version: Bump to v0.34.30 Signed-off-by: Thane Thomson <[email protected]> * Build changelog Signed-off-by: Thane Thomson <[email protected]> --------- Signed-off-by: Thane Thomson <[email protected]>
Merge conficts:
both modified: .github/workflows/e2e-nightly-34x.yml
Accept our change to comment out the version
both modified: test/e2e/docker/Dockerfile
Accept their go version
Release v0.34.30
|
I'm going to ignore the govulncheck for now, since it might go green in a more recent version. |
michaelfig
approved these changes
Jan 17, 2024
There was a problem hiding this comment.
I carefully inspected your merge commits (with the aid of git log --remerge-diff) and the conflicts you resolved looked straightforward.
Also, I studied git diff v0.34.30 HEAD. Aside from the familiar (to me) committingClient code, it looked trivial.
Given that, this PR LGTM!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs: Agoric/agoric-sdk#8224
Description
Merge cometbft/cometbft v0.34.30 into the Agoric branch.
PR checklist
.changelog(we useunclog to manage our changelog)
docs/orspec/) and code comments