Reconstruct full Capella block #11732
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit b060158) # Conflicts: # beacon-chain/rpc/eth/beacon/blocks.go # proto/engine/v1/json_marshal_unmarshal.go
rkapka
changed the title
(cherry picked from commit 903cab7) # Conflicts: # beacon-chain/execution/testing/mock_engine_client.go
nisdas
reviewed
Dec 12, 2022
| @@ -92,6 +93,7 @@ func (s *Service) getBlkParentHashAndTD(ctx context.Context, blkHash []byte) ([] | |||
| if blk == nil { | |||
| return nil, nil, errors.New("pow block is nil") | |||
| } | |||
| blk.Version = version.Bellatrix | |||
There was a problem hiding this comment.
Why set this ? Shouldn't it already have its version set in the ExecutionBlockByHash method ? Or are you not able to infer that
There was a problem hiding this comment.
Not able to infer from how ExecutionBlockByHash is implemented. I can add a version argument, but this seems cleaner to me.
| @@ -437,11 +437,12 @@ func (s *Service) ReconstructFullBellatrixBlock( | |||
| if executionBlock == nil { | |||
| return nil, fmt.Errorf("received nil execution block for request by hash %#x", executionBlockHash) | |||
| } | |||
| executionBlock.Version = blindedBlock.Version() | |||
| // ToBytes20 is a convenience method for converting a byte slice to a fix | ||
| // sized 20 byte array. This method will truncate the input if it is larger | ||
| // than 20 bytes. | ||
| func ToBytes20(x []byte) [20]byte { |
There was a problem hiding this comment.
Can we add some unit tests for this ?
|
|
||
| rawWithdrawals, ok := decoded["withdrawals"] | ||
| if !ok || rawWithdrawals == nil { | ||
| e.Version = version.Bellatrix |
There was a problem hiding this comment.
Do we know this for sure ? This just means there are 0 withdrawals in the payload.
There was a problem hiding this comment.
I asked on Discord and we have this now: ethereum/execution-apis#334.
# Conflicts: # encoding/bytesutil/bytes_test.go
nisdas
reviewed
Dec 13, 2022
| return w, nil | ||
| } | ||
|
|
||
| func (w *Withdrawal) toWithdrawalJSON() (*withdrawalJSON, error) { |
There was a problem hiding this comment.
This is an odd method, why do we have it ?
There was a problem hiding this comment.
I use it here:
ws := make([]*withdrawalJSON, len(e.Withdrawals))
for i, w := range e.Withdrawals {
ws[i], err = w.toWithdrawalJSON() <-- HERE
if err != nil {
return nil, err
}
}
decoded["withdrawals"] = ws
nisdas
approved these changes
Dec 14, 2022
roberto-bayardo
pushed a commit
to roberto-bayardo/prysm
that referenced
this pull request
Dec 17, 2022
* Merge branch 'reconstruct-capella-block' into capella (cherry picked from commit b060158) # 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 commit 903cab7) # 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
Feature
What does this PR do? Why is it needed?
Extends the engine client with the ability to reconstruct full Capella blocks from blinded Capella blocks.
Which issues(s) does this PR fix?
Part of Capella