Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to latest merge spec #87

Merged
merged 7 commits into from
Dec 27, 2021
Merged

update to latest merge spec #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0665d1
update to latest merge spec
Giulio2002 Dec 24, 2021
49458f5
now
Giulio2002 Dec 24, 2021
bc1a347
done
Giulio2002 Dec 25, 2021
7504b5e
better names
Giulio2002 Dec 25, 2021
0cf0514
ops
Giulio2002 Dec 25, 2021
397f740
correct order
Giulio2002 Dec 27, 2021
dd260da
again order
Giulio2002 Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions remote/ethbackend.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ message EngineExecutePayloadReply {
}

message EnginePreparePayload {
types.H256 parentHash = 1;
uint64 timestamp = 2;
types.H256 random = 3;
types.H160 feeRecipient = 4;
uint64 timestamp = 1;
types.H256 random = 2;
types.H160 feeRecipient = 3;
}

message EngineForkChoiceUpdated {
Expand All @@ -83,8 +82,8 @@ message EngineForkChoiceUpdated {
}

message EngineForkChoiceUpdatedRequest {
EnginePreparePayload headBlockHash = 1;
EngineForkChoiceUpdated safeBlockHash = 2;
EngineForkChoiceUpdated forkchoice = 1;
EnginePreparePayload prepare = 2;
}

message EngineForkChoiceUpdatedReply {
Expand Down
2 changes: 1 addition & 1 deletion types/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ message ExecutionPayload {
uint64 gasLimit = 8;
uint64 gasUsed = 9;
uint64 timestamp = 10;
types.H256 extraData = 11;
bytes extraData = 11;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is ExecutionPayload in types.proto while other Engine API types like EngineForkChoiceUpdated are in ethbackend.proto? It seems to me that types.proto is reserved for more basic stuff and we should move ExecutionPayload to ethbackend.proto.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My reasoning is that, that is not really a neither a request or a reply and can works both way depending on what engine_ method you are using. so I put it in types because its behaviour more resembled a datatype rather than the request/reply of one single method.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. OK. @AskAlexSharov what do you think?

types.H256 baseFeePerGas = 12;
types.H256 blockHash = 13;
/*
Expand Down