redo proto

tac0turtle · Apr 29, 2026 · Apr 28, 2026 · Apr 28, 2026 · Apr 28, 2026 · Apr 29, 2026
commit 58a300240547db88e3d43c6697578ecda909ff6a
diff --git a/execution/grpc/README.md b/execution/grpc/README.md
@@ -71,7 +71,7 @@ The gRPC service is defined in `proto/evnode/v1/execution.proto` and provides th
 - Support for Unix domain socket connections with `unix:///path/to/socket`
 - gRPC reflection for debugging and service discovery
 - Compression for efficient data transfer
-- Contiguous transaction batch encoding to reduce per-transaction protobuf overhead
+- Additive contiguous transaction batch encoding to reduce per-transaction protobuf overhead while keeping legacy `txs` fields in the protobuf API
 - Comprehensive error handling and validation
 
 ## Testing

diff --git a/execution/grpc/client.go b/execution/grpc/client.go
@@ -130,7 +130,7 @@ func (c *Client) GetTxs(ctx context.Context) ([][]byte, error) {
 		return nil, fmt.Errorf("grpc client: failed to get txs: %w", err)
 	}
 
-	txs, err := decodeTxBatch(resp.Msg.TxBatch)
+	txs, err := decodeTxBatchOrTxs(resp.Msg.TxBatch, resp.Msg.Txs)
 	if err != nil {
 		return nil, fmt.Errorf("grpc client: invalid get txs response: %w", err)
 	}

diff --git a/execution/grpc/server.go b/execution/grpc/server.go
@@ -107,7 +107,7 @@ func (s *Server) ExecuteTxs(
 		return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("prev_state_root is required"))
 	}
 
-	txs, err := decodeTxBatch(req.Msg.TxBatch)
+	txs, err := decodeTxBatchOrTxs(req.Msg.TxBatch, req.Msg.Txs)
 	if err != nil {
 		return nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("invalid tx_batch: %w", err))
 	}
@@ -172,7 +172,7 @@ func (s *Server) FilterTxs(
 	ctx context.Context,
 	req *connect.Request[pb.FilterTxsRequest],
 ) (*connect.Response[pb.FilterTxsResponse], error) {
-	txs, err := decodeTxBatch(req.Msg.TxBatch)
+	txs, err := decodeTxBatchOrTxs(req.Msg.TxBatch, req.Msg.Txs)
 	if err != nil {
 		return nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("invalid tx_batch: %w", err))
 	}

diff --git a/execution/grpc/server_test.go b/execution/grpc/server_test.go
@@ -212,6 +212,22 @@ func TestServer_ExecuteTxs(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "legacy txs fallback",
+			req: &pb.ExecuteTxsRequest{
+				Txs:           txs,
+				BlockHeight:   blockHeight,
+				Timestamp:     timestamppb.New(timestamp),
+				PrevStateRoot: prevStateRoot,
+			},
+			mockFunc: func(ctx context.Context, txsIn [][]byte, bh uint64, ts time.Time, psr []byte) ([]byte, error) {
+				if len(txsIn) != len(txs) {
+					t.Fatalf("expected %d txs, got %d", len(txs), len(txsIn))
+				}
+				return expectedStateRoot, nil
+			},
+			wantErr: false,
+		},
 		{
 			name: "missing block height",
 			req: &pb.ExecuteTxsRequest{
@@ -416,6 +432,21 @@ func TestServer_FilterTxs(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "legacy txs fallback",
+			req: &pb.FilterTxsRequest{
+				Txs:      txs,
+				MaxBytes: 100,
+				MaxGas:   200,
+			},
+			mockFunc: func(ctx context.Context, txsIn [][]byte, maxBytes, maxGas uint64, forced bool) ([]execution.FilterStatus, error) {
+				if len(txsIn) != len(txs) {
+					t.Fatalf("expected %d txs, got %d", len(txs), len(txsIn))
+				}
+				return expectedStatuses, nil
+			},
+			wantErr: false,
+		},
 		{
 			name: "invalid tx batch",
 			req: &pb.FilterTxsRequest{

diff --git a/execution/grpc/tx_batch.go b/execution/grpc/tx_batch.go
@@ -72,3 +72,14 @@ func decodeTxBatch(batch *pb.TxBatch) ([][]byte, error) {
 	}
 	return txs, nil
 }
+
+func decodeTxBatchOrTxs(batch *pb.TxBatch, txs [][]byte) ([][]byte, error) {
+	if hasTxBatchData(batch) {
+		return decodeTxBatch(batch)
+	}
+	return txs, nil
+}
+
+func hasTxBatchData(batch *pb.TxBatch) bool {
+	return batch != nil && (len(batch.Data) != 0 || len(batch.TxSizes) != 0)
+}
diff --git a/execution/grpc/tx_batch_test.go b/execution/grpc/tx_batch_test.go
@@ -67,3 +67,36 @@ func TestDecodeTxBatchRejectsMalformedInput(t *testing.T) {
 		})
 	}
 }
+
+func TestDecodeTxBatchOrTxsFallsBackToLegacyTxs(t *testing.T) {
+	legacyTxs := [][]byte{[]byte("legacy1"), []byte("legacy2")}
+
+	txs, err := decodeTxBatchOrTxs(nil, legacyTxs)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if len(txs) != len(legacyTxs) {
+		t.Fatalf("expected %d txs, got %d", len(legacyTxs), len(txs))
+	}
+	for i := range txs {
+		if !bytes.Equal(txs[i], legacyTxs[i]) {
+			t.Fatalf("tx %d: expected %q, got %q", i, legacyTxs[i], txs[i])
+		}
+	}
+}
+
+func TestDecodeTxBatchOrTxsPrefersTxBatch(t *testing.T) {
+	batchTxs := [][]byte{[]byte("batch")}
+	legacyTxs := [][]byte{[]byte("legacy")}
+
+	txs, err := decodeTxBatchOrTxs(mustEncodeTxBatch(t, batchTxs), legacyTxs)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if len(txs) != len(batchTxs) {
+		t.Fatalf("expected %d txs, got %d", len(batchTxs), len(txs))
+	}
+	if !bytes.Equal(txs[0], batchTxs[0]) {
+		t.Fatalf("expected tx_batch %q, got %q", batchTxs[0], txs[0])
+	}
+}
diff --git a/proto/evnode/v1/execution.proto b/proto/evnode/v1/execution.proto
@@ -61,13 +61,16 @@ message TxBatch {
 // GetTxsResponse contains the available transactions
 message GetTxsResponse {
   // Valid transactions from mempool.
-  TxBatch tx_batch = 1;
+  repeated bytes txs = 1;
+
+  // Valid transactions from mempool in contiguous batch form.
+  TxBatch tx_batch = 2;
 }
 
 // ExecuteTxsRequest contains transactions and block context for execution
 message ExecuteTxsRequest {
   // Ordered transactions to execute.
-  TxBatch tx_batch = 1;
+  repeated bytes txs = 1;
 
   // Height of block being created (must be > 0)
   uint64 block_height = 2;
@@ -77,6 +80,9 @@ message ExecuteTxsRequest {
 
   // Previous block's state root hash
   bytes prev_state_root = 4;
+
+  // Ordered transactions to execute in contiguous batch form.
+  TxBatch tx_batch = 5;
 }
 
 // ExecuteTxsResponse contains the result of transaction execution
@@ -122,7 +128,7 @@ enum FilterStatus {
 // FilterTxsRequest contains transactions to validate and filter
 message FilterTxsRequest {
   // All transactions (force-included + mempool).
-  TxBatch tx_batch = 1;
+  repeated bytes txs = 1;
 
   // Maximum cumulative size allowed (0 means no size limit)
   uint64 max_bytes = 2;
@@ -132,6 +138,9 @@ message FilterTxsRequest {
 
   // Whether force-included transactions are present
   bool has_force_included_transaction = 4;
+
+  // All transactions (force-included + mempool) in contiguous batch form.
+  TxBatch tx_batch = 5;
 }
 
 // FilterTxsResponse contains the filter status for each transaction

diff --git a/types/pb/evnode/v1/execution.pb.go b/types/pb/evnode/v1/execution.pb.go