Merge branch 'develop' into keystone-bytes32-secrets-pub-key

core/capabilities/webapi/trigger.go

@@ -24,7 +24,7 @@ import (
 
 const defaultSendChannelBufferSize = 1000
 
-const TriggerType = "web-trigger@1.0.0"
+const TriggerType = "web-api-trigger@1.0.0"
 
 var webapiTriggerInfo = capabilities.MustNewCapabilityInfo(
 	TriggerType,
@@ -49,6 +49,7 @@ type triggerConnectorHandler struct {
 	lggr                logger.Logger
 	mu                  sync.Mutex
 	registeredWorkflows map[string]webapiTrigger
+	registry            core.CapabilitiesRegistry
 }
 
 var _ capabilities.TriggerCapability = (*triggerConnectorHandler)(nil)
@@ -59,9 +60,11 @@ func NewTrigger(config string, registry core.CapabilitiesRegistry, connector con
 		return nil, errors.New("missing connector")
 	}
 	handler := &triggerConnectorHandler{
+		CapabilityInfo:      webapiTriggerInfo,
 		Validator:           capabilities.NewValidator[webapicap.TriggerConfig, struct{}, capabilities.TriggerResponse](capabilities.ValidatorArgs{Info: webapiTriggerInfo}),
 		connector:           connector,
 		registeredWorkflows: map[string]webapiTrigger{},
+		registry:            registry,
 		lggr:                lggr.Named("WorkflowConnectorHandler"),
 	}
 
@@ -239,7 +242,14 @@ func (h *triggerConnectorHandler) UnregisterTrigger(ctx context.Context, req cap
 	return nil
 }
 
+func (h *triggerConnectorHandler) Info(ctx context.Context) (capabilities.CapabilityInfo, error) {
+	return h.CapabilityInfo, nil
+}
+
 func (h *triggerConnectorHandler) Start(ctx context.Context) error {
+	if err := h.registry.Add(ctx, h); err != nil {
+		return err
+	}
 	return h.StartOnce("GatewayConnectorServiceWrapper", func() error {
 		return h.connector.AddHandler([]string{"web_api_trigger"}, h)
 	})
@@ -265,15 +275,13 @@ func (h *triggerConnectorHandler) sendResponse(ctx context.Context, gatewayID st
 		payloadJSON, _ = json.Marshal(webapicapabilities.TriggerResponsePayload{Status: "ERROR", ErrorMessage: fmt.Errorf("error %s marshalling payload", err.Error()).Error()})
 	}
 
-	msg := &api.Message{
-		Body: api.MessageBody{
-			MessageId: requestBody.MessageId,
-			DonId:     requestBody.DonId,
-			Method:    requestBody.Method,
-			Receiver:  requestBody.Sender,
-			Payload:   payloadJSON,
-		},
+	body := &api.MessageBody{
+		MessageId: requestBody.MessageId,
+		DonId:     requestBody.DonId,
+		Method:    requestBody.Method,
+		Receiver:  requestBody.Sender,
+		Payload:   payloadJSON,
 	}
 
-	return h.connector.SendToGateway(ctx, gatewayID, msg)
+	return h.connector.SignAndSendToGateway(ctx, gatewayID, body)
 }

core/capabilities/webapi/trigger_test.go

@@ -118,7 +118,8 @@ func gatewayRequest(t *testing.T, privateKey string, topics string, methodName s
 
 func getResponseFromArg(arg interface{}) (webapicapabilities.TriggerResponsePayload, error) {
 	var response webapicapabilities.TriggerResponsePayload
-	err := json.Unmarshal((&(arg.(*api.Message)).Body).Payload, &response)
+	msgBody := arg.(*api.MessageBody)
+	err := json.Unmarshal(msgBody.Payload, &response)
 	return response, err
 }
 
@@ -177,7 +178,7 @@ func TestTriggerExecute(t *testing.T) {
 	t.Run("happy case single topic to single workflow", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey1, `["daily_price_update"]`, "")
 
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ACCEPTED"}, resp)
 		}).Return(nil).Once()
@@ -199,7 +200,7 @@ func TestTriggerExecute(t *testing.T) {
 	t.Run("happy case single different topic 2 workflows.", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey1, `["ad_hoc_price_update"]`, "")
 
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ACCEPTED"}, resp)
 		}).Return(nil).Once()
@@ -226,7 +227,7 @@ func TestTriggerExecute(t *testing.T) {
 	t.Run("sad case empty topic 2 workflows", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey1, `[]`, "")
 
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ERROR", ErrorMessage: "empty Workflow Topics"}, resp)
 		}).Return(nil).Once()
@@ -239,7 +240,7 @@ func TestTriggerExecute(t *testing.T) {
 
 	t.Run("sad case topic with no workflows", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey1, `["foo"]`, "")
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ERROR", ErrorMessage: "no Matching Workflow Topics"}, resp)
 		}).Return(nil).Once()
@@ -251,7 +252,7 @@ func TestTriggerExecute(t *testing.T) {
 
 	t.Run("sad case Not Allowed Sender", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey2, `["ad_hoc_price_update"]`, "")
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ERROR", ErrorMessage: "unauthorized Sender 0x2dAC9f74Ee66e2D55ea1B8BE284caFedE048dB3A, messageID 12345"}, resp)
@@ -264,7 +265,7 @@ func TestTriggerExecute(t *testing.T) {
 
 	t.Run("sad case Invalid Method", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey2, `["ad_hoc_price_update"]`, "boo")
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ERROR", ErrorMessage: "unsupported method boo"}, resp)
 		}).Return(nil).Once()
@@ -333,7 +334,7 @@ func TestTriggerExecute2WorkflowsSameTopicDifferentAllowLists(t *testing.T) {
 	t.Run("happy case single topic to single workflow", func(t *testing.T) {
 		gatewayRequest := gatewayRequest(t, privateKey1, `["daily_price_update"]`, "")
 
-		th.connector.On("SendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+		th.connector.On("SignAndSendToGateway", mock.Anything, mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 			resp, _ := getResponseFromArg(args.Get(2))
 			require.Equal(t, webapicapabilities.TriggerResponsePayload{Status: "ACCEPTED"}, resp)
 		}).Return(nil).Once()

core/capabilities/webapi/webapicap/event_trigger-schema.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://github.com/smartcontractkit/chainlink/v2/core/capabilities/webapi/webapicap/web-trigger@1.0.0",
+    "$id": "https://github.com/smartcontractkit/chainlink/v2/core/capabilities/webapi/webapicap/web-api-trigger@1.0.0",
     "$defs": {
         "TriggerConfig": {
             "type": "object",

core/scripts/gateway/web_api_trigger/invoke_trigger.go

@@ -18,17 +18,17 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/api"
 )
 
-// https://gateway-us-1.chain.link/web-trigger
+// https://gateway-us-1.chain.link/web-api-trigger
 //   {
 //     jsonrpc: "2.0",
 //     id: "...",
-//     method: "web-trigger",
+//     method: "web-api-trigger",
 //     params: {
 //       signature: "...",
 //       body: {
 //         don_id: "workflow_123",
 //         payload: {
-//           trigger_id: "web-trigger@1.0.0",
+//           trigger_id: "web-api-trigger@1.0.0",
 //           trigger_event_id: "action_1234567890",
 //           timestamp: 1234567890,
 //           sub-events: [
@@ -78,7 +78,7 @@ func main() {
 	}
 
 	payload := `{
-          "trigger_id": "web-trigger@1.0.0",
+          "trigger_id": "web-api-trigger@1.0.0",
           "trigger_event_id": "action_1234567890",
           "timestamp": ` + strconv.Itoa(int(time.Now().Unix())) + `,
           "topics": ["daily_price_update"],

core/services/gateway/handlers/webapicapabilities/handler_test.go

@@ -202,7 +202,7 @@ func triggerRequest(t *testing.T, privateKey string, topics string, methodName s
 	require.NoError(t, err)
 	if payload == "" {
 		payload = `{
-         "trigger_id": "web-trigger@1.0.0",
+         "trigger_id": "web-api-trigger@1.0.0",
           "trigger_event_id": "action_1234567890",
           "timestamp": ` + timestamp + `,
           "topics": ` + topics + `,

core/services/gateway/handlers/webapicapabilities/webapi.go

@@ -20,18 +20,18 @@ type TargetResponsePayload struct {
 	Body           []byte            `json:"body,omitempty"`         // HTTP response body
 }
 
-// https://gateway-us-1.chain.link/web-trigger
+// https://gateway-us-1.chain.link/web-api-trigger
 //
 //	{
 //	  jsonrpc: "2.0",
 //	  id: "...",
-//	  method: "web-trigger",
+//	  method: "web-api-trigger",
 //	  params: {
 //	    signature: "...",
 //	    body: {
 //	      don_id: "workflow_123",
 //	      payload: {
-//	        trigger_id: "web-trigger@1.0.0",
+//	        trigger_id: "web-api-trigger@1.0.0",
 //	        trigger_event_id: "action_1234567890",
 //	        timestamp: 1234567890,
 //	        topics: ["daily_price_update"],