Merge remote-tracking branch 'origin/main' into tejaswi/tee-attestation

Author: nadahalli

pkg/capabilities/capabilities.go

@@ -118,6 +118,9 @@ type RequestMetadata struct {
 	WorkflowRegistryChainSelector string
 	WorkflowRegistryAddress       string
 	EngineVersion                 string
+	// ExecutionTimestamp is the DonTime-derived execution timestamp.
+	// Propagated to capability DONs so they can evaluate feature flags atomically with the workflow DON.
+	ExecutionTimestamp time.Time
 }
 
 func (m *RequestMetadata) ContextWithCRE(ctx context.Context) context.Context {

pkg/capabilities/pb/capabilities.pb.go

@@ -8,6 +8,7 @@ import "values/v1/values.proto";
 import "metering/pb/meteringdetail.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
 
 service BaseCapability {
   rpc Info (google.protobuf.Empty) returns (CapabilityInfoReply) {}
@@ -51,6 +52,7 @@ message RequestMetadata {
   string workflow_registry_chain_selector = 12;
   string workflow_registry_address = 13;
   string engine_version = 14;
+  google.protobuf.Timestamp execution_timestamp = 15;
 }
 
 message CapabilityRequest {

pkg/capabilities/pb/capabilities.proto

@@ -3,8 +3,10 @@ package pb
 import (
 	"errors"
 	"fmt"
+	"time"
 
 	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
 	meter "github.com/smartcontractkit/chainlink-common/pkg/metering/pb"
@@ -71,6 +73,7 @@ func CapabilityRequestToProto(req capabilities.CapabilityRequest) *CapabilityReq
 			DecodedWorkflowName:      req.Metadata.DecodedWorkflowName,
 			SpendLimits:              spendLimitsToProto(req.Metadata.SpendLimits),
 			WorkflowTag:              req.Metadata.WorkflowTag,
+			ExecutionTimestamp:        timeToProto(req.Metadata.ExecutionTimestamp),
 		},
 		Inputs:        values.ProtoMap(inputs),
 		Config:        values.ProtoMap(config),
@@ -133,6 +136,7 @@ func CapabilityRequestFromProto(pr *CapabilityRequest) (capabilities.CapabilityR
 			DecodedWorkflowName:      md.DecodedWorkflowName,
 			SpendLimits:              spendLimitsFromProto(md.SpendLimits),
 			WorkflowTag:              md.WorkflowTag,
+			ExecutionTimestamp:        timeFromProto(md.ExecutionTimestamp),
 		},
 		Config:        config,
 		Inputs:        inputs,
@@ -332,13 +336,28 @@ func TriggerRegistrationRequestToProto(req capabilities.TriggerRegistrationReque
 			WorkflowRegistryChainSelector: md.WorkflowRegistryChainSelector,
 			WorkflowRegistryAddress:       md.WorkflowRegistryAddress,
 			EngineVersion:                 md.EngineVersion,
+			ExecutionTimestamp:             timeToProto(md.ExecutionTimestamp),
 		},
 		Config:  values.ProtoMap(config),
 		Payload: req.Payload,
 		Method:  req.Method,
 	}
 }
 
+func timeToProto(t time.Time) *timestamppb.Timestamp {
+	if t.IsZero() {
+		return nil
+	}
+	return timestamppb.New(t)
+}
+
+func timeFromProto(ts *timestamppb.Timestamp) time.Time {
+	if ts == nil {
+		return time.Time{}
+	}
+	return ts.AsTime()
+}
+
 func spendLimitsToProto(limits []capabilities.SpendLimit) []*SpendLimit {
 	result := make([]*SpendLimit, len(limits))
 	for i, limit := range limits {
@@ -382,6 +401,7 @@ func TriggerRegistrationRequestFromProto(req *TriggerRegistrationRequest) (capab
 			WorkflowRegistryChainSelector: md.WorkflowRegistryChainSelector,
 			WorkflowRegistryAddress:       md.WorkflowRegistryAddress,
 			EngineVersion:                 md.EngineVersion,
+			ExecutionTimestamp:             timeFromProto(md.ExecutionTimestamp),
 		},
 		Config:  config,
 		Payload: req.Payload,

pkg/capabilities/pb/capabilities_helpers.go

@@ -2,6 +2,7 @@ package pb_test
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -98,7 +99,8 @@ func TestMarshalUnmarshalRequest(t *testing.T) {
 				{SpendType: "COMPUTE", Limit: "1000"},
 				{SpendType: "GAS_12345", Limit: "1000000"},
 			},
-			WorkflowTag: "test-workflow-tag",
+			WorkflowTag:        "test-workflow-tag",
+			ExecutionTimestamp:  time.Date(2025, 6, 15, 12, 0, 0, 0, time.UTC),
 		},
 		Config: &values.Map{Underlying: map[string]values.Value{
 			testConfigKey: &values.String{Underlying: testConfigValue},
@@ -193,7 +195,8 @@ func TestMarshalUnmarshalTriggerRegistrationRequest(t *testing.T) {
 			SpendLimits: []capabilities.SpendLimit{
 				{SpendType: "GAS", Limit: "5000"},
 			},
-			WorkflowTag: "workflow-tag",
+			WorkflowTag:        "workflow-tag",
+			ExecutionTimestamp:  time.Date(2025, 6, 15, 12, 0, 0, 0, time.UTC),
 		},
 		Config: &values.Map{Underlying: map[string]values.Value{
 			testConfigKey: &values.String{Underlying: testConfigValue},