chore: merge unstable into epbs (CI check only, do not squash) - #1216
Merged
Conversation
Co-Authored-By: shane-moore <skm1790@gmail.com>
Co-Authored-By: shane-moore <skm1790@gmail.com>
Co-Authored-By: shane-moore <skm1790@gmail.com>
Co-Authored-By: shane-moore <skm1790@gmail.com>
Co-Authored-By: shane-moore <skm1790@gmail.com>
Co-Authored-By: shane-moore <skm1790@gmail.com>
Co-Authored-By: shane-moore <skm1790@gmail.com>
# Conflicts: # .github/custom/local-testnet/params.yaml # Cargo.lock # Cargo.toml # anchor/validator_store/src/lib.rs # anchor/validator_store/src/testing/common.rs
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## epbs #1216 +/- ##
=======================================
Coverage ? 69.67%
=======================================
Files ? 165
Lines ? 32475
Branches ? 0
=======================================
Hits ? 22626
Misses ? 9849
Partials ? 0
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges
unstableintoepbsas a true merge commit, bringing in the 12 commitsepbsis behind, including the ruint 1.20.0 bump (#1202) that fixes thecargo auditfailure currently breakingepbs-based PR CI (e.g. #1215).Do not merge via GitHub (squash would break the eventual epbs -> unstable merge). This PR exists only to run CI against the merge result; once green it will be closed and the identical merge commit pushed directly to
epbs, matching the existing pattern on that branch (b162b606,a9f378a4).Conflict resolutions:
Cargo.toml: kept the epbs lighthouse pin (81d576943); unstable's v8.2.1 pin lacks Gloas types.Cargo.lock: rebuilt from unstable's side (preserves ruint 1.20.0), then reconciled so all 31 lighthouse crates are back on81d576943..github/custom/local-testnet/params.yaml: took unstable's lighthouse v8.2.1 image bump.validator_store/src/lib.rs: kept epbs's refactor (decide_committee_vote,round_deadline_origin); it already contains unstable'sget_slot_duration()cleanup. The fix: harden signature reconstruction #1198validator_pubkeysigning-data change auto-merged.validator_store/src/testing/common.rs: union of epbs's hang/failure mock and fix: harden signature reconstruction #1198'svalidator_pubkeycapture (asserted by the committee_attestation test).cargo check --workspace --all-targetspasses on the merge.