refactor(execution/grpc): move execution service where it belongs

Author: julienrbrt

.just/proto.just

@@ -4,6 +4,7 @@ proto-gen:
     @echo "--> Generating Protobuf files"
     buf generate --path="./proto/evnode" --template="buf.gen.yaml" --config="buf.yaml"
     buf generate --path="./proto/execution/evm" --template="buf.gen.evm.yaml" --config="buf.yaml"
+    buf generate --template="buf.gen.grpc.yaml" --config="buf.yaml"
 
 # Lint protobuf files (requires Docker)
 [group('proto')]

CHANGELOG.md

@@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Optimization of mutex usage in cache for reaper [#3286](https://github.com/evstack/ev-node/pull/3286)
 - Add Unix domain socket support for gRPC execution endpoints via `unix:///path/to/socket` [#3297](https://github.com/evstack/ev-node/pull/3297)
-- **BREAKING:** Replace legacy gRPC execution `txs` payload fields with `tx_batch` so clients and servers use contiguous transaction buffers [#3297](https://github.com/evstack/ev-node/pull/3297)
+- **BREAKING:** (execution/grpc)
+  - Move execution service where it belongs in execution/grpc. []()
+  - Replace legacy gRPC execution `txs` payload fields with `tx_batch` so clients and servers use contiguous transaction buffers [#3297](https://github.com/evstack/ev-node/pull/3297)
 - Optimize metadata writes by making it async in cache store [#3298](https://github.com/evstack/ev-node/pull/3298)
 - Reduce tx cache retention to avoid OOM under (really) heavy tx load [#3299](https://github.com/evstack/ev-node/pull/3299)
 

buf.gen.grpc.yaml

@@ -0,0 +1,11 @@
+version: v2
+
+plugins:
+  - remote: buf.build/protocolbuffers/go
+    out: execution/grpc/types/pb
+    opt: paths=source_relative
+  - remote: buf.build/connectrpc/go
+    out: execution/grpc/types/pb
+    opt: paths=source_relative
+inputs:
+  - directory: execution/grpc/proto

buf.yaml

@@ -2,6 +2,7 @@ version: v2
 
 modules:
   - path: proto
+  - path: execution/grpc/proto
 lint:
   use:
     - COMMENTS
@@ -14,6 +15,4 @@ lint:
 breaking:
   use:
     - FILE
-  ignore_only:
-    FIELD_NO_DELETE:
-      - proto/evnode/v1/execution.proto
+

execution/grpc/client.go

@@ -15,8 +15,8 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/evstack/ev-node/core/execution"
-	pb "github.com/evstack/ev-node/types/pb/evnode/v1"
-	"github.com/evstack/ev-node/types/pb/evnode/v1/v1connect"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
+	"github.com/evstack/ev-node/execution/grpc/types/pb/pbconnect"
 )
 
 // Ensure Client implements the execution.Executor interface
@@ -25,7 +25,7 @@ var _ execution.Executor = (*Client)(nil)
 // Client is a gRPC client that implements the execution.Executor interface.
 // It communicates with a remote execution service via gRPC using Connect-RPC.
 type Client struct {
-	client v1connect.ExecutorServiceClient
+	client pbconnect.ExecutorServiceClient
 }
 
 const (
@@ -99,7 +99,7 @@ func NewClient(url string, opts ...connect.ClientOption) (*Client, error) {
 		return nil, err
 	}
 	return &Client{
-		client: v1connect.NewExecutorServiceClient(
+		client: pbconnect.NewExecutorServiceClient(
 			httpClient,
 			targetURL,
 			opts...,

execution/grpc/go.mod

@@ -2,12 +2,9 @@ module github.com/evstack/ev-node/execution/grpc
 
 go 1.25.7
 
-replace github.com/evstack/ev-node => ../..
-
 require (
 	connectrpc.com/connect v1.19.2
 	connectrpc.com/grpcreflect v1.3.0
-	github.com/evstack/ev-node v1.1.1
 	github.com/evstack/ev-node/core v1.0.0
 	golang.org/x/net v0.53.0
 	google.golang.org/protobuf v1.36.11

execution/grpc/go.sum

@@ -2,8 +2,6 @@ connectrpc.com/connect v1.19.2 h1:McQ83FGdzL+t60peksi0gXC7MQ/iLKgLduAnThbM0mo=
 connectrpc.com/connect v1.19.2/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
 connectrpc.com/grpcreflect v1.3.0 h1:Y4V+ACf8/vOb1XOc251Qun7jMB75gCUNw6llvB9csXc=
 connectrpc.com/grpcreflect v1.3.0/go.mod h1:nfloOtCS8VUQOQ1+GTdFzVg2CJo4ZGaat8JIovCtDYs=
-github.com/evstack/ev-node v1.1.1 h1:J9h5PKx177XdvNWLZCDOkWJEGRIrPzYxkCFhbGkVUm8=
-github.com/evstack/ev-node v1.1.1/go.mod h1:/d/i+SSTDFnxffoijcrwmlt0LgfUU8D4S3HQqucwtu8=
 github.com/evstack/ev-node/core v1.0.0 h1:s0Tx0uWHme7SJn/ZNEtee4qNM8UO6PIxXnHhPbbKTz8=
 github.com/evstack/ev-node/core v1.0.0/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

execution/grpc/handler.go

@@ -10,7 +10,7 @@ import (
 	"golang.org/x/net/http2/h2c"
 
 	"github.com/evstack/ev-node/core/execution"
-	"github.com/evstack/ev-node/types/pb/evnode/v1/v1connect"
+	"github.com/evstack/ev-node/execution/grpc/types/pb/pbconnect"
 )
 
 // NewExecutorServiceHandler creates a new HTTP handler for the ExecutorService.
@@ -33,13 +33,13 @@ func NewExecutorServiceHandler(executor execution.Executor, opts ...connect.Hand
 
 	// Set up gRPC reflection for debugging and discovery
 	reflector := grpcreflect.NewStaticReflector(
-		v1connect.ExecutorServiceName,
+		pbconnect.ExecutorServiceName,
 	)
 	mux.Handle(grpcreflect.NewHandlerV1(reflector, compress1KB))
 	mux.Handle(grpcreflect.NewHandlerV1Alpha(reflector, compress1KB))
 
 	// Register the ExecutorService
-	path, handler := v1connect.NewExecutorServiceHandler(server, append(opts, compress1KB)...)
+	path, handler := pbconnect.NewExecutorServiceHandler(server, append(opts, compress1KB)...)
 	mux.Handle(path, handler)
 
 	// Use h2c to support HTTP/2 without TLS

proto/evnode/v1/execution.proto execution/grpc/proto/execution.protoproto/evnode/v1/execution.proto renamed to execution/grpc/proto/execution.proto

@@ -3,9 +3,9 @@ package evnode.v1;
 
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/evstack/ev-node/types/pb/evnode/v1";
+option go_package = "github.com/evstack/ev-node/execution/grpc/types/pb";
 
-// ExecutorService defines the execution layer interface for EVNode
+// ExecutorService defines the execution layer interface for execution/grpc
 service ExecutorService {
   // InitChain initializes a new blockchain instance with genesis parameters
   rpc InitChain(InitChainRequest) returns (InitChainResponse) {}

execution/grpc/server.go

@@ -8,7 +8,7 @@ import (
 	"connectrpc.com/connect"
 
 	"github.com/evstack/ev-node/core/execution"
-	pb "github.com/evstack/ev-node/types/pb/evnode/v1"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
 )
 
 // Server is a gRPC server that wraps an execution.Executor implementation.