feat(proto): Add _v2 fields to support wrapperspb.Uint64Value (#157)

* feat(proto): Add _v2 fields to support wrapperspb.Uint64Value * refactor(proto): Remove deprecated fields * Add subcommittee_index_v2 * refactor: Simplify clock drift calculation
ethpandaops · Aug 21, 2023 · 4e8b4fd · 4e8b4fd
1 parent 0cccf4b
commit 4e8b4fd
Show file tree

Hide file tree

Showing 33 changed files with 2,662 additions and 1,442 deletions.
diff --git a/pkg/mimicry/mimicry.go b/pkg/mimicry/mimicry.go
@@ -23,6 +23,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/sirupsen/logrus"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 type Mimicry struct {
@@ -168,6 +169,7 @@ func (m *Mimicry) createNewClientMeta(ctx context.Context) (*xatu.ClientMeta, er
 		Implementation: xatu.Implementation,
 		Os:             runtime.GOOS,
 		ClockDrift:     uint64(m.clockDrift.Milliseconds()),
+		ClockDriftV2:   wrapperspb.UInt64(uint64(m.clockDrift.Milliseconds())),
 		Labels:         m.Config.Labels,
 	}, nil
 }

diff --git a/pkg/mimicry/p2p/execution/event_transaction.go b/pkg/mimicry/p2p/execution/event_transaction.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethpandaops/xatu/pkg/proto/xatu"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/protobuf/types/known/timestamppb"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 func (p *Peer) handleTransaction(ctx context.Context, eventTime time.Time, event *types.Transaction) (*xatu.DecoratedEvent, error) {
@@ -23,7 +24,7 @@ func (p *Peer) handleTransaction(ctx context.Context, eventTime time.Time, event
 
 	now := time.Now()
 	if meta != nil {
-		now = now.Add(time.Duration(meta.ClockDrift) * time.Millisecond)
+		now = now.Add(time.Duration(meta.ClockDriftV2.Value) * time.Millisecond)
 	}
 
 	tx, err := event.MarshalBinary()
@@ -71,10 +72,12 @@ func (p *Peer) getTransactionData(ctx context.Context, event *types.Transaction,
 
 	extra := &xatu.ClientMeta_AdditionalMempoolTransactionData{
 		Nonce:        event.Nonce(),
+		NonceV2:      wrapperspb.UInt64(event.Nonce()),
 		GasPrice:     event.GasPrice().String(),
 		From:         from.String(),
 		To:           to,
 		Gas:          event.Gas(),
+		GasV2:        wrapperspb.UInt64(event.Gas()),
 		Value:        event.Value().String(),
 		Hash:         event.Hash().String(),
 		Size:         strconv.FormatFloat(float64(event.Size()), 'f', 0, 64),

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/attestation.proto b/pkg/proto/eth/v1/attestation.proto
@@ -6,6 +6,7 @@ package xatu.eth.v1;
 
 option go_package = "github.com/ethpandaops/xatu/pkg/proto/eth/v1";
 
+import "google/protobuf/wrappers.proto";
 import "google/protobuf/descriptor.proto";
 import "pkg/proto/eth/v1/checkpoint.proto";
 
@@ -18,23 +19,29 @@ message Attestation {
 }
 
 message AttestationData {
-  uint64 slot = 1;
+  uint64 slot = 1 [ deprecated = true ];
 
-  uint64 index = 2;
+  uint64 index = 2 [ deprecated = true ];
 
   string beacon_block_root = 3 [json_name="beacon_block_root"];
 
   Checkpoint source = 4;
 
   Checkpoint target = 5;
+
+  google.protobuf.UInt64Value slot_v2 = 6 [json_name="slot_v2"];
+
+  google.protobuf.UInt64Value index_v2 = 7 [json_name="index_v2"];
 }
 
 message AggregateAttestationAndProof {
-  uint64 aggregator_index = 1 [json_name="aggregator_index"];
+  uint64 aggregator_index = 1 [json_name="aggregator_index", deprecated=true];
 
   Attestation aggregate = 3;
 
   string selection_proof = 2 [json_name="selection_proof"];
+
+  google.protobuf.UInt64Value aggregator_index_v2 = 4 [json_name="aggregator_index_v2"];  
 }
 
 message SignedAggregateAttestationAndProof {

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/beacon_block.proto b/pkg/proto/eth/v1/beacon_block.proto
@@ -7,19 +7,24 @@ package xatu.eth.v1;
 
 option go_package = "github.com/ethpandaops/xatu/pkg/proto/eth/v1";
 
+import "google/protobuf/wrappers.proto";
 import "google/protobuf/descriptor.proto";
 import "pkg/proto/eth/v1/attestation.proto";
 
 message BeaconBlock {
-  uint64 slot = 1;
+  uint64 slot = 1 [ deprecated=true ];
 
-  uint64 proposer_index = 2 [ json_name = "proposer_index" ];
+  uint64 proposer_index = 2 [ json_name = "proposer_index", deprecated=true ];
 
   string parent_root = 3 [ json_name = "parent_root" ];
 
   string state_root = 4 [ json_name = "state_root" ];
 
   BeaconBlockBody body = 5;
+
+  google.protobuf.UInt64Value slot_v2 = 6 [ json_name = "slot_v2" ];
+
+  google.protobuf.UInt64Value proposer_index_v2 = 7 [ json_name = "proposer_index_v2" ];
 }
 
 message SignedBeaconBlock {

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/checkpoint.proto b/pkg/proto/eth/v1/checkpoint.proto
@@ -7,9 +7,12 @@ package xatu.eth.v1;
 option go_package = "github.com/ethpandaops/xatu/pkg/proto/eth/v1";
 
 import "google/protobuf/descriptor.proto";
+import "google/protobuf/wrappers.proto";
 
 message Checkpoint {
-  uint64 epoch = 1;
+  uint64 epoch = 1 [ deprecated=true ];
 
   string root = 2;
+
+  google.protobuf.UInt64Value epoch_v2 = 3 [ json_name = "epoch_v2" ];
 }