CCIP - add ExtraDataCodecBundle protobuf and client/server support

Author: ogtownsend

pkg/loop/internal/pb/ccipocr3/codec.pb.go

@@ -32,6 +32,12 @@ service SourceChainExtraDataCodec {
   rpc DecodeDestExecDataToMap(DecodeDestExecDataToMapRequest) returns (DecodeDestExecDataToMapResponse);
 }
 
+// ExtraDataCodecBundle service for decoding extra args and dest exec data with chain selector
+service ExtraDataCodecBundle {
+  rpc DecodeExtraArgs(DecodeExtraArgsWithChainSelectorRequest) returns (DecodeExtraArgsWithChainSelectorResponse);
+  rpc DecodeTokenAmountDestExecData(DecodeTokenAmountDestExecDataRequest) returns (DecodeTokenAmountDestExecDataResponse);
+}
+
 // ChainSpecificAddressCodec messages
 message AddressBytesToStringRequest {
   bytes address = 1;
@@ -109,6 +115,25 @@ message DecodeDestExecDataToMapResponse {
   values.v1.Map decoded_map = 1;
 }
 
+// ExtraDataCodecBundle messages
+message DecodeExtraArgsWithChainSelectorRequest {
+  bytes extra_args = 1;
+  uint64 source_chain_selector = 2;
+}
+
+message DecodeExtraArgsWithChainSelectorResponse {
+  values.v1.Map decoded_map = 1;
+}
+
+message DecodeTokenAmountDestExecDataRequest {
+  bytes dest_exec_data = 1;
+  uint64 source_chain_selector = 2;
+}
+
+message DecodeTokenAmountDestExecDataResponse {
+  values.v1.Map decoded_map = 1;
+}
+
 // Supporting types
 message ExecutePluginReport {
   repeated ChainReport chain_reports = 1;

pkg/loop/internal/pb/ccipocr3/codec.proto

@@ -63,6 +63,7 @@ message CCIPProviderArgs {
   string OffRampAddress = 4;
   uint32 pluginType = 5;
   map<string, bytes> synced_addresses = 6; // map[contract_name]contract_address
+  uint32 extraDataCodecBundleID = 7; // LOOP service ID for ExtraDataCodecBundle served by core node
 }
 
 // NewContractWriterRequest has request parameters for [github.com/smartcontractkit/chainlink-common/pkg/loop.Relayer.NewContractWriter].

pkg/loop/internal/pb/ccipocr3/codec_grpc.pb.go

@@ -589,3 +589,80 @@ func pbToExecutePluginReport(pb *ccipocr3pb.ExecutePluginReport) ccipocr3.Execut
 		ChainReports: chainReports,
 	}
 }
+
+// ExtraDataCodecBundle client
+var _ ccipocr3.ExtraDataCodecBundle = (*extraDataCodecBundleClient)(nil)
+
+type extraDataCodecBundleClient struct {
+	*net.BrokerExt
+	grpc ccipocr3pb.ExtraDataCodecBundleClient
+}
+
+func NewExtraDataCodecBundleClient(broker *net.BrokerExt, cc grpc.ClientConnInterface) ccipocr3.ExtraDataCodecBundle {
+	return &extraDataCodecBundleClient{
+		BrokerExt: broker,
+		grpc:      ccipocr3pb.NewExtraDataCodecBundleClient(cc),
+	}
+}
+
+func (c *extraDataCodecBundleClient) DecodeExtraArgs(extraArgs ccipocr3.Bytes, sourceChainSelector ccipocr3.ChainSelector) (map[string]any, error) {
+	resp, err := c.grpc.DecodeExtraArgs(context.Background(), &ccipocr3pb.DecodeExtraArgsWithChainSelectorRequest{
+		ExtraArgs:           extraArgs,
+		SourceChainSelector: uint64(sourceChainSelector),
+	})
+	if err != nil {
+		return nil, err
+	}
+	return pbMapToGoMap(resp.DecodedMap)
+}
+
+func (c *extraDataCodecBundleClient) DecodeTokenAmountDestExecData(destExecData ccipocr3.Bytes, sourceChainSelector ccipocr3.ChainSelector) (map[string]any, error) {
+	resp, err := c.grpc.DecodeTokenAmountDestExecData(context.Background(), &ccipocr3pb.DecodeTokenAmountDestExecDataRequest{
+		DestExecData:        destExecData,
+		SourceChainSelector: uint64(sourceChainSelector),
+	})
+	if err != nil {
+		return nil, err
+	}
+	return pbMapToGoMap(resp.DecodedMap)
+}
+
+// ExtraDataCodecBundle server
+var _ ccipocr3pb.ExtraDataCodecBundleServer = (*extraDataCodecBundleServer)(nil)
+
+type extraDataCodecBundleServer struct {
+	ccipocr3pb.UnimplementedExtraDataCodecBundleServer
+	impl ccipocr3.ExtraDataCodecBundle
+}
+
+func NewExtraDataCodecBundleServer(impl ccipocr3.ExtraDataCodecBundle) ccipocr3pb.ExtraDataCodecBundleServer {
+	return &extraDataCodecBundleServer{impl: impl}
+}
+
+func (s *extraDataCodecBundleServer) DecodeExtraArgs(ctx context.Context, req *ccipocr3pb.DecodeExtraArgsWithChainSelectorRequest) (*ccipocr3pb.DecodeExtraArgsWithChainSelectorResponse, error) {
+	decodedMap, err := s.impl.DecodeExtraArgs(req.ExtraArgs, ccipocr3.ChainSelector(req.SourceChainSelector))
+	if err != nil {
+		return nil, err
+	}
+	pbMap, err := goMapToPbMap(decodedMap)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert decoded map to protobuf: %w", err)
+	}
+	return &ccipocr3pb.DecodeExtraArgsWithChainSelectorResponse{
+		DecodedMap: pbMap,
+	}, nil
+}
+
+func (s *extraDataCodecBundleServer) DecodeTokenAmountDestExecData(ctx context.Context, req *ccipocr3pb.DecodeTokenAmountDestExecDataRequest) (*ccipocr3pb.DecodeTokenAmountDestExecDataResponse, error) {
+	decodedMap, err := s.impl.DecodeTokenAmountDestExecData(req.DestExecData, ccipocr3.ChainSelector(req.SourceChainSelector))
+	if err != nil {
+		return nil, err
+	}
+	pbMap, err := goMapToPbMap(decodedMap)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert decoded map to protobuf: %w", err)
+	}
+	return &ccipocr3pb.DecodeTokenAmountDestExecDataResponse{
+		DecodedMap: pbMap,
+	}, nil
+}

pkg/loop/internal/pb/relayer.pb.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
+	
 	ccipocr3pb "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb/ccipocr3"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
 )