Skip to content

Commit 490e13c

Browse files
varex83agentclaude
andcommitted
Merge branch 'main' into bohdan/validatorapi-proposal
Resolves conflicts in the validatorapi stack against main's PR #458, PR #451, and the dutydb high-water-mark refactor: - dutydb/memory.rs: take main's terser comment on `delete_duty` waking the per-duty-type notify. - validatorapi/component.rs: take main's BoxFuture-based callback API (SubscriberFn by-ref, AwaitAggSigDbFn naming, cleaner comments, 10s upstream timeout) and layer the PR's proposal / submit_proposal / submit_blinded_proposal handlers, ProposerPubkeyFn, PROPOSAL_TIMEOUT, register_proposer_pubkey, lookup_proposer_pubkey, await_proposal_for_handler, proposal_timeout, pubkey_to_bls, verify_partial_sig_error, map_signed_data_error, verify_par_signed_proposal, proposal_matches_duty (+ ProposalMatchError), and all the per-fork slot/version/proposer-index/message-root accessors on top. Subscriber call sites adapted to main's by-ref signature (sub(&duty, &set) instead of sub(&duty, set.clone())). PR's tests appended to the existing test module. - validatorapi/router.rs: take main's version verbatim — PR 461 did not touch router.rs, only main did (enforce_json_content_type middleware + json_rejection_to_api_error + content-type tests). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 parents ed6f61e + ed4277e commit 490e13c

44 files changed

Lines changed: 6884 additions & 2560 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/dkg-runner.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
CI: "true"
101101
NODES: "4"
102102
THRESHOLD: "3"
103+
EXPECT_VALIDATORS: "1"
103104
PLUTO_NODES: ${{ matrix.pluto_nodes }}
104105
CHARON_NODES: ${{ matrix.charon_nodes }}
105106
CHARON_BIN: ${{ github.workspace }}/bin/charon

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ chrono.workspace = true
1414
crossbeam.workspace = true
1515
dyn-clone.workspace = true
1616
dyn-eq.workspace = true
17+
futures.workspace = true
1718
hex.workspace = true
1819
k256.workspace = true
1920
libp2p.workspace = true

0 commit comments

Comments
 (0)