From d0665d1d154cdf2dc9cd7a01f4c0b8ad046e9221 Mon Sep 17 00:00:00 2001 From: Giulio Rebuffo Date: Fri, 24 Dec 2021 16:56:50 +0100 Subject: [PATCH 1/7] update to latest merge spec --- remote/ethbackend.proto | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto index 7406b8f..157c325 100644 --- a/remote/ethbackend.proto +++ b/remote/ethbackend.proto @@ -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 { From 49458f5037df684ab511656dd04405b219bd60f5 Mon Sep 17 00:00:00 2001 From: Giulio Rebuffo Date: Fri, 24 Dec 2021 19:45:43 +0100 Subject: [PATCH 2/7] now --- remote/ethbackend.proto | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto index 157c325..e7a0c5b 100644 --- a/remote/ethbackend.proto +++ b/remote/ethbackend.proto @@ -22,7 +22,7 @@ service ETHBACKEND { rpc EngineExecutePayloadV1(types.ExecutionPayload) returns (EngineExecutePayloadReply); // Update fork choice - rpc EngineForkChoiceUpdatedV1(EngineForkChoiceUpdatedRequest) returns (EngineForkChoiceUpdatedReply); + rpc EngineForkChoiceUpdatedV1(EnginePreparePayload) returns (EngineForkChoiceUpdatedReply); // Version returns the service version number rpc Version(google.protobuf.Empty) returns (types.VersionReply); @@ -70,20 +70,10 @@ message EngineExecutePayloadReply { } message EnginePreparePayload { - uint64 timestamp = 1; - types.H256 random = 2; - types.H160 feeRecipient = 3; -} - -message EngineForkChoiceUpdated { - types.H256 headBlockHash = 1; - types.H256 safeBlockHash = 2; - types.H256 finalizedBlockHash = 3; -} - -message EngineForkChoiceUpdatedRequest { - EnginePreparePayload headBlockHash = 1; - EngineForkChoiceUpdated safeBlockHash = 2; + types.H256 parenthash = 1; + uint64 timestamp = 2; + types.H256 random = 3; + types.H160 feeRecipient = 4; } message EngineForkChoiceUpdatedReply { From bc1a34750aa7cc497967300a71499671301374fa Mon Sep 17 00:00:00 2001 From: Giulio Rebuffo Date: Sat, 25 Dec 2021 18:55:51 +0100 Subject: [PATCH 3/7] done --- remote/ethbackend.proto | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto index e7a0c5b..bb85280 100644 --- a/remote/ethbackend.proto +++ b/remote/ethbackend.proto @@ -22,7 +22,7 @@ service ETHBACKEND { rpc EngineExecutePayloadV1(types.ExecutionPayload) returns (EngineExecutePayloadReply); // Update fork choice - rpc EngineForkChoiceUpdatedV1(EnginePreparePayload) returns (EngineForkChoiceUpdatedReply); + rpc EngineForkChoiceUpdatedV1(EngineForkChoiceUpdatedRequest) returns (EngineForkChoiceUpdatedReply); // Version returns the service version number rpc Version(google.protobuf.Empty) returns (types.VersionReply); @@ -70,10 +70,20 @@ 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 { + types.H256 headBlockHash = 1; + types.H256 safeBlockHash = 2; + types.H256 finalizedBlockHash = 3; +} + +message EngineForkChoiceUpdatedRequest { + EnginePreparePayload headBlockHash = 1; + EngineForkChoiceUpdated safeBlockHash = 2; } message EngineForkChoiceUpdatedReply { @@ -115,4 +125,4 @@ message NodesInfoRequest { message NodesInfoReply { repeated types.NodeInfoReply nodesInfo = 1; -} +} \ No newline at end of file From 7504b5eea3451ca05cd3c75c37ef4ed62a0b4dee Mon Sep 17 00:00:00 2001 From: Giulio Rebuffo Date: Sat, 25 Dec 2021 19:17:08 +0100 Subject: [PATCH 4/7] better names --- remote/ethbackend.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto index bb85280..9e9089f 100644 --- a/remote/ethbackend.proto +++ b/remote/ethbackend.proto @@ -82,8 +82,8 @@ message EngineForkChoiceUpdated { } message EngineForkChoiceUpdatedRequest { - EnginePreparePayload headBlockHash = 1; - EngineForkChoiceUpdated safeBlockHash = 2; + EngineForkChoiceUpdated forkchoice = 2; + EnginePreparePayload prepare = 1; } message EngineForkChoiceUpdatedReply { From 0cf0514e4437f136698b7a0854d83f6cffc08c99 Mon Sep 17 00:00:00 2001 From: Giulio Rebuffo Date: Sat, 25 Dec 2021 22:06:06 +0100 Subject: [PATCH 5/7] ops --- types/types.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/types.proto b/types/types.proto index 3e6c7eb..9397aad 100644 --- a/types/types.proto +++ b/types/types.proto @@ -65,7 +65,7 @@ message ExecutionPayload { uint64 gasLimit = 8; uint64 gasUsed = 9; uint64 timestamp = 10; - types.H256 extraData = 11; + bytes extraData = 11; types.H256 baseFeePerGas = 12; types.H256 blockHash = 13; /* From 397f740076018fe1fd6923a1e230984c38120b56 Mon Sep 17 00:00:00 2001 From: Giulio rebuffo Date: Mon, 27 Dec 2021 09:48:24 +0100 Subject: [PATCH 6/7] correct order --- remote/ethbackend.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto index 9e9089f..fa65c75 100644 --- a/remote/ethbackend.proto +++ b/remote/ethbackend.proto @@ -82,8 +82,8 @@ message EngineForkChoiceUpdated { } message EngineForkChoiceUpdatedRequest { - EngineForkChoiceUpdated forkchoice = 2; EnginePreparePayload prepare = 1; + EngineForkChoiceUpdated forkchoice = 2; } message EngineForkChoiceUpdatedReply { @@ -125,4 +125,4 @@ message NodesInfoRequest { message NodesInfoReply { repeated types.NodeInfoReply nodesInfo = 1; -} \ No newline at end of file +} From dd260dad004c38d6a87f26391c59f305825ee8f4 Mon Sep 17 00:00:00 2001 From: Giulio rebuffo Date: Mon, 27 Dec 2021 10:12:30 +0100 Subject: [PATCH 7/7] again order --- remote/ethbackend.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto index fa65c75..03f0b1b 100644 --- a/remote/ethbackend.proto +++ b/remote/ethbackend.proto @@ -82,8 +82,8 @@ message EngineForkChoiceUpdated { } message EngineForkChoiceUpdatedRequest { - EnginePreparePayload prepare = 1; - EngineForkChoiceUpdated forkchoice = 2; + EngineForkChoiceUpdated forkchoice = 1; + EnginePreparePayload prepare = 2; } message EngineForkChoiceUpdatedReply {