Skip to content

chore: merge unstable into epbs (CI check only, do not squash) - #1216

Merged
shane-moore merged 13 commits into
sigp:epbsfrom
shane-moore:merge-unstable-into-epbs
Aug 5, 2026
Merged

chore: merge unstable into epbs (CI check only, do not squash)#1216
shane-moore merged 13 commits into
sigp:epbsfrom
shane-moore:merge-unstable-into-epbs

Conversation

@shane-moore

Copy link
Copy Markdown
Member

Merges unstable into epbs as a true merge commit, bringing in the 12 commits epbs is behind, including the ruint 1.20.0 bump (#1202) that fixes the cargo audit failure currently breaking epbs-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 on 81d576943.
  • .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's get_slot_duration() cleanup. The fix: harden signature reconstruction #1198 validator_pubkey signing-data change auto-merged.
  • validator_store/src/testing/common.rs: union of epbs's hang/failure mock and fix: harden signature reconstruction #1198's validator_pubkey capture (asserted by the committee_attestation test).

cargo check --workspace --all-targets passes on the merge.

shane-moore and others added 13 commits July 11, 2026 06:42
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-commenter

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 82.87293% with 62 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (epbs@7bad23f). Learn more about missing BASE report.

Files with missing lines Patch % Lines
anchor/signature_collector/src/lib.rs 77.51% 47 Missing ⚠️
anchor/network/src/behaviour.rs 68.18% 7 Missing ⚠️
anchor/network/src/network.rs 0.00% 3 Missing ⚠️
anchor/client/src/lib.rs 0.00% 2 Missing ⚠️
anchor/network/src/discovery.rs 96.66% 2 Missing ⚠️
anchor/subnet_service/src/topic.rs 97.82% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             epbs    #1216   +/-   ##
=======================================
  Coverage        ?   69.67%           
=======================================
  Files           ?      165           
  Lines           ?    32475           
  Branches        ?        0           
=======================================
  Hits            ?    22626           
  Misses          ?     9849           
  Partials        ?        0           
Flag Coverage Δ
rust 69.67% <82.87%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@shane-moore
shane-moore merged commit 01f19c4 into sigp:epbs Aug 5, 2026
21 checks passed
@shane-moore
shane-moore deleted the merge-unstable-into-epbs branch August 5, 2026 01:09
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.

2 participants