From 5f294de4ce4da7c835ba397ade16890dfeaff23f Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Sun, 25 Oct 2026 13:57:50 -0500 Subject: [PATCH 01/10] pkg/capabilities/pb: expand ConsensusQueueObservation --- pkg/capabilities/pb/triggers.pb.go | 169 +++++++++++++++++++++++++---- pkg/capabilities/pb/triggers.proto | 22 +++- 2 files changed, 166 insertions(+), 25 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index 5d5f88fb87..a8a0d34838 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -22,6 +22,59 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +type ExecutionStatus int32 + +const ( + ExecutionStatus_OBSERVED ExecutionStatus = 0 + ExecutionStatus_TRANSMISSION_IN_PROGRESS ExecutionStatus = 1 + ExecutionStatus_TRANSMISSION_FAILED ExecutionStatus = 2 + ExecutionStatus_TRANSMISSION_SUCCESS ExecutionStatus = 3 +) + +// Enum value maps for ExecutionStatus. +var ( + ExecutionStatus_name = map[int32]string{ + 0: "OBSERVED", + 1: "TRANSMISSION_IN_PROGRESS", + 2: "TRANSMISSION_FAILED", + 3: "TRANSMISSION_SUCCESS", + } + ExecutionStatus_value = map[string]int32{ + "OBSERVED": 0, + "TRANSMISSION_IN_PROGRESS": 1, + "TRANSMISSION_FAILED": 2, + "TRANSMISSION_SUCCESS": 3, + } +) + +func (x ExecutionStatus) Enum() *ExecutionStatus { + p := new(ExecutionStatus) + *p = x + return p +} + +func (x ExecutionStatus) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (ExecutionStatus) Descriptor() protoreflect.EnumDescriptor { + return file_triggers_proto_enumTypes[0].Descriptor() +} + +func (ExecutionStatus) Type() protoreflect.EnumType { + return &file_triggers_proto_enumTypes[0] +} + +func (x ExecutionStatus) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use ExecutionStatus.Descriptor instead. +func (ExecutionStatus) EnumDescriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{0} +} + +// TODO ObservedTriggerEvent? type CoordinatedEvent struct { state protoimpl.MessageState `protogen:"open.v1"` WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` @@ -115,8 +168,16 @@ func (x *CoordinatedEvent) GetEvent() *TriggerResponse { } type ConsensusQueueObservation struct { - state protoimpl.MessageState `protogen:"open.v1"` - Events []*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + SeqNr uint64 `protobuf:"varint,1,opt,name=seq_nr,json=seqNr,proto3" json:"seq_nr,omitempty"` + // Event Data + Events []*CoordinatedEvent `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` //TODO ObservedTriggerEvent? + EventBlobHandles [][]byte `protobuf:"bytes,3,rep,name=event_blob_handles,json=eventBlobHandles,proto3" json:"event_blob_handles,omitempty"` // Parallel to events + // Capacity Management + Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity + WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflow_capacities,json=workflowCapacities,proto3" json:"workflow_capacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions + // Previous Round + Transmissions map[string]ExecutionStatus `protobuf:"bytes,6,rep,name=transmissions,proto3" json:"transmissions,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=triggers.ExecutionStatus"` // State of previous transmissions unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -151,6 +212,13 @@ func (*ConsensusQueueObservation) Descriptor() ([]byte, []int) { return file_triggers_proto_rawDescGZIP(), []int{1} } +func (x *ConsensusQueueObservation) GetSeqNr() uint64 { + if x != nil { + return x.SeqNr + } + return 0 +} + func (x *ConsensusQueueObservation) GetEvents() []*CoordinatedEvent { if x != nil { return x.Events @@ -158,6 +226,35 @@ func (x *ConsensusQueueObservation) GetEvents() []*CoordinatedEvent { return nil } +func (x *ConsensusQueueObservation) GetEventBlobHandles() [][]byte { + if x != nil { + return x.EventBlobHandles + } + return nil +} + +func (x *ConsensusQueueObservation) GetCapacity() uint32 { + if x != nil { + return x.Capacity + } + return 0 +} + +func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { + if x != nil { + return x.WorkflowCapacities + } + return nil +} + +func (x *ConsensusQueueObservation) GetTransmissions() map[string]ExecutionStatus { + if x != nil { + return x.Transmissions + } + return nil +} + +// TODO remove? type ConsensusQueueReport struct { state protoimpl.MessageState `protogen:"open.v1"` Events []*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` @@ -218,11 +315,27 @@ const file_triggers_proto_rawDesc = "" + "observedAt\x126\n" + "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12&\n" + "\x0esequenceNumber\x18\x06 \x01(\x04R\x0esequenceNumber\x123\n" + - "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"O\n" + - "\x19ConsensusQueueObservation\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"J\n" + + "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"\xa0\x04\n" + + "\x19ConsensusQueueObservation\x12\x15\n" + + "\x06seq_nr\x18\x01 \x01(\x04R\x05seqNr\x122\n" + + "\x06events\x18\x02 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12,\n" + + "\x12event_blob_handles\x18\x03 \x03(\fR\x10eventBlobHandles\x12\x1a\n" + + "\bcapacity\x18\x04 \x01(\rR\bcapacity\x12l\n" + + "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x12\\\n" + + "\rtransmissions\x18\x06 \x03(\v26.triggers.ConsensusQueueObservation.TransmissionsEntryR\rtransmissions\x1aE\n" + + "\x17WorkflowCapacitiesEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\x1a[\n" + + "\x12TransmissionsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12/\n" + + "\x05value\x18\x02 \x01(\x0e2\x19.triggers.ExecutionStatusR\x05value:\x028\x01\"J\n" + "\x14ConsensusQueueReport\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06eventsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events*p\n" + + "\x0fExecutionStatus\x12\f\n" + + "\bOBSERVED\x10\x00\x12\x1c\n" + + "\x18TRANSMISSION_IN_PROGRESS\x10\x01\x12\x17\n" + + "\x13TRANSMISSION_FAILED\x10\x02\x12\x18\n" + + "\x14TRANSMISSION_SUCCESS\x10\x03BBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" var ( file_triggers_proto_rawDescOnce sync.Once @@ -236,25 +349,32 @@ func file_triggers_proto_rawDescGZIP() []byte { return file_triggers_proto_rawDescData } -var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_triggers_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_triggers_proto_goTypes = []any{ - (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent - (*ConsensusQueueObservation)(nil), // 1: triggers.ConsensusQueueObservation - (*ConsensusQueueReport)(nil), // 2: triggers.ConsensusQueueReport - (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp - (*TriggerResponse)(nil), // 4: capabilities.TriggerResponse + (ExecutionStatus)(0), // 0: triggers.ExecutionStatus + (*CoordinatedEvent)(nil), // 1: triggers.CoordinatedEvent + (*ConsensusQueueObservation)(nil), // 2: triggers.ConsensusQueueObservation + (*ConsensusQueueReport)(nil), // 3: triggers.ConsensusQueueReport + nil, // 4: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + nil, // 5: triggers.ConsensusQueueObservation.TransmissionsEntry + (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp + (*TriggerResponse)(nil), // 7: capabilities.TriggerResponse } var file_triggers_proto_depIdxs = []int32{ - 3, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp - 3, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp - 4, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse - 0, // 3: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent - 0, // 4: triggers.ConsensusQueueReport.events:type_name -> triggers.CoordinatedEvent - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 6, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp + 6, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp + 7, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse + 1, // 3: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent + 4, // 4: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 5, // 5: triggers.ConsensusQueueObservation.transmissions:type_name -> triggers.ConsensusQueueObservation.TransmissionsEntry + 1, // 6: triggers.ConsensusQueueReport.events:type_name -> triggers.CoordinatedEvent + 0, // 7: triggers.ConsensusQueueObservation.TransmissionsEntry.value:type_name -> triggers.ExecutionStatus + 8, // [8:8] is the sub-list for method output_type + 8, // [8:8] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_triggers_proto_init() } @@ -268,13 +388,14 @@ func file_triggers_proto_init() { File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_triggers_proto_rawDesc), len(file_triggers_proto_rawDesc)), - NumEnums: 0, - NumMessages: 3, + NumEnums: 1, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, GoTypes: file_triggers_proto_goTypes, DependencyIndexes: file_triggers_proto_depIdxs, + EnumInfos: file_triggers_proto_enumTypes, MessageInfos: file_triggers_proto_msgTypes, }.Build() File_triggers_proto = out.File diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index 1042eacb7f..3943f73f03 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -7,6 +7,7 @@ package triggers; import "google/protobuf/timestamp.proto"; import "capabilities.proto"; +// TODO ObservedTriggerEvent? message CoordinatedEvent { string workflowID = 1; string triggerCapID = 2; @@ -17,10 +18,29 @@ message CoordinatedEvent { capabilities.TriggerResponse event = 7; } +enum ExecutionStatus { + OBSERVED = 0; + TRANSMISSION_IN_PROGRESS = 1; + TRANSMISSION_FAILED = 2; + TRANSMISSION_SUCCESS = 3; +} + message ConsensusQueueObservation { - repeated CoordinatedEvent events = 1; + uint64 seq_nr = 1; + + // Event Data + repeated CoordinatedEvent events = 2; //TODO ObservedTriggerEvent? + repeated bytes event_blob_handles = 3; // Parallel to events + + // Capacity Management + uint32 capacity = 4; // Global remaining capacity + map workflow_capacities = 5; // Workflow-specific free executions + + // Previous Round + map transmissions = 6; // State of previous transmissions } +// TODO remove? message ConsensusQueueReport { repeated CoordinatedEvent events = 1; } \ No newline at end of file From 33f0afdb11c46405cc233e4e39baa6c0d2ff67af Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Tue, 27 Oct 2026 08:01:06 -0500 Subject: [PATCH 02/10] simplify ConsensusQueueObservation --- pkg/capabilities/pb/triggers.pb.go | 142 ++++++----------------------- pkg/capabilities/pb/triggers.proto | 14 +-- 2 files changed, 29 insertions(+), 127 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index a8a0d34838..b350ddb842 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -22,59 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type ExecutionStatus int32 - -const ( - ExecutionStatus_OBSERVED ExecutionStatus = 0 - ExecutionStatus_TRANSMISSION_IN_PROGRESS ExecutionStatus = 1 - ExecutionStatus_TRANSMISSION_FAILED ExecutionStatus = 2 - ExecutionStatus_TRANSMISSION_SUCCESS ExecutionStatus = 3 -) - -// Enum value maps for ExecutionStatus. -var ( - ExecutionStatus_name = map[int32]string{ - 0: "OBSERVED", - 1: "TRANSMISSION_IN_PROGRESS", - 2: "TRANSMISSION_FAILED", - 3: "TRANSMISSION_SUCCESS", - } - ExecutionStatus_value = map[string]int32{ - "OBSERVED": 0, - "TRANSMISSION_IN_PROGRESS": 1, - "TRANSMISSION_FAILED": 2, - "TRANSMISSION_SUCCESS": 3, - } -) - -func (x ExecutionStatus) Enum() *ExecutionStatus { - p := new(ExecutionStatus) - *p = x - return p -} - -func (x ExecutionStatus) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (ExecutionStatus) Descriptor() protoreflect.EnumDescriptor { - return file_triggers_proto_enumTypes[0].Descriptor() -} - -func (ExecutionStatus) Type() protoreflect.EnumType { - return &file_triggers_proto_enumTypes[0] -} - -func (x ExecutionStatus) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use ExecutionStatus.Descriptor instead. -func (ExecutionStatus) EnumDescriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{0} -} - -// TODO ObservedTriggerEvent? type CoordinatedEvent struct { state protoimpl.MessageState `protogen:"open.v1"` WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` @@ -171,15 +118,12 @@ type ConsensusQueueObservation struct { state protoimpl.MessageState `protogen:"open.v1"` SeqNr uint64 `protobuf:"varint,1,opt,name=seq_nr,json=seqNr,proto3" json:"seq_nr,omitempty"` // Event Data - Events []*CoordinatedEvent `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` //TODO ObservedTriggerEvent? - EventBlobHandles [][]byte `protobuf:"bytes,3,rep,name=event_blob_handles,json=eventBlobHandles,proto3" json:"event_blob_handles,omitempty"` // Parallel to events + Events []*CoordinatedEvent `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` // Capacity Management Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflow_capacities,json=workflowCapacities,proto3" json:"workflow_capacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions - // Previous Round - Transmissions map[string]ExecutionStatus `protobuf:"bytes,6,rep,name=transmissions,proto3" json:"transmissions,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=triggers.ExecutionStatus"` // State of previous transmissions - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ConsensusQueueObservation) Reset() { @@ -226,13 +170,6 @@ func (x *ConsensusQueueObservation) GetEvents() []*CoordinatedEvent { return nil } -func (x *ConsensusQueueObservation) GetEventBlobHandles() [][]byte { - if x != nil { - return x.EventBlobHandles - } - return nil -} - func (x *ConsensusQueueObservation) GetCapacity() uint32 { if x != nil { return x.Capacity @@ -247,13 +184,6 @@ func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { return nil } -func (x *ConsensusQueueObservation) GetTransmissions() map[string]ExecutionStatus { - if x != nil { - return x.Transmissions - } - return nil -} - // TODO remove? type ConsensusQueueReport struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -315,27 +245,17 @@ const file_triggers_proto_rawDesc = "" + "observedAt\x126\n" + "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12&\n" + "\x0esequenceNumber\x18\x06 \x01(\x04R\x0esequenceNumber\x123\n" + - "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"\xa0\x04\n" + + "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"\xb7\x02\n" + "\x19ConsensusQueueObservation\x12\x15\n" + "\x06seq_nr\x18\x01 \x01(\x04R\x05seqNr\x122\n" + - "\x06events\x18\x02 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12,\n" + - "\x12event_blob_handles\x18\x03 \x03(\fR\x10eventBlobHandles\x12\x1a\n" + + "\x06events\x18\x02 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12\x1a\n" + "\bcapacity\x18\x04 \x01(\rR\bcapacity\x12l\n" + - "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x12\\\n" + - "\rtransmissions\x18\x06 \x03(\v26.triggers.ConsensusQueueObservation.TransmissionsEntryR\rtransmissions\x1aE\n" + + "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\x1a[\n" + - "\x12TransmissionsEntry\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x12/\n" + - "\x05value\x18\x02 \x01(\x0e2\x19.triggers.ExecutionStatusR\x05value:\x028\x01\"J\n" + + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"J\n" + "\x14ConsensusQueueReport\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events*p\n" + - "\x0fExecutionStatus\x12\f\n" + - "\bOBSERVED\x10\x00\x12\x1c\n" + - "\x18TRANSMISSION_IN_PROGRESS\x10\x01\x12\x17\n" + - "\x13TRANSMISSION_FAILED\x10\x02\x12\x18\n" + - "\x14TRANSMISSION_SUCCESS\x10\x03BBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06eventsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" var ( file_triggers_proto_rawDescOnce sync.Once @@ -349,32 +269,27 @@ func file_triggers_proto_rawDescGZIP() []byte { return file_triggers_proto_rawDescData } -var file_triggers_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_triggers_proto_goTypes = []any{ - (ExecutionStatus)(0), // 0: triggers.ExecutionStatus - (*CoordinatedEvent)(nil), // 1: triggers.CoordinatedEvent - (*ConsensusQueueObservation)(nil), // 2: triggers.ConsensusQueueObservation - (*ConsensusQueueReport)(nil), // 3: triggers.ConsensusQueueReport - nil, // 4: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - nil, // 5: triggers.ConsensusQueueObservation.TransmissionsEntry - (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp - (*TriggerResponse)(nil), // 7: capabilities.TriggerResponse + (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent + (*ConsensusQueueObservation)(nil), // 1: triggers.ConsensusQueueObservation + (*ConsensusQueueReport)(nil), // 2: triggers.ConsensusQueueReport + nil, // 3: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*TriggerResponse)(nil), // 5: capabilities.TriggerResponse } var file_triggers_proto_depIdxs = []int32{ - 6, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp - 6, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp - 7, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse - 1, // 3: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent - 4, // 4: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 5, // 5: triggers.ConsensusQueueObservation.transmissions:type_name -> triggers.ConsensusQueueObservation.TransmissionsEntry - 1, // 6: triggers.ConsensusQueueReport.events:type_name -> triggers.CoordinatedEvent - 0, // 7: triggers.ConsensusQueueObservation.TransmissionsEntry.value:type_name -> triggers.ExecutionStatus - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 4, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp + 4, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp + 5, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse + 0, // 3: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent + 3, // 4: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 0, // 5: triggers.ConsensusQueueReport.events:type_name -> triggers.CoordinatedEvent + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_triggers_proto_init() } @@ -388,14 +303,13 @@ func file_triggers_proto_init() { File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_triggers_proto_rawDesc), len(file_triggers_proto_rawDesc)), - NumEnums: 1, - NumMessages: 5, + NumEnums: 0, + NumMessages: 4, NumExtensions: 0, NumServices: 0, }, GoTypes: file_triggers_proto_goTypes, DependencyIndexes: file_triggers_proto_depIdxs, - EnumInfos: file_triggers_proto_enumTypes, MessageInfos: file_triggers_proto_msgTypes, }.Build() File_triggers_proto = out.File diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index 3943f73f03..b9892dc4b0 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -7,7 +7,6 @@ package triggers; import "google/protobuf/timestamp.proto"; import "capabilities.proto"; -// TODO ObservedTriggerEvent? message CoordinatedEvent { string workflowID = 1; string triggerCapID = 2; @@ -18,26 +17,15 @@ message CoordinatedEvent { capabilities.TriggerResponse event = 7; } -enum ExecutionStatus { - OBSERVED = 0; - TRANSMISSION_IN_PROGRESS = 1; - TRANSMISSION_FAILED = 2; - TRANSMISSION_SUCCESS = 3; -} - message ConsensusQueueObservation { uint64 seq_nr = 1; // Event Data - repeated CoordinatedEvent events = 2; //TODO ObservedTriggerEvent? - repeated bytes event_blob_handles = 3; // Parallel to events + repeated CoordinatedEvent events = 2; // Capacity Management uint32 capacity = 4; // Global remaining capacity map workflow_capacities = 5; // Workflow-specific free executions - - // Previous Round - map transmissions = 6; // State of previous transmissions } // TODO remove? From 19544684537b56f6a0e9311d47a1244700909f00 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Tue, 27 Oct 2026 08:56:34 -0500 Subject: [PATCH 03/10] add CoordinatedEventList --- pkg/capabilities/pb/triggers.pb.go | 113 ++++++++++++++--------------- pkg/capabilities/pb/triggers.proto | 9 +-- 2 files changed, 60 insertions(+), 62 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index b350ddb842..ce51d97d00 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -114,6 +114,50 @@ func (x *CoordinatedEvent) GetEvent() *TriggerResponse { return nil } +type CoordinatedEventList struct { + state protoimpl.MessageState `protogen:"open.v1"` + Events []*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CoordinatedEventList) Reset() { + *x = CoordinatedEventList{} + mi := &file_triggers_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CoordinatedEventList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CoordinatedEventList) ProtoMessage() {} + +func (x *CoordinatedEventList) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CoordinatedEventList.ProtoReflect.Descriptor instead. +func (*CoordinatedEventList) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{1} +} + +func (x *CoordinatedEventList) GetEvents() []*CoordinatedEvent { + if x != nil { + return x.Events + } + return nil +} + type ConsensusQueueObservation struct { state protoimpl.MessageState `protogen:"open.v1"` SeqNr uint64 `protobuf:"varint,1,opt,name=seq_nr,json=seqNr,proto3" json:"seq_nr,omitempty"` @@ -128,7 +172,7 @@ type ConsensusQueueObservation struct { func (x *ConsensusQueueObservation) Reset() { *x = ConsensusQueueObservation{} - mi := &file_triggers_proto_msgTypes[1] + mi := &file_triggers_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -140,7 +184,7 @@ func (x *ConsensusQueueObservation) String() string { func (*ConsensusQueueObservation) ProtoMessage() {} func (x *ConsensusQueueObservation) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[1] + mi := &file_triggers_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -153,7 +197,7 @@ func (x *ConsensusQueueObservation) ProtoReflect() protoreflect.Message { // Deprecated: Use ConsensusQueueObservation.ProtoReflect.Descriptor instead. func (*ConsensusQueueObservation) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{1} + return file_triggers_proto_rawDescGZIP(), []int{2} } func (x *ConsensusQueueObservation) GetSeqNr() uint64 { @@ -184,51 +228,6 @@ func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { return nil } -// TODO remove? -type ConsensusQueueReport struct { - state protoimpl.MessageState `protogen:"open.v1"` - Events []*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ConsensusQueueReport) Reset() { - *x = ConsensusQueueReport{} - mi := &file_triggers_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ConsensusQueueReport) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ConsensusQueueReport) ProtoMessage() {} - -func (x *ConsensusQueueReport) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[2] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ConsensusQueueReport.ProtoReflect.Descriptor instead. -func (*ConsensusQueueReport) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{2} -} - -func (x *ConsensusQueueReport) GetEvents() []*CoordinatedEvent { - if x != nil { - return x.Events - } - return nil -} - var File_triggers_proto protoreflect.FileDescriptor const file_triggers_proto_rawDesc = "" + @@ -245,7 +244,9 @@ const file_triggers_proto_rawDesc = "" + "observedAt\x126\n" + "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12&\n" + "\x0esequenceNumber\x18\x06 \x01(\x04R\x0esequenceNumber\x123\n" + - "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"\xb7\x02\n" + + "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"J\n" + + "\x14CoordinatedEventList\x122\n" + + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xb7\x02\n" + "\x19ConsensusQueueObservation\x12\x15\n" + "\x06seq_nr\x18\x01 \x01(\x04R\x05seqNr\x122\n" + "\x06events\x18\x02 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12\x1a\n" + @@ -253,9 +254,7 @@ const file_triggers_proto_rawDesc = "" + "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"J\n" + - "\x14ConsensusQueueReport\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06eventsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01BBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" var ( file_triggers_proto_rawDescOnce sync.Once @@ -272,8 +271,8 @@ func file_triggers_proto_rawDescGZIP() []byte { var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_triggers_proto_goTypes = []any{ (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent - (*ConsensusQueueObservation)(nil), // 1: triggers.ConsensusQueueObservation - (*ConsensusQueueReport)(nil), // 2: triggers.ConsensusQueueReport + (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList + (*ConsensusQueueObservation)(nil), // 2: triggers.ConsensusQueueObservation nil, // 3: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp (*TriggerResponse)(nil), // 5: capabilities.TriggerResponse @@ -282,9 +281,9 @@ var file_triggers_proto_depIdxs = []int32{ 4, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp 4, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp 5, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse - 0, // 3: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent - 3, // 4: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 0, // 5: triggers.ConsensusQueueReport.events:type_name -> triggers.CoordinatedEvent + 0, // 3: triggers.CoordinatedEventList.events:type_name -> triggers.CoordinatedEvent + 0, // 4: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent + 3, // 5: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry 6, // [6:6] is the sub-list for method output_type 6, // [6:6] is the sub-list for method input_type 6, // [6:6] is the sub-list for extension type_name diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index b9892dc4b0..cbb079d6e0 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -17,6 +17,10 @@ message CoordinatedEvent { capabilities.TriggerResponse event = 7; } +message CoordinatedEventList { + repeated CoordinatedEvent events = 1; +} + message ConsensusQueueObservation { uint64 seq_nr = 1; @@ -27,8 +31,3 @@ message ConsensusQueueObservation { uint32 capacity = 4; // Global remaining capacity map workflow_capacities = 5; // Workflow-specific free executions } - -// TODO remove? -message ConsensusQueueReport { - repeated CoordinatedEvent events = 1; -} \ No newline at end of file From 36d41f2ea53ea383bad29cd03737280cbef3763a Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Wed, 28 Oct 2026 18:44:12 -0500 Subject: [PATCH 04/10] add ConsensusQueueProposals --- pkg/capabilities/pb/triggers.pb.go | 175 +++++++++++++++++++++++------ pkg/capabilities/pb/triggers.proto | 15 ++- 2 files changed, 150 insertions(+), 40 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index ce51d97d00..b7011a371d 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -159,13 +159,10 @@ func (x *CoordinatedEventList) GetEvents() []*CoordinatedEvent { } type ConsensusQueueObservation struct { - state protoimpl.MessageState `protogen:"open.v1"` - SeqNr uint64 `protobuf:"varint,1,opt,name=seq_nr,json=seqNr,proto3" json:"seq_nr,omitempty"` - // Event Data - Events []*CoordinatedEvent `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` - // Capacity Management - Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity - WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflow_capacities,json=workflowCapacities,proto3" json:"workflow_capacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions + state protoimpl.MessageState `protogen:"open.v1"` + Events []*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` + Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity + WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflow_capacities,json=workflowCapacities,proto3" json:"workflow_capacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -200,13 +197,6 @@ func (*ConsensusQueueObservation) Descriptor() ([]byte, []int) { return file_triggers_proto_rawDescGZIP(), []int{2} } -func (x *ConsensusQueueObservation) GetSeqNr() uint64 { - if x != nil { - return x.SeqNr - } - return 0 -} - func (x *ConsensusQueueObservation) GetEvents() []*CoordinatedEvent { if x != nil { return x.Events @@ -228,6 +218,102 @@ func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { return nil } +type ConsensusQueueProposals struct { + state protoimpl.MessageState `protogen:"open.v1"` + Events map[string]*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // eventID -> Event + Observers map[string]*NodeIDList `protobuf:"bytes,2,rep,name=observers,proto3" json:"observers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // eventID -> Observers < f+1 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ConsensusQueueProposals) Reset() { + *x = ConsensusQueueProposals{} + mi := &file_triggers_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ConsensusQueueProposals) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ConsensusQueueProposals) ProtoMessage() {} + +func (x *ConsensusQueueProposals) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ConsensusQueueProposals.ProtoReflect.Descriptor instead. +func (*ConsensusQueueProposals) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{3} +} + +func (x *ConsensusQueueProposals) GetEvents() map[string]*CoordinatedEvent { + if x != nil { + return x.Events + } + return nil +} + +func (x *ConsensusQueueProposals) GetObservers() map[string]*NodeIDList { + if x != nil { + return x.Observers + } + return nil +} + +type NodeIDList struct { + state protoimpl.MessageState `protogen:"open.v1"` + Ids []byte `protobuf:"bytes,1,opt,name=ids,proto3" json:"ids,omitempty"` // []uint8 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *NodeIDList) Reset() { + *x = NodeIDList{} + mi := &file_triggers_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *NodeIDList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*NodeIDList) ProtoMessage() {} + +func (x *NodeIDList) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use NodeIDList.ProtoReflect.Descriptor instead. +func (*NodeIDList) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{4} +} + +func (x *NodeIDList) GetIds() []byte { + if x != nil { + return x.Ids + } + return nil +} + var File_triggers_proto protoreflect.FileDescriptor const file_triggers_proto_rawDesc = "" + @@ -246,15 +332,26 @@ const file_triggers_proto_rawDesc = "" + "\x0esequenceNumber\x18\x06 \x01(\x04R\x0esequenceNumber\x123\n" + "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"J\n" + "\x14CoordinatedEventList\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xb7\x02\n" + - "\x19ConsensusQueueObservation\x12\x15\n" + - "\x06seq_nr\x18\x01 \x01(\x04R\x05seqNr\x122\n" + - "\x06events\x18\x02 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12\x1a\n" + + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xa0\x02\n" + + "\x19ConsensusQueueObservation\x122\n" + + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12\x1a\n" + "\bcapacity\x18\x04 \x01(\rR\bcapacity\x12l\n" + "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01BBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\xdb\x02\n" + + "\x17ConsensusQueueProposals\x12E\n" + + "\x06events\x18\x01 \x03(\v2-.triggers.ConsensusQueueProposals.EventsEntryR\x06events\x12N\n" + + "\tobservers\x18\x02 \x03(\v20.triggers.ConsensusQueueProposals.ObserversEntryR\tobservers\x1aU\n" + + "\vEventsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x120\n" + + "\x05value\x18\x02 \x01(\v2\x1a.triggers.CoordinatedEventR\x05value:\x028\x01\x1aR\n" + + "\x0eObserversEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12*\n" + + "\x05value\x18\x02 \x01(\v2\x14.triggers.NodeIDListR\x05value:\x028\x01\"\x1e\n" + + "\n" + + "NodeIDList\x12\x10\n" + + "\x03ids\x18\x01 \x01(\fR\x03idsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" var ( file_triggers_proto_rawDescOnce sync.Once @@ -268,27 +365,35 @@ func file_triggers_proto_rawDescGZIP() []byte { return file_triggers_proto_rawDescData } -var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_triggers_proto_goTypes = []any{ (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList (*ConsensusQueueObservation)(nil), // 2: triggers.ConsensusQueueObservation - nil, // 3: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*TriggerResponse)(nil), // 5: capabilities.TriggerResponse + (*ConsensusQueueProposals)(nil), // 3: triggers.ConsensusQueueProposals + (*NodeIDList)(nil), // 4: triggers.NodeIDList + nil, // 5: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + nil, // 6: triggers.ConsensusQueueProposals.EventsEntry + nil, // 7: triggers.ConsensusQueueProposals.ObserversEntry + (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp + (*TriggerResponse)(nil), // 9: capabilities.TriggerResponse } var file_triggers_proto_depIdxs = []int32{ - 4, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp - 4, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp - 5, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse - 0, // 3: triggers.CoordinatedEventList.events:type_name -> triggers.CoordinatedEvent - 0, // 4: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent - 3, // 5: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 8, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp + 8, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp + 9, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse + 0, // 3: triggers.CoordinatedEventList.events:type_name -> triggers.CoordinatedEvent + 0, // 4: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent + 5, // 5: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 6, // 6: triggers.ConsensusQueueProposals.events:type_name -> triggers.ConsensusQueueProposals.EventsEntry + 7, // 7: triggers.ConsensusQueueProposals.observers:type_name -> triggers.ConsensusQueueProposals.ObserversEntry + 0, // 8: triggers.ConsensusQueueProposals.EventsEntry.value:type_name -> triggers.CoordinatedEvent + 4, // 9: triggers.ConsensusQueueProposals.ObserversEntry.value:type_name -> triggers.NodeIDList + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_triggers_proto_init() } @@ -303,7 +408,7 @@ func file_triggers_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_triggers_proto_rawDesc), len(file_triggers_proto_rawDesc)), NumEnums: 0, - NumMessages: 4, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index cbb079d6e0..e38ef050d7 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -22,12 +22,17 @@ message CoordinatedEventList { } message ConsensusQueueObservation { - uint64 seq_nr = 1; - - // Event Data - repeated CoordinatedEvent events = 2; + repeated CoordinatedEvent events = 1; - // Capacity Management uint32 capacity = 4; // Global remaining capacity map workflow_capacities = 5; // Workflow-specific free executions } + +message ConsensusQueueProposals { + map events = 1; // eventID -> Event + map observers = 2; // eventID -> Observers < f+1 +} + +message NodeIDList { + bytes ids = 1; // []uint8 +} From ceedd30df3604842126e6b3f3d30bda5cff5c1fb Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Mon, 9 Nov 2026 07:24:47 -0600 Subject: [PATCH 05/10] blob support --- pkg/capabilities/pb/triggers.pb.go | 396 +++++++++++++++++++++-------- pkg/capabilities/pb/triggers.proto | 40 ++- 2 files changed, 322 insertions(+), 114 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index b7011a371d..9bf567a037 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -23,16 +23,15 @@ const ( ) type CoordinatedEvent struct { - state protoimpl.MessageState `protogen:"open.v1"` - WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` - TriggerCapID string `protobuf:"bytes,2,opt,name=triggerCapID,proto3" json:"triggerCapID,omitempty"` - TriggerIndex int64 `protobuf:"varint,3,opt,name=triggerIndex,proto3" json:"triggerIndex,omitempty"` - ObservedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=observedAt,proto3" json:"observedAt,omitempty"` - Deadline *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=deadline,proto3" json:"deadline,omitempty"` - SequenceNumber uint64 `protobuf:"varint,6,opt,name=sequenceNumber,proto3" json:"sequenceNumber,omitempty"` - Event *TriggerResponse `protobuf:"bytes,7,opt,name=event,proto3" json:"event,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` + TriggerCapID string `protobuf:"bytes,2,opt,name=triggerCapID,proto3" json:"triggerCapID,omitempty"` + TriggerIndex int64 `protobuf:"varint,3,opt,name=triggerIndex,proto3" json:"triggerIndex,omitempty"` + ObservedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=observedAt,proto3" json:"observedAt,omitempty"` + Deadline *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=deadline,proto3" json:"deadline,omitempty"` + Event *TriggerResponse `protobuf:"bytes,6,opt,name=event,proto3" json:"event,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CoordinatedEvent) Reset() { @@ -100,13 +99,6 @@ func (x *CoordinatedEvent) GetDeadline() *timestamppb.Timestamp { return nil } -func (x *CoordinatedEvent) GetSequenceNumber() uint64 { - if x != nil { - return x.SequenceNumber - } - return 0 -} - func (x *CoordinatedEvent) GetEvent() *TriggerResponse { if x != nil { return x.Event @@ -158,9 +150,178 @@ func (x *CoordinatedEventList) GetEvents() []*CoordinatedEvent { return nil } +// ConsensusQueueEvent holds minimal event metadata for queueing within the plugin, and one or more blob references +// pointing to the rest. +type ConsensusQueueEvent struct { + state protoimpl.MessageState `protogen:"open.v1"` + WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` + TriggerEventID string `protobuf:"bytes,2,opt,name=triggerEventID,proto3" json:"triggerEventID,omitempty"` + Deadline *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=deadline,proto3" json:"deadline,omitempty"` + Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,4,rep,name=blobs,proto3" json:"blobs,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ConsensusQueueEvent) Reset() { + *x = ConsensusQueueEvent{} + mi := &file_triggers_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ConsensusQueueEvent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ConsensusQueueEvent) ProtoMessage() {} + +func (x *ConsensusQueueEvent) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ConsensusQueueEvent.ProtoReflect.Descriptor instead. +func (*ConsensusQueueEvent) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{2} +} + +func (x *ConsensusQueueEvent) GetWorkflowID() string { + if x != nil { + return x.WorkflowID + } + return "" +} + +func (x *ConsensusQueueEvent) GetTriggerEventID() string { + if x != nil { + return x.TriggerEventID + } + return "" +} + +func (x *ConsensusQueueEvent) GetDeadline() *timestamppb.Timestamp { + if x != nil { + return x.Deadline + } + return nil +} + +func (x *ConsensusQueueEvent) GetBlobs() []*CoordinatedEventBlobHandle { + if x != nil { + return x.Blobs + } + return nil +} + +// ConsensusQueueEventsBlobHandle refers to a CoordinatedEvent by blob handle and index within an CoordinatedEventList. +type CoordinatedEventBlobHandle struct { + state protoimpl.MessageState `protogen:"open.v1"` + Handle []byte `protobuf:"bytes,1,opt,name=handle,proto3" json:"handle,omitempty"` + Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CoordinatedEventBlobHandle) Reset() { + *x = CoordinatedEventBlobHandle{} + mi := &file_triggers_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CoordinatedEventBlobHandle) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CoordinatedEventBlobHandle) ProtoMessage() {} + +func (x *CoordinatedEventBlobHandle) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CoordinatedEventBlobHandle.ProtoReflect.Descriptor instead. +func (*CoordinatedEventBlobHandle) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{3} +} + +func (x *CoordinatedEventBlobHandle) GetHandle() []byte { + if x != nil { + return x.Handle + } + return nil +} + +func (x *CoordinatedEventBlobHandle) GetIndex() uint32 { + if x != nil { + return x.Index + } + return 0 +} + +// ConsensusQueueEvents holds a list of events. +type ConsensusQueueEventList struct { + state protoimpl.MessageState `protogen:"open.v1"` + Events []*ConsensusQueueEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ConsensusQueueEventList) Reset() { + *x = ConsensusQueueEventList{} + mi := &file_triggers_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ConsensusQueueEventList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ConsensusQueueEventList) ProtoMessage() {} + +func (x *ConsensusQueueEventList) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ConsensusQueueEventList.ProtoReflect.Descriptor instead. +func (*ConsensusQueueEventList) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{4} +} + +func (x *ConsensusQueueEventList) GetEvents() []*ConsensusQueueEvent { + if x != nil { + return x.Events + } + return nil +} + +// ConsensusQueueObservation is a ReportingPlugin observation of events and capacity meta-data. type ConsensusQueueObservation struct { state protoimpl.MessageState `protogen:"open.v1"` - Events []*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` + Events []*ConsensusQueueEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflow_capacities,json=workflowCapacities,proto3" json:"workflow_capacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions unknownFields protoimpl.UnknownFields @@ -169,7 +330,7 @@ type ConsensusQueueObservation struct { func (x *ConsensusQueueObservation) Reset() { *x = ConsensusQueueObservation{} - mi := &file_triggers_proto_msgTypes[2] + mi := &file_triggers_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -181,7 +342,7 @@ func (x *ConsensusQueueObservation) String() string { func (*ConsensusQueueObservation) ProtoMessage() {} func (x *ConsensusQueueObservation) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[2] + mi := &file_triggers_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -194,10 +355,10 @@ func (x *ConsensusQueueObservation) ProtoReflect() protoreflect.Message { // Deprecated: Use ConsensusQueueObservation.ProtoReflect.Descriptor instead. func (*ConsensusQueueObservation) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{2} + return file_triggers_proto_rawDescGZIP(), []int{5} } -func (x *ConsensusQueueObservation) GetEvents() []*CoordinatedEvent { +func (x *ConsensusQueueObservation) GetEvents() []*ConsensusQueueEvent { if x != nil { return x.Events } @@ -218,29 +379,29 @@ func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { return nil } -type ConsensusQueueProposals struct { - state protoimpl.MessageState `protogen:"open.v1"` - Events map[string]*CoordinatedEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // eventID -> Event - Observers map[string]*NodeIDList `protobuf:"bytes,2,rep,name=observers,proto3" json:"observers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // eventID -> Observers < f+1 +// ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. +type ConsensusQueueObservedEvents struct { + state protoimpl.MessageState `protogen:"open.v1"` + Observations map[string]*ConsensusQueueObservedEvent `protobuf:"bytes,1,rep,name=observations,proto3" json:"observations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ConsensusQueueProposals) Reset() { - *x = ConsensusQueueProposals{} - mi := &file_triggers_proto_msgTypes[3] +func (x *ConsensusQueueObservedEvents) Reset() { + *x = ConsensusQueueObservedEvents{} + mi := &file_triggers_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ConsensusQueueProposals) String() string { +func (x *ConsensusQueueObservedEvents) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ConsensusQueueProposals) ProtoMessage() {} +func (*ConsensusQueueObservedEvents) ProtoMessage() {} -func (x *ConsensusQueueProposals) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[3] +func (x *ConsensusQueueObservedEvents) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -251,47 +412,43 @@ func (x *ConsensusQueueProposals) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ConsensusQueueProposals.ProtoReflect.Descriptor instead. -func (*ConsensusQueueProposals) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{3} -} - -func (x *ConsensusQueueProposals) GetEvents() map[string]*CoordinatedEvent { - if x != nil { - return x.Events - } - return nil +// Deprecated: Use ConsensusQueueObservedEvents.ProtoReflect.Descriptor instead. +func (*ConsensusQueueObservedEvents) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{6} } -func (x *ConsensusQueueProposals) GetObservers() map[string]*NodeIDList { +func (x *ConsensusQueueObservedEvents) GetObservations() map[string]*ConsensusQueueObservedEvent { if x != nil { - return x.Observers + return x.Observations } return nil } -type NodeIDList struct { - state protoimpl.MessageState `protogen:"open.v1"` - Ids []byte `protobuf:"bytes,1,opt,name=ids,proto3" json:"ids,omitempty"` // []uint8 +// ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. +type ConsensusQueueObservedEvent struct { + state protoimpl.MessageState `protogen:"open.v1"` + NodeIds []byte `protobuf:"bytes,1,opt,name=nodeIds,proto3" json:"nodeIds,omitempty"` // []OracleID + Deadlines []*timestamppb.Timestamp `protobuf:"bytes,2,rep,name=deadlines,proto3" json:"deadlines,omitempty"` + Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *NodeIDList) Reset() { - *x = NodeIDList{} - mi := &file_triggers_proto_msgTypes[4] +func (x *ConsensusQueueObservedEvent) Reset() { + *x = ConsensusQueueObservedEvent{} + mi := &file_triggers_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *NodeIDList) String() string { +func (x *ConsensusQueueObservedEvent) String() string { return protoimpl.X.MessageStringOf(x) } -func (*NodeIDList) ProtoMessage() {} +func (*ConsensusQueueObservedEvent) ProtoMessage() {} -func (x *NodeIDList) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[4] +func (x *ConsensusQueueObservedEvent) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -302,14 +459,28 @@ func (x *NodeIDList) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use NodeIDList.ProtoReflect.Descriptor instead. -func (*NodeIDList) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{4} +// Deprecated: Use ConsensusQueueObservedEvent.ProtoReflect.Descriptor instead. +func (*ConsensusQueueObservedEvent) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{7} +} + +func (x *ConsensusQueueObservedEvent) GetNodeIds() []byte { + if x != nil { + return x.NodeIds + } + return nil +} + +func (x *ConsensusQueueObservedEvent) GetDeadlines() []*timestamppb.Timestamp { + if x != nil { + return x.Deadlines + } + return nil } -func (x *NodeIDList) GetIds() []byte { +func (x *ConsensusQueueObservedEvent) GetBlobs() []*CoordinatedEventBlobHandle { if x != nil { - return x.Ids + return x.Blobs } return nil } @@ -318,7 +489,7 @@ var File_triggers_proto protoreflect.FileDescriptor const file_triggers_proto_rawDesc = "" + "\n" + - "\x0etriggers.proto\x12\btriggers\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x12capabilities.proto\"\xcb\x02\n" + + "\x0etriggers.proto\x12\btriggers\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x12capabilities.proto\"\xa3\x02\n" + "\x10CoordinatedEvent\x12\x1e\n" + "\n" + "workflowID\x18\x01 \x01(\tR\n" + @@ -328,30 +499,38 @@ const file_triggers_proto_rawDesc = "" + "\n" + "observedAt\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\n" + "observedAt\x126\n" + - "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12&\n" + - "\x0esequenceNumber\x18\x06 \x01(\x04R\x0esequenceNumber\x123\n" + - "\x05event\x18\a \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"J\n" + + "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x123\n" + + "\x05event\x18\x06 \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"J\n" + "\x14CoordinatedEventList\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xa0\x02\n" + - "\x19ConsensusQueueObservation\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\x12\x1a\n" + + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xd1\x01\n" + + "\x13ConsensusQueueEvent\x12\x1e\n" + + "\n" + + "workflowID\x18\x01 \x01(\tR\n" + + "workflowID\x12&\n" + + "\x0etriggerEventID\x18\x02 \x01(\tR\x0etriggerEventID\x126\n" + + "\bdeadline\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12:\n" + + "\x05blobs\x18\x04 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobs\"J\n" + + "\x1aCoordinatedEventBlobHandle\x12\x16\n" + + "\x06handle\x18\x01 \x01(\fR\x06handle\x12\x14\n" + + "\x05index\x18\x02 \x01(\rR\x05index\"P\n" + + "\x17ConsensusQueueEventList\x125\n" + + "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\"\xa3\x02\n" + + "\x19ConsensusQueueObservation\x125\n" + + "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\x12\x1a\n" + "\bcapacity\x18\x04 \x01(\rR\bcapacity\x12l\n" + "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\xdb\x02\n" + - "\x17ConsensusQueueProposals\x12E\n" + - "\x06events\x18\x01 \x03(\v2-.triggers.ConsensusQueueProposals.EventsEntryR\x06events\x12N\n" + - "\tobservers\x18\x02 \x03(\v20.triggers.ConsensusQueueProposals.ObserversEntryR\tobservers\x1aU\n" + - "\vEventsEntry\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x120\n" + - "\x05value\x18\x02 \x01(\v2\x1a.triggers.CoordinatedEventR\x05value:\x028\x01\x1aR\n" + - "\x0eObserversEntry\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x12*\n" + - "\x05value\x18\x02 \x01(\v2\x14.triggers.NodeIDListR\x05value:\x028\x01\"\x1e\n" + - "\n" + - "NodeIDList\x12\x10\n" + - "\x03ids\x18\x01 \x01(\fR\x03idsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\xe4\x01\n" + + "\x1cConsensusQueueObservedEvents\x12\\\n" + + "\fobservations\x18\x01 \x03(\v28.triggers.ConsensusQueueObservedEvents.ObservationsEntryR\fobservations\x1af\n" + + "\x11ObservationsEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12;\n" + + "\x05value\x18\x02 \x01(\v2%.triggers.ConsensusQueueObservedEventR\x05value:\x028\x01\"\xad\x01\n" + + "\x1bConsensusQueueObservedEvent\x12\x18\n" + + "\anodeIds\x18\x01 \x01(\fR\anodeIds\x128\n" + + "\tdeadlines\x18\x02 \x03(\v2\x1a.google.protobuf.TimestampR\tdeadlines\x12:\n" + + "\x05blobs\x18\x03 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" var ( file_triggers_proto_rawDescOnce sync.Once @@ -365,35 +544,40 @@ func file_triggers_proto_rawDescGZIP() []byte { return file_triggers_proto_rawDescData } -var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_triggers_proto_goTypes = []any{ - (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent - (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList - (*ConsensusQueueObservation)(nil), // 2: triggers.ConsensusQueueObservation - (*ConsensusQueueProposals)(nil), // 3: triggers.ConsensusQueueProposals - (*NodeIDList)(nil), // 4: triggers.NodeIDList - nil, // 5: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - nil, // 6: triggers.ConsensusQueueProposals.EventsEntry - nil, // 7: triggers.ConsensusQueueProposals.ObserversEntry - (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp - (*TriggerResponse)(nil), // 9: capabilities.TriggerResponse + (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent + (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList + (*ConsensusQueueEvent)(nil), // 2: triggers.ConsensusQueueEvent + (*CoordinatedEventBlobHandle)(nil), // 3: triggers.CoordinatedEventBlobHandle + (*ConsensusQueueEventList)(nil), // 4: triggers.ConsensusQueueEventList + (*ConsensusQueueObservation)(nil), // 5: triggers.ConsensusQueueObservation + (*ConsensusQueueObservedEvents)(nil), // 6: triggers.ConsensusQueueObservedEvents + (*ConsensusQueueObservedEvent)(nil), // 7: triggers.ConsensusQueueObservedEvent + nil, // 8: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + nil, // 9: triggers.ConsensusQueueObservedEvents.ObservationsEntry + (*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp + (*TriggerResponse)(nil), // 11: capabilities.TriggerResponse } var file_triggers_proto_depIdxs = []int32{ - 8, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp - 8, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp - 9, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse + 10, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp + 10, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp + 11, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse 0, // 3: triggers.CoordinatedEventList.events:type_name -> triggers.CoordinatedEvent - 0, // 4: triggers.ConsensusQueueObservation.events:type_name -> triggers.CoordinatedEvent - 5, // 5: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 6, // 6: triggers.ConsensusQueueProposals.events:type_name -> triggers.ConsensusQueueProposals.EventsEntry - 7, // 7: triggers.ConsensusQueueProposals.observers:type_name -> triggers.ConsensusQueueProposals.ObserversEntry - 0, // 8: triggers.ConsensusQueueProposals.EventsEntry.value:type_name -> triggers.CoordinatedEvent - 4, // 9: triggers.ConsensusQueueProposals.ObserversEntry.value:type_name -> triggers.NodeIDList - 10, // [10:10] is the sub-list for method output_type - 10, // [10:10] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 10, // 4: triggers.ConsensusQueueEvent.deadline:type_name -> google.protobuf.Timestamp + 3, // 5: triggers.ConsensusQueueEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle + 2, // 6: triggers.ConsensusQueueEventList.events:type_name -> triggers.ConsensusQueueEvent + 2, // 7: triggers.ConsensusQueueObservation.events:type_name -> triggers.ConsensusQueueEvent + 8, // 8: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 9, // 9: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEvents.ObservationsEntry + 10, // 10: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp + 3, // 11: triggers.ConsensusQueueObservedEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle + 7, // 12: triggers.ConsensusQueueObservedEvents.ObservationsEntry.value:type_name -> triggers.ConsensusQueueObservedEvent + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_triggers_proto_init() } @@ -408,7 +592,7 @@ func file_triggers_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_triggers_proto_rawDesc), len(file_triggers_proto_rawDesc)), NumEnums: 0, - NumMessages: 8, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index e38ef050d7..e77af73f3c 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -13,26 +13,50 @@ message CoordinatedEvent { int64 triggerIndex = 3; google.protobuf.Timestamp observedAt = 4; google.protobuf.Timestamp deadline = 5; - uint64 sequenceNumber = 6; - capabilities.TriggerResponse event = 7; + capabilities.TriggerResponse event = 6; } message CoordinatedEventList { repeated CoordinatedEvent events = 1; } +// ConsensusQueueEvent holds minimal event metadata for queueing within the plugin, and one or more blob references +// pointing to the rest. +message ConsensusQueueEvent { + string workflowID = 1; + string triggerEventID = 2; + + google.protobuf.Timestamp deadline = 3; + repeated CoordinatedEventBlobHandle blobs = 4; +} + +// ConsensusQueueEventsBlobHandle refers to a CoordinatedEvent by blob handle and index within an CoordinatedEventList. +message CoordinatedEventBlobHandle { + bytes handle = 1; + uint32 index = 2; +} + +// ConsensusQueueEvents holds a list of events. +message ConsensusQueueEventList { + repeated ConsensusQueueEvent events = 1; +} + +// ConsensusQueueObservation is a ReportingPlugin observation of events and capacity meta-data. message ConsensusQueueObservation { - repeated CoordinatedEvent events = 1; + repeated ConsensusQueueEvent events = 1; uint32 capacity = 4; // Global remaining capacity map workflow_capacities = 5; // Workflow-specific free executions } -message ConsensusQueueProposals { - map events = 1; // eventID -> Event - map observers = 2; // eventID -> Observers < f+1 +// ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. +message ConsensusQueueObservedEvents { + map observations = 1; } -message NodeIDList { - bytes ids = 1; // []uint8 +// ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. +message ConsensusQueueObservedEvent { + bytes nodeIds = 1; // []OracleID + repeated google.protobuf.Timestamp deadlines = 2; + repeated CoordinatedEventBlobHandle blobs = 3; } From 9392e9f319044467064044d61bfb418d3663b1a7 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Thu, 12 Nov 2026 13:01:22 -0600 Subject: [PATCH 06/10] proto updates --- pkg/capabilities/pb/capabilities.pb.go | 2 +- pkg/capabilities/pb/registry.pb.go | 2 +- pkg/capabilities/pb/triggers.pb.go | 143 ++++++++++++++++++------- pkg/capabilities/pb/triggers.proto | 26 +++-- 4 files changed, 121 insertions(+), 52 deletions(-) diff --git a/pkg/capabilities/pb/capabilities.pb.go b/pkg/capabilities/pb/capabilities.pb.go index 627af5f0ab..f22f41f209 100644 --- a/pkg/capabilities/pb/capabilities.pb.go +++ b/pkg/capabilities/pb/capabilities.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.12 +// protoc-gen-go v1.36.10 // protoc v5.29.3 // source: capabilities.proto diff --git a/pkg/capabilities/pb/registry.pb.go b/pkg/capabilities/pb/registry.pb.go index 3a2fd8911a..748ddb62a2 100644 --- a/pkg/capabilities/pb/registry.pb.go +++ b/pkg/capabilities/pb/registry.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.12 +// protoc-gen-go v1.36.10 // protoc v5.29.3 // source: registry.proto diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index 9bf567a037..7c344d16d5 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.12 +// protoc-gen-go v1.36.10 // protoc v5.29.3 // source: triggers.proto @@ -150,14 +150,16 @@ func (x *CoordinatedEventList) GetEvents() []*CoordinatedEvent { return nil } -// ConsensusQueueEvent holds minimal event metadata for queueing within the plugin, and one or more blob references -// pointing to the rest. +// ConsensusQueueEvent holds minimal event metadata for queueing and medianization within the plugin, and one or more +// blob reference pointing to the rest. type ConsensusQueueEvent struct { state protoimpl.MessageState `protogen:"open.v1"` WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` TriggerEventID string `protobuf:"bytes,2,opt,name=triggerEventID,proto3" json:"triggerEventID,omitempty"` - Deadline *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=deadline,proto3" json:"deadline,omitempty"` - Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,4,rep,name=blobs,proto3" json:"blobs,omitempty"` + ObservedAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=observedAt,proto3" json:"observedAt,omitempty"` + Deadline *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=deadline,proto3" json:"deadline,omitempty"` + BlobHash []byte `protobuf:"bytes,5,opt,name=blobHash,proto3" json:"blobHash,omitempty"` // hash of the blob data, timestamp fields we have extracted for medianization set to nil + Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,6,rep,name=blobs,proto3" json:"blobs,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -206,6 +208,13 @@ func (x *ConsensusQueueEvent) GetTriggerEventID() string { return "" } +func (x *ConsensusQueueEvent) GetObservedAt() *timestamppb.Timestamp { + if x != nil { + return x.ObservedAt + } + return nil +} + func (x *ConsensusQueueEvent) GetDeadline() *timestamppb.Timestamp { if x != nil { return x.Deadline @@ -213,6 +222,13 @@ func (x *ConsensusQueueEvent) GetDeadline() *timestamppb.Timestamp { return nil } +func (x *ConsensusQueueEvent) GetBlobHash() []byte { + if x != nil { + return x.BlobHash + } + return nil +} + func (x *ConsensusQueueEvent) GetBlobs() []*CoordinatedEventBlobHandle { if x != nil { return x.Blobs @@ -322,8 +338,9 @@ func (x *ConsensusQueueEventList) GetEvents() []*ConsensusQueueEvent { type ConsensusQueueObservation struct { state protoimpl.MessageState `protogen:"open.v1"` Events []*ConsensusQueueEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` - Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity - WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflow_capacities,json=workflowCapacities,proto3" json:"workflow_capacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions + Expiration *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` // + Capacity uint32 `protobuf:"varint,3,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity + WorkflowCapacities map[string]uint32 `protobuf:"bytes,4,rep,name=workflowCapacities,proto3" json:"workflowCapacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -365,6 +382,13 @@ func (x *ConsensusQueueObservation) GetEvents() []*ConsensusQueueEvent { return nil } +func (x *ConsensusQueueObservation) GetExpiration() *timestamppb.Timestamp { + if x != nil { + return x.Expiration + } + return nil +} + func (x *ConsensusQueueObservation) GetCapacity() uint32 { if x != nil { return x.Capacity @@ -426,12 +450,15 @@ func (x *ConsensusQueueObservedEvents) GetObservations() map[string]*ConsensusQu // ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. type ConsensusQueueObservedEvent struct { - state protoimpl.MessageState `protogen:"open.v1"` - NodeIds []byte `protobuf:"bytes,1,opt,name=nodeIds,proto3" json:"nodeIds,omitempty"` // []OracleID - Deadlines []*timestamppb.Timestamp `protobuf:"bytes,2,rep,name=deadlines,proto3" json:"deadlines,omitempty"` - Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + WorkflowID string `protobuf:"bytes,1,opt,name=workflowID,proto3" json:"workflowID,omitempty"` + TriggerEventID string `protobuf:"bytes,2,opt,name=triggerEventID,proto3" json:"triggerEventID,omitempty"` + NodeIds []byte `protobuf:"bytes,3,opt,name=nodeIds,proto3" json:"nodeIds,omitempty"` // []OracleID + ObservedAts []*timestamppb.Timestamp `protobuf:"bytes,4,rep,name=observedAts,proto3" json:"observedAts,omitempty"` + Deadlines []*timestamppb.Timestamp `protobuf:"bytes,5,rep,name=deadlines,proto3" json:"deadlines,omitempty"` + Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,6,rep,name=blobs,proto3" json:"blobs,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ConsensusQueueObservedEvent) Reset() { @@ -464,6 +491,20 @@ func (*ConsensusQueueObservedEvent) Descriptor() ([]byte, []int) { return file_triggers_proto_rawDescGZIP(), []int{7} } +func (x *ConsensusQueueObservedEvent) GetWorkflowID() string { + if x != nil { + return x.WorkflowID + } + return "" +} + +func (x *ConsensusQueueObservedEvent) GetTriggerEventID() string { + if x != nil { + return x.TriggerEventID + } + return "" +} + func (x *ConsensusQueueObservedEvent) GetNodeIds() []byte { if x != nil { return x.NodeIds @@ -471,6 +512,13 @@ func (x *ConsensusQueueObservedEvent) GetNodeIds() []byte { return nil } +func (x *ConsensusQueueObservedEvent) GetObservedAts() []*timestamppb.Timestamp { + if x != nil { + return x.ObservedAts + } + return nil +} + func (x *ConsensusQueueObservedEvent) GetDeadlines() []*timestamppb.Timestamp { if x != nil { return x.Deadlines @@ -502,23 +550,30 @@ const file_triggers_proto_rawDesc = "" + "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x123\n" + "\x05event\x18\x06 \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"J\n" + "\x14CoordinatedEventList\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xd1\x01\n" + + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xa9\x02\n" + "\x13ConsensusQueueEvent\x12\x1e\n" + "\n" + "workflowID\x18\x01 \x01(\tR\n" + "workflowID\x12&\n" + - "\x0etriggerEventID\x18\x02 \x01(\tR\x0etriggerEventID\x126\n" + - "\bdeadline\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12:\n" + - "\x05blobs\x18\x04 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobs\"J\n" + + "\x0etriggerEventID\x18\x02 \x01(\tR\x0etriggerEventID\x12:\n" + + "\n" + + "observedAt\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\n" + + "observedAt\x126\n" + + "\bdeadline\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12\x1a\n" + + "\bblobHash\x18\x05 \x01(\fR\bblobHash\x12:\n" + + "\x05blobs\x18\x06 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobs\"J\n" + "\x1aCoordinatedEventBlobHandle\x12\x16\n" + "\x06handle\x18\x01 \x01(\fR\x06handle\x12\x14\n" + "\x05index\x18\x02 \x01(\rR\x05index\"P\n" + "\x17ConsensusQueueEventList\x125\n" + - "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\"\xa3\x02\n" + + "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\"\xde\x02\n" + "\x19ConsensusQueueObservation\x125\n" + - "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\x12\x1a\n" + - "\bcapacity\x18\x04 \x01(\rR\bcapacity\x12l\n" + - "\x13workflow_capacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + + "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\x12:\n" + + "\n" + + "expiration\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\n" + + "expiration\x12\x1a\n" + + "\bcapacity\x18\x03 \x01(\rR\bcapacity\x12k\n" + + "\x12workflowCapacities\x18\x04 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\xe4\x01\n" + @@ -526,11 +581,16 @@ const file_triggers_proto_rawDesc = "" + "\fobservations\x18\x01 \x03(\v28.triggers.ConsensusQueueObservedEvents.ObservationsEntryR\fobservations\x1af\n" + "\x11ObservationsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12;\n" + - "\x05value\x18\x02 \x01(\v2%.triggers.ConsensusQueueObservedEventR\x05value:\x028\x01\"\xad\x01\n" + - "\x1bConsensusQueueObservedEvent\x12\x18\n" + - "\anodeIds\x18\x01 \x01(\fR\anodeIds\x128\n" + - "\tdeadlines\x18\x02 \x03(\v2\x1a.google.protobuf.TimestampR\tdeadlines\x12:\n" + - "\x05blobs\x18\x03 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" + "\x05value\x18\x02 \x01(\v2%.triggers.ConsensusQueueObservedEventR\x05value:\x028\x01\"\xb3\x02\n" + + "\x1bConsensusQueueObservedEvent\x12\x1e\n" + + "\n" + + "workflowID\x18\x01 \x01(\tR\n" + + "workflowID\x12&\n" + + "\x0etriggerEventID\x18\x02 \x01(\tR\x0etriggerEventID\x12\x18\n" + + "\anodeIds\x18\x03 \x01(\fR\anodeIds\x12<\n" + + "\vobservedAts\x18\x04 \x03(\v2\x1a.google.protobuf.TimestampR\vobservedAts\x128\n" + + "\tdeadlines\x18\x05 \x03(\v2\x1a.google.protobuf.TimestampR\tdeadlines\x12:\n" + + "\x05blobs\x18\x06 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobsBBZ@github.com/smartcontractkit/chainlink-common/pkg/capabilities/pbb\x06proto3" var ( file_triggers_proto_rawDescOnce sync.Once @@ -564,20 +624,23 @@ var file_triggers_proto_depIdxs = []int32{ 10, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp 11, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse 0, // 3: triggers.CoordinatedEventList.events:type_name -> triggers.CoordinatedEvent - 10, // 4: triggers.ConsensusQueueEvent.deadline:type_name -> google.protobuf.Timestamp - 3, // 5: triggers.ConsensusQueueEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle - 2, // 6: triggers.ConsensusQueueEventList.events:type_name -> triggers.ConsensusQueueEvent - 2, // 7: triggers.ConsensusQueueObservation.events:type_name -> triggers.ConsensusQueueEvent - 8, // 8: triggers.ConsensusQueueObservation.workflow_capacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 9, // 9: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEvents.ObservationsEntry - 10, // 10: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp - 3, // 11: triggers.ConsensusQueueObservedEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle - 7, // 12: triggers.ConsensusQueueObservedEvents.ObservationsEntry.value:type_name -> triggers.ConsensusQueueObservedEvent - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 10, // 4: triggers.ConsensusQueueEvent.observedAt:type_name -> google.protobuf.Timestamp + 10, // 5: triggers.ConsensusQueueEvent.deadline:type_name -> google.protobuf.Timestamp + 3, // 6: triggers.ConsensusQueueEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle + 2, // 7: triggers.ConsensusQueueEventList.events:type_name -> triggers.ConsensusQueueEvent + 2, // 8: triggers.ConsensusQueueObservation.events:type_name -> triggers.ConsensusQueueEvent + 10, // 9: triggers.ConsensusQueueObservation.expiration:type_name -> google.protobuf.Timestamp + 8, // 10: triggers.ConsensusQueueObservation.workflowCapacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 9, // 11: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEvents.ObservationsEntry + 10, // 12: triggers.ConsensusQueueObservedEvent.observedAts:type_name -> google.protobuf.Timestamp + 10, // 13: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp + 3, // 14: triggers.ConsensusQueueObservedEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle + 7, // 15: triggers.ConsensusQueueObservedEvents.ObservationsEntry.value:type_name -> triggers.ConsensusQueueObservedEvent + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_triggers_proto_init() } diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index e77af73f3c..a0519fc456 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -20,14 +20,15 @@ message CoordinatedEventList { repeated CoordinatedEvent events = 1; } -// ConsensusQueueEvent holds minimal event metadata for queueing within the plugin, and one or more blob references -// pointing to the rest. +// ConsensusQueueEvent holds minimal event metadata for queueing and medianization within the plugin, and one or more +// blob reference pointing to the rest. message ConsensusQueueEvent { string workflowID = 1; string triggerEventID = 2; - - google.protobuf.Timestamp deadline = 3; - repeated CoordinatedEventBlobHandle blobs = 4; + google.protobuf.Timestamp observedAt = 3; + google.protobuf.Timestamp deadline = 4; + bytes blobHash = 5; // hash of the blob data, timestamp fields we have extracted for medianization set to nil + repeated CoordinatedEventBlobHandle blobs = 6; } // ConsensusQueueEventsBlobHandle refers to a CoordinatedEvent by blob handle and index within an CoordinatedEventList. @@ -45,8 +46,9 @@ message ConsensusQueueEventList { message ConsensusQueueObservation { repeated ConsensusQueueEvent events = 1; - uint32 capacity = 4; // Global remaining capacity - map workflow_capacities = 5; // Workflow-specific free executions + google.protobuf.Timestamp expiration = 2; // + uint32 capacity = 3; // Global remaining capacity + map workflowCapacities = 4; // Workflow-specific free executions } // ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. @@ -56,7 +58,11 @@ message ConsensusQueueObservedEvents { // ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. message ConsensusQueueObservedEvent { - bytes nodeIds = 1; // []OracleID - repeated google.protobuf.Timestamp deadlines = 2; - repeated CoordinatedEventBlobHandle blobs = 3; + string workflowID = 1; + string triggerEventID = 2; + + bytes nodeIds = 3; // []OracleID + repeated google.protobuf.Timestamp observedAts = 4; + repeated google.protobuf.Timestamp deadlines = 5; + repeated CoordinatedEventBlobHandle blobs = 6; } From 86be69f83e49c39fe837f869429b1acb390e988e Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Thu, 12 Nov 2026 13:58:48 -0600 Subject: [PATCH 07/10] pkg/settings/cresettings: add ConsensusQueueExpirationInterval --- pkg/settings/cresettings/README.md | 3 ++- pkg/settings/cresettings/defaults.json | 1 + pkg/settings/cresettings/defaults.toml | 1 + pkg/settings/cresettings/settings.go | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/settings/cresettings/README.md b/pkg/settings/cresettings/README.md index 75def5cff5..76f4db8e0e 100644 --- a/pkg/settings/cresettings/README.md +++ b/pkg/settings/cresettings/README.md @@ -462,7 +462,8 @@ flowchart CentralTriggerQueue.Drain %% TODO placating test for now since this flowchart no longer renders - DonTimeSequencedTimestampsActivePeriod + DonTimeSequencedTimestampsActivePeriod + ConsensusQueueExpirationInterval %% standard capabilities job startup is likewise its own entry point standardcapabilities.Delegate.NewServices diff --git a/pkg/settings/cresettings/defaults.json b/pkg/settings/cresettings/defaults.json index 72c213887c..81651c8392 100644 --- a/pkg/settings/cresettings/defaults.json +++ b/pkg/settings/cresettings/defaults.json @@ -39,6 +39,7 @@ "DispatcherPerSenderRate": "500rps:1000", "CentralTriggerEventQueueLimit": "1000", "CentralTriggerQueueDrainInterval": "500ms", + "ConsensusQueueExpirationInterval": "1h0m0s", "TriggerRegistrationStatusUpdateTimeout": "0s", "BaseTriggerRetryInterval": "30s", "BaseTriggerMaxRetries": "20", diff --git a/pkg/settings/cresettings/defaults.toml b/pkg/settings/cresettings/defaults.toml index 622fb73234..4cfce12291 100644 --- a/pkg/settings/cresettings/defaults.toml +++ b/pkg/settings/cresettings/defaults.toml @@ -38,6 +38,7 @@ DispatcherGlobalRate = '5000rps:5000' DispatcherPerSenderRate = '500rps:1000' CentralTriggerEventQueueLimit = '1000' CentralTriggerQueueDrainInterval = '500ms' +ConsensusQueueExpirationInterval = '1h0m0s' TriggerRegistrationStatusUpdateTimeout = '0s' BaseTriggerRetryInterval = '30s' BaseTriggerMaxRetries = '20' diff --git a/pkg/settings/cresettings/settings.go b/pkg/settings/cresettings/settings.go index 0527a5e7c1..32f2225071 100644 --- a/pkg/settings/cresettings/settings.go +++ b/pkg/settings/cresettings/settings.go @@ -106,6 +106,7 @@ var Default = Schema{ DispatcherPerSenderRate: Rate(rate.Limit(500), 1000), CentralTriggerEventQueueLimit: Int(1000), CentralTriggerQueueDrainInterval: Duration(500 * time.Millisecond), + ConsensusQueueExpirationInterval: Duration(time.Hour), TriggerRegistrationStatusUpdateTimeout: Duration(0 * time.Second), BaseTriggerRetryInterval: Duration(30 * time.Second), BaseTriggerMaxRetries: Int(20), @@ -476,7 +477,9 @@ type Schema struct { CentralTriggerEventQueueLimit Setting[int] `unit:"{trigger}"` // CentralTriggerQueueDrainInterval is how often the central trigger queue is drained. The default // matches the expected OCR round interval. The drainer raises values below 200ms to 200ms. - CentralTriggerQueueDrainInterval Setting[time.Duration] + CentralTriggerQueueDrainInterval Setting[time.Duration] + // How long past their deadline to expire consensus queue entries + ConsensusQueueExpirationInterval Setting[time.Duration] TriggerRegistrationStatusUpdateTimeout Setting[time.Duration] BaseTriggerRetryInterval Setting[time.Duration] From a7ac77a0c0123f265c5acfb8d85e372a3de31f65 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Mon, 16 Nov 2026 20:37:19 -0600 Subject: [PATCH 08/10] dedupe blobs --- pkg/capabilities/pb/triggers.pb.go | 180 ++++++++++++++++++++--------- pkg/capabilities/pb/triggers.proto | 23 ++-- 2 files changed, 138 insertions(+), 65 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index 7c344d16d5..5cf3d28b7c 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -158,7 +158,7 @@ type ConsensusQueueEvent struct { TriggerEventID string `protobuf:"bytes,2,opt,name=triggerEventID,proto3" json:"triggerEventID,omitempty"` ObservedAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=observedAt,proto3" json:"observedAt,omitempty"` Deadline *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=deadline,proto3" json:"deadline,omitempty"` - BlobHash []byte `protobuf:"bytes,5,opt,name=blobHash,proto3" json:"blobHash,omitempty"` // hash of the blob data, timestamp fields we have extracted for medianization set to nil + TimelessHash []byte `protobuf:"bytes,5,opt,name=timelessHash,proto3" json:"timelessHash,omitempty"` // hash of the blob data, timestamp fields we have extracted for medianization set to nil Blobs []*CoordinatedEventBlobHandle `protobuf:"bytes,6,rep,name=blobs,proto3" json:"blobs,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -222,9 +222,9 @@ func (x *ConsensusQueueEvent) GetDeadline() *timestamppb.Timestamp { return nil } -func (x *ConsensusQueueEvent) GetBlobHash() []byte { +func (x *ConsensusQueueEvent) GetTimelessHash() []byte { if x != nil { - return x.BlobHash + return x.TimelessHash } return nil } @@ -239,8 +239,8 @@ func (x *ConsensusQueueEvent) GetBlobs() []*CoordinatedEventBlobHandle { // ConsensusQueueEventsBlobHandle refers to a CoordinatedEvent by blob handle and index within an CoordinatedEventList. type CoordinatedEventBlobHandle struct { state protoimpl.MessageState `protogen:"open.v1"` - Handle []byte `protobuf:"bytes,1,opt,name=handle,proto3" json:"handle,omitempty"` - Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + Blob uint32 `protobuf:"varint,1,opt,name=blob,proto3" json:"blob,omitempty"` + Element uint32 `protobuf:"varint,2,opt,name=element,proto3" json:"element,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -275,16 +275,16 @@ func (*CoordinatedEventBlobHandle) Descriptor() ([]byte, []int) { return file_triggers_proto_rawDescGZIP(), []int{3} } -func (x *CoordinatedEventBlobHandle) GetHandle() []byte { +func (x *CoordinatedEventBlobHandle) GetBlob() uint32 { if x != nil { - return x.Handle + return x.Blob } - return nil + return 0 } -func (x *CoordinatedEventBlobHandle) GetIndex() uint32 { +func (x *CoordinatedEventBlobHandle) GetElement() uint32 { if x != nil { - return x.Index + return x.Element } return 0 } @@ -334,20 +334,66 @@ func (x *ConsensusQueueEventList) GetEvents() []*ConsensusQueueEvent { return nil } +// ConsensusQueueBlobHandleList holds a list of blob handles referenced from ConsensusQueueEventList events. +type ConsensusQueueBlobHandleList struct { + state protoimpl.MessageState `protogen:"open.v1"` + BlobHandles [][]byte `protobuf:"bytes,1,rep,name=blobHandles,proto3" json:"blobHandles,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ConsensusQueueBlobHandleList) Reset() { + *x = ConsensusQueueBlobHandleList{} + mi := &file_triggers_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ConsensusQueueBlobHandleList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ConsensusQueueBlobHandleList) ProtoMessage() {} + +func (x *ConsensusQueueBlobHandleList) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ConsensusQueueBlobHandleList.ProtoReflect.Descriptor instead. +func (*ConsensusQueueBlobHandleList) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{5} +} + +func (x *ConsensusQueueBlobHandleList) GetBlobHandles() [][]byte { + if x != nil { + return x.BlobHandles + } + return nil +} + // ConsensusQueueObservation is a ReportingPlugin observation of events and capacity meta-data. type ConsensusQueueObservation struct { state protoimpl.MessageState `protogen:"open.v1"` - Events []*ConsensusQueueEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` - Expiration *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` // - Capacity uint32 `protobuf:"varint,3,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity - WorkflowCapacities map[string]uint32 `protobuf:"bytes,4,rep,name=workflowCapacities,proto3" json:"workflowCapacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions + Events []*ConsensusQueueEvent `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` // sorted + BlobHandles [][]byte `protobuf:"bytes,2,rep,name=blobHandles,proto3" json:"blobHandles,omitempty"` // referenced from events by index + Expiration *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expiration,proto3" json:"expiration,omitempty"` // observation time - grace period + Capacity uint32 `protobuf:"varint,4,opt,name=capacity,proto3" json:"capacity,omitempty"` // Global remaining capacity + WorkflowCapacities map[string]uint32 `protobuf:"bytes,5,rep,name=workflowCapacities,proto3" json:"workflowCapacities,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // Workflow-specific free executions unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } func (x *ConsensusQueueObservation) Reset() { *x = ConsensusQueueObservation{} - mi := &file_triggers_proto_msgTypes[5] + mi := &file_triggers_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -359,7 +405,7 @@ func (x *ConsensusQueueObservation) String() string { func (*ConsensusQueueObservation) ProtoMessage() {} func (x *ConsensusQueueObservation) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[5] + mi := &file_triggers_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -372,7 +418,7 @@ func (x *ConsensusQueueObservation) ProtoReflect() protoreflect.Message { // Deprecated: Use ConsensusQueueObservation.ProtoReflect.Descriptor instead. func (*ConsensusQueueObservation) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{5} + return file_triggers_proto_rawDescGZIP(), []int{6} } func (x *ConsensusQueueObservation) GetEvents() []*ConsensusQueueEvent { @@ -382,6 +428,13 @@ func (x *ConsensusQueueObservation) GetEvents() []*ConsensusQueueEvent { return nil } +func (x *ConsensusQueueObservation) GetBlobHandles() [][]byte { + if x != nil { + return x.BlobHandles + } + return nil +} + func (x *ConsensusQueueObservation) GetExpiration() *timestamppb.Timestamp { if x != nil { return x.Expiration @@ -406,14 +459,15 @@ func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { // ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. type ConsensusQueueObservedEvents struct { state protoimpl.MessageState `protogen:"open.v1"` - Observations map[string]*ConsensusQueueObservedEvent `protobuf:"bytes,1,rep,name=observations,proto3" json:"observations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Observations map[string]*ConsensusQueueObservedEvent `protobuf:"bytes,1,rep,name=observations,proto3" json:"observations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // key: eventHash + BlobHandles [][]byte `protobuf:"bytes,2,rep,name=blobHandles,proto3" json:"blobHandles,omitempty"` // referenced from observations events by index unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } func (x *ConsensusQueueObservedEvents) Reset() { *x = ConsensusQueueObservedEvents{} - mi := &file_triggers_proto_msgTypes[6] + mi := &file_triggers_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -425,7 +479,7 @@ func (x *ConsensusQueueObservedEvents) String() string { func (*ConsensusQueueObservedEvents) ProtoMessage() {} func (x *ConsensusQueueObservedEvents) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[6] + mi := &file_triggers_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -438,7 +492,7 @@ func (x *ConsensusQueueObservedEvents) ProtoReflect() protoreflect.Message { // Deprecated: Use ConsensusQueueObservedEvents.ProtoReflect.Descriptor instead. func (*ConsensusQueueObservedEvents) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{6} + return file_triggers_proto_rawDescGZIP(), []int{7} } func (x *ConsensusQueueObservedEvents) GetObservations() map[string]*ConsensusQueueObservedEvent { @@ -448,6 +502,13 @@ func (x *ConsensusQueueObservedEvents) GetObservations() map[string]*ConsensusQu return nil } +func (x *ConsensusQueueObservedEvents) GetBlobHandles() [][]byte { + if x != nil { + return x.BlobHandles + } + return nil +} + // ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. type ConsensusQueueObservedEvent struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -463,7 +524,7 @@ type ConsensusQueueObservedEvent struct { func (x *ConsensusQueueObservedEvent) Reset() { *x = ConsensusQueueObservedEvent{} - mi := &file_triggers_proto_msgTypes[7] + mi := &file_triggers_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -475,7 +536,7 @@ func (x *ConsensusQueueObservedEvent) String() string { func (*ConsensusQueueObservedEvent) ProtoMessage() {} func (x *ConsensusQueueObservedEvent) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[7] + mi := &file_triggers_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -488,7 +549,7 @@ func (x *ConsensusQueueObservedEvent) ProtoReflect() protoreflect.Message { // Deprecated: Use ConsensusQueueObservedEvent.ProtoReflect.Descriptor instead. func (*ConsensusQueueObservedEvent) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{7} + return file_triggers_proto_rawDescGZIP(), []int{8} } func (x *ConsensusQueueObservedEvent) GetWorkflowID() string { @@ -550,7 +611,7 @@ const file_triggers_proto_rawDesc = "" + "\bdeadline\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x123\n" + "\x05event\x18\x06 \x01(\v2\x1d.capabilities.TriggerResponseR\x05event\"J\n" + "\x14CoordinatedEventList\x122\n" + - "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xa9\x02\n" + + "\x06events\x18\x01 \x03(\v2\x1a.triggers.CoordinatedEventR\x06events\"\xb1\x02\n" + "\x13ConsensusQueueEvent\x12\x1e\n" + "\n" + "workflowID\x18\x01 \x01(\tR\n" + @@ -559,26 +620,30 @@ const file_triggers_proto_rawDesc = "" + "\n" + "observedAt\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\n" + "observedAt\x126\n" + - "\bdeadline\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12\x1a\n" + - "\bblobHash\x18\x05 \x01(\fR\bblobHash\x12:\n" + + "\bdeadline\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\bdeadline\x12\"\n" + + "\ftimelessHash\x18\x05 \x01(\fR\ftimelessHash\x12:\n" + "\x05blobs\x18\x06 \x03(\v2$.triggers.CoordinatedEventBlobHandleR\x05blobs\"J\n" + - "\x1aCoordinatedEventBlobHandle\x12\x16\n" + - "\x06handle\x18\x01 \x01(\fR\x06handle\x12\x14\n" + - "\x05index\x18\x02 \x01(\rR\x05index\"P\n" + + "\x1aCoordinatedEventBlobHandle\x12\x12\n" + + "\x04blob\x18\x01 \x01(\rR\x04blob\x12\x18\n" + + "\aelement\x18\x02 \x01(\rR\aelement\"P\n" + "\x17ConsensusQueueEventList\x125\n" + - "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\"\xde\x02\n" + + "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\"@\n" + + "\x1cConsensusQueueBlobHandleList\x12 \n" + + "\vblobHandles\x18\x01 \x03(\fR\vblobHandles\"\x80\x03\n" + "\x19ConsensusQueueObservation\x125\n" + - "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\x12:\n" + + "\x06events\x18\x01 \x03(\v2\x1d.triggers.ConsensusQueueEventR\x06events\x12 \n" + + "\vblobHandles\x18\x02 \x03(\fR\vblobHandles\x12:\n" + "\n" + - "expiration\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\n" + + "expiration\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampR\n" + "expiration\x12\x1a\n" + - "\bcapacity\x18\x03 \x01(\rR\bcapacity\x12k\n" + - "\x12workflowCapacities\x18\x04 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + + "\bcapacity\x18\x04 \x01(\rR\bcapacity\x12k\n" + + "\x12workflowCapacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\xe4\x01\n" + + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\x86\x02\n" + "\x1cConsensusQueueObservedEvents\x12\\\n" + - "\fobservations\x18\x01 \x03(\v28.triggers.ConsensusQueueObservedEvents.ObservationsEntryR\fobservations\x1af\n" + + "\fobservations\x18\x01 \x03(\v28.triggers.ConsensusQueueObservedEvents.ObservationsEntryR\fobservations\x12 \n" + + "\vblobHandles\x18\x02 \x03(\fR\vblobHandles\x1af\n" + "\x11ObservationsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12;\n" + "\x05value\x18\x02 \x01(\v2%.triggers.ConsensusQueueObservedEventR\x05value:\x028\x01\"\xb3\x02\n" + @@ -604,38 +669,39 @@ func file_triggers_proto_rawDescGZIP() []byte { return file_triggers_proto_rawDescData } -var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_triggers_proto_goTypes = []any{ (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList (*ConsensusQueueEvent)(nil), // 2: triggers.ConsensusQueueEvent (*CoordinatedEventBlobHandle)(nil), // 3: triggers.CoordinatedEventBlobHandle (*ConsensusQueueEventList)(nil), // 4: triggers.ConsensusQueueEventList - (*ConsensusQueueObservation)(nil), // 5: triggers.ConsensusQueueObservation - (*ConsensusQueueObservedEvents)(nil), // 6: triggers.ConsensusQueueObservedEvents - (*ConsensusQueueObservedEvent)(nil), // 7: triggers.ConsensusQueueObservedEvent - nil, // 8: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - nil, // 9: triggers.ConsensusQueueObservedEvents.ObservationsEntry - (*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp - (*TriggerResponse)(nil), // 11: capabilities.TriggerResponse + (*ConsensusQueueBlobHandleList)(nil), // 5: triggers.ConsensusQueueBlobHandleList + (*ConsensusQueueObservation)(nil), // 6: triggers.ConsensusQueueObservation + (*ConsensusQueueObservedEvents)(nil), // 7: triggers.ConsensusQueueObservedEvents + (*ConsensusQueueObservedEvent)(nil), // 8: triggers.ConsensusQueueObservedEvent + nil, // 9: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + nil, // 10: triggers.ConsensusQueueObservedEvents.ObservationsEntry + (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp + (*TriggerResponse)(nil), // 12: capabilities.TriggerResponse } var file_triggers_proto_depIdxs = []int32{ - 10, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp - 10, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp - 11, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse + 11, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp + 11, // 1: triggers.CoordinatedEvent.deadline:type_name -> google.protobuf.Timestamp + 12, // 2: triggers.CoordinatedEvent.event:type_name -> capabilities.TriggerResponse 0, // 3: triggers.CoordinatedEventList.events:type_name -> triggers.CoordinatedEvent - 10, // 4: triggers.ConsensusQueueEvent.observedAt:type_name -> google.protobuf.Timestamp - 10, // 5: triggers.ConsensusQueueEvent.deadline:type_name -> google.protobuf.Timestamp + 11, // 4: triggers.ConsensusQueueEvent.observedAt:type_name -> google.protobuf.Timestamp + 11, // 5: triggers.ConsensusQueueEvent.deadline:type_name -> google.protobuf.Timestamp 3, // 6: triggers.ConsensusQueueEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle 2, // 7: triggers.ConsensusQueueEventList.events:type_name -> triggers.ConsensusQueueEvent 2, // 8: triggers.ConsensusQueueObservation.events:type_name -> triggers.ConsensusQueueEvent - 10, // 9: triggers.ConsensusQueueObservation.expiration:type_name -> google.protobuf.Timestamp - 8, // 10: triggers.ConsensusQueueObservation.workflowCapacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 9, // 11: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEvents.ObservationsEntry - 10, // 12: triggers.ConsensusQueueObservedEvent.observedAts:type_name -> google.protobuf.Timestamp - 10, // 13: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp + 11, // 9: triggers.ConsensusQueueObservation.expiration:type_name -> google.protobuf.Timestamp + 9, // 10: triggers.ConsensusQueueObservation.workflowCapacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 10, // 11: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEvents.ObservationsEntry + 11, // 12: triggers.ConsensusQueueObservedEvent.observedAts:type_name -> google.protobuf.Timestamp + 11, // 13: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp 3, // 14: triggers.ConsensusQueueObservedEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle - 7, // 15: triggers.ConsensusQueueObservedEvents.ObservationsEntry.value:type_name -> triggers.ConsensusQueueObservedEvent + 8, // 15: triggers.ConsensusQueueObservedEvents.ObservationsEntry.value:type_name -> triggers.ConsensusQueueObservedEvent 16, // [16:16] is the sub-list for method output_type 16, // [16:16] is the sub-list for method input_type 16, // [16:16] is the sub-list for extension type_name @@ -655,7 +721,7 @@ func file_triggers_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_triggers_proto_rawDesc), len(file_triggers_proto_rawDesc)), NumEnums: 0, - NumMessages: 10, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index a0519fc456..6d08ef957a 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -27,14 +27,14 @@ message ConsensusQueueEvent { string triggerEventID = 2; google.protobuf.Timestamp observedAt = 3; google.protobuf.Timestamp deadline = 4; - bytes blobHash = 5; // hash of the blob data, timestamp fields we have extracted for medianization set to nil + bytes timelessHash = 5; // hash of the blob data, timestamp fields we have extracted for medianization set to nil repeated CoordinatedEventBlobHandle blobs = 6; } // ConsensusQueueEventsBlobHandle refers to a CoordinatedEvent by blob handle and index within an CoordinatedEventList. message CoordinatedEventBlobHandle { - bytes handle = 1; - uint32 index = 2; + uint32 blob = 1; + uint32 element = 2; } // ConsensusQueueEvents holds a list of events. @@ -42,18 +42,25 @@ message ConsensusQueueEventList { repeated ConsensusQueueEvent events = 1; } +// ConsensusQueueBlobHandleList holds a list of blob handles referenced from ConsensusQueueEventList events. +message ConsensusQueueBlobHandleList { + repeated bytes blobHandles = 1; +} + // ConsensusQueueObservation is a ReportingPlugin observation of events and capacity meta-data. message ConsensusQueueObservation { - repeated ConsensusQueueEvent events = 1; + repeated ConsensusQueueEvent events = 1; // sorted + repeated bytes blobHandles = 2; // referenced from events by index - google.protobuf.Timestamp expiration = 2; // - uint32 capacity = 3; // Global remaining capacity - map workflowCapacities = 4; // Workflow-specific free executions + google.protobuf.Timestamp expiration = 3; // observation time - grace period + uint32 capacity = 4; // Global remaining capacity + map workflowCapacities = 5; // Workflow-specific free executions } // ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. message ConsensusQueueObservedEvents { - map observations = 1; + map observations = 1; // key: eventHash + repeated bytes blobHandles = 2; // referenced from observations events by index } // ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. From 4423d67da5d5132ec9c12db186c0e70b3bea1d0e Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Tue, 17 Nov 2026 17:49:47 -0600 Subject: [PATCH 09/10] swap map for entry list --- pkg/capabilities/pb/triggers.pb.go | 118 +++++++++++++++++++++-------- pkg/capabilities/pb/triggers.proto | 7 +- 2 files changed, 91 insertions(+), 34 deletions(-) diff --git a/pkg/capabilities/pb/triggers.pb.go b/pkg/capabilities/pb/triggers.pb.go index 5cf3d28b7c..209bb8b13e 100644 --- a/pkg/capabilities/pb/triggers.pb.go +++ b/pkg/capabilities/pb/triggers.pb.go @@ -458,9 +458,9 @@ func (x *ConsensusQueueObservation) GetWorkflowCapacities() map[string]uint32 { // ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. type ConsensusQueueObservedEvents struct { - state protoimpl.MessageState `protogen:"open.v1"` - Observations map[string]*ConsensusQueueObservedEvent `protobuf:"bytes,1,rep,name=observations,proto3" json:"observations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // key: eventHash - BlobHandles [][]byte `protobuf:"bytes,2,rep,name=blobHandles,proto3" json:"blobHandles,omitempty"` // referenced from observations events by index + state protoimpl.MessageState `protogen:"open.v1"` + Observations []*ConsensusQueueObservedEventEntry `protobuf:"bytes,1,rep,name=observations,proto3" json:"observations,omitempty"` // map entries since we have []byte keys + BlobHandles [][]byte `protobuf:"bytes,2,rep,name=blobHandles,proto3" json:"blobHandles,omitempty"` // referenced from observations events by index unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -495,7 +495,7 @@ func (*ConsensusQueueObservedEvents) Descriptor() ([]byte, []int) { return file_triggers_proto_rawDescGZIP(), []int{7} } -func (x *ConsensusQueueObservedEvents) GetObservations() map[string]*ConsensusQueueObservedEvent { +func (x *ConsensusQueueObservedEvents) GetObservations() []*ConsensusQueueObservedEventEntry { if x != nil { return x.Observations } @@ -509,6 +509,58 @@ func (x *ConsensusQueueObservedEvents) GetBlobHandles() [][]byte { return nil } +type ConsensusQueueObservedEventEntry struct { + state protoimpl.MessageState `protogen:"open.v1"` + TimelessHash []byte `protobuf:"bytes,1,opt,name=timelessHash,proto3" json:"timelessHash,omitempty"` // key + Event *ConsensusQueueObservedEvent `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"` // val + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ConsensusQueueObservedEventEntry) Reset() { + *x = ConsensusQueueObservedEventEntry{} + mi := &file_triggers_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ConsensusQueueObservedEventEntry) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ConsensusQueueObservedEventEntry) ProtoMessage() {} + +func (x *ConsensusQueueObservedEventEntry) ProtoReflect() protoreflect.Message { + mi := &file_triggers_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ConsensusQueueObservedEventEntry.ProtoReflect.Descriptor instead. +func (*ConsensusQueueObservedEventEntry) Descriptor() ([]byte, []int) { + return file_triggers_proto_rawDescGZIP(), []int{8} +} + +func (x *ConsensusQueueObservedEventEntry) GetTimelessHash() []byte { + if x != nil { + return x.TimelessHash + } + return nil +} + +func (x *ConsensusQueueObservedEventEntry) GetEvent() *ConsensusQueueObservedEvent { + if x != nil { + return x.Event + } + return nil +} + // ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. type ConsensusQueueObservedEvent struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -524,7 +576,7 @@ type ConsensusQueueObservedEvent struct { func (x *ConsensusQueueObservedEvent) Reset() { *x = ConsensusQueueObservedEvent{} - mi := &file_triggers_proto_msgTypes[8] + mi := &file_triggers_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -536,7 +588,7 @@ func (x *ConsensusQueueObservedEvent) String() string { func (*ConsensusQueueObservedEvent) ProtoMessage() {} func (x *ConsensusQueueObservedEvent) ProtoReflect() protoreflect.Message { - mi := &file_triggers_proto_msgTypes[8] + mi := &file_triggers_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -549,7 +601,7 @@ func (x *ConsensusQueueObservedEvent) ProtoReflect() protoreflect.Message { // Deprecated: Use ConsensusQueueObservedEvent.ProtoReflect.Descriptor instead. func (*ConsensusQueueObservedEvent) Descriptor() ([]byte, []int) { - return file_triggers_proto_rawDescGZIP(), []int{8} + return file_triggers_proto_rawDescGZIP(), []int{9} } func (x *ConsensusQueueObservedEvent) GetWorkflowID() string { @@ -640,13 +692,13 @@ const file_triggers_proto_rawDesc = "" + "\x12workflowCapacities\x18\x05 \x03(\v2;.triggers.ConsensusQueueObservation.WorkflowCapacitiesEntryR\x12workflowCapacities\x1aE\n" + "\x17WorkflowCapacitiesEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\x86\x02\n" + - "\x1cConsensusQueueObservedEvents\x12\\\n" + - "\fobservations\x18\x01 \x03(\v28.triggers.ConsensusQueueObservedEvents.ObservationsEntryR\fobservations\x12 \n" + - "\vblobHandles\x18\x02 \x03(\fR\vblobHandles\x1af\n" + - "\x11ObservationsEntry\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x12;\n" + - "\x05value\x18\x02 \x01(\v2%.triggers.ConsensusQueueObservedEventR\x05value:\x028\x01\"\xb3\x02\n" + + "\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\"\x90\x01\n" + + "\x1cConsensusQueueObservedEvents\x12N\n" + + "\fobservations\x18\x01 \x03(\v2*.triggers.ConsensusQueueObservedEventEntryR\fobservations\x12 \n" + + "\vblobHandles\x18\x02 \x03(\fR\vblobHandles\"\x83\x01\n" + + " ConsensusQueueObservedEventEntry\x12\"\n" + + "\ftimelessHash\x18\x01 \x01(\fR\ftimelessHash\x12;\n" + + "\x05event\x18\x02 \x01(\v2%.triggers.ConsensusQueueObservedEventR\x05event\"\xb3\x02\n" + "\x1bConsensusQueueObservedEvent\x12\x1e\n" + "\n" + "workflowID\x18\x01 \x01(\tR\n" + @@ -671,19 +723,19 @@ func file_triggers_proto_rawDescGZIP() []byte { var file_triggers_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_triggers_proto_goTypes = []any{ - (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent - (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList - (*ConsensusQueueEvent)(nil), // 2: triggers.ConsensusQueueEvent - (*CoordinatedEventBlobHandle)(nil), // 3: triggers.CoordinatedEventBlobHandle - (*ConsensusQueueEventList)(nil), // 4: triggers.ConsensusQueueEventList - (*ConsensusQueueBlobHandleList)(nil), // 5: triggers.ConsensusQueueBlobHandleList - (*ConsensusQueueObservation)(nil), // 6: triggers.ConsensusQueueObservation - (*ConsensusQueueObservedEvents)(nil), // 7: triggers.ConsensusQueueObservedEvents - (*ConsensusQueueObservedEvent)(nil), // 8: triggers.ConsensusQueueObservedEvent - nil, // 9: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - nil, // 10: triggers.ConsensusQueueObservedEvents.ObservationsEntry - (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp - (*TriggerResponse)(nil), // 12: capabilities.TriggerResponse + (*CoordinatedEvent)(nil), // 0: triggers.CoordinatedEvent + (*CoordinatedEventList)(nil), // 1: triggers.CoordinatedEventList + (*ConsensusQueueEvent)(nil), // 2: triggers.ConsensusQueueEvent + (*CoordinatedEventBlobHandle)(nil), // 3: triggers.CoordinatedEventBlobHandle + (*ConsensusQueueEventList)(nil), // 4: triggers.ConsensusQueueEventList + (*ConsensusQueueBlobHandleList)(nil), // 5: triggers.ConsensusQueueBlobHandleList + (*ConsensusQueueObservation)(nil), // 6: triggers.ConsensusQueueObservation + (*ConsensusQueueObservedEvents)(nil), // 7: triggers.ConsensusQueueObservedEvents + (*ConsensusQueueObservedEventEntry)(nil), // 8: triggers.ConsensusQueueObservedEventEntry + (*ConsensusQueueObservedEvent)(nil), // 9: triggers.ConsensusQueueObservedEvent + nil, // 10: triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp + (*TriggerResponse)(nil), // 12: capabilities.TriggerResponse } var file_triggers_proto_depIdxs = []int32{ 11, // 0: triggers.CoordinatedEvent.observedAt:type_name -> google.protobuf.Timestamp @@ -696,12 +748,12 @@ var file_triggers_proto_depIdxs = []int32{ 2, // 7: triggers.ConsensusQueueEventList.events:type_name -> triggers.ConsensusQueueEvent 2, // 8: triggers.ConsensusQueueObservation.events:type_name -> triggers.ConsensusQueueEvent 11, // 9: triggers.ConsensusQueueObservation.expiration:type_name -> google.protobuf.Timestamp - 9, // 10: triggers.ConsensusQueueObservation.workflowCapacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry - 10, // 11: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEvents.ObservationsEntry - 11, // 12: triggers.ConsensusQueueObservedEvent.observedAts:type_name -> google.protobuf.Timestamp - 11, // 13: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp - 3, // 14: triggers.ConsensusQueueObservedEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle - 8, // 15: triggers.ConsensusQueueObservedEvents.ObservationsEntry.value:type_name -> triggers.ConsensusQueueObservedEvent + 10, // 10: triggers.ConsensusQueueObservation.workflowCapacities:type_name -> triggers.ConsensusQueueObservation.WorkflowCapacitiesEntry + 8, // 11: triggers.ConsensusQueueObservedEvents.observations:type_name -> triggers.ConsensusQueueObservedEventEntry + 9, // 12: triggers.ConsensusQueueObservedEventEntry.event:type_name -> triggers.ConsensusQueueObservedEvent + 11, // 13: triggers.ConsensusQueueObservedEvent.observedAts:type_name -> google.protobuf.Timestamp + 11, // 14: triggers.ConsensusQueueObservedEvent.deadlines:type_name -> google.protobuf.Timestamp + 3, // 15: triggers.ConsensusQueueObservedEvent.blobs:type_name -> triggers.CoordinatedEventBlobHandle 16, // [16:16] is the sub-list for method output_type 16, // [16:16] is the sub-list for method input_type 16, // [16:16] is the sub-list for extension type_name diff --git a/pkg/capabilities/pb/triggers.proto b/pkg/capabilities/pb/triggers.proto index 6d08ef957a..5d955b1732 100644 --- a/pkg/capabilities/pb/triggers.proto +++ b/pkg/capabilities/pb/triggers.proto @@ -59,10 +59,15 @@ message ConsensusQueueObservation { // ConsensusQueueObservedEvents holds a working set of observed events that are awaiting consensus. message ConsensusQueueObservedEvents { - map observations = 1; // key: eventHash + repeated ConsensusQueueObservedEventEntry observations = 1; // map entries since we have []byte keys repeated bytes blobHandles = 2; // referenced from observations events by index } +message ConsensusQueueObservedEventEntry { + bytes timelessHash = 1; // key + ConsensusQueueObservedEvent event = 2; // val +} + // ConsensusQueueObservedEvent tracks observation metadata for events awaiting consensus. message ConsensusQueueObservedEvent { string workflowID = 1; From 05caa74bd0876a56508f8901e22d1c436feb91f7 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Wed, 18 Nov 2026 09:09:12 -0600 Subject: [PATCH 10/10] add ConsensusQueueEvent.CompareDeadline --- pkg/capabilities/pb/triggers.go | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pkg/capabilities/pb/triggers.go diff --git a/pkg/capabilities/pb/triggers.go b/pkg/capabilities/pb/triggers.go new file mode 100644 index 0000000000..26e2fc58e9 --- /dev/null +++ b/pkg/capabilities/pb/triggers.go @@ -0,0 +1,9 @@ +package pb + +import "cmp" + +func (e *ConsensusQueueEvent) CompareDeadline(o *ConsensusQueueEvent) int { + return cmp.Or(cmp.Compare(e.Deadline.Seconds, o.Deadline.Seconds), + cmp.Compare(e.Deadline.Nanos, o.Deadline.Nanos), + cmp.Compare(e.TriggerEventID, o.TriggerEventID)) +}