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

Main patch tm-v0.34.11 #359

Merged
merged 9 commits into from
Jan 20, 2022
Merged

Main patch tm-v0.34.11 #359

merged 9 commits into from
Jan 20, 2022

Conversation

tnasu
Copy link
Member

@tnasu tnasu commented Jan 7, 2022

@codecov
Copy link

codecov bot commented Jan 7, 2022

Codecov Report

Merging #359 (53a2a11) into main (fb1b65d) will increase coverage by 0.13%.
The diff coverage is 88.98%.

@@            Coverage Diff             @@
##             main     #359      +/-   ##
==========================================
+ Coverage   64.31%   64.45%   +0.13%     
==========================================
  Files         274      274              
  Lines       30692    30698       +6     
==========================================
+ Hits        19741    19785      +44     
+ Misses       9188     9144      -44     
- Partials     1763     1769       +6     
Impacted Files Coverage Δ
config/toml.go 68.00% <ø> (ø)
types/validator.go 82.82% <ø> (ø)
types/voter_set.go 84.63% <33.33%> (-0.45%) ⬇️
config/config.go 80.75% <60.00%> (+3.70%) ⬆️
statesync/syncer.go 80.29% <77.77%> (+0.90%) ⬆️
types/evidence.go 61.56% <92.30%> (+2.03%) ⬆️
evidence/pool.go 70.28% <100.00%> (+4.69%) ⬆️
evidence/verify.go 78.98% <100.00%> (+11.87%) ⬆️
libs/os/os.go 27.27% <100.00%> (+2.74%) ⬆️
node/node.go 59.89% <100.00%> (+0.21%) ⬆️
... and 31 more

@tnasu tnasu force-pushed the main-patch-tm-v0.34.11 branch from fee0a97 to 74c6973 Compare January 11, 2022 04:17
tnasu and others added 2 commits January 12, 2022 14:32
(cherry picked from commit d36a5905a67db1ed7afb09f371b3ea3910afb6eb)

Co-authored-by: Sam Kleinman <garen@tychoish.com>
@tnasu tnasu force-pushed the main-patch-tm-v0.34.11 branch from 74c6973 to d13c936 Compare January 12, 2022 05:36
@tnasu tnasu force-pushed the main-patch-tm-v0.34.11 branch from 512d4c8 to 48a55ae Compare January 14, 2022 05:25
tnasu and others added 4 commits January 14, 2022 15:09
…ular file (backport: #6428) (#6436)

Co-authored-by: Callum Waters <cmwaters19@gmail.com>
…king if regular file (backport: #6428) (#6436)`
… (backport #6522) (#6528)

* p2p/conn: check for channel id overflow before processing receive msg (#6522)

Per tendermint spec, each Channel has a globally unique byte id, which
is mapped to uint8 in Go. However, the proto PacketMsg.ChannelID field
is declared as int32, and when receive the packet, we cast it to a byte
without checking for possible overflow. That leads to a malform packet
with invalid channel id is sent successfully.

To fix it, we just add a check for possible overflow, and return invalid
channel id error.

Fixed #6521

(cherry picked from commit 1f46a4c90e268def505037a5d42627942f605ef4)
* state sync: tune request timeout and chunkers (#6566)

(cherry picked from commit 7d961b55b2132d53ccf7ee8d6c86b84fc7fc9ddc)

* fix build

* fix config

* fix config

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
@tnasu tnasu force-pushed the main-patch-tm-v0.34.11 branch from 0c43da6 to 4f2fe0f Compare January 18, 2022 09:28
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
@tnasu tnasu marked this pull request as ready for review January 19, 2022 02:45
@tnasu tnasu requested review from Kynea0b and torao as code owners January 19, 2022 02:45
@Kynea0b Kynea0b added the C: enhancement Classification: New feature or its request, or improvement in maintainability of code label Jan 19, 2022
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

Copy link
Contributor

@Kynea0b Kynea0b 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 7320ceb into Finschia:main Jan 20, 2022
@tnasu tnasu deleted the main-patch-tm-v0.34.11 branch February 28, 2022 03:00
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.

3 participants