@@ -13,8 +13,8 @@ import (
1313 "sync"
1414 "time"
1515
16- astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1alpha2/executionv1alpha2grpc "
17- astriaPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/execution/v1alpha2 "
16+ astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1/executionv1grpc "
17+ astriaPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/execution/v1 "
1818 primitivev1 "buf.build/gen/go/astria/primitives/protocolbuffers/go/astria/primitive/v1"
1919 "github.com/ethereum/go-ethereum/beacon/engine"
2020 "github.com/ethereum/go-ethereum/common"
@@ -30,9 +30,9 @@ import (
3030 "google.golang.org/protobuf/types/known/timestamppb"
3131)
3232
33- // ExecutionServiceServerV1Alpha2 is the implementation of the
33+ // ExecutionServiceServerV1 is the implementation of the
3434// ExecutionServiceServer interface.
35- type ExecutionServiceServerV1Alpha2 struct {
35+ type ExecutionServiceServerV1 struct {
3636 // NOTE - from the generated code: All implementations must embed
3737 // UnimplementedExecutionServiceServer for forward compatibility
3838 astriaGrpc.UnimplementedExecutionServiceServer
7474 commitmentStateUpdateTimer = metrics .GetOrRegisterTimer ("astria/execution/commitment" , nil )
7575)
7676
77- func NewExecutionServiceServerV1Alpha2 (eth * eth.Ethereum ) (* ExecutionServiceServerV1Alpha2 , error ) {
77+ func NewExecutionServiceServerV1 (eth * eth.Ethereum ) (* ExecutionServiceServerV1 , error ) {
7878 bc := eth .BlockChain ()
7979
8080 if bc .Config ().AstriaRollupName == "" {
@@ -143,7 +143,7 @@ func NewExecutionServiceServerV1Alpha2(eth *eth.Ethereum) (*ExecutionServiceServ
143143 }
144144 }
145145
146- return & ExecutionServiceServerV1Alpha2 {
146+ return & ExecutionServiceServerV1 {
147147 eth : eth ,
148148 bc : bc ,
149149 bridgeAddresses : bridgeAddresses ,
@@ -152,7 +152,7 @@ func NewExecutionServiceServerV1Alpha2(eth *eth.Ethereum) (*ExecutionServiceServ
152152 }, nil
153153}
154154
155- func (s * ExecutionServiceServerV1Alpha2 ) GetGenesisInfo (ctx context.Context , req * astriaPb.GetGenesisInfoRequest ) (* astriaPb.GenesisInfo , error ) {
155+ func (s * ExecutionServiceServerV1 ) GetGenesisInfo (ctx context.Context , req * astriaPb.GetGenesisInfoRequest ) (* astriaPb.GenesisInfo , error ) {
156156 log .Debug ("GetGenesisInfo called" )
157157 getGenesisInfoRequestCount .Inc (1 )
158158
@@ -172,7 +172,7 @@ func (s *ExecutionServiceServerV1Alpha2) GetGenesisInfo(ctx context.Context, req
172172}
173173
174174// GetBlock will return a block given an identifier.
175- func (s * ExecutionServiceServerV1Alpha2 ) GetBlock (ctx context.Context , req * astriaPb.GetBlockRequest ) (* astriaPb.Block , error ) {
175+ func (s * ExecutionServiceServerV1 ) GetBlock (ctx context.Context , req * astriaPb.GetBlockRequest ) (* astriaPb.Block , error ) {
176176 if req .GetIdentifier () == nil {
177177 return nil , status .Error (codes .InvalidArgument , "identifier cannot be empty" )
178178 }
@@ -193,7 +193,7 @@ func (s *ExecutionServiceServerV1Alpha2) GetBlock(ctx context.Context, req *astr
193193
194194// BatchGetBlocks will return an array of Blocks given an array of block
195195// identifiers.
196- func (s * ExecutionServiceServerV1Alpha2 ) BatchGetBlocks (ctx context.Context , req * astriaPb.BatchGetBlocksRequest ) (* astriaPb.BatchGetBlocksResponse , error ) {
196+ func (s * ExecutionServiceServerV1 ) BatchGetBlocks (ctx context.Context , req * astriaPb.BatchGetBlocksRequest ) (* astriaPb.BatchGetBlocksResponse , error ) {
197197 if req .Identifiers == nil || len (req .Identifiers ) == 0 {
198198 return nil , status .Error (codes .InvalidArgument , "identifiers cannot be empty" )
199199 }
@@ -232,7 +232,7 @@ func protoU128ToBigInt(u128 *primitivev1.Uint128) *big.Int {
232232
233233// ExecuteBlock drives deterministic derivation of a rollup block from sequencer
234234// block data
235- func (s * ExecutionServiceServerV1Alpha2 ) ExecuteBlock (ctx context.Context , req * astriaPb.ExecuteBlockRequest ) (* astriaPb.Block , error ) {
235+ func (s * ExecutionServiceServerV1 ) ExecuteBlock (ctx context.Context , req * astriaPb.ExecuteBlockRequest ) (* astriaPb.Block , error ) {
236236 if err := validateStaticExecuteBlockRequest (req ); err != nil {
237237 log .Error ("ExecuteBlock called with invalid ExecuteBlockRequest" , "err" , err )
238238 return nil , status .Error (codes .InvalidArgument , "ExecuteBlockRequest is invalid" )
@@ -323,7 +323,7 @@ func (s *ExecutionServiceServerV1Alpha2) ExecuteBlock(ctx context.Context, req *
323323}
324324
325325// GetCommitmentState fetches the current CommitmentState of the chain.
326- func (s * ExecutionServiceServerV1Alpha2 ) GetCommitmentState (ctx context.Context , req * astriaPb.GetCommitmentStateRequest ) (* astriaPb.CommitmentState , error ) {
326+ func (s * ExecutionServiceServerV1 ) GetCommitmentState (ctx context.Context , req * astriaPb.GetCommitmentStateRequest ) (* astriaPb.CommitmentState , error ) {
327327 log .Info ("GetCommitmentState called" )
328328 getCommitmentStateRequestCount .Inc (1 )
329329
@@ -354,7 +354,7 @@ func (s *ExecutionServiceServerV1Alpha2) GetCommitmentState(ctx context.Context,
354354
355355// UpdateCommitmentState replaces the whole CommitmentState with a new
356356// CommitmentState.
357- func (s * ExecutionServiceServerV1Alpha2 ) UpdateCommitmentState (ctx context.Context , req * astriaPb.UpdateCommitmentStateRequest ) (* astriaPb.CommitmentState , error ) {
357+ func (s * ExecutionServiceServerV1 ) UpdateCommitmentState (ctx context.Context , req * astriaPb.UpdateCommitmentStateRequest ) (* astriaPb.CommitmentState , error ) {
358358 if err := validateStaticCommitmentState (req .CommitmentState ); err != nil {
359359 log .Error ("UpdateCommitmentState called with invalid CommitmentState" , "err" , err )
360360 return nil , status .Error (codes .InvalidArgument , "CommitmentState is invalid" )
@@ -434,7 +434,7 @@ func (s *ExecutionServiceServerV1Alpha2) UpdateCommitmentState(ctx context.Conte
434434 return req .CommitmentState , nil
435435}
436436
437- func (s * ExecutionServiceServerV1Alpha2 ) getBlockFromIdentifier (identifier * astriaPb.BlockIdentifier ) (* astriaPb.Block , error ) {
437+ func (s * ExecutionServiceServerV1 ) getBlockFromIdentifier (identifier * astriaPb.BlockIdentifier ) (* astriaPb.Block , error ) {
438438 var header * types.Header
439439
440440 // Grab the header based on the identifier provided
@@ -475,6 +475,6 @@ func ethHeaderToExecutionBlock(header *types.Header) (*astriaPb.Block, error) {
475475 }, nil
476476}
477477
478- func (s * ExecutionServiceServerV1Alpha2 ) syncMethodsCalled () bool {
478+ func (s * ExecutionServiceServerV1 ) syncMethodsCalled () bool {
479479 return s .genesisInfoCalled && s .getCommitmentStateCalled
480480}
0 commit comments