mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 15:37:56 -05:00
* Merge branch 'reconstruct-capella-block' into capella (cherry picked from commitb0601580ef) # Conflicts: # beacon-chain/rpc/eth/beacon/blocks.go # proto/engine/v1/json_marshal_unmarshal.go * remove unneeded test * rename methods * add doc to interface * deepsource (cherry picked from commit903cab75ee) # Conflicts: # beacon-chain/execution/testing/mock_engine_client.go * bzl * fix failing tests * single ExecutionBlockByHash function * fix engine mock * deepsource * reorder checks * single execution block type * update tests * update doc * bytes test * remove toWithdrawalJSON Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>