Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions pkg/capabilities/v2/chain-capabilities/evm/proto_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions pkg/capabilities/v2/consensus/server/consensus_server_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 18 additions & 2 deletions pkg/chains/evm/proto_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,19 @@ func ConvertCallMsgFromProto(protoMsg *CallMsg) (*evmtypes.CallMsg, error) {
if protoMsg == nil {
return nil, errEmptyMsg
}
from, err := ConvertOptionalAddressFromProto(protoMsg.From)
if err != nil {
return nil, fmt.Errorf("from address is invalid: %w", err)
}

to, err := 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
}

Expand Down Expand Up @@ -562,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))
Expand Down
Loading