Electra payload body engine methods #14000
Conversation
kasey
force-pushed
the
electra-engine-payload-methods
branch
from
e41b7de
to
63fef7b
Compare
| ExcessBlobGas: ebg, | ||
| BlobGasUsed: bgu, | ||
| DepositReceipts: pb.JsonDepositRequestsToProto(body.DepositRequests), | ||
| WithdrawalRequests: pb.JsonWithdrawalRequestsToProto(body.WithdrawalRequests), | ||
| }, big.NewInt(0)) // We can't get the block value and don't care about the block value for this instance |
There was a problem hiding this comment.
I know this isn't code you changed, but why can't we get the value? header.ValueInWei() or the gwei version?
There was a problem hiding this comment.
It doesn't exist because it isn't part of the payload, it is a separate field in the new payload response or builder api response for a blinded block bid. This doesn't really belong in the ExecutionData interface. It's a hack for bundling values together during proposals. I actually have another branch to remove this value from the ExecutionData.
| @@ -510,49 +522,33 @@ func (s *Service) HeaderByNumber(ctx context.Context, number *big.Int) (*types.H | |||
| } | |||
|
|
|||
| // GetPayloadBodiesByHash returns the relevant payload bodies for the provided block hash. | |||
| func (s *Service) GetPayloadBodiesByHash(ctx context.Context, executionBlockHashes []common.Hash) ([]*pb.ExecutionPayloadBodyV1, error) { | |||
| func (s *Service) GetPayloadBodiesByHash(ctx context.Context, executionBlockHashes []common.Hash) ([]*pb.ExecutionPayloadBodyV1Or2, error) { | |||
There was a problem hiding this comment.
Could we just have this be ExecutionPayloadBody since it includes all versions. And just put a note that it's for both V1 and V2?
| func (s *Service) GetPayloadBodiesByHash(ctx context.Context, executionBlockHashes []common.Hash) ([]*pb.ExecutionPayloadBodyV1Or2, error) { | |
| func (s *Service) GetPayloadBodiesByHash(ctx context.Context, executionBlockHashes []common.Hash) ([]*pb.ExecutionPayloadBody, error) { |
kasey
force-pushed
the
electra-engine-payload-methods
branch
from
befb14d
to
1c68c21
Compare
| // ExecutionPayloadBody represents the engine API ExecutionPayloadV1 or ExecutionPayloadV2 type. | ||
| type ExecutionPayloadBody struct { | ||
| Transactions []hexutil.Bytes `json:"transactions"` | ||
| Withdrawals []*Withdrawal `json:"withdrawals"` |
There was a problem hiding this comment.
why do Withdrawals need to be a pointer but WithdrawalRequests not a pointer?
There was a problem hiding this comment.
(Deposit|Withdrawal)Requests are a new type where I'm trying out something different, whereas Withdrawals uses the existing pattern with its own un/marshal methods. I want to compare the ux of the two approaches - see also the functional helpers that the new types use.
kasey
force-pushed
the
electra-engine-payload-methods
branch
from
e5f8d40
to
78bc05c
Compare
|
Tests failing |
* Combined v1/v2 payload body handling * prevent overflows when dealing with electra fixture --------- Co-authored-by: Kasey Kirkham <kasey@users.noreply.github.com>
What type of PR is this?
Feature
What does this PR do? Why is it needed?
This adds support for unblinding electra blocks. That includes a rewrite of the code for interacting with the engine API via
engine_getPayloadBodiesByHashV1so that we can deal with the fact that we can no longer call only one engine method, becauseengine_getPayloadBodiesByHashV2needs to be used for post-electra blocks.I also added a fallback path to request bodies via the
engine_getPayloadBodiesByRangeV(1|2)methods whenengine_getPayloadBodiesByHashV(1|2)responds with a nil value, because the engine API docs forengine_getPayloadBodiesByHashV1stipulatesClient software MAY NOT respond to requests for finalized blocks by hash..To support testing I added a new engine api mock server type in
mock_test.goas well as types and utility methods to support un/marshaling requests, parameters (hashes and uints), converting ExecutionPayloads -> a payload bodies that can be easily marshaled.Most of the test coverage has been preserved by way of
ReconstructFull(Bellatrix)Block(Batch)using the new code under the hood, but a number of new tests for the new request type were also added.