Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport tendermint-v0.34.20 into main #642

Merged
merged 31 commits into from
Jul 19, 2023
Merged

Conversation

tnasu
Copy link
Member

@tnasu tnasu commented Jun 20, 2023

Description

v0.34.20

STATUS: commit hash

Upgrade tendermint-v0.34.20

@tnasu tnasu self-assigned this Jun 20, 2023
@tnasu tnasu added the C: enhancement Classification: New feature or its request, or improvement in maintainability of code label Jun 20, 2023
@codecov
Copy link

codecov bot commented Jun 20, 2023

Codecov Report

Merging #642 (10dec2f) into main (32bffb8) will increase coverage by 0.10%.
The diff coverage is 69.55%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #642      +/-   ##
==========================================
+ Coverage   66.15%   66.25%   +0.10%     
==========================================
  Files         277      279       +2     
  Lines       37001    37157     +156     
==========================================
+ Hits        24477    24620     +143     
- Misses      10763    10766       +3     
- Partials     1761     1771      +10     
Impacted Files Coverage Δ
abci/client/grpc_client.go 69.37% <ø> (ø)
config/toml.go 74.19% <ø> (ø)
libs/os/os.go 28.78% <0.00%> (ø)
mempool/mempool.go 38.88% <0.00%> (-61.12%) ⬇️
mempool/metrics.go 0.00% <0.00%> (-17.40%) ⬇️
p2p/pex/addrbook.go 72.08% <0.00%> (+0.50%) ⬆️
rpc/core/events.go 0.00% <0.00%> (ø)
rpc/core/tx.go 59.77% <0.00%> (-2.59%) ⬇️
types/tx.go 88.09% <0.00%> (-5.81%) ⬇️
consensus/replay_stubs.go 53.33% <25.00%> (-3.81%) ⬇️
... and 19 more

... and 8 files with indirect coverage changes

@tnasu tnasu force-pushed the main-v0.34.20 branch 8 times, most recently from 14280ff to 4c4b5f9 Compare July 11, 2023 02:40
@zemyblue zemyblue mentioned this pull request Jul 13, 2023
9 tasks
tnasu and others added 17 commits July 13, 2023 20:22
Co-authored-by: Sam Kleinman <garen@tychoish.com>
A manual backport of #7263.

As a safety measure, don't allow a query string to be unreasonably long. The
query filter is not especially efficient, so a query that needs more than basic
detail should filter coarsely in the subscriber and refine on the client side.

This affects Subscribe and TxSearch queries.

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
* makefile: update buf commands to use tools.go (#8609)

This will keep the version of `buf` consistent between all developer machines.

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
@tnasu tnasu force-pushed the main-v0.34.20 branch 2 times, most recently from 611c340 to 268652c Compare July 13, 2023 13:02
tnasu and others added 9 commits July 13, 2023 23:02
* Updated mocks

* add reactor tests

* add v1 reactor tests

* Fix fuzz test for priority mempool

* e2e adapted to mempool v1; prio pool is default now

* Reverted default mempool to be fifo

* Changed buf version

* Added priority mempool to ci testnet

* Fixed linter

* Updated makefile

* Aligned makefile changes to v0.34.x

* Added go install for proto

* Add log message to warn about prioritized mempool bug

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Changelog message

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
Co-authored-by: Sam Kleinman <garen@tychoish.com>
Co-authored-by: Thane Thomson <connect@thanethomson.com>
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
This is a manual backport of the changes from these commits:

- bc49f66 Add more unit tests for the priority mempool. (#8961)
- 9b02094 Fix unbounded heap growth in the priority mempool. (#8944)

Imports and type signatures have been updated to match the v0.34 usage.

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
- Remove warning log for issue #8775.
- Fix call to FlushAsync (no error is reported).
- Don't log on rechecks, it's the default (manual backport of #8969).

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
A manual cherry-pick of 9e64c95.

The way this was originally structured, we reacquired the lock after issuing
the initial ABCI CheckTx call, only to immediately release it. Restructure the
code so that this redundant acquire is no longer necessary.

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
A manual backport of #8984.

This case is symmetric to what we did for CheckTx calls, where we release the
mempool mutex to ensure callbacks can fire during call setup.  We also need
this behaviour for application flush, for the same reason: The caller holds the
lock by contract from the Mempool interface.

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
…port #9000) (#9004)

This is a manual cherry-pick of commit b94470a6a42e8ffe7e7467521de5f51eb937c454.

In the original implementation transactions evicted for priority were also
removed from the cache. In addition, remove expired transactions from the
cache.

Related:

- Add Has method to cache implementations.
- Update tests to exercise this condition.

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
In the v0.34 line, the socket and gRPC clients require explicit flushes to
ensure that the client and server have received an async request.  Add these
calls explicitly where required in the backport of the priority mempool.

In addition, the gRPC client's flush plumbing was not fully hooked up in the
v0.34 line, so this change includes that update as well.

Co-authored: M. J. Fromberger <fromberger@interchain.io>
@tnasu tnasu marked this pull request as ready for review July 14, 2023 09:09
@tnasu tnasu requested review from torao and ulbqb as code owners July 14, 2023 09:09
ulbqb
ulbqb previously approved these changes Jul 18, 2023
torao
torao previously approved these changes Jul 19, 2023
Copy link
Member

@torao torao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tnasu tnasu dismissed stale reviews from torao and ulbqb via 294e011 July 19, 2023 08:36
@ulbqb ulbqb self-requested a review July 19, 2023 09:21
@tnasu tnasu merged commit 0dcca16 into Finschia:main Jul 19, 2023
26 checks passed
@tnasu tnasu deleted the main-v0.34.20 branch July 28, 2023 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C: enhancement Classification: New feature or its request, or improvement in maintainability of code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants