Merge pull request #326 from ethpandaops/feat/blob-fields

feat(cl-mimicry): add block fields to blob sidecar events
ethpandaops · Jun 4, 2024 · c149d5a · c149d5a
2 parents d0a85d4 + 1fc8a0a
commit c149d5a
Show file tree

Hide file tree

Showing 27 changed files with 131 additions and 54 deletions.
diff --git a/deploy/local/docker-compose/vector-kafka-clickhouse-libp2p.yaml b/deploy/local/docker-compose/vector-kafka-clickhouse-libp2p.yaml
@@ -835,6 +835,8 @@ transforms:
       .propagation_slot_start_diff = .meta.client.additional_data.propagation.slot_start_diff
       .proposer_index = .data.proposer_index
       .blob_index = .data.index
+      .state_root = .data.state_root
+      .parent_root = .data.parent_root
 
       peer_id_key, err = .meta.client.additional_data.metadata.peer_id + .meta.ethereum.network.name
       if err != null {

diff --git a/deploy/migrations/clickhouse/038_libp2p_gossipsub_blob_sidecar_block_fields.down.sql b/deploy/migrations/clickhouse/038_libp2p_gossipsub_blob_sidecar_block_fields.down.sql
@@ -0,0 +1,11 @@
+ALTER TABLE libp2p_gossipsub_blob_sidecar_local on cluster '{cluster}'
+    DROP COLUMN parent_root;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar on cluster '{cluster}'
+    DROP COLUMN parent_root;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar_local on cluster '{cluster}'
+    DROP COLUMN state_root;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar on cluster '{cluster}'
+    DROP COLUMN state_root;
diff --git a/deploy/migrations/clickhouse/038_libp2p_gossipsub_blob_sidecar_block_fields.up.sql b/deploy/migrations/clickhouse/038_libp2p_gossipsub_blob_sidecar_block_fields.up.sql
@@ -0,0 +1,23 @@
+ALTER TABLE libp2p_gossipsub_blob_sidecar_local on cluster '{cluster}'
+ADD COLUMN parent_root FixedString(66) Codec(ZSTD(1)) AFTER blob_index;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar on cluster '{cluster}'
+ADD COLUMN parent_root FixedString(66) Codec(ZSTD(1)) AFTER blob_index;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar_local on cluster '{cluster}'
+COMMENT COLUMN parent_root 'Parent root of the beacon block';
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar on cluster '{cluster}'
+COMMENT COLUMN parent_root 'Parent root of the beacon block';
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar_local on cluster '{cluster}'
+ADD COLUMN state_root FixedString(66) Codec(ZSTD(1)) AFTER parent_root;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar on cluster '{cluster}'
+ADD COLUMN state_root FixedString(66) Codec(ZSTD(1)) AFTER parent_root;
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar_local on cluster '{cluster}'
+COMMENT COLUMN state_root 'State root of the beacon block';
+
+ALTER TABLE libp2p_gossipsub_blob_sidecar on cluster '{cluster}'
+COMMENT COLUMN state_root 'State root of the beacon block';
diff --git a/pkg/clmimicry/gossipsub_blob_sidecar.go b/pkg/clmimicry/gossipsub_blob_sidecar.go
@@ -38,10 +38,22 @@ func (m *Mimicry) handleGossipBlobSidecar(
 		return fmt.Errorf("invalid proposer index")
 	}
 
+	stateRoot, ok := payload["StateRoot"].(string)
+	if !ok {
+		return fmt.Errorf("invalid state root")
+	}
+
+	parentRoot, ok := payload["ParentRoot"].(string)
+	if !ok {
+		return fmt.Errorf("invalid parent root")
+	}
+
 	data := &gossipsub.BlobSidecar{
 		Index:         wrapperspb.UInt64(blobIndex),
 		Slot:          wrapperspb.UInt64(uint64(slot)),
 		ProposerIndex: wrapperspb.UInt64(uint64(proposerIndex)),
+		StateRoot:     wrapperspb.String(stateRoot),
+		ParentRoot:    wrapperspb.String(parentRoot),
 	}
 
 	metadata, ok := proto.Clone(clientMeta).(*xatu.ClientMeta)

diff --git a/pkg/proto/blockprint/block_classification.pb.go b/pkg/proto/blockprint/block_classification.pb.go
diff --git a/pkg/proto/eth/v1/attestation.pb.go b/pkg/proto/eth/v1/attestation.pb.go
diff --git a/pkg/proto/eth/v1/beacon_block.pb.go b/pkg/proto/eth/v1/beacon_block.pb.go
diff --git a/pkg/proto/eth/v1/blob.pb.go b/pkg/proto/eth/v1/blob.pb.go
diff --git a/pkg/proto/eth/v1/checkpoint.pb.go b/pkg/proto/eth/v1/checkpoint.pb.go
diff --git a/pkg/proto/eth/v1/committee.pb.go b/pkg/proto/eth/v1/committee.pb.go
diff --git a/pkg/proto/eth/v1/duties.pb.go b/pkg/proto/eth/v1/duties.pb.go
diff --git a/pkg/proto/eth/v1/events.pb.go b/pkg/proto/eth/v1/events.pb.go
diff --git a/pkg/proto/eth/v1/execution_engine.pb.go b/pkg/proto/eth/v1/execution_engine.pb.go
diff --git a/pkg/proto/eth/v1/fork_choice.pb.go b/pkg/proto/eth/v1/fork_choice.pb.go
diff --git a/pkg/proto/eth/v1/sync_committee.pb.go b/pkg/proto/eth/v1/sync_committee.pb.go
diff --git a/pkg/proto/eth/v2/beacon_block.pb.go b/pkg/proto/eth/v2/beacon_block.pb.go
diff --git a/pkg/proto/eth/v2/events.pb.go b/pkg/proto/eth/v2/events.pb.go
diff --git a/pkg/proto/eth/v2/withdrawals.pb.go b/pkg/proto/eth/v2/withdrawals.pb.go
diff --git a/pkg/proto/libp2p/eth.pb.go b/pkg/proto/libp2p/eth.pb.go
diff --git a/pkg/proto/libp2p/gossipsub/eth.pb.go b/pkg/proto/libp2p/gossipsub/eth.pb.go
diff --git a/pkg/proto/libp2p/gossipsub/eth.proto b/pkg/proto/libp2p/gossipsub/eth.proto
@@ -16,4 +16,7 @@ message BlobSidecar {
     google.protobuf.UInt64Value index = 1 [json_name = "index"];
     google.protobuf.UInt64Value slot = 2 [json_name = "slot"];
     google.protobuf.UInt64Value proposer_index = 3 [json_name = "proposer_index"];
-}
+    google.protobuf.StringValue state_root = 4 [json_name = "state_root"];
+    google.protobuf.StringValue parent_root = 5 [json_name = "parent_root"];
+}
+
diff --git a/pkg/proto/libp2p/peer.pb.go b/pkg/proto/libp2p/peer.pb.go
diff --git a/pkg/proto/libp2p/trace.pb.go b/pkg/proto/libp2p/trace.pb.go
diff --git a/pkg/proto/xatu/coordinator.pb.go b/pkg/proto/xatu/coordinator.pb.go
diff --git a/pkg/proto/xatu/coordinator_grpc.pb.go b/pkg/proto/xatu/coordinator_grpc.pb.go
diff --git a/pkg/proto/xatu/event_ingester.pb.go b/pkg/proto/xatu/event_ingester.pb.go
diff --git a/pkg/proto/xatu/event_ingester_grpc.pb.go b/pkg/proto/xatu/event_ingester_grpc.pb.go