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.

Sign up for GitHub

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

Jump to bottom

Main patch from tm-v0.34.17 #389

Merged
merged 10 commits into from
Apr 6, 2022
Merged

Main patch from tm-v0.34.17 #389

merged 10 commits into from
Apr 6, 2022

Conversation

tnasu
Copy link
Member

@tnasu tnasu commented Apr 5, 2022 •
edited
Loading

tnasu and others added 3 commits April 5, 2022 15:19
@tnasu @tac0turtle
crypto: Remove build flags from secp256k1 (#8051)
c6793ee 
Manual backport of #7823.

* remove cgo build flags
* remove nocgo file

Co-authored-by: Marko <[email protected]>
@tnasu @williambanfield
consensus: start the timeout ticker before replay (backport #7844) (#…
e359cb2 
…8079)

Co-authored-by: M. J. Fromberger <[email protected]>
Co-authored-by: Sam Kleinman <[email protected]>

Co-authored-by: William Banfield <[email protected]>
@tnasu
cmd: make reset more safe (backport #8081) (#8089)
686a624 
Backport notes:

- Revert command declaration to the old explicit format.
- Remove threading of the keyType argument.
- Fix function naming collision.
- Fix error handling.
- Restore snake-case deprecation warnings.
@tnasu tnasu force-pushed the main-tm-v0.34.17 branch from 71b686a to 1922d9b Compare April 5, 2022 07:21
@codecov
Copy link

codecov bot commented Apr 5, 2022 •
edited
Loading

Codecov Report

Merging #389 (c4c3b1a) into main (6069aff) will increase coverage by 0.12%.
The diff coverage is 67.08%.

@@            Coverage Diff             @@
##             main     #389      +/-   ##
==========================================
+ Coverage   65.15%   65.27%   +0.12%     
==========================================
  Files         278      277       -1     
  Lines       37743    37856     +113     
==========================================
+ Hits        24590    24711     +121     
+ Misses      11370    11341      -29     
- Partials     1783     1804      +21
Impacted Files Coverage Δ
cmd/ostracon/commands/reset_priv_validator.go 37.86% <31.57%> (+26.32%) ⬆️
crypto/secp256k1/secp256k1.go 69.56% <75.67%> (+2.89%) ⬆️
consensus/state.go 73.85% <88.63%> (+0.62%) ⬆️
consensus/reactor.go 74.75% <100.00%> (+2.00%) ⬆️
privval/socket_listeners.go 79.72% <0.00%> (-4.06%) ⬇️
privval/signer_listener_endpoint.go 88.88% <0.00%> (-2.39%) ⬇️
crypto/ed25519/ed25519.go 45.12% <0.00%> (-1.22%) ⬇️
p2p/switch.go 65.90% <0.00%> (-0.62%) ⬇️
p2p/pex/pex_reactor.go 79.67% <0.00%> (-0.62%) ⬇️
p2p/pex/addrbook.go 71.01% <0.00%> (-0.51%) ⬇️
... and 10 more

@tnasu tnasu force-pushed the main-tm-v0.34.17 branch from 1922d9b to 39bb0ff Compare April 5, 2022 11:20
tnasu and others added 5 commits April 5, 2022 20:25
@tnasu
Fix codecov: cmd/ostracon/commands/reset_priv_validator_test.go
12a2fc5
@tnasu @williambanfield
consensus: change lock handling in 'handleMsg' method (#7992)
dd7e02a 
* change lock handling in consensus state file

* add comment explaining the unlock

* comment fix

* Update consensus/state.go

Co-authored-by: M. J. Fromberger <[email protected]>

* spelling fix

Co-authored-by: M. J. Fromberger <[email protected]>

Co-authored-by: William Banfield <[email protected]>
@tnasu @williambanfield
consensus: change lock handling in reactor for RoundState (#7994)
1d3d9e2 
This change updates the lock handling in the consensus reactor. The consensus reactor now periodically fetches the RoundState and the gossip routines operate on this fetched copy instead of fetching the latest copy in each iteration of the gossip routine.

Co-authored-by: William Banfield <[email protected]>
@tnasu @williambanfield
stop using %w in testing errors (#8241)
699f384 
Co-authored-by: William Banfield <[email protected]>
@tnasu @williambanfield
consensus: change lock to handle panics (#8237)
c4c3b1a 
Co-authored-by: William Banfield <[email protected]>
@tnasu tnasu force-pushed the main-tm-v0.34.17 branch from 39bb0ff to c4c3b1a Compare April 5, 2022 11:26
@tnasu tnasu marked this pull request as ready for review April 5, 2022 11:51
@tnasu tnasu requested review from Kynea0b and torao as code owners April 5, 2022 11:51
@torao torao added the C: enhancement Classification: New feature or its request, or improvement in maintainability of code label Apr 6, 2022
Kynea0b
Kynea0b approved these changes Apr 6, 2022
View reviewed changes
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 d5bf6f6 into Finschia:main Apr 6, 2022
@torao torao mentioned this pull request Apr 6, 2022
Merged
@tnasu tnasu deleted the main-tm-v0.34.17 branch April 28, 2022 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kynea0b Kynea0b Kynea0b approved these changes

@torao torao torao approved these changes

Assignees

@tnasu tnasu

Labels
C: enhancement Classification: New feature or its request, or improvement in maintainability of code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tnasu @torao @Kynea0b