all: implement flat deposit requests encoding #30425
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
fjl
requested review from
gballet,
lightclient,
karalabe,
holiman,
rjl493456442 and
MariusVanDerWijden
as code owners
fjl
force-pushed
the
core-flat-deposit-requests
branch
from
b61af3b
to
0be1fe8
Compare
…ad in engine tests
lightclient
reviewed
Oct 7, 2024
beacon/engine/types.go
Outdated
| // ExecutionPayloadBody is used in the response to GetPayloadBodiesByHash and GetPayloadBodiesByRange | ||
| type ExecutionPayloadBody struct { | ||
| TransactionData []hexutil.Bytes `json:"transactions"` | ||
| Withdrawals []*types.Withdrawal `json:"withdrawals"` | ||
| Deposits types.Deposits `json:"depositRequests"` | ||
| Requests []hexutil.Bytes `json:"requests"` |
There was a problem hiding this comment.
This is going to be a problem, no? If we no longer have the requests in the block I don't think we'll be able to return them from GetPayloadBodiesByXXX ?
lightclient
reviewed
Oct 7, 2024
| @@ -473,11 +472,12 @@ func (g *Genesis) toBlockWithRoot(root common.Hash) *types.Block { | |||
| } | |||
| } | |||
| if conf.IsPrague(num, g.Timestamp) { | |||
| head.RequestsHash = &types.EmptyRequestsHash | |||
| requests = make(types.Requests, 0) | |||
| emptyRequests := [][]byte{{0}} | |||
There was a problem hiding this comment.
kinda weird to just have the deposit request prefix just as a bare 0 value here instead of named?
lightclient
reviewed
Oct 7, 2024
lightclient
reviewed
Oct 7, 2024
islishude
reviewed
Oct 8, 2024
islishude
reviewed
Oct 8, 2024
| @@ -474,6 +457,28 @@ func CalcUncleHash(uncles []*Header) common.Hash { | |||
| return rlpHash(uncles) | |||
| } | |||
|
|
|||
| // CalcRequestsHash creates the block requestsHash value for a list of requests. | |||
| func CalcRequestsHash(requests [][]byte) common.Hash { | |||
There was a problem hiding this comment.
It can be rewrote to following to eliminate memory allocation
func CalcRequestsHash(requests [][]byte) common.Hash {
h1, h2 := sha256.New(), sha256.New()
var buf common.Hash
for _, item := range requests {
h1.Reset()
h1.Write(item)
h2.Write(h1.Sum(buf[:0]))
}
h2.Sum(buf[:0])
return buf
}There was a problem hiding this comment.
This is a very clever suggestion!
islishude
reviewed
Oct 9, 2024
islishude
reviewed
Oct 9, 2024
| @@ -224,22 +224,21 @@ type BlockBody struct { | |||
| Transactions []*types.Transaction // Transactions contained within a block | |||
| Uncles []*types.Header // Uncles contained within a block | |||
| Withdrawals []*types.Withdrawal `rlp:"optional"` // Withdrawals contained within a block | |||
| Requests []*types.Request `rlp:"optional"` // Requests contained within a block | |||
| Requests [][]byte `rlp:"optional"` // Requests contained within a block | |||
There was a problem hiding this comment.
I just made a PR to remove it
fjl
pushed a commit
that referenced
this pull request
Oct 10, 2024
Block no longer has Requests. This PR just removes some code that wasn't removed in #30425.
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.
Implements changes from
engine: unified list of opaque requests execution-apis#577