Merge branch 'master' into composable-ci-action

Author: Elvis339

.github/workflows/c-chain-reexecution-benchmark-container.json

@@ -22,6 +22,25 @@
         ]
     },
     "schedule": {
-        "include": []
+        "include": [
+            {
+                "runner": "avago-runner-m6i-4xlarge-ebs-fast",
+                "config": "default",
+                "start-block": 33000001,
+                "end-block": 33500000,
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-30m-40m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-33m/**",
+                "timeout-minutes": 1440
+            },
+            {
+                "runner": "avago-runner-i4i-4xlarge-local-ssd",
+                "config": "default",
+                "start-block": 33000001,
+                "end-block": 33500000,
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-30m-40m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-33m/**",
+                "timeout-minutes": 1440
+            }
+        ]
     }
 }

.github/workflows/c-chain-reexecution-benchmark-container.yml

@@ -38,8 +38,8 @@ on:
 
   # Disabled because scheduled trigger is empty. To enable, uncomment and add at least one vector to the schedule
   # entry in the corresponding JSON file.
-  # schedule:
-  #   - cron: '0 9 * * *' # Runs every day at 09:00 UTC (04:00 EST)
+  schedule:
+    - cron: '0 9 * * *' # Runs every day at 09:00 UTC (04:00 EST)
 
 jobs:
   define-matrix:

.github/workflows/c-chain-reexecution-benchmark-gh-native.json

@@ -31,16 +31,6 @@
         ]
     },
     "schedule": {
-        "include": [
-            {
-                "runner": "blacksmith-4vcpu-ubuntu-2404",
-                "config": "default",
-                "start-block": 33000001,
-                "end-block": 33500000,
-                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-30m-40m-ldb/**",
-                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-33m/**",
-                "timeout-minutes": 1440
-            }
-        ]
+        "include": []
     }
 }

.github/workflows/c-chain-reexecution-benchmark-gh-native.yml

@@ -35,8 +35,11 @@ on:
         description: 'Timeout in minutes for the job.'
         required: false
         default: 30
-  schedule:
-    - cron: '0 9 * * *' # Runs every day at 09:00 UTC (04:00 EST)
+
+  # Disabled because scheduled trigger is empty. To enable, uncomment and add at least one vector to the schedule
+  # entry in the corresponding JSON file.
+  # schedule:
+  #   - cron: '0 9 * * *' # Runs every day at 09:00 UTC (04:00 EST)
 
 jobs:
   define-matrix:

api/connectclient/client.go

@@ -5,8 +5,12 @@ package connectclient
 
 import (
 	"context"
+	"crypto/tls"
+	"net"
+	"net/http"
 
 	"connectrpc.com/connect"
+	"golang.org/x/net/http2"
 
 	"github.com/ava-labs/avalanchego/api/server"
 )
@@ -16,24 +20,40 @@ var _ connect.Interceptor = (*SetRouteHeaderInterceptor)(nil)
 // SetRouteHeaderInterceptor sets the api routing header for connect-rpc
 // requests
 type SetRouteHeaderInterceptor struct {
-	Route string
+	Route []string
 }
 
 func (s SetRouteHeaderInterceptor) WrapUnary(next connect.UnaryFunc) connect.UnaryFunc {
 	return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) {
-		request.Header().Set(server.HTTPHeaderRoute, s.Route)
+		for _, route := range s.Route {
+			request.Header().Add(server.HTTPHeaderRoute, route)
+		}
 		return next(ctx, request)
 	}
 }
 
 func (s SetRouteHeaderInterceptor) WrapStreamingClient(next connect.StreamingClientFunc) connect.StreamingClientFunc {
 	return func(ctx context.Context, spec connect.Spec) connect.StreamingClientConn {
 		conn := next(ctx, spec)
-		conn.RequestHeader().Set(server.HTTPHeaderRoute, s.Route)
+		for _, route := range s.Route {
+			conn.RequestHeader().Add(server.HTTPHeaderRoute, route)
+		}
 		return conn
 	}
 }
 
 func (SetRouteHeaderInterceptor) WrapStreamingHandler(next connect.StreamingHandlerFunc) connect.StreamingHandlerFunc {
 	return next
 }
+
+func New() *http.Client {
+	return &http.Client{
+		Transport: &http2.Transport{
+			AllowHTTP: true,
+			DialTLSContext: func(ctx context.Context, network, addr string, _ *tls.Config) (net.Conn, error) {
+				var d net.Dialer
+				return d.DialContext(ctx, network, addr) // Skip TLS to use h2c
+			},
+		},
+	}
+}

api/server/router.go

@@ -60,7 +60,7 @@ func (r *router) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 
 	// Request specified the routing header key but did not provide a
 	// corresponding value
-	if len(route) != 1 {
+	if len(route) < 1 {
 		writer.WriteHeader(http.StatusBadRequest)
 		return
 	}