Fix CallContract conversion for capaiblity

Author: dhaidashenko

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

@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"time"
 
+	valuespb "github.com/smartcontractkit/chainlink-common/pkg/values/pb"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/chains/evm"
 	evmtypes "github.com/smartcontractkit/chainlink-common/pkg/types/chains/evm"
-	valuespb "github.com/smartcontractkit/chainlink-protos/cre/go/values/pb"
 )
 
 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/chains/evm/proto_helpers.go

@@ -192,22 +192,19 @@ func ConvertCallMsgFromProto(protoMsg *CallMsg) (*evmtypes.CallMsg, error) {
 	if protoMsg == nil {
 		return nil, errEmptyMsg
 	}
-	var from evmtypes.Address
-	if len(protoMsg.From) != 0 {
-		if len(protoMsg.From) != evmtypes.AddressLength {
-			return nil, fmt.Errorf("invalid from address length: expected %d, got %d", evmtypes.AddressLength, len(protoMsg.From))
-		}
-
-		from = evmtypes.Address(protoMsg.From)
+	from, err := ConvertOptionalAddressFromProto(protoMsg.From)
+	if err != nil {
+		return nil, fmt.Errorf("from address is invalid: %w", err)
 	}
 
-	if len(protoMsg.To) != evmtypes.AddressLength {
-		return nil, fmt.Errorf("invalid to address length: expected %d, got %d", evmtypes.AddressLength, len(protoMsg.To))
+	to, err := ConvertAddressFromProto(protoMsg.GetTo())
+	if err != nil {
+		return nil, fmt.Errorf("to address is invalid: %w", err)
 	}
 	return &evmtypes.CallMsg{
 		From: from,
 		Data: protoMsg.GetData(),
-		To:   evmtypes.Address(protoMsg.GetTo()),
+		To:   to,
 	}, nil
 }
 
@@ -573,6 +570,14 @@ func ConvertAddressFromProto(b []byte) (evmtypes.Address, error) {
 	return evmtypes.Address(b), nil
 }
 
+func ConvertOptionalAddressFromProto(b []byte) (evmtypes.Address, error) {
+	if len(b) == 0 {
+		return evmtypes.Address{}, nil // Return zero address if empty
+	}
+
+	return ConvertAddressFromProto(b)
+}
+
 func ConvertHashFromProto(b []byte) (evmtypes.Hash, error) {
 	if len(b) != evmtypes.HashLength {
 		return evmtypes.Hash{}, fmt.Errorf("invalid hash length: expected %d, got %d", evmtypes.HashLength, len(b))