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

v1.18: blockstore: send duplicate proofs for chained merkle root conflicts (backport of #835) #1009

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 23, 2024

alternative implementation of #102

Contributes to solana-labs#34897


This is an automatic backport of pull request #835 done by Mergify.

…835)

* blockstore: send duplicate proofs for chained merkle root conflicts

* pr feedback: avoid deserialization, inline warn logs

* remove allow[dead_code] after rebase

* pr feedback: cow to simplify, avoid extra indentation

(cherry picked from commit 175e152)
@mergify mergify bot added the feature-gate Pull Request adds or modifies a runtime feature gate label Apr 23, 2024
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 98.21429% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 81.6%. Comparing base (9593d26) to head (8e26932).
Report is 1 commits behind head on v1.18.

Additional details and impacted files
@@           Coverage Diff            @@
##            v1.18    #1009    +/-   ##
========================================
  Coverage    81.5%    81.6%            
========================================
  Files         827      827            
  Lines      225122   225368   +246     
========================================
+ Hits       183660   184020   +360     
+ Misses      41462    41348   -114     

@AshwinSekar AshwinSekar merged commit 07a9b53 into v1.18 Apr 24, 2024
37 checks passed
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.18/pr-835 branch April 24, 2024 22:55
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…licts (backport of anza-xyz#835) (anza-xyz#1009)

blockstore: send duplicate proofs for chained merkle root conflicts (anza-xyz#835)

* blockstore: send duplicate proofs for chained merkle root conflicts

* pr feedback: avoid deserialization, inline warn logs

* remove allow[dead_code] after rebase

* pr feedback: cow to simplify, avoid extra indentation

(cherry picked from commit 175e152)

Co-authored-by: Ashwin Sekar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants