grpc: use the latest optimistic execution service proto package

cmd/utils/flags.go

@@ -37,6 +37,7 @@ import (
 
 	auctionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/auction/v1alpha1/auctionv1alpha1grpc"
 	astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1/executionv1grpc"
+	optimisticExecutionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/optimistic_execution/v1alpha1/optimistic_executionv1alpha1grpc"
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	bparams "github.com/ethereum/go-ethereum/beacon/params"
@@ -2001,7 +2002,7 @@ func RegisterGraphQLService(stack *node.Node, backend ethapi.Backend, filterSyst
 
 // RegisterGRPCServices adds the gRPC API to the node.
 // It was done this way so that our grpc execution server can access the ethapi.Backend
-func RegisterGRPCServices(stack *node.Node, execServ astriaGrpc.ExecutionServiceServer, optimisticExecutionServ auctionGrpc.OptimisticExecutionServiceServer, auctionServiceServer auctionGrpc.AuctionServiceServer, cfg *node.Config) {
+func RegisterGRPCServices(stack *node.Node, execServ astriaGrpc.ExecutionServiceServer, optimisticExecutionServ optimisticExecutionGrpc.OptimisticExecutionServiceServer, auctionServiceServer auctionGrpc.AuctionServiceServer, cfg *node.Config) {
 	if err := node.NewGRPCServerHandler(stack, execServ, optimisticExecutionServ, auctionServiceServer, cfg); err != nil {
 		Fatalf("Failed to register the gRPC service: %v", err)
 	}

go.mod

@@ -3,10 +3,10 @@ module github.com/ethereum/go-ethereum
 go 1.21
 
 require (
-	buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-42cbdd5aad4c.2
-	buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.2-00000000000000-42cbdd5aad4c.1
-	buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.2-00000000000000-9a039a6ed8db.1
-	buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.2-00000000000000-e54e1c9ad405.1
+	buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-f71d210402a3.2
+	buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.5-00000000000000-f71d210402a3.1
+	buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.5-00000000000000-9a039a6ed8db.1
+	buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.5-00000000000000-e54e1c9ad405.1
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
 	github.com/Microsoft/go-winio v0.6.1
 	github.com/VictoriaMetrics/fastcache v1.12.1
@@ -79,7 +79,7 @@ require (
 	golang.org/x/time v0.5.0
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
 	google.golang.org/grpc v1.64.1
-	google.golang.org/protobuf v1.36.2
+	google.golang.org/protobuf v1.36.5
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -6,6 +6,8 @@ buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-cc31a327d54
 buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-cc31a327d543.1/go.mod h1:+pVCkEpJNp2JtooS8NiydT7bO9+hu11XUZ5Z47DPtXo=
 buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-e09c7fd3fe26.1 h1:gS4erruX5XeMN0MZ7xe4JmEIR3uCWrvzG5HGV725WiI=
 buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-e09c7fd3fe26.1/go.mod h1:oXNLXPUVa006hXUuEk+z5isisNlEbrm0yS+XJeMj6u4=
+buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-f71d210402a3.2 h1:HvyE45fERELL3N5ypjePfBUrziRHng4h+VacA/0xkDE=
+buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-00000000000000-f71d210402a3.2/go.mod h1:VBmHq2jLdeuppnbQAsDWXHIuKYrQCDjYgh4PASxnXMY=
 buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-20241017141511-7e4bcc0ebba5.1 h1:v7QnrDjNmG7I/0aqZdtlP3cBPQGd62w4AYVF8TfAcHM=
 buf.build/gen/go/astria/execution-apis/grpc/go v1.5.1-20241017141511-7e4bcc0ebba5.1/go.mod h1:T5EsLvEE5UMk62gVSwNY/7XlxknAP3sL8tYRsU68b4s=
 buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.35.1-00000000000000-cc31a327d543.1 h1:VkPk2LvyNK8NF9WmAnodrwgQZ3JiYAHFEmPKXUtlX4E=
@@ -20,6 +22,8 @@ buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.2-00000000000000
 buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.2-00000000000000-1f40f333891d.1/go.mod h1:oB3M+Fq9RgyUWGMqYk2FqRobQpdH1yZQZ9TYOoc4yIw=
 buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.2-00000000000000-42cbdd5aad4c.1 h1:GnqNuwC6UjXvtjGscDekiO+/lstY7NWOILlsOMGNpC4=
 buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.2-00000000000000-42cbdd5aad4c.1/go.mod h1:oB3M+Fq9RgyUWGMqYk2FqRobQpdH1yZQZ9TYOoc4yIw=
+buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.5-00000000000000-f71d210402a3.1 h1:eCTl5ODYL9nD5YPhKi0vTv8DvdK00vHiavaKYWkC6j8=
+buf.build/gen/go/astria/execution-apis/protocolbuffers/go v1.36.5-00000000000000-f71d210402a3.1/go.mod h1:IQAAkWC9aB4JNhu828cYMgkX61POY9byXGUyOmm3wi4=
 buf.build/gen/go/astria/primitives/protocolbuffers/go v1.35.1-20240911152449-eeebd3decdce.1 h1:kG4riHqlF9X6iZ1Oxs5/6ul6aue7MS+A6DK6HAchuTk=
 buf.build/gen/go/astria/primitives/protocolbuffers/go v1.35.1-20240911152449-eeebd3decdce.1/go.mod h1:n9L7X3VAj4od4VHf2ScJuHARUUQTSxJqtRHZk/7Ptt0=
 buf.build/gen/go/astria/primitives/protocolbuffers/go v1.35.2-00000000000000-2f2e9ce53f59.1 h1:C1bT0G1In6Z6tBERd1XqwDjdxTK+PatSOJYlVk5Is60=
@@ -28,6 +32,8 @@ buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.1-00000000000000-9a0
 buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.1-00000000000000-9a039a6ed8db.1/go.mod h1:HnX2FkSKZuD3zPFBR+Q17WzloqvIbFd0pYE++or/x2Q=
 buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.2-00000000000000-9a039a6ed8db.1 h1:inT/lOAbHunpGP9YLqtAQNssrxEIgH/OmxXNwbXjUqs=
 buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.2-00000000000000-9a039a6ed8db.1/go.mod h1:Lk1TBSGhOGvbtj0lb7eTeq+Z4N86/67Ay+WWxbqhh6s=
+buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.5-00000000000000-9a039a6ed8db.1 h1:25sK4RjDvkf+ryKQeOlIt2aWL9CdZbIxBUCuGcgK+q0=
+buf.build/gen/go/astria/primitives/protocolbuffers/go v1.36.5-00000000000000-9a039a6ed8db.1/go.mod h1:1Yy42OW1qdHTCWq9sfiJD8ZJCRqEL6xc2fBppEyNF0k=
 buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.35.1-20241017141511-71aab1871615.1 h1:hPMoxTiT7jJjnIbWqneBbL05VeVOTD9UeC/qdvzHL8g=
 buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.35.1-20241017141511-71aab1871615.1/go.mod h1:2uasRFMH+a3DaF34c1o+w7/YtYnoknmARyYpb9W2QIc=
 buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.35.2-00000000000000-0eda7df0ee38.1 h1:uJm/22xugluY5AL2NkIDbNEFBxzN6UcI8vts/bGEDBs=
@@ -36,6 +42,8 @@ buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.1-000000000
 buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.1-00000000000000-e54e1c9ad405.1/go.mod h1:D6ou7OxkQXmiZDDNNrT147dA9wC9rhJPchCIfVbw9wM=
 buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.2-00000000000000-e54e1c9ad405.1 h1:n2embOKwJS+YIyjHRDvOAo7c/kuv3fw9U+gQ/g2Yis8=
 buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.2-00000000000000-e54e1c9ad405.1/go.mod h1:dHPKfn7RW6FSo7EkD0LqPhZUmRm5NXMB+tWvTrTnZTQ=
+buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.5-00000000000000-e54e1c9ad405.1 h1:Y324sJphYQUJ+1TuWMkNTfa4l906LMZX6LB6En3ZvDE=
+buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go v1.36.5-00000000000000-e54e1c9ad405.1/go.mod h1:p7KHf/SEqMWFOQYEnHxSn3IytcJ4+Pabd5q/U2Jmjk8=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -945,6 +953,8 @@ google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/g
 google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
 google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

grpc/optimistic/server.go

@@ -2,8 +2,10 @@ package optimistic
 
 import (
 	auctionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/auction/v1alpha1/auctionv1alpha1grpc"
+	optimisticExecutionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/optimistic_execution/v1alpha1/optimistic_executionv1alpha1grpc"
 	auctionPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/auction/v1alpha1"
 	astriaPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/execution/v1"
+	optimisticExecutionPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/optimistic_execution/v1alpha1"
 	sequencerblockv1 "buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go/astria/sequencerblock/v1"
 	"context"
 	"errors"
@@ -27,7 +29,7 @@ import (
 )
 
 type AuctionServiceV1Alpha1 struct {
-	auctionGrpc.UnimplementedOptimisticExecutionServiceServer
+	optimisticExecutionGrpc.UnimplementedOptimisticExecutionServiceServer
 	auctionGrpc.UnimplementedAuctionServiceServer
 
 	sharedServiceContainer *shared.SharedServiceContainer
@@ -113,7 +115,7 @@ func (o *AuctionServiceV1Alpha1) GetBidStream(_ *auctionPb.GetBidStreamRequest,
 	}
 }
 
-func (o *AuctionServiceV1Alpha1) ExecuteOptimisticBlockStream(stream auctionGrpc.OptimisticExecutionService_ExecuteOptimisticBlockStreamServer) error {
+func (o *AuctionServiceV1Alpha1) ExecuteOptimisticBlockStream(stream optimisticExecutionGrpc.OptimisticExecutionService_ExecuteOptimisticBlockStreamServer) error {
 	log.Debug("ExecuteOptimisticBlockStream called")
 
 	mempoolClearingEventCh := make(chan core.NewMempoolCleared)
@@ -152,7 +154,7 @@ func (o *AuctionServiceV1Alpha1) ExecuteOptimisticBlockStream(stream auctionGrpc
 			o.currentAuctionBlock.Store(&baseBlock.SequencerBlockHash)
 			executeOptimisticBlockSuccessCount.Inc(1)
 			log.Debug("sending optimistic block response", "block_hash", optimisticBlockHash.String(), "base_block_hash", common.BytesToHash(baseBlock.SequencerBlockHash).String())
-			err = stream.Send(&auctionPb.ExecuteOptimisticBlockStreamResponse{
+			err = stream.Send(&optimisticExecutionPb.ExecuteOptimisticBlockStreamResponse{
 				Block:                  optimisticBlock,
 				BaseSequencerBlockHash: baseBlock.SequencerBlockHash,
 			})
@@ -178,7 +180,7 @@ func (o *AuctionServiceV1Alpha1) ExecuteOptimisticBlockStream(stream auctionGrpc
 	}
 }
 
-func (o *AuctionServiceV1Alpha1) ExecuteOptimisticBlock(ctx context.Context, req *auctionPb.BaseBlock) (*astriaPb.Block, error) {
+func (o *AuctionServiceV1Alpha1) ExecuteOptimisticBlock(ctx context.Context, req *optimisticExecutionPb.BaseBlock) (*astriaPb.Block, error) {
 	// we need to execute the optimistic block
 	log.Debug("ExecuteOptimisticBlock called", "timestamp", req.Timestamp, "sequencer_block_hash", common.BytesToHash(req.SequencerBlockHash).String())
 

grpc/optimistic/server_test.go

@@ -1,8 +1,9 @@
 package optimistic
 
 import (
-	optimsticPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/auction/v1alpha1"
+	auctionPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/auction/v1alpha1"
 	astriaPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/execution/v1"
+	optimisticExecutionPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/optimistic_execution/v1alpha1"
 	primitivev1 "buf.build/gen/go/astria/primitives/protocolbuffers/go/astria/primitive/v1"
 	sequencerblockv1 "buf.build/gen/go/astria/sequencerblock-apis/protocolbuffers/go/astria/sequencerblock/v1"
 	"bytes"
@@ -134,7 +135,7 @@ func TestAuctionServiceServerV1Alpha1_ExecuteOptimisticBlock(t *testing.T) {
 			optimsticHeadSub := ethservice.BlockChain().SubscribeChainOptimisticHeadEvent(optimisticHeadCh)
 			defer optimsticHeadSub.Unsubscribe()
 
-			baseBlockReq := &optimsticPb.BaseBlock{
+			baseBlockReq := &optimisticExecutionPb.BaseBlock{
 				Timestamp: &timestamppb.Timestamp{
 					Seconds: int64(tt.timestamp),
 				},
@@ -212,7 +213,7 @@ func TestAuctionServiceServerV1Alpha_StreamBids(t *testing.T) {
 	require.NotNil(t, previousBlock, "Previous block not found")
 
 	// create the optimistic block via the StreamExecuteOptimisticBlock rpc
-	requestStreams := []*optimsticPb.ExecuteOptimisticBlockStreamRequest{}
+	requestStreams := []*optimisticExecutionPb.ExecuteOptimisticBlockStreamRequest{}
 	sequencerBlockHash := []byte("sequencer_block_hash")
 
 	// create 1 stream item with 5 txs
@@ -240,7 +241,7 @@ func TestAuctionServiceServerV1Alpha_StreamBids(t *testing.T) {
 	require.Equal(t, pending, 5, "Mempool should have 5 pending txs")
 	require.Equal(t, queued, 0, "Mempool should have 0 queued txs")
 
-	req := optimsticPb.ExecuteOptimisticBlockStreamRequest{BaseBlock: &optimsticPb.BaseBlock{
+	req := optimisticExecutionPb.ExecuteOptimisticBlockStreamRequest{BaseBlock: &optimisticExecutionPb.BaseBlock{
 		SequencerBlockHash: sequencerBlockHash,
 		Transactions:       marshalledTxs,
 		Timestamp: &timestamppb.Timestamp{
@@ -250,9 +251,9 @@ func TestAuctionServiceServerV1Alpha_StreamBids(t *testing.T) {
 
 	requestStreams = append(requestStreams, &req)
 
-	mockBidirectionalStream := &MockBidirectionalStreaming[optimsticPb.ExecuteOptimisticBlockStreamRequest, optimsticPb.ExecuteOptimisticBlockStreamResponse]{
+	mockBidirectionalStream := &MockBidirectionalStreaming[optimisticExecutionPb.ExecuteOptimisticBlockStreamRequest, optimisticExecutionPb.ExecuteOptimisticBlockStreamResponse]{
 		requestStream:        requestStreams,
-		accumulatedResponses: []*optimsticPb.ExecuteOptimisticBlockStreamResponse{},
+		accumulatedResponses: []*optimisticExecutionPb.ExecuteOptimisticBlockStreamResponse{},
 		requestCounter:       0,
 	}
 
@@ -281,13 +282,13 @@ func TestAuctionServiceServerV1Alpha_StreamBids(t *testing.T) {
 	require.Equal(t, pending, 0, "Mempool should have 0 pending txs")
 	require.Equal(t, queued, 0, "Mempool should have 0 queued txs")
 
-	mockServerSideStreaming := MockServerSideStreaming[optimsticPb.GetBidStreamResponse]{
-		sentResponses: []*optimsticPb.GetBidStreamResponse{},
+	mockServerSideStreaming := MockServerSideStreaming[auctionPb.GetBidStreamResponse]{
+		sentResponses: []*auctionPb.GetBidStreamResponse{},
 	}
 
 	errorCh = make(chan error)
 	go func() {
-		errorCh <- optimisticServiceV1Alpha1.GetBidStream(&optimsticPb.GetBidStreamRequest{}, &mockServerSideStreaming)
+		errorCh <- optimisticServiceV1Alpha1.GetBidStream(&auctionPb.GetBidStreamRequest{}, &mockServerSideStreaming)
 	}()
 
 	stateDb, err := ethservice.BlockChain().StateAt(currentOptimisticBlock.Root)
@@ -370,7 +371,7 @@ func TestAuctionServiceServerV1_StreamExecuteOptimisticBlock(t *testing.T) {
 	previousBlock := ethservice.BlockChain().CurrentSafeBlock()
 	require.NotNil(t, previousBlock, "Previous block not found")
 
-	requestStreams := []*optimsticPb.ExecuteOptimisticBlockStreamRequest{}
+	requestStreams := []*optimisticExecutionPb.ExecuteOptimisticBlockStreamRequest{}
 	sequencerBlockHash := []byte("sequencer_block_hash")
 
 	// create 1 stream item with 5 txs
@@ -398,7 +399,7 @@ func TestAuctionServiceServerV1_StreamExecuteOptimisticBlock(t *testing.T) {
 	require.Equal(t, pending, 5, "Mempool should have 5 pending txs")
 	require.Equal(t, queued, 0, "Mempool should have 0 queued txs")
 
-	req := optimsticPb.ExecuteOptimisticBlockStreamRequest{BaseBlock: &optimsticPb.BaseBlock{
+	req := optimisticExecutionPb.ExecuteOptimisticBlockStreamRequest{BaseBlock: &optimisticExecutionPb.BaseBlock{
 		SequencerBlockHash: sequencerBlockHash,
 		Transactions:       marshalledTxs,
 		Timestamp: &timestamppb.Timestamp{
@@ -408,9 +409,9 @@ func TestAuctionServiceServerV1_StreamExecuteOptimisticBlock(t *testing.T) {
 
 	requestStreams = append(requestStreams, &req)
 
-	mockStream := &MockBidirectionalStreaming[optimsticPb.ExecuteOptimisticBlockStreamRequest, optimsticPb.ExecuteOptimisticBlockStreamResponse]{
+	mockStream := &MockBidirectionalStreaming[optimisticExecutionPb.ExecuteOptimisticBlockStreamRequest, optimisticExecutionPb.ExecuteOptimisticBlockStreamResponse]{
 		requestStream:        requestStreams,
-		accumulatedResponses: []*optimsticPb.ExecuteOptimisticBlockStreamResponse{},
+		accumulatedResponses: []*optimisticExecutionPb.ExecuteOptimisticBlockStreamResponse{},
 		requestCounter:       0,
 	}
 

grpc/optimistic/validation.go

@@ -1,11 +1,11 @@
 package optimistic
 
 import (
-	optimsticPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/auction/v1alpha1"
+	optimisticExecutionPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/optimistic_execution/v1alpha1"
 	"fmt"
 )
 
-func validateStaticExecuteOptimisticBlockRequest(req *optimsticPb.BaseBlock) error {
+func validateStaticExecuteOptimisticBlockRequest(req *optimisticExecutionPb.BaseBlock) error {
 	if req.Timestamp == nil {
 		return fmt.Errorf("Timestamp cannot be nil")
 	}

node/grpcstack.go

@@ -1,11 +1,12 @@
 package node
 
 import (
-	auctionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/auction/v1alpha1/auctionv1alpha1grpc"
 	"net"
 	"sync"
 
+	auctionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/auction/v1alpha1/auctionv1alpha1grpc"
 	astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1/executionv1grpc"
+	optimisticExecutionGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/optimistic_execution/v1alpha1/optimistic_executionv1alpha1grpc"
 	"github.com/ethereum/go-ethereum/log"
 	"google.golang.org/grpc"
 )
@@ -18,7 +19,7 @@ type GRPCServerHandler struct {
 	endpoint                   string
 	execServer                 *grpc.Server
 	executionServiceServerV1a2 *astriaGrpc.ExecutionServiceServer
-	optimisticExecServ         *auctionGrpc.OptimisticExecutionServiceServer
+	optimisticExecServ         *optimisticExecutionGrpc.OptimisticExecutionServiceServer
 	auctionServiceServ         *auctionGrpc.AuctionServiceServer
 
 	enableAuctioneer bool
@@ -27,7 +28,7 @@ type GRPCServerHandler struct {
 // NewServer creates a new gRPC server.
 // It registers the execution service server.
 // It registers the gRPC server with the node so it can be stopped on shutdown.
-func NewGRPCServerHandler(node *Node, execServ astriaGrpc.ExecutionServiceServer, optimisticExecServ auctionGrpc.OptimisticExecutionServiceServer, auctionServiceServ auctionGrpc.AuctionServiceServer, cfg *Config) error {
+func NewGRPCServerHandler(node *Node, execServ astriaGrpc.ExecutionServiceServer, optimisticExecServ optimisticExecutionGrpc.OptimisticExecutionServiceServer, auctionServiceServ auctionGrpc.AuctionServiceServer, cfg *Config) error {
 	execServer := grpc.NewServer()
 
 	log.Info("gRPC server enabled", "endpoint", cfg.GRPCEndpoint())
@@ -43,7 +44,7 @@ func NewGRPCServerHandler(node *Node, execServ astriaGrpc.ExecutionServiceServer
 
 	astriaGrpc.RegisterExecutionServiceServer(execServer, execServ)
 	if cfg.EnableAuctioneer {
-		auctionGrpc.RegisterOptimisticExecutionServiceServer(execServer, optimisticExecServ)
+		optimisticExecutionGrpc.RegisterOptimisticExecutionServiceServer(execServer, optimisticExecServ)
 		auctionGrpc.RegisterAuctionServiceServer(execServer, auctionServiceServ)
 	}