Removed code for GET `validator/blinded_blocks` and also adjusted/removed tests #7515

PoulavBhowmick03 · 2025-05-24T13:35:32Z

Issue Addressed

Proposed Changes

Remove client/server code for deprecated GET validator/blinded_blocks endpoint and subsequently, removed the tests which were just testing the blinded endpoint, and modified other endpoints to use the new GET /eth/v3/validator/blocks endpoint

Additional Info

None

PoulavBhowmick03 · 2025-05-24T14:10:10Z

@michaelsproul @eserilev PTAL at this

beacon_node/http_api/tests/tests.rs

PoulavBhowmick03 · 2025-05-29T11:35:50Z

@michaelsproul can you take a look at the changes and the implementation now please?

eserilev · 2025-05-29T19:19:00Z

beacon_node/http_api/tests/tests.rs

+        let (payload_type, metadata) = self
            .client
-            .get_validator_blinded_blocks::<E>(slot, &randao_reveal, None)
+            .get_validator_blocks_v3::<E>(slot, &randao_reveal, None, None)
            .await
-            .unwrap()
-            .into_data()
-            .body()
-            .execution_payload()
-            .unwrap()
-            .into();
+            .unwrap();
+        Self::check_block_v3_metadata(&metadata, &payload_type);
+
+        let payload: FullPayload<E> = match payload_type.data {
+            ProduceBlockV3Response::Full(payload) => {
+                payload.block().body().execution_payload().unwrap().into()
+            }
+            ProduceBlockV3Response::Blinded(_) => panic!("Expecting a full payload"),
+        };


comment for clarity: we want to check that we fallback local EE, so this is equivalent to the previous test format. Some of the other test changes below do something similar. looks good!

eserilev

LGTM!

PoulavBhowmick03 · 2025-06-04T04:09:53Z

Any update on this? @michaelsproul
Would be great, i would love to create a pr for #7478 but this would otherwise cause merge conflicts

michaelsproul

Looks good on the whole, thanks for sticking with this!

Just a few tweaks and then I think we can merge.

Sorry for the slow review, I've been busy trying to get tree-states across the line and also getting some stuff reading for the next PeerDAS devnet

michaelsproul · 2025-06-04T04:38:24Z

beacon_node/http_api/tests/tests.rs

+                    self.chain.slot_clock.set_slot(slot.as_u64() + 1);
+                }
+                ProduceBlockV3Response::Full(block_contents) => {
+                    assert!(!metadata.execution_payload_blinded);


This test is meant to be checking blinded production, so I think it should error in the Full case

michaelsproul · 2025-06-04T04:40:31Z

beacon_node/http_api/tests/tests.rs

+                    assert_eq!(blinded_block.slot(), slot);
+                }
+                ProduceBlockV3Response::Full(full_block) => {
+                    assert_eq!(full_block.block().slot(), slot);


This should also be unreachable, I think we should panic if we get a Full block.

When I add a panic to this and the other line as well, some pre_merge tests seem to panic as they are receiving full blocks

failures: ---- tests::blinded_block_production_blinded_payload_premerge stdout ---- thread 'tests::blinded_block_production_blinded_payload_premerge' panicked at beacon_node/http_api/tests/tests.rs:3537:21: Expecting a blinded block note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ---- tests::blinded_block_production_full_payload_premerge stdout ---- thread 'tests::blinded_block_production_full_payload_premerge' panicked at beacon_node/http_api/tests/tests.rs:3537:21: Expecting a blinded block ---- tests::blinded_block_production_no_verify_randao_blinded_payload_premerge stdout ---- thread 'tests::blinded_block_production_no_verify_randao_blinded_payload_premerge' panicked at beacon_node/http_api/tests/tests.rs:3638:21: Expecting a blinded block ---- tests::blinded_block_production_no_verify_randao_full_payload_premerge stdout ---- thread 'tests::blinded_block_production_no_verify_randao_full_payload_premerge' panicked at beacon_node/http_api/tests/tests.rs:3638:21: Expecting a blinded block ---- tests::blinded_block_production_with_skip_slots_blinded_payload_premerge stdout ---- thread 'tests::blinded_block_production_with_skip_slots_blinded_payload_premerge' panicked at beacon_node/http_api/tests/tests.rs:3537:21: Expecting a blinded block ---- tests::blinded_block_production_with_skip_slots_full_payload_premerge stdout ---- thread 'tests::blinded_block_production_with_skip_slots_full_payload_premerge' panicked at beacon_node/http_api/tests/tests.rs:3537:21: Expecting a blinded block failures: tests::blinded_block_production_blinded_payload_premerge tests::blinded_block_production_full_payload_premerge tests::blinded_block_production_no_verify_randao_blinded_payload_premerge tests::blinded_block_production_no_verify_randao_full_payload_premerge tests::blinded_block_production_with_skip_slots_blinded_payload_premerge tests::blinded_block_production_with_skip_slots_full_payload_premerge

@michaelsproul do take a look

i have committed a change where it throws error in case of a Full Block, can you PTAL @michaelsproul @eserilev

PoulavBhowmick03 · 2025-06-04T07:00:38Z

Looks good on the whole, thanks for sticking with this!

Just a few tweaks and then I think we can merge.

Sorry for the slow review, I've been busy trying to get tree-states across the line and also getting some stuff reading for the next PeerDAS devnet

Ah I see, that's some important stuff to get done with! No issues
Thanks a lot!

PoulavBhowmick03 · 2025-06-26T05:23:34Z

@michaelsproul, in order for the tests to pass, what should we do in case of panic for FullBlock?

michaelsproul · 2025-06-26T07:05:03Z

what you suggested about only panicking post Bellatrix sounds good

…ed tests for that endpoint

…ithout the blinded block endpoints

PoulavBhowmick03 · 2025-07-08T06:18:43Z

@michaelsproul can you PTAL now

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from 0d463bd to 7cfbced Compare May 24, 2025 13:41

PoulavBhowmick03 changed the title ~~Removed code for GET validator/blinded_blocks and also adjusted/removed tests~~ Removed code for GET validator/blinded_blocks and also adjusted/removed tests May 24, 2025

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from 7cfbced to b0b57b5 Compare May 24, 2025 14:08

PoulavBhowmick03 mentioned this pull request May 25, 2025

Delete POST /eth/v1/beacon/blocks #7478

Open

michaelsproul added ready-for-review The code is ready for review code-quality backwards-incompat Backwards-incompatible API change labels May 25, 2025

michaelsproul requested changes May 25, 2025

View reviewed changes

beacon_node/http_api/tests/tests.rs Outdated Show resolved Hide resolved

beacon_node/http_api/tests/tests.rs Outdated Show resolved Hide resolved

beacon_node/http_api/tests/tests.rs Outdated Show resolved Hide resolved

michaelsproul added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels May 25, 2025

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch 2 times, most recently from 53dc327 to 3936be5 Compare May 29, 2025 11:33

PoulavBhowmick03 requested a review from michaelsproul May 29, 2025 11:35

eserilev reviewed May 29, 2025

View reviewed changes

eserilev approved these changes May 29, 2025

View reviewed changes

michaelsproul requested changes Jun 4, 2025

View reviewed changes

chong-he mentioned this pull request Jun 9, 2025

Remove endpoint /eth/v1/validator/blinded_blocks/{slot} #7581

Closed

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from a1171ee to 6f70e93 Compare June 13, 2025 07:48

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from 6f70e93 to 176a8bf Compare June 21, 2025 17:35

PoulavBhowmick03 requested a review from michaelsproul June 21, 2025 17:35

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from 176a8bf to c988628 Compare June 25, 2025 18:44

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from 317b16d to f8523b4 Compare July 8, 2025 06:17

PoulavBhowmick03 added 2 commits July 8, 2025 11:48

Removed code for GET validator/blinded_blocks and also adjusted/remov…

28acc43

…ed tests for that endpoint

added back the tests previously removed and modified them to fit in w…

f8072ed

…ithout the blinded block endpoints

PoulavBhowmick03 added 2 commits July 8, 2025 11:48

Error in case of Full for test_blinded_block_production

c1b4350

fixed pre-merge tests

00f985e

PoulavBhowmick03 force-pushed the remove/blinded_blocks branch from f8523b4 to 00f985e Compare July 8, 2025 06:18

Merge branch 'unstable' into remove/blinded_blocks

bcc4f9d

Removed code for GET validator/blinded_blocks and also adjusted/removed tests #7515

Are you sure you want to change the base?

Removed code for GET validator/blinded_blocks and also adjusted/removed tests #7515

Uh oh!

Conversation

PoulavBhowmick03 commented May 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue Addressed

Proposed Changes

Additional Info

Uh oh!

PoulavBhowmick03 commented May 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PoulavBhowmick03 commented May 29, 2025

Uh oh!

eserilev May 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eserilev left a comment

Choose a reason for hiding this comment

Uh oh!

PoulavBhowmick03 commented Jun 4, 2025

Uh oh!

michaelsproul left a comment

Choose a reason for hiding this comment

Uh oh!

michaelsproul Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

michaelsproul Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

PoulavBhowmick03 Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

PoulavBhowmick03 Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

PoulavBhowmick03 commented Jun 4, 2025

Uh oh!

PoulavBhowmick03 commented Jun 26, 2025

Uh oh!

michaelsproul commented Jun 26, 2025

Uh oh!

PoulavBhowmick03 commented Jul 8, 2025

Uh oh!

Uh oh!

Removed code for GET `validator/blinded_blocks` and also adjusted/removed tests #7515

Removed code for GET `validator/blinded_blocks` and also adjusted/removed tests #7515

PoulavBhowmick03 commented May 24, 2025 •

edited

Loading

eserilev May 29, 2025 •

edited

Loading