merge upstream

2026-03-19 04:42:34 +00:00 · 2022-11-26 10:01:57 -05:00
parent 07a79c8266 788b337951
commit 3c9e1abcb7
29 changed files with 557 additions and 69 deletions
--- a/beacon_node/lighthouse_network/src/service/mod.rs
+++ b/beacon_node/lighthouse_network/src/service/mod.rs
@@ -199,6 +199,7 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
                .attester_slashing_timeout(half_epoch * 2)
                // .signed_contribution_and_proof_timeout(timeout) // Do not retry
                // .sync_committee_message_timeout(timeout) // Do not retry
+                .bls_to_execution_change_timeout(half_epoch * 2)
                .build()
        };