Merge branch 'main' into otelhealth

Author: jmank88

.github/workflows/api-diff.yml

@@ -0,0 +1,31 @@
+name: Analyze API Changes
+description: Runs apidiff-go action to check for breaking changes to modules' public APIs
+
+on:
+  pull_request:
+
+jobs:
+  root-module:
+    name: Root Module
+    permissions:
+      pull-requests: write
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+          cache: false
+
+      - uses: smartcontractkit/.github/actions/apidiff-go@apidiff-go/0.1.0
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          go-mod-paths: "./"
+          enforce-compatible: "false" # dont fail on breaking changes

.github/workflows/build_external.yml

@@ -104,6 +104,12 @@ jobs:
       - name: Install Solana CLI
         run: ./scripts/install-solana-ci.sh
 
+      - name: Update mocks
+        run: |
+          make mockery
+          make rm-mocked
+          mockery
+
       - name: Build & Test
         run: make test_relay_unit
 

pkg/capabilities/actions/vault/mock/vault.go

@@ -28,7 +28,7 @@ func (m Vault) Execute(ctx context.Context, req capabilities.CapabilityRequest)
 	if err != nil {
 		return capabilities.CapabilityResponse{}, errors.New("received unexpected payload: want *vault.GetSecretsRequest")
 	}
-	if req.Method != vault.MethodGetSecrets {
+	if req.Method != "vault.secrets.get" {
 		return capabilities.CapabilityResponse{}, errors.New("received unexpected method: want vault.MethodGetSecrets")
 	}
 

pkg/capabilities/actions/vault/vault.go

@@ -3,5 +3,6 @@ package vault
 
 const (
 	CapabilityID     = "[email protected]"
-	MethodGetSecrets = "GetSecrets"
+	// Deprecated - use the types in core instead.
+	MethodGetSecrets = "vault.secrets.get"
 )

pkg/capabilities/v2/actions/http/server/client_server_gen.go

@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	evmtypes "github.com/smartcontractkit/chainlink-common/pkg/types/chains/evm"
 	valuespb "github.com/smartcontractkit/chainlink-protos/cre/go/values/pb"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/chains/evm"
+	evmtypes "github.com/smartcontractkit/chainlink-common/pkg/types/chains/evm"
 )
 
 func ConvertAddressesFromProto(addresses [][]byte) []evmtypes.Address {
@@ -172,10 +174,20 @@ func ConvertCallMsgFromProto(protoMsg *CallMsg) (*evmtypes.CallMsg, error) {
 		return nil, errEmptyMsg
 	}
 
+	from, err := evm.ConvertOptionalAddressFromProto(protoMsg.From)
+	if err != nil {
+		return nil, fmt.Errorf("from address is invalid: %w", err)
+	}
+
+	to, err := evm.ConvertAddressFromProto(protoMsg.GetTo())
+	if err != nil {
+		return nil, fmt.Errorf("to address is invalid: %w", err)
+	}
+
 	return &evmtypes.CallMsg{
-		From: evmtypes.Address(protoMsg.GetFrom()),
+		From: from,
 		Data: protoMsg.GetData(),
-		To:   evmtypes.Address(protoMsg.GetTo()),
+		To:   to,
 	}, nil
 }
 

pkg/capabilities/v2/chain-capabilities/evm/proto_helpers.go

@@ -188,7 +188,10 @@ func (c *{{.GoName|LowerFirst}}Capability) Execute(ctx context.Context, request
             {{- if eq "emptypb.Empty" (ConfigType $service) }}
             wrapped := func(ctx context.Context, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}, _ *emptypb.Empty) (*{{ImportAlias .Output.GoIdent.GoImportPath}}.{{.Output.GoIdent.GoName}}, capabilities.ResponseMetadata, error) {
                 output, err := c.{{$service.GoName}}Capability.{{.GoName}}(ctx, metadata, input)
-                if output == nil && err == nil {
+                if err != nil {
+                    return nil, capabilities.ResponseMetadata{}, err
+                }
+                if output == nil {
                     return nil, capabilities.ResponseMetadata{}, fmt.Errorf("output and error is nil for method {{.GoName}}(..) (if output is nil error must be present)")
                 }
                 return output.Response, output.ResponseMetadata, err
@@ -204,7 +207,10 @@ func (c *{{.GoName|LowerFirst}}Capability) Execute(ctx context.Context, request
              {{- if eq "emptypb.Empty" (ConfigType $service) }}
              wrapped := func(ctx context.Context, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}, _ *emptypb.Empty) (*{{ImportAlias .Output.GoIdent.GoImportPath}}.{{.Output.GoIdent.GoName}}, capabilities.ResponseMetadata, error) {
                  output, err := c.{{$service.GoName}}Capability.{{.GoName}}(ctx, metadata, input)
-                 if output == nil && err == nil {
+                 if err != nil {
+                    return nil, capabilities.ResponseMetadata{}, err
+                 }
+                 if output == nil {
                      return nil, capabilities.ResponseMetadata{}, fmt.Errorf("output and error is nil for method {{.GoName}}(..) (if output is nil error must be present)")
                  }
                  return output.Response, output.ResponseMetadata, err