Merge branch 'main' of github.com:smartcontractkit/chainlink-common into INFOPLAT-2938-logs-streaming-loopp

Author: pkcll

pkg/capabilities/v2/chain-capabilities/consensus/ocr3/types/generate.go

@@ -0,0 +1,3 @@
+package types
+
+//go:generate protoc --go_out=. --go_opt=paths=source_relative -I. ocr3_chain_capabilities_config_types.proto

pkg/capabilities/v2/chain-capabilities/consensus/ocr3/types/ocr3_chain_capabilities_config_types.pb.go

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option go_package = "capabilities/v2/chain-capabilities/consensus/ocr3/types";
+
+package chain_capabilities_ocr3_config_types;
+
+message ReportingPluginConfig {
+  // These fields are shadowing the `ReportingPluginLimits` fields.
+  // See: https://github.com/smartcontractkit/libocr/blob/master/offchainreporting2plus/ocr3types/plugin.go#L296
+  uint32 maxQueryLengthBytes = 1;
+  uint32 maxObservationLengthBytes = 2;
+  uint32 maxOutcomeLengthBytes = 3;
+  uint32 maxReportLengthBytes = 4;
+  uint32 maxReportCount = 5;
+
+  uint32 maxBatchSize = 6;
+}

pkg/capabilities/v2/chain-capabilities/consensus/ocr3/types/ocr3_chain_capabilities_config_types.proto

@@ -11,7 +11,7 @@ var _ credentials.PerRPCCredentials = basicAuthCredentials{}
 var _ credentials.PerRPCCredentials = tokenAuthCredentials{}
 
 type HeaderProvider interface {
-	Headers(ctx context.Context) map[string]string
+	Headers(ctx context.Context) (map[string]string, error)
 }
 
 // Basic-Auth authentication for Chip Ingress
@@ -50,7 +50,7 @@ func (c tokenAuthCredentials) GetRequestMetadata(ctx context.Context, _ ...strin
 	if c.authTokenProvider == nil {
 		return nil, nil
 	}
-	return c.authTokenProvider.Headers(ctx), nil
+	return c.authTokenProvider.Headers(ctx)
 }
 
 func (c tokenAuthCredentials) RequireTransportSecurity() bool {

pkg/chipingress/auth.go

@@ -53,8 +53,8 @@ type testHeaderProvider struct {
 	headers map[string]string
 }
 
-func (p *testHeaderProvider) Headers(ctx context.Context) map[string]string {
-	return p.headers
+func (p *testHeaderProvider) Headers(ctx context.Context) (map[string]string, error) {
+	return p.headers, nil
 }
 
 func TestTokenAuth(t *testing.T) {

pkg/chipingress/auth_test.go

@@ -167,7 +167,13 @@ func newHeaderInterceptor(provider HeaderProvider) grpc.UnaryClientInterceptor {
 	return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
 		// Add dynamic headers from provider if available
 		if provider != nil {
-			for k, v := range provider.Headers(ctx) {
+
+			headers, err := provider.Headers(ctx)
+			if err != nil {
+				return fmt.Errorf("failed to get headers: %w", err)
+			}
+
+			for k, v := range headers {
 				ctx = metadata.AppendToOutgoingContext(ctx, k, v)
 			}
 		}

pkg/chipingress/client.go

@@ -584,8 +584,8 @@ type mockHeaderProvider struct {
 	headers map[string]string
 }
 
-func (m *mockHeaderProvider) Headers(ctx context.Context) map[string]string {
-	return m.headers
+func (m *mockHeaderProvider) Headers(ctx context.Context) (map[string]string, error) {
+	return m.headers, nil
 }
 
 func TestWithTLS(t *testing.T) {