Merge branch 'erigon-cl' of https://github.com/ledgerwatch/interfaces …

…into erigon-cl
erigontech · Jun 28, 2023 · dd20e4e · dd20e4e
2 parents abfa4bf + 0fef16f
commit dd20e4e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/execution/execution.proto b/execution/execution.proto
@@ -36,7 +36,7 @@ message Header {
   types.H256 state_root = 3;
   types.H256 receipt_root = 4;
   types.H2048 logs_bloom = 5;
-  types.H256 mix_digest = 6;
+  types.H256 prev_randao = 6;
   uint64 block_number = 7;
   uint64 gas_limit = 8;
   uint64 gas_used = 9;
@@ -49,7 +49,8 @@ message Header {
   types.H256 transaction_hash = 16;
   optional types.H256 base_fee_per_gas = 17;
   optional types.H256 withdrawal_hash = 18;
-  optional types.H256 excess_data_gas = 19;
+  optional uint64 data_gas_used = 19;
+  optional uint64 excess_data_gas = 20;
 }
 
 // Body is a block body for execution

diff --git a/p2psentinel/sentinel.proto b/p2psentinel/sentinel.proto
@@ -9,17 +9,13 @@ import "types/types.proto";
 message EmptyMessage {}
 
 enum GossipType {
-    // Lightclient gossip
-    LightClientFinalityUpdateGossipType = 0;
-    LightClientOptimisticUpdateGossipType = 1;
-    // Legacy gossip
-    BeaconBlockGossipType = 2;
-
     // Global gossip topics.
-    AggregateAndProofGossipType = 3;
-    VoluntaryExitGossipType = 4;
-    ProposerSlashingGossipType = 5;
-    AttesterSlashingGossipType = 6;
+    BeaconBlockGossipType = 0;
+    AggregateAndProofGossipType = 1;
+    VoluntaryExitGossipType = 2;
+    ProposerSlashingGossipType = 3;
+    AttesterSlashingGossipType = 4;
+    BlobSidecarType = 5;
 }
 
 message Peer {
@@ -30,6 +26,7 @@ message GossipData {
     bytes data = 1; // SSZ encoded data
     GossipType type = 2;
     optional Peer peer = 3;
+    optional uint32 blob_index = 4; // Blob identifier for EIP4844
 }
 
 message Status {
@@ -52,6 +49,7 @@ message RequestData {
 message ResponseData {
     bytes data = 1; // prefix-stripped SSZ encoded data
     bool error = 2; // did the peer encounter an error
+    Peer peer = 3;
 }
 
 service Sentinel {

diff --git a/remote/ethbackend.proto b/remote/ethbackend.proto
@@ -66,7 +66,6 @@ message NetPeerCountRequest {}
 
 message NetPeerCountReply { uint64 count = 1; }
 
-
 message ProtocolVersionRequest {}
 
 message ProtocolVersionReply { uint64 id = 1; }

diff --git a/types/types.proto b/types/types.proto
@@ -75,7 +75,8 @@ message ExecutionPayload {
   H256 block_hash = 14;
   repeated bytes transactions = 15;
   repeated Withdrawal withdrawals = 16;
-  optional H256 excess_data_gas = 17;
+  optional uint64 data_gas_used = 17;
+  optional uint64 excess_data_gas = 18;
 }
 
 message Withdrawal {
@@ -86,11 +87,11 @@ message Withdrawal {
 }
 
 message BlobsBundleV1 {
-  H256 block_hash = 1;
   // TODO(eip-4844): define a protobuf message for type KZGCommitment
-  repeated bytes kzgs = 2;
+  repeated bytes commitments = 1;
   // TODO(eip-4844): define a protobuf message for type Blob
-  repeated bytes blobs = 3;
+  repeated bytes blobs = 2;
+  repeated bytes proofs = 3;
 }
 
 // End of Engine API types