diff --git a/capabilities/go.mod b/capabilities/go.mod index 3cbc71f..a1cce75 100644 --- a/capabilities/go.mod +++ b/capabilities/go.mod @@ -51,6 +51,7 @@ require ( github.com/prometheus/common v0.63.0 // indirect github.com/prometheus/procfs v0.16.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 // indirect + github.com/smartcontractkit/capabilities/libs v0.0.0-20250710152725-133f16605d23 // indirect github.com/smartcontractkit/libocr v0.0.0-20250328171017-609ec10a5510 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect diff --git a/capabilities/go.sum b/capabilities/go.sum index 2ad9058..fdbf155 100644 --- a/capabilities/go.sum +++ b/capabilities/go.sum @@ -89,6 +89,8 @@ github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 h1:WCcC4vZDS1tYNxjWlwRJZQy28r8CM github.com/santhosh-tekuri/jsonschema/v5 v5.2.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= +github.com/smartcontractkit/capabilities/libs v0.0.0-20250710152725-133f16605d23 h1:hI3x6vYfANqUsJ6oMy2ol/CgbCvgn5L6fKfcgBVSAgo= +github.com/smartcontractkit/capabilities/libs v0.0.0-20250710152725-133f16605d23/go.mod h1:qxV7aEa4ifbj1UQCcmz/cyARzLtJSSN0Qq6dpC3rM9M= github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702142954-f9ce5ef305d1 h1:XI7dErChGcWbbv9vOrSyhXhkkkvROuGpfLj2vwnP6gY= github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702142954-f9ce5ef305d1/go.mod h1:kNOevuC9e+gJXT3+bbJKX0svJal6QCxJVSTrW5e36uM= github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250626141212-e50b2e7ffe2d h1:86gp4tIXRb6ccSrjcm4gV8iA5wJN6er3rJY9f2UxRLU= diff --git a/capabilities/writetarget/messages.go b/capabilities/writetarget/messages.go index 018da1c..df55d8a 100644 --- a/capabilities/writetarget/messages.go +++ b/capabilities/writetarget/messages.go @@ -5,6 +5,7 @@ import ( "encoding/hex" "time" + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/capabilities" "github.com/smartcontractkit/chainlink-common/pkg/types" commonpb "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" @@ -60,7 +61,7 @@ func (m *messageBuilder) buildWriteError(i requestInfo, code uint32, summary, ca ReportId: uint32(i.reportInfo.reportID), // Execution Context - Source - ExecutionContext: &commonpb.ExecutionContext{ + ExecutionContext: &monitoring.ExecutionContext{ MetaSourceId: i.node, // Execution Context - Chain @@ -94,7 +95,7 @@ func (m *messageBuilder) buildWriteInitiated(i requestInfo) *wt.WriteInitiated { Receiver: i.receiver, ReportId: uint32(i.reportInfo.reportID), - ExecutionContext: &commonpb.ExecutionContext{ + ExecutionContext: &monitoring.ExecutionContext{ // Execution Context - Source MetaSourceId: i.node, @@ -130,7 +131,7 @@ func (m *messageBuilder) buildWriteSkipped(i requestInfo, reason string) *wt.Wri ReportId: uint32(i.reportInfo.reportID), Reason: reason, - ExecutionContext: &commonpb.ExecutionContext{ + ExecutionContext: &monitoring.ExecutionContext{ // Execution Context - Source MetaSourceId: i.node, @@ -173,7 +174,7 @@ func (m *messageBuilder) buildWriteSent(i requestInfo, head types.Head, txID str BlockTimestamp: head.Timestamp * 1000, // convert to milliseconds }, - ExecutionContext: &commonpb.ExecutionContext{ + ExecutionContext: &monitoring.ExecutionContext{ // Execution Context - Source MetaSourceId: i.node, @@ -232,7 +233,7 @@ func (m *messageBuilder) buildWriteConfirmed(i requestInfo, head types.Head) *wt Transmitter: i.reportTransmissionState.Transmitter, Success: i.reportTransmissionState.Status == TransmissionStateSucceeded, - ExecutionContext: &commonpb.ExecutionContext{ + ExecutionContext: &monitoring.ExecutionContext{ // Execution Context - Source MetaSourceId: i.node, diff --git a/capabilities/writetarget/monitoring/pb/common/execution_context.pb.go b/capabilities/writetarget/monitoring/pb/common/execution_context.pb.go deleted file mode 100644 index 8d7ef32..0000000 --- a/capabilities/writetarget/monitoring/pb/common/execution_context.pb.go +++ /dev/null @@ -1,263 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.36.6 -// protoc v5.29.3 -// source: execution_context.proto - -package common - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" - unsafe "unsafe" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// [Execution Context] -type ExecutionContext struct { - state protoimpl.MessageState `protogen:"open.v1"` - // Execution Context - Source - MetaSourceId string `protobuf:"bytes,1,opt,name=meta_source_id,json=metaSourceId,proto3" json:"meta_source_id,omitempty"` - // Execution Context - Chain - MetaChainFamilyName string `protobuf:"bytes,2,opt,name=meta_chain_family_name,json=metaChainFamilyName,proto3" json:"meta_chain_family_name,omitempty"` - MetaChainId string `protobuf:"bytes,3,opt,name=meta_chain_id,json=metaChainId,proto3" json:"meta_chain_id,omitempty"` - MetaNetworkName string `protobuf:"bytes,4,opt,name=meta_network_name,json=metaNetworkName,proto3" json:"meta_network_name,omitempty"` - MetaNetworkNameFull string `protobuf:"bytes,5,opt,name=meta_network_name_full,json=metaNetworkNameFull,proto3" json:"meta_network_name_full,omitempty"` - // Execution Context - Workflow (capabilities.RequestMetadata) - MetaWorkflowId string `protobuf:"bytes,6,opt,name=meta_workflow_id,json=metaWorkflowId,proto3" json:"meta_workflow_id,omitempty"` - MetaWorkflowOwner string `protobuf:"bytes,7,opt,name=meta_workflow_owner,json=metaWorkflowOwner,proto3" json:"meta_workflow_owner,omitempty"` - MetaWorkflowExecutionId string `protobuf:"bytes,8,opt,name=meta_workflow_execution_id,json=metaWorkflowExecutionId,proto3" json:"meta_workflow_execution_id,omitempty"` - MetaWorkflowName string `protobuf:"bytes,9,opt,name=meta_workflow_name,json=metaWorkflowName,proto3" json:"meta_workflow_name,omitempty"` - MetaWorkflowDonId uint32 `protobuf:"varint,10,opt,name=meta_workflow_don_id,json=metaWorkflowDonId,proto3" json:"meta_workflow_don_id,omitempty"` - MetaWorkflowDonConfigVersion uint32 `protobuf:"varint,11,opt,name=meta_workflow_don_config_version,json=metaWorkflowDonConfigVersion,proto3" json:"meta_workflow_don_config_version,omitempty"` - MetaReferenceId string `protobuf:"bytes,12,opt,name=meta_reference_id,json=metaReferenceId,proto3" json:"meta_reference_id,omitempty"` - // Execution Context - Capability - MetaCapabilityType string `protobuf:"bytes,13,opt,name=meta_capability_type,json=metaCapabilityType,proto3" json:"meta_capability_type,omitempty"` - MetaCapabilityId string `protobuf:"bytes,14,opt,name=meta_capability_id,json=metaCapabilityId,proto3" json:"meta_capability_id,omitempty"` - MetaCapabilityTimestampStart uint64 `protobuf:"varint,15,opt,name=meta_capability_timestamp_start,json=metaCapabilityTimestampStart,proto3" json:"meta_capability_timestamp_start,omitempty"` - MetaCapabilityTimestampEmit uint64 `protobuf:"varint,16,opt,name=meta_capability_timestamp_emit,json=metaCapabilityTimestampEmit,proto3" json:"meta_capability_timestamp_emit,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ExecutionContext) Reset() { - *x = ExecutionContext{} - mi := &file_execution_context_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ExecutionContext) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ExecutionContext) ProtoMessage() {} - -func (x *ExecutionContext) ProtoReflect() protoreflect.Message { - mi := &file_execution_context_proto_msgTypes[0] - 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 ExecutionContext.ProtoReflect.Descriptor instead. -func (*ExecutionContext) Descriptor() ([]byte, []int) { - return file_execution_context_proto_rawDescGZIP(), []int{0} -} - -func (x *ExecutionContext) GetMetaSourceId() string { - if x != nil { - return x.MetaSourceId - } - return "" -} - -func (x *ExecutionContext) GetMetaChainFamilyName() string { - if x != nil { - return x.MetaChainFamilyName - } - return "" -} - -func (x *ExecutionContext) GetMetaChainId() string { - if x != nil { - return x.MetaChainId - } - return "" -} - -func (x *ExecutionContext) GetMetaNetworkName() string { - if x != nil { - return x.MetaNetworkName - } - return "" -} - -func (x *ExecutionContext) GetMetaNetworkNameFull() string { - if x != nil { - return x.MetaNetworkNameFull - } - return "" -} - -func (x *ExecutionContext) GetMetaWorkflowId() string { - if x != nil { - return x.MetaWorkflowId - } - return "" -} - -func (x *ExecutionContext) GetMetaWorkflowOwner() string { - if x != nil { - return x.MetaWorkflowOwner - } - return "" -} - -func (x *ExecutionContext) GetMetaWorkflowExecutionId() string { - if x != nil { - return x.MetaWorkflowExecutionId - } - return "" -} - -func (x *ExecutionContext) GetMetaWorkflowName() string { - if x != nil { - return x.MetaWorkflowName - } - return "" -} - -func (x *ExecutionContext) GetMetaWorkflowDonId() uint32 { - if x != nil { - return x.MetaWorkflowDonId - } - return 0 -} - -func (x *ExecutionContext) GetMetaWorkflowDonConfigVersion() uint32 { - if x != nil { - return x.MetaWorkflowDonConfigVersion - } - return 0 -} - -func (x *ExecutionContext) GetMetaReferenceId() string { - if x != nil { - return x.MetaReferenceId - } - return "" -} - -func (x *ExecutionContext) GetMetaCapabilityType() string { - if x != nil { - return x.MetaCapabilityType - } - return "" -} - -func (x *ExecutionContext) GetMetaCapabilityId() string { - if x != nil { - return x.MetaCapabilityId - } - return "" -} - -func (x *ExecutionContext) GetMetaCapabilityTimestampStart() uint64 { - if x != nil { - return x.MetaCapabilityTimestampStart - } - return 0 -} - -func (x *ExecutionContext) GetMetaCapabilityTimestampEmit() uint64 { - if x != nil { - return x.MetaCapabilityTimestampEmit - } - return 0 -} - -var File_execution_context_proto protoreflect.FileDescriptor - -const file_execution_context_proto_rawDesc = "" + - "\n" + - "\x17execution_context.proto\x12\x06common\"\xc8\x06\n" + - "\x10ExecutionContext\x12$\n" + - "\x0emeta_source_id\x18\x01 \x01(\tR\fmetaSourceId\x123\n" + - "\x16meta_chain_family_name\x18\x02 \x01(\tR\x13metaChainFamilyName\x12\"\n" + - "\rmeta_chain_id\x18\x03 \x01(\tR\vmetaChainId\x12*\n" + - "\x11meta_network_name\x18\x04 \x01(\tR\x0fmetaNetworkName\x123\n" + - "\x16meta_network_name_full\x18\x05 \x01(\tR\x13metaNetworkNameFull\x12(\n" + - "\x10meta_workflow_id\x18\x06 \x01(\tR\x0emetaWorkflowId\x12.\n" + - "\x13meta_workflow_owner\x18\a \x01(\tR\x11metaWorkflowOwner\x12;\n" + - "\x1ameta_workflow_execution_id\x18\b \x01(\tR\x17metaWorkflowExecutionId\x12,\n" + - "\x12meta_workflow_name\x18\t \x01(\tR\x10metaWorkflowName\x12/\n" + - "\x14meta_workflow_don_id\x18\n" + - " \x01(\rR\x11metaWorkflowDonId\x12F\n" + - " meta_workflow_don_config_version\x18\v \x01(\rR\x1cmetaWorkflowDonConfigVersion\x12*\n" + - "\x11meta_reference_id\x18\f \x01(\tR\x0fmetaReferenceId\x120\n" + - "\x14meta_capability_type\x18\r \x01(\tR\x12metaCapabilityType\x12,\n" + - "\x12meta_capability_id\x18\x0e \x01(\tR\x10metaCapabilityId\x12E\n" + - "\x1fmeta_capability_timestamp_start\x18\x0f \x01(\x04R\x1cmetaCapabilityTimestampStart\x12C\n" + - "\x1emeta_capability_timestamp_emit\x18\x10 \x01(\x04R\x1bmetaCapabilityTimestampEmitBfZdgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common;commonb\x06proto3" - -var ( - file_execution_context_proto_rawDescOnce sync.Once - file_execution_context_proto_rawDescData []byte -) - -func file_execution_context_proto_rawDescGZIP() []byte { - file_execution_context_proto_rawDescOnce.Do(func() { - file_execution_context_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_execution_context_proto_rawDesc), len(file_execution_context_proto_rawDesc))) - }) - return file_execution_context_proto_rawDescData -} - -var file_execution_context_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_execution_context_proto_goTypes = []any{ - (*ExecutionContext)(nil), // 0: common.ExecutionContext -} -var file_execution_context_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_execution_context_proto_init() } -func file_execution_context_proto_init() { - if File_execution_context_proto != nil { - return - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_execution_context_proto_rawDesc), len(file_execution_context_proto_rawDesc)), - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_execution_context_proto_goTypes, - DependencyIndexes: file_execution_context_proto_depIdxs, - MessageInfos: file_execution_context_proto_msgTypes, - }.Build() - File_execution_context_proto = out.File - file_execution_context_proto_goTypes = nil - file_execution_context_proto_depIdxs = nil -} diff --git a/capabilities/writetarget/monitoring/pb/common/execution_context.proto b/capabilities/writetarget/monitoring/pb/common/execution_context.proto deleted file mode 100644 index 4ee6369..0000000 --- a/capabilities/writetarget/monitoring/pb/common/execution_context.proto +++ /dev/null @@ -1,30 +0,0 @@ -syntax="proto3"; - -package common; -option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common;common"; -// [Execution Context] -message ExecutionContext { - // Execution Context - Source - string meta_source_id = 1; - - // Execution Context - Chain - string meta_chain_family_name = 2; - string meta_chain_id = 3; - string meta_network_name = 4; - string meta_network_name_full = 5; - - // Execution Context - Workflow (capabilities.RequestMetadata) - string meta_workflow_id = 6; - string meta_workflow_owner = 7; - string meta_workflow_execution_id = 8; - string meta_workflow_name = 9; - uint32 meta_workflow_don_id = 10; - uint32 meta_workflow_don_config_version = 11; - string meta_reference_id = 12; - - // Execution Context - Capability - string meta_capability_type = 13; - string meta_capability_id = 14; - uint64 meta_capability_timestamp_start = 15; - uint64 meta_capability_timestamp_emit = 16; -} diff --git a/capabilities/writetarget/monitoring/pb/common/generate.go b/capabilities/writetarget/monitoring/pb/common/generate.go index 6f4105c..6893d2a 100644 --- a/capabilities/writetarget/monitoring/pb/common/generate.go +++ b/capabilities/writetarget/monitoring/pb/common/generate.go @@ -2,5 +2,4 @@ package common //go:generate protoc -I=. --go_out=paths=source_relative:. block_data.proto -//go:generate protoc -I=. --go_out=paths=source_relative:. execution_context.proto //go:generate protoc -I=. --go_out=paths=source_relative:. transaction_data.proto diff --git a/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.pb.go b/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.pb.go index b2636c3..40a50d4 100644 --- a/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.pb.go +++ b/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.pb.go @@ -7,6 +7,7 @@ package registry import ( + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -41,7 +42,7 @@ type FeedUpdated struct { Bundle []byte `protobuf:"bytes,9,opt,name=bundle,proto3" json:"bundle,omitempty"` TransactionData *common.TransactionData `protobuf:"bytes,10,opt,name=transaction_data,json=transactionData,proto3" json:"transaction_data,omitempty"` // [Execution Context] - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -132,7 +133,7 @@ func (x *FeedUpdated) GetTransactionData() *common.TransactionData { return nil } -func (x *FeedUpdated) GetExecutionContext() *common.ExecutionContext { +func (x *FeedUpdated) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -143,7 +144,7 @@ var File_feed_updated_proto protoreflect.FileDescriptor const file_feed_updated_proto_rawDesc = "" + "\n" + - "\x12feed_updated.proto\x12\x1bdatafeeds.on_chain.registry\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\x1aDcapabilities/writetarget/monitoring/pb/common/transaction_data.proto\"\x8d\x03\n" + + "\x12feed_updated.proto\x12\x1bdatafeeds.on_chain.registry\x1a\"monitoring/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\x1aDcapabilities/writetarget/monitoring/pb/common/transaction_data.proto\"\x91\x03\n" + "\vFeedUpdated\x12\x17\n" + "\afeed_id\x18\x01 \x01(\tR\x06feedId\x125\n" + "\x16observations_timestamp\x18\x02 \x01(\rR\x15observationsTimestamp\x12\x1c\n" + @@ -154,8 +155,8 @@ const file_feed_updated_proto_rawDesc = "" + "block_data\x18\x06 \x01(\v2\x11.common.BlockDataR\tblockData\x12\x16\n" + "\x06bundle\x18\t \x01(\fR\x06bundle\x12B\n" + "\x10transaction_data\x18\n" + - " \x01(\v2\x17.common.TransactionDataR\x0ftransactionData\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextB\fZ\n" + + " \x01(\v2\x17.common.TransactionDataR\x0ftransactionData\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextB\fZ\n" + ".;registryb\x06proto3" var ( @@ -172,15 +173,15 @@ func file_feed_updated_proto_rawDescGZIP() []byte { var file_feed_updated_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_feed_updated_proto_goTypes = []any{ - (*FeedUpdated)(nil), // 0: datafeeds.on_chain.registry.FeedUpdated - (*common.BlockData)(nil), // 1: common.BlockData - (*common.TransactionData)(nil), // 2: common.TransactionData - (*common.ExecutionContext)(nil), // 3: common.ExecutionContext + (*FeedUpdated)(nil), // 0: datafeeds.on_chain.registry.FeedUpdated + (*common.BlockData)(nil), // 1: common.BlockData + (*common.TransactionData)(nil), // 2: common.TransactionData + (*monitoring.ExecutionContext)(nil), // 3: monitoring.ExecutionContext } var file_feed_updated_proto_depIdxs = []int32{ 1, // 0: datafeeds.on_chain.registry.FeedUpdated.block_data:type_name -> common.BlockData 2, // 1: datafeeds.on_chain.registry.FeedUpdated.transaction_data:type_name -> common.TransactionData - 3, // 2: datafeeds.on_chain.registry.FeedUpdated.execution_context:type_name -> common.ExecutionContext + 3, // 2: datafeeds.on_chain.registry.FeedUpdated.execution_context:type_name -> monitoring.ExecutionContext 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.proto b/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.proto index 800a80f..c30cc52 100644 --- a/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.proto +++ b/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/feed_updated.proto @@ -3,7 +3,7 @@ syntax="proto3"; package datafeeds.on_chain.registry; option go_package = ".;registry"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; import "capabilities/writetarget/monitoring/pb/common/block_data.proto"; import "capabilities/writetarget/monitoring/pb/common/transaction_data.proto"; @@ -30,5 +30,5 @@ message FeedUpdated { common.TransactionData transaction_data = 10; // [Execution Context] - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; } diff --git a/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/generate.go b/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/generate.go index d77c011..ecef7ce 100644 --- a/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/generate.go +++ b/capabilities/writetarget/monitoring/pb/data-feeds/on-chain/registry/generate.go @@ -1,3 +1,3 @@ package registry -//go:generate protoc -I=../../../../../../.. -I=. --go_out=paths=source_relative:. feed_updated.proto +//go:generate sh -c "protoc -I=../../../../../../.. -I=. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. feed_updated.proto" diff --git a/capabilities/writetarget/monitoring/pb/platform/generate.go b/capabilities/writetarget/monitoring/pb/platform/generate.go index 0678143..a19bc96 100644 --- a/capabilities/writetarget/monitoring/pb/platform/generate.go +++ b/capabilities/writetarget/monitoring/pb/platform/generate.go @@ -1,8 +1,8 @@ package writetarget -//go:generate protoc -I=. -I=../../../../.. --go_out=paths=source_relative:. ./write_accepted.proto -//go:generate protoc -I=. -I=../../../../.. --go_out=paths=source_relative:. ./write_confirmed.proto -//go:generate protoc -I=. -I=../../../../.. --go_out=paths=source_relative:. ./write_error.proto -//go:generate protoc -I=. -I=../../../../.. --go_out=paths=source_relative:. ./write_initiated.proto -//go:generate protoc -I=. -I=../../../../.. --go_out=paths=source_relative:. ./write_sent.proto -//go:generate protoc -I=. -I=../../../../.. --go_out=paths=source_relative:. ./write_skipped.proto +//go:generate sh -c "protoc -I=. -I=../../../../.. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. ./write_accepted.proto" +//go:generate sh -c "protoc -I=. -I=../../../../.. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. ./write_confirmed.proto" +//go:generate sh -c "protoc -I=. -I=../../../../.. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. ./write_error.proto" +//go:generate sh -c "protoc -I=. -I=../../../../.. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. ./write_initiated.proto" +//go:generate sh -c "protoc -I=. -I=../../../../.. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. ./write_sent.proto" +//go:generate sh -c "protoc -I=. -I=../../../../.. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. ./write_skipped.proto" diff --git a/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/generate.go b/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/generate.go index 2d49449..c73ddf1 100644 --- a/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/generate.go +++ b/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/generate.go @@ -1,3 +1,3 @@ package forwarder -//go:generate protoc -I=../../../../../../.. -I=. --go_out=paths=source_relative:. report_processed.proto +//go:generate sh -c "protoc -I=../../../../../../.. -I=. -I=$(go list -f '{{ .Dir }}' -m github.com/smartcontractkit/capabilities/libs) --go_out=paths=source_relative:. report_processed.proto" diff --git a/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.pb.go b/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.pb.go index 7766ec2..7e800b1 100644 --- a/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.pb.go @@ -7,6 +7,7 @@ package forwarder import ( + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -27,13 +28,13 @@ const ( type ReportProcessed struct { state protoimpl.MessageState `protogen:"open.v1"` // Event data - Receiver string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty"` - WorkflowExecutionId string `protobuf:"bytes,2,opt,name=workflow_execution_id,json=workflowExecutionId,proto3" json:"workflow_execution_id,omitempty"` // bytes as hex string for readability - ReportId uint32 `protobuf:"varint,3,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` - Success bool `protobuf:"varint,4,opt,name=success,proto3" json:"success,omitempty"` - BlockData *common.BlockData `protobuf:"bytes,6,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` - TransactionData *common.TransactionData `protobuf:"bytes,10,opt,name=transaction_data,json=transactionData,proto3" json:"transaction_data,omitempty"` - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + Receiver string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty"` + WorkflowExecutionId string `protobuf:"bytes,2,opt,name=workflow_execution_id,json=workflowExecutionId,proto3" json:"workflow_execution_id,omitempty"` // bytes as hex string for readability + ReportId uint32 `protobuf:"varint,3,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` + Success bool `protobuf:"varint,4,opt,name=success,proto3" json:"success,omitempty"` + BlockData *common.BlockData `protobuf:"bytes,6,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` + TransactionData *common.TransactionData `protobuf:"bytes,10,opt,name=transaction_data,json=transactionData,proto3" json:"transaction_data,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -110,7 +111,7 @@ func (x *ReportProcessed) GetTransactionData() *common.TransactionData { return nil } -func (x *ReportProcessed) GetExecutionContext() *common.ExecutionContext { +func (x *ReportProcessed) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -121,7 +122,7 @@ var File_report_processed_proto protoreflect.FileDescriptor const file_report_processed_proto_rawDesc = "" + "\n" + - "\x16report_processed.proto\x12\x1bplatform.on_chain.forwarder\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\x1aDcapabilities/writetarget/monitoring/pb/common/transaction_data.proto\"\xd5\x02\n" + + "\x16report_processed.proto\x12\x1bplatform.on_chain.forwarder\x1a\"monitoring/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\x1aDcapabilities/writetarget/monitoring/pb/common/transaction_data.proto\"\xd9\x02\n" + "\x0fReportProcessed\x12\x1a\n" + "\breceiver\x18\x01 \x01(\tR\breceiver\x122\n" + "\x15workflow_execution_id\x18\x02 \x01(\tR\x13workflowExecutionId\x12\x1b\n" + @@ -130,8 +131,8 @@ const file_report_processed_proto_rawDesc = "" + "\n" + "block_data\x18\x06 \x01(\v2\x11.common.BlockDataR\tblockData\x12B\n" + "\x10transaction_data\x18\n" + - " \x01(\v2\x17.common.TransactionDataR\x0ftransactionData\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextB~Z|github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder;forwarderb\x06proto3" + " \x01(\v2\x17.common.TransactionDataR\x0ftransactionData\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextB~Z|github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder;forwarderb\x06proto3" var ( file_report_processed_proto_rawDescOnce sync.Once @@ -147,15 +148,15 @@ func file_report_processed_proto_rawDescGZIP() []byte { var file_report_processed_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_report_processed_proto_goTypes = []any{ - (*ReportProcessed)(nil), // 0: platform.on_chain.forwarder.ReportProcessed - (*common.BlockData)(nil), // 1: common.BlockData - (*common.TransactionData)(nil), // 2: common.TransactionData - (*common.ExecutionContext)(nil), // 3: common.ExecutionContext + (*ReportProcessed)(nil), // 0: platform.on_chain.forwarder.ReportProcessed + (*common.BlockData)(nil), // 1: common.BlockData + (*common.TransactionData)(nil), // 2: common.TransactionData + (*monitoring.ExecutionContext)(nil), // 3: monitoring.ExecutionContext } var file_report_processed_proto_depIdxs = []int32{ 1, // 0: platform.on_chain.forwarder.ReportProcessed.block_data:type_name -> common.BlockData 2, // 1: platform.on_chain.forwarder.ReportProcessed.transaction_data:type_name -> common.TransactionData - 3, // 2: platform.on_chain.forwarder.ReportProcessed.execution_context:type_name -> common.ExecutionContext + 3, // 2: platform.on_chain.forwarder.ReportProcessed.execution_context:type_name -> monitoring.ExecutionContext 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.proto b/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.proto index f3d8ae1..487c324 100644 --- a/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.proto +++ b/capabilities/writetarget/monitoring/pb/platform/on-chain/forwarder/report_processed.proto @@ -2,7 +2,7 @@ syntax="proto3"; package platform.on_chain.forwarder; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; import "capabilities/writetarget/monitoring/pb/common/block_data.proto"; import "capabilities/writetarget/monitoring/pb/common/transaction_data.proto"; @@ -20,5 +20,5 @@ message ReportProcessed { common.BlockData block_data = 6; common.TransactionData transaction_data = 10; - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; } diff --git a/capabilities/writetarget/monitoring/pb/platform/write_accepted.pb.go b/capabilities/writetarget/monitoring/pb/platform/write_accepted.pb.go index ec3c2fd..6938676 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_accepted.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/write_accepted.pb.go @@ -7,6 +7,7 @@ package writetarget import ( + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -31,10 +32,10 @@ type WriteAccepted struct { Forwarder string `protobuf:"bytes,2,opt,name=forwarder,proto3" json:"forwarder,omitempty"` Receiver string `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"` // Report Info - ReportId uint32 `protobuf:"varint,4,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` - BlockData *common.BlockData `protobuf:"bytes,6,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` - TransactionData *common.TransactionData `protobuf:"bytes,10,opt,name=transaction_data,json=transactionData,proto3" json:"transaction_data,omitempty"` - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ReportId uint32 `protobuf:"varint,4,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` + BlockData *common.BlockData `protobuf:"bytes,6,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` + TransactionData *common.TransactionData `protobuf:"bytes,10,opt,name=transaction_data,json=transactionData,proto3" json:"transaction_data,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -111,7 +112,7 @@ func (x *WriteAccepted) GetTransactionData() *common.TransactionData { return nil } -func (x *WriteAccepted) GetExecutionContext() *common.ExecutionContext { +func (x *WriteAccepted) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -122,7 +123,7 @@ var File_write_accepted_proto protoreflect.FileDescriptor const file_write_accepted_proto_rawDesc = "" + "\n" + - "\x14write_accepted.proto\x12\x15platform.write_target\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\x1aDcapabilities/writetarget/monitoring/pb/common/transaction_data.proto\"\xb7\x02\n" + + "\x14write_accepted.proto\x12\x15platform.write_target\x1a\"monitoring/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\x1aDcapabilities/writetarget/monitoring/pb/common/transaction_data.proto\"\xbb\x02\n" + "\rWriteAccepted\x12\x12\n" + "\x04node\x18\x01 \x01(\tR\x04node\x12\x1c\n" + "\tforwarder\x18\x02 \x01(\tR\tforwarder\x12\x1a\n" + @@ -131,8 +132,8 @@ const file_write_accepted_proto_rawDesc = "" + "\n" + "block_data\x18\x06 \x01(\v2\x11.common.BlockDataR\tblockData\x12B\n" + "\x10transaction_data\x18\n" + - " \x01(\v2\x17.common.TransactionDataR\x0ftransactionData\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" + " \x01(\v2\x17.common.TransactionDataR\x0ftransactionData\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" var ( file_write_accepted_proto_rawDescOnce sync.Once @@ -148,15 +149,15 @@ func file_write_accepted_proto_rawDescGZIP() []byte { var file_write_accepted_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_write_accepted_proto_goTypes = []any{ - (*WriteAccepted)(nil), // 0: platform.write_target.WriteAccepted - (*common.BlockData)(nil), // 1: common.BlockData - (*common.TransactionData)(nil), // 2: common.TransactionData - (*common.ExecutionContext)(nil), // 3: common.ExecutionContext + (*WriteAccepted)(nil), // 0: platform.write_target.WriteAccepted + (*common.BlockData)(nil), // 1: common.BlockData + (*common.TransactionData)(nil), // 2: common.TransactionData + (*monitoring.ExecutionContext)(nil), // 3: monitoring.ExecutionContext } var file_write_accepted_proto_depIdxs = []int32{ 1, // 0: platform.write_target.WriteAccepted.block_data:type_name -> common.BlockData 2, // 1: platform.write_target.WriteAccepted.transaction_data:type_name -> common.TransactionData - 3, // 2: platform.write_target.WriteAccepted.execution_context:type_name -> common.ExecutionContext + 3, // 2: platform.write_target.WriteAccepted.execution_context:type_name -> monitoring.ExecutionContext 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/write_accepted.proto b/capabilities/writetarget/monitoring/pb/platform/write_accepted.proto index ebdd3ef..5171df5 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_accepted.proto +++ b/capabilities/writetarget/monitoring/pb/platform/write_accepted.proto @@ -3,7 +3,7 @@ syntax="proto3"; package platform.write_target; option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetarget"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; import "capabilities/writetarget/monitoring/pb/common/block_data.proto"; import "capabilities/writetarget/monitoring/pb/common/transaction_data.proto"; @@ -20,5 +20,5 @@ message WriteAccepted { common.BlockData block_data = 6; common.TransactionData transaction_data = 10; - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; } diff --git a/capabilities/writetarget/monitoring/pb/platform/write_confirmed.pb.go b/capabilities/writetarget/monitoring/pb/platform/write_confirmed.pb.go index 72539a7..0093ecb 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_confirmed.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/write_confirmed.pb.go @@ -7,6 +7,7 @@ package writetarget import ( + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -39,7 +40,7 @@ type WriteConfirmed struct { Transmitter string `protobuf:"bytes,12,opt,name=transmitter,proto3" json:"transmitter,omitempty"` Success bool `protobuf:"varint,13,opt,name=success,proto3" json:"success,omitempty"` // TODO: what about EVM's TransmissionInfo parity? // [Execution Context] - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` // encoder processor info MetaCapabilityProcessor string `protobuf:"bytes,21,opt,name=meta_capability_processor,json=metaCapabilityProcessor,proto3" json:"meta_capability_processor,omitempty"` unknownFields protoimpl.UnknownFields @@ -146,7 +147,7 @@ func (x *WriteConfirmed) GetSuccess() bool { return false } -func (x *WriteConfirmed) GetExecutionContext() *common.ExecutionContext { +func (x *WriteConfirmed) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -164,7 +165,7 @@ var File_write_confirmed_proto protoreflect.FileDescriptor const file_write_confirmed_proto_rawDesc = "" + "\n" + - "\x15write_confirmed.proto\x12\x15platform.write_target\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\"\xcc\x03\n" + + "\x15write_confirmed.proto\x12\x15platform.write_target\x1a\"monitoring/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\"\xd0\x03\n" + "\x0eWriteConfirmed\x12\x12\n" + "\x04node\x18\x01 \x01(\tR\x04node\x12\x1c\n" + "\tforwarder\x18\x02 \x01(\tR\tforwarder\x12\x1a\n" + @@ -177,8 +178,8 @@ const file_write_confirmed_proto_rawDesc = "" + "\n" + "block_data\x18\t \x01(\v2\x11.common.BlockDataR\tblockData\x12 \n" + "\vtransmitter\x18\f \x01(\tR\vtransmitter\x12\x18\n" + - "\asuccess\x18\r \x01(\bR\asuccess\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContext\x12:\n" + + "\asuccess\x18\r \x01(\bR\asuccess\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContext\x12:\n" + "\x19meta_capability_processor\x18\x15 \x01(\tR\x17metaCapabilityProcessorBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" var ( @@ -195,13 +196,13 @@ func file_write_confirmed_proto_rawDescGZIP() []byte { var file_write_confirmed_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_write_confirmed_proto_goTypes = []any{ - (*WriteConfirmed)(nil), // 0: platform.write_target.WriteConfirmed - (*common.BlockData)(nil), // 1: common.BlockData - (*common.ExecutionContext)(nil), // 2: common.ExecutionContext + (*WriteConfirmed)(nil), // 0: platform.write_target.WriteConfirmed + (*common.BlockData)(nil), // 1: common.BlockData + (*monitoring.ExecutionContext)(nil), // 2: monitoring.ExecutionContext } var file_write_confirmed_proto_depIdxs = []int32{ 1, // 0: platform.write_target.WriteConfirmed.block_data:type_name -> common.BlockData - 2, // 1: platform.write_target.WriteConfirmed.execution_context:type_name -> common.ExecutionContext + 2, // 1: platform.write_target.WriteConfirmed.execution_context:type_name -> monitoring.ExecutionContext 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/write_confirmed.proto b/capabilities/writetarget/monitoring/pb/platform/write_confirmed.proto index 7f1b5f3..f554780 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_confirmed.proto +++ b/capabilities/writetarget/monitoring/pb/platform/write_confirmed.proto @@ -3,7 +3,7 @@ syntax="proto3"; package platform.write_target; option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetarget"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; import "capabilities/writetarget/monitoring/pb/common/block_data.proto"; // WT confirmed the report was successfully written on-chain @@ -29,7 +29,7 @@ message WriteConfirmed { // TODO: what about EVM's TransmissionInfo parity? // [Execution Context] - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; // encoder processor info string meta_capability_processor = 21; diff --git a/capabilities/writetarget/monitoring/pb/platform/write_error.pb.go b/capabilities/writetarget/monitoring/pb/platform/write_error.pb.go index c68608e..e10849b 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_error.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/write_error.pb.go @@ -7,7 +7,7 @@ package writetarget import ( - common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -34,7 +34,7 @@ type WriteError struct { // Report Info ReportId uint32 `protobuf:"varint,7,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` // [Execution Context] - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -118,7 +118,7 @@ func (x *WriteError) GetReportId() uint32 { return 0 } -func (x *WriteError) GetExecutionContext() *common.ExecutionContext { +func (x *WriteError) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -129,7 +129,7 @@ var File_write_error_proto protoreflect.FileDescriptor const file_write_error_proto_rawDesc = "" + "\n" + - "\x11write_error.proto\x12\x15platform.write_target\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\"\x82\x02\n" + + "\x11write_error.proto\x12\x15platform.write_target\x1a\"monitoring/execution_context.proto\"\x86\x02\n" + "\n" + "WriteError\x12\x12\n" + "\x04code\x18\x01 \x01(\rR\x04code\x12\x18\n" + @@ -138,8 +138,8 @@ const file_write_error_proto_rawDesc = "" + "\x04node\x18\x04 \x01(\tR\x04node\x12\x1c\n" + "\tforwarder\x18\x05 \x01(\tR\tforwarder\x12\x1a\n" + "\breceiver\x18\x06 \x01(\tR\breceiver\x12\x1b\n" + - "\treport_id\x18\a \x01(\rR\breportId\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" + "\treport_id\x18\a \x01(\rR\breportId\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" var ( file_write_error_proto_rawDescOnce sync.Once @@ -155,11 +155,11 @@ func file_write_error_proto_rawDescGZIP() []byte { var file_write_error_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_write_error_proto_goTypes = []any{ - (*WriteError)(nil), // 0: platform.write_target.WriteError - (*common.ExecutionContext)(nil), // 1: common.ExecutionContext + (*WriteError)(nil), // 0: platform.write_target.WriteError + (*monitoring.ExecutionContext)(nil), // 1: monitoring.ExecutionContext } var file_write_error_proto_depIdxs = []int32{ - 1, // 0: platform.write_target.WriteError.execution_context:type_name -> common.ExecutionContext + 1, // 0: platform.write_target.WriteError.execution_context:type_name -> monitoring.ExecutionContext 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/write_error.proto b/capabilities/writetarget/monitoring/pb/platform/write_error.proto index 51c8453..3c76bf4 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_error.proto +++ b/capabilities/writetarget/monitoring/pb/platform/write_error.proto @@ -3,7 +3,7 @@ syntax="proto3"; package platform.write_target; option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetarget"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; // WT errored while processing write request message WriteError { @@ -19,5 +19,5 @@ message WriteError { uint32 report_id = 7; // [Execution Context] - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; } diff --git a/capabilities/writetarget/monitoring/pb/platform/write_initiated.pb.go b/capabilities/writetarget/monitoring/pb/platform/write_initiated.pb.go index c1b10b0..4ff9698 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_initiated.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/write_initiated.pb.go @@ -7,7 +7,7 @@ package writetarget import ( - common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -31,7 +31,7 @@ type WriteInitiated struct { // Report Info ReportId uint32 `protobuf:"varint,4,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` // [Execution Context] - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -94,7 +94,7 @@ func (x *WriteInitiated) GetReportId() uint32 { return 0 } -func (x *WriteInitiated) GetExecutionContext() *common.ExecutionContext { +func (x *WriteInitiated) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -105,13 +105,13 @@ var File_write_initiated_proto protoreflect.FileDescriptor const file_write_initiated_proto_rawDesc = "" + "\n" + - "\x15write_initiated.proto\x12\x15platform.write_target\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\"\xc2\x01\n" + + "\x15write_initiated.proto\x12\x15platform.write_target\x1a\"monitoring/execution_context.proto\"\xc6\x01\n" + "\x0eWriteInitiated\x12\x12\n" + "\x04node\x18\x01 \x01(\tR\x04node\x12\x1c\n" + "\tforwarder\x18\x02 \x01(\tR\tforwarder\x12\x1a\n" + "\breceiver\x18\x03 \x01(\tR\breceiver\x12\x1b\n" + - "\treport_id\x18\x04 \x01(\rR\breportId\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" + "\treport_id\x18\x04 \x01(\rR\breportId\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" var ( file_write_initiated_proto_rawDescOnce sync.Once @@ -127,11 +127,11 @@ func file_write_initiated_proto_rawDescGZIP() []byte { var file_write_initiated_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_write_initiated_proto_goTypes = []any{ - (*WriteInitiated)(nil), // 0: platform.write_target.WriteInitiated - (*common.ExecutionContext)(nil), // 1: common.ExecutionContext + (*WriteInitiated)(nil), // 0: platform.write_target.WriteInitiated + (*monitoring.ExecutionContext)(nil), // 1: monitoring.ExecutionContext } var file_write_initiated_proto_depIdxs = []int32{ - 1, // 0: platform.write_target.WriteInitiated.execution_context:type_name -> common.ExecutionContext + 1, // 0: platform.write_target.WriteInitiated.execution_context:type_name -> monitoring.ExecutionContext 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/write_initiated.proto b/capabilities/writetarget/monitoring/pb/platform/write_initiated.proto index 30c4b7b..d7b907a 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_initiated.proto +++ b/capabilities/writetarget/monitoring/pb/platform/write_initiated.proto @@ -3,7 +3,7 @@ syntax="proto3"; package platform.write_target; option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetarget"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; // WT initiated the processing of the write request message WriteInitiated { @@ -15,5 +15,5 @@ message WriteInitiated { uint32 report_id = 4; // [Execution Context] - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; } diff --git a/capabilities/writetarget/monitoring/pb/platform/write_sent.pb.go b/capabilities/writetarget/monitoring/pb/platform/write_sent.pb.go index e774c8a..b4d694e 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_sent.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/write_sent.pb.go @@ -7,6 +7,7 @@ package writetarget import ( + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -37,7 +38,7 @@ type WriteSent struct { // When was the transaction submitted BlockData *common.BlockData `protobuf:"bytes,7,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` // [Execution Context] - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -114,7 +115,7 @@ func (x *WriteSent) GetBlockData() *common.BlockData { return nil } -func (x *WriteSent) GetExecutionContext() *common.ExecutionContext { +func (x *WriteSent) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -125,7 +126,7 @@ var File_write_sent_proto protoreflect.FileDescriptor const file_write_sent_proto_rawDesc = "" + "\n" + - "\x10write_sent.proto\x12\x15platform.write_target\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\"\x84\x02\n" + + "\x10write_sent.proto\x12\x15platform.write_target\x1a\"monitoring/execution_context.proto\x1a>capabilities/writetarget/monitoring/pb/common/block_data.proto\"\x88\x02\n" + "\tWriteSent\x12\x12\n" + "\x04node\x18\x01 \x01(\tR\x04node\x12\x1c\n" + "\tforwarder\x18\x02 \x01(\tR\tforwarder\x12\x1a\n" + @@ -133,8 +134,8 @@ const file_write_sent_proto_rawDesc = "" + "\treport_id\x18\x04 \x01(\rR\breportId\x12\x13\n" + "\x05tx_id\x18\x05 \x01(\tR\x04txId\x120\n" + "\n" + - "block_data\x18\a \x01(\v2\x11.common.BlockDataR\tblockData\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" + "block_data\x18\a \x01(\v2\x11.common.BlockDataR\tblockData\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" var ( file_write_sent_proto_rawDescOnce sync.Once @@ -150,13 +151,13 @@ func file_write_sent_proto_rawDescGZIP() []byte { var file_write_sent_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_write_sent_proto_goTypes = []any{ - (*WriteSent)(nil), // 0: platform.write_target.WriteSent - (*common.BlockData)(nil), // 1: common.BlockData - (*common.ExecutionContext)(nil), // 2: common.ExecutionContext + (*WriteSent)(nil), // 0: platform.write_target.WriteSent + (*common.BlockData)(nil), // 1: common.BlockData + (*monitoring.ExecutionContext)(nil), // 2: monitoring.ExecutionContext } var file_write_sent_proto_depIdxs = []int32{ 1, // 0: platform.write_target.WriteSent.block_data:type_name -> common.BlockData - 2, // 1: platform.write_target.WriteSent.execution_context:type_name -> common.ExecutionContext + 2, // 1: platform.write_target.WriteSent.execution_context:type_name -> monitoring.ExecutionContext 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/write_sent.proto b/capabilities/writetarget/monitoring/pb/platform/write_sent.proto index 02ba38f..274ebc1 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_sent.proto +++ b/capabilities/writetarget/monitoring/pb/platform/write_sent.proto @@ -3,7 +3,7 @@ syntax="proto3"; package platform.write_target; option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetarget"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; import "capabilities/writetarget/monitoring/pb/common/block_data.proto"; // WT sent a transaction on-chain @@ -24,5 +24,5 @@ message WriteSent { common.BlockData block_data = 7; // [Execution Context] - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; } diff --git a/capabilities/writetarget/monitoring/pb/platform/write_skipped.pb.go b/capabilities/writetarget/monitoring/pb/platform/write_skipped.pb.go index 6d0c6e4..cd4605e 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_skipped.pb.go +++ b/capabilities/writetarget/monitoring/pb/platform/write_skipped.pb.go @@ -7,7 +7,7 @@ package writetarget import ( - common "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/common" + monitoring "github.com/smartcontractkit/capabilities/libs/monitoring" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -31,7 +31,7 @@ type WriteSkipped struct { ReportId uint32 `protobuf:"varint,4,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` Reason string `protobuf:"bytes,5,opt,name=reason,proto3" json:"reason,omitempty"` // [Execution Context] - ExecutionContext *common.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` + ExecutionContext *monitoring.ExecutionContext `protobuf:"bytes,20,opt,name=execution_context,json=executionContext,proto3" json:"execution_context,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -101,7 +101,7 @@ func (x *WriteSkipped) GetReason() string { return "" } -func (x *WriteSkipped) GetExecutionContext() *common.ExecutionContext { +func (x *WriteSkipped) GetExecutionContext() *monitoring.ExecutionContext { if x != nil { return x.ExecutionContext } @@ -112,14 +112,14 @@ var File_write_skipped_proto protoreflect.FileDescriptor const file_write_skipped_proto_rawDesc = "" + "\n" + - "\x13write_skipped.proto\x12\x15platform.write_target\x1aEcapabilities/writetarget/monitoring/pb/common/execution_context.proto\"\xd8\x01\n" + + "\x13write_skipped.proto\x12\x15platform.write_target\x1a\"monitoring/execution_context.proto\"\xdc\x01\n" + "\fWriteSkipped\x12\x12\n" + "\x04node\x18\x01 \x01(\tR\x04node\x12\x1c\n" + "\tforwarder\x18\x02 \x01(\tR\tforwarder\x12\x1a\n" + "\breceiver\x18\x03 \x01(\tR\breceiver\x12\x1b\n" + "\treport_id\x18\x04 \x01(\rR\breportId\x12\x16\n" + - "\x06reason\x18\x05 \x01(\tR\x06reason\x12E\n" + - "\x11execution_context\x18\x14 \x01(\v2\x18.common.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" + "\x06reason\x18\x05 \x01(\tR\x06reason\x12I\n" + + "\x11execution_context\x18\x14 \x01(\v2\x1c.monitoring.ExecutionContextR\x10executionContextBmZkgithub.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetargetb\x06proto3" var ( file_write_skipped_proto_rawDescOnce sync.Once @@ -135,11 +135,11 @@ func file_write_skipped_proto_rawDescGZIP() []byte { var file_write_skipped_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_write_skipped_proto_goTypes = []any{ - (*WriteSkipped)(nil), // 0: platform.write_target.WriteSkipped - (*common.ExecutionContext)(nil), // 1: common.ExecutionContext + (*WriteSkipped)(nil), // 0: platform.write_target.WriteSkipped + (*monitoring.ExecutionContext)(nil), // 1: monitoring.ExecutionContext } var file_write_skipped_proto_depIdxs = []int32{ - 1, // 0: platform.write_target.WriteSkipped.execution_context:type_name -> common.ExecutionContext + 1, // 0: platform.write_target.WriteSkipped.execution_context:type_name -> monitoring.ExecutionContext 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/capabilities/writetarget/monitoring/pb/platform/write_skipped.proto b/capabilities/writetarget/monitoring/pb/platform/write_skipped.proto index 80e9dcb..03aebc9 100644 --- a/capabilities/writetarget/monitoring/pb/platform/write_skipped.proto +++ b/capabilities/writetarget/monitoring/pb/platform/write_skipped.proto @@ -3,7 +3,7 @@ syntax="proto3"; package platform.write_target; option go_package = "github.com/smartcontractkit/chainlink-framework/capabilities/writetarget/monitoring/pb/platform;writetarget"; -import "capabilities/writetarget/monitoring/pb/common/execution_context.proto"; +import "monitoring/execution_context.proto"; // WT skipped the write request message WriteSkipped { @@ -15,5 +15,5 @@ message WriteSkipped { string reason = 5; // [Execution Context] - common.ExecutionContext execution_context = 20; + monitoring.ExecutionContext execution_context = 20; }