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.23 into main #674

Merged
merged 15 commits into from
Jul 24, 2023
Merged

Conversation

tnasu
Copy link
Member

@tnasu tnasu commented Jul 20, 2023

@tnasu tnasu self-assigned this Jul 20, 2023
@tnasu tnasu force-pushed the main-v0.34.23 branch 2 times, most recently from 60249bd to fe5b8c4 Compare July 20, 2023 11:58
@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #674 (3c2dbe1) into main (949633b) will increase coverage by 0.19%.
The diff coverage is 76.50%.

❗ Current head 3c2dbe1 differs from pull request most recent head ced843d. Consider uploading reports for the commit ced843d to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #674      +/-   ##
==========================================
+ Coverage   66.30%   66.50%   +0.19%     
==========================================
  Files         283      283              
  Lines       37611    37818     +207     
==========================================
+ Hits        24939    25149     +210     
+ Misses      10882    10871      -11     
- Partials     1790     1798       +8     
Impacted Files Coverage Δ
blockchain/v2/io.go 0.00% <0.00%> (ø)
blockchain/v2/routine.go 70.52% <ø> (+1.45%) ⬆️
libs/pubsub/query/query.peg.go 61.34% <ø> (ø)
p2p/conn/connection.go 80.38% <ø> (-0.58%) ⬇️
rpc/core/routes.go 0.00% <ø> (ø)
rpc/jsonrpc/client/http_uri_client.go 0.00% <0.00%> (ø)
state/state.go 84.61% <ø> (-0.14%) ⬇️
statesync/messages.go 100.00% <ø> (+13.43%) ⬆️
test/e2e/generator/main.go 55.00% <ø> (ø)
types/event_bus.go 58.04% <ø> (ø)
... and 31 more

... and 9 files with indirect coverage changes

tnasu and others added 9 commits July 21, 2023 11:04
* ci: Fix linter complaint (#9645)

Fixes a very silly linter complaint that makes absolutely no sense and is blocking the merging of several PRs.

---

- [x] Tests written/updated, or no tests needed
- [x] `CHANGELOG_PENDING.md` updated, or no changelog entry needed
- [x] Updated relevant documentation (`docs/`) and code comments, or no
      documentation updates needed

(cherry picked from commit 83b7f4ad5bc77a56fdb51ec39ae13c1204dde6e0)

* Resolve conflicts

Signed-off-by: Thane Thomson <[email protected]>

* ci: Sync golangci-lint config with main

Minus the spelling configuration that restricts spelling to US English
only.

Signed-off-by: Thane Thomson <[email protected]>

* make format

Signed-off-by: Thane Thomson <[email protected]>

* Remove usage of deprecated io/ioutil package

Signed-off-by: Thane Thomson <[email protected]>

* Remove unused mockBlockStore

Signed-off-by: Thane Thomson <[email protected]>

* blockchain/v2: Remove unused method

Signed-off-by: Thane Thomson <[email protected]>

* Bulk fix lints

Signed-off-by: Thane Thomson <[email protected]>

* lint: Ignore auto-generated query PEG

Signed-off-by: Thane Thomson <[email protected]>

Signed-off-by: Thane Thomson <[email protected]>
Co-authored-by: Thane Thomson <[email protected]>
Signed-off-by: Thane Thomson <[email protected]>

Signed-off-by: Thane Thomson <[email protected]>

Co-authored-by: Thane Thomson <[email protected]>
…(#9641)

* p2p: add a per-message type send and receive metric (#9622)

* p2p: ressurrect the p2p envelope and use to calculate message metric

Add new SendEnvelope, TrySendEnvelope, BroadcastEnvelope, and ReceiveEnvelope methods in the p2p package to work with the new envelope type.

Care was taken to ensure this was performed in a non-breaking manner.

Co-authored-by: William Banfield <[email protected]>
Co-authored-by: William Banfield <[email protected]>
tnasu and others added 3 commits July 22, 2023 18:40
* rpc: Add caching support (#9650)

* Set cache control in the HTTP-RPC response header

* Add a simply cache policy to the RPC routes

* add a condition to check the RPC request has default height settings

* fix cherry pick error

* update pending log

* use options struct intead of single parameter

* refacor FuncOptions to functional options

* add functional options in WebSocket RPC function

* revert doc

* replace deprecated function call

* revise functional options

* remove unuse comment

* fix revised error

* adjust cache-control settings

* Update rpc/jsonrpc/server/http_json_handler.go

Co-authored-by: Thane Thomson <[email protected]>

* linter: Fix false positive

Signed-off-by: Thane Thomson <[email protected]>

* rpc: Separate cacheable and non-cacheable HTTP response writers

Allows us to roll this change out in a non-API-breaking way, since this
is an additive change.

Signed-off-by: Thane Thomson <[email protected]>

* rpc: Ensure consistent caching strategy

Ensure a consistent caching strategy across both JSONRPC- and URI-based
requests.

This requires a bit of a refactor of the previous caching logic, which
is complicated a little by the complex reflection-based approach taken
in the Tendermint RPC.

Signed-off-by: Thane Thomson <[email protected]>

* rpc: Add more tests for caching

Signed-off-by: Thane Thomson <[email protected]>

* Update CHANGELOG_PENDING

Signed-off-by: Thane Thomson <[email protected]>

* light: Sync routes config with RPC core

Signed-off-by: Thane Thomson <[email protected]>

* rpc: Update OpenAPI docs

Signed-off-by: Thane Thomson <[email protected]>

Signed-off-by: Thane Thomson <[email protected]>
Co-authored-by: jayt106 <[email protected]>
Co-authored-by: jay tseng <[email protected]>
Co-authored-by: JayT106 <[email protected]>
(cherry picked from commit 816c6bac00c63a421a1bdaeccbc081c5346cb0d8)

* Fix conflict in CHANGELOG_PENDING

Signed-off-by: Thane Thomson <[email protected]>

* Resolve remaining conflicts

Signed-off-by: Thane Thomson <[email protected]>

Signed-off-by: Thane Thomson <[email protected]>
Co-authored-by: Thane Thomson <[email protected]>
@tnasu tnasu marked this pull request as ready for review July 24, 2023 01:03
@tnasu tnasu requested review from torao and ulbqb as code owners July 24, 2023 01:03
Copy link
Member

@ulbqb ulbqb left a comment

Choose a reason for hiding this comment

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

Just suggestion.

p2p/peer.go Outdated Show resolved Hide resolved
ulbqb
ulbqb previously approved these changes Jul 24, 2023
Co-authored-by: Shogo Hyodo <[email protected]>
@ulbqb ulbqb self-requested a review July 24, 2023 08:41
Copy link
Contributor

@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 merged commit 1cab268 into Finschia:main Jul 24, 2023
@tnasu tnasu deleted the main-v0.34.23 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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants