diff --git a/data-feeds/beholder-job-spec-schemas.json b/data-feeds/beholder-job-spec-schemas.json index cf127095..f7e8647a 100644 --- a/data-feeds/beholder-job-spec-schemas.json +++ b/data-feeds/beholder-job-spec-schemas.json @@ -1,10 +1,6 @@ { "domain": "beholder__data-feeds.job-spec__messages", "schemas": [ - { - "entity": "job_spec.v1.OCR1OracleSpecInfo", - "path": "job_spec/v1/ocr1_oracle_spec_info.proto" - }, { "entity": "job_spec.v1.OCR2EVMRelayConfig", "path": "job_spec/v1/ocr2_evm_relay_config.proto" @@ -33,11 +29,6 @@ "entity": "job_spec.v1.JobSpecEvent", "path": "job_spec/v1/job_spec_event.proto", "references": [ - { - "name": "job_spec/v1/ocr1_oracle_spec_info.proto", - "entity": "job_spec.v1.OCR1OracleSpecInfo", - "path": "job_spec/v1/ocr1_oracle_spec_info.proto" - }, { "name": "job_spec/v1/ocr2_oracle_spec_info.proto", "entity": "job_spec.v1.OCR2OracleSpecInfo", diff --git a/data-feeds/chip-job-spec-schemas.json b/data-feeds/chip-job-spec-schemas.json index 944b738e..eb419680 100644 --- a/data-feeds/chip-job-spec-schemas.json +++ b/data-feeds/chip-job-spec-schemas.json @@ -1,10 +1,6 @@ { "domain": "data-feeds.job-spec", "schemas": [ - { - "entity": "job_spec.v1.OCR1OracleSpecInfo", - "path": "job_spec/v1/ocr1_oracle_spec_info.proto" - }, { "entity": "job_spec.v1.OCR2EVMRelayConfig", "path": "job_spec/v1/ocr2_evm_relay_config.proto" @@ -33,11 +29,6 @@ "entity": "job_spec.v1.JobSpecEvent", "path": "job_spec/v1/job_spec_event.proto", "references": [ - { - "name": "job_spec/v1/ocr1_oracle_spec_info.proto", - "entity": "job_spec.v1.OCR1OracleSpecInfo", - "path": "job_spec/v1/ocr1_oracle_spec_info.proto" - }, { "name": "job_spec/v1/ocr2_oracle_spec_info.proto", "entity": "job_spec.v1.OCR2OracleSpecInfo", diff --git a/data-feeds/generate.go b/data-feeds/generate.go index a399821a..c3250138 100644 --- a/data-feeds/generate.go +++ b/data-feeds/generate.go @@ -7,7 +7,6 @@ package data_feeds //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./bridge_status/v1/endpoint_info.proto //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./bridge_status/v1/configuration_item.proto //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./job_spec/v1/job_spec_event.proto -//go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./job_spec/v1/ocr1_oracle_spec_info.proto //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./job_spec/v1/ocr2_oracle_spec_info.proto //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./job_spec/v1/ocr2_evm_relay_config.proto //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative ./job_spec/v1/ocr2_median_plugin_config.proto diff --git a/data-feeds/job_spec/v1/job_spec_event.pb.go b/data-feeds/job_spec/v1/job_spec_event.pb.go index 412c7647..b40984bc 100644 --- a/data-feeds/job_spec/v1/job_spec_event.pb.go +++ b/data-feeds/job_spec/v1/job_spec_event.pb.go @@ -78,19 +78,16 @@ func (EmissionTrigger) EnumDescriptor() ([]byte, []int) { type JobSpecEvent struct { state protoimpl.MessageState `protogen:"open.v1"` // Job identity - ExternalJobId string `protobuf:"bytes,1,opt,name=external_job_id,json=externalJobId,proto3" json:"external_job_id,omitempty"` - InternalJobId int32 `protobuf:"varint,2,opt,name=internal_job_id,json=internalJobId,proto3" json:"internal_job_id,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - JobType string `protobuf:"bytes,4,opt,name=job_type,json=jobType,proto3" json:"job_type,omitempty"` - SchemaVersion uint32 `protobuf:"varint,5,opt,name=schema_version,json=schemaVersion,proto3" json:"schema_version,omitempty"` - GasLimit uint32 `protobuf:"varint,6,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` - ForwardingAllowed bool `protobuf:"varint,7,opt,name=forwarding_allowed,json=forwardingAllowed,proto3" json:"forwarding_allowed,omitempty"` - StreamId *uint32 `protobuf:"varint,8,opt,name=stream_id,json=streamId,proto3,oneof" json:"stream_id,omitempty"` - MaxTaskDurationSeconds float64 `protobuf:"fixed64,9,opt,name=max_task_duration_seconds,json=maxTaskDurationSeconds,proto3" json:"max_task_duration_seconds,omitempty"` - CreatedAt string `protobuf:"bytes,10,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + ExternalJobId string `protobuf:"bytes,1,opt,name=external_job_id,json=externalJobId,proto3" json:"external_job_id,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + JobType string `protobuf:"bytes,4,opt,name=job_type,json=jobType,proto3" json:"job_type,omitempty"` + SchemaVersion uint32 `protobuf:"varint,5,opt,name=schema_version,json=schemaVersion,proto3" json:"schema_version,omitempty"` + GasLimit *uint32 `protobuf:"varint,6,opt,name=gas_limit,json=gasLimit,proto3,oneof" json:"gas_limit,omitempty"` + ForwardingAllowed bool `protobuf:"varint,7,opt,name=forwarding_allowed,json=forwardingAllowed,proto3" json:"forwarding_allowed,omitempty"` + StreamId *uint32 `protobuf:"varint,8,opt,name=stream_id,json=streamId,proto3,oneof" json:"stream_id,omitempty"` + CreatedAt string `protobuf:"bytes,10,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // Observation pipeline ObservationSource string `protobuf:"bytes,11,opt,name=observation_source,json=observationSource,proto3" json:"observation_source,omitempty"` - PipelineSpecId int32 `protobuf:"varint,12,opt,name=pipeline_spec_id,json=pipelineSpecId,proto3" json:"pipeline_spec_id,omitempty"` // Top-level bridge names in the observation pipeline. BridgeNames []string `protobuf:"bytes,13,rep,name=bridge_names,json=bridgeNames,proto3" json:"bridge_names,omitempty"` // Proposal lifecycle: zero/empty for jobs not managed by a Feeds Manager. @@ -109,14 +106,8 @@ type JobSpecEvent struct { // Event metadata EmissionTrigger EmissionTrigger `protobuf:"varint,24,opt,name=emission_trigger,json=emissionTrigger,proto3,enum=job_spec.v1.EmissionTrigger" json:"emission_trigger,omitempty"` Timestamp string `protobuf:"bytes,25,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - // Primary on-chain contract, populated for single-contract job types - // (OCR1, OCR2, Flux Monitor, Keeper). - ContractAddress string `protobuf:"bytes,26,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty"` - ChainId string `protobuf:"bytes,27,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - // OCR1-only; absent for other job types. - Ocr1OracleSpec *OCR1OracleSpecInfo `protobuf:"bytes,28,opt,name=ocr1_oracle_spec,json=ocr1OracleSpec,proto3" json:"ocr1_oracle_spec,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *JobSpecEvent) Reset() { @@ -156,13 +147,6 @@ func (x *JobSpecEvent) GetExternalJobId() string { return "" } -func (x *JobSpecEvent) GetInternalJobId() int32 { - if x != nil { - return x.InternalJobId - } - return 0 -} - func (x *JobSpecEvent) GetName() string { if x != nil { return x.Name @@ -185,8 +169,8 @@ func (x *JobSpecEvent) GetSchemaVersion() uint32 { } func (x *JobSpecEvent) GetGasLimit() uint32 { - if x != nil { - return x.GasLimit + if x != nil && x.GasLimit != nil { + return *x.GasLimit } return 0 } @@ -205,13 +189,6 @@ func (x *JobSpecEvent) GetStreamId() uint32 { return 0 } -func (x *JobSpecEvent) GetMaxTaskDurationSeconds() float64 { - if x != nil { - return x.MaxTaskDurationSeconds - } - return 0 -} - func (x *JobSpecEvent) GetCreatedAt() string { if x != nil { return x.CreatedAt @@ -226,13 +203,6 @@ func (x *JobSpecEvent) GetObservationSource() string { return "" } -func (x *JobSpecEvent) GetPipelineSpecId() int32 { - if x != nil { - return x.PipelineSpecId - } - return 0 -} - func (x *JobSpecEvent) GetBridgeNames() []string { if x != nil { return x.BridgeNames @@ -324,47 +294,23 @@ func (x *JobSpecEvent) GetTimestamp() string { return "" } -func (x *JobSpecEvent) GetContractAddress() string { - if x != nil { - return x.ContractAddress - } - return "" -} - -func (x *JobSpecEvent) GetChainId() string { - if x != nil { - return x.ChainId - } - return "" -} - -func (x *JobSpecEvent) GetOcr1OracleSpec() *OCR1OracleSpecInfo { - if x != nil { - return x.Ocr1OracleSpec - } - return nil -} - var File_job_spec_v1_job_spec_event_proto protoreflect.FileDescriptor const file_job_spec_v1_job_spec_event_proto_rawDesc = "" + "\n" + - " job_spec/v1/job_spec_event.proto\x12\vjob_spec.v1\x1a'job_spec/v1/ocr1_oracle_spec_info.proto\x1a'job_spec/v1/ocr2_oracle_spec_info.proto\"\x94\t\n" + + " job_spec/v1/job_spec_event.proto\x12\vjob_spec.v1\x1a'job_spec/v1/ocr2_oracle_spec_info.proto\"\x89\a\n" + "\fJobSpecEvent\x12&\n" + - "\x0fexternal_job_id\x18\x01 \x01(\tR\rexternalJobId\x12&\n" + - "\x0finternal_job_id\x18\x02 \x01(\x05R\rinternalJobId\x12\x12\n" + + "\x0fexternal_job_id\x18\x01 \x01(\tR\rexternalJobId\x12\x12\n" + "\x04name\x18\x03 \x01(\tR\x04name\x12\x19\n" + "\bjob_type\x18\x04 \x01(\tR\ajobType\x12%\n" + - "\x0eschema_version\x18\x05 \x01(\rR\rschemaVersion\x12\x1b\n" + - "\tgas_limit\x18\x06 \x01(\rR\bgasLimit\x12-\n" + + "\x0eschema_version\x18\x05 \x01(\rR\rschemaVersion\x12 \n" + + "\tgas_limit\x18\x06 \x01(\rH\x00R\bgasLimit\x88\x01\x01\x12-\n" + "\x12forwarding_allowed\x18\a \x01(\bR\x11forwardingAllowed\x12 \n" + - "\tstream_id\x18\b \x01(\rH\x00R\bstreamId\x88\x01\x01\x129\n" + - "\x19max_task_duration_seconds\x18\t \x01(\x01R\x16maxTaskDurationSeconds\x12\x1d\n" + + "\tstream_id\x18\b \x01(\rH\x01R\bstreamId\x88\x01\x01\x12\x1d\n" + "\n" + "created_at\x18\n" + " \x01(\tR\tcreatedAt\x12-\n" + - "\x12observation_source\x18\v \x01(\tR\x11observationSource\x12(\n" + - "\x10pipeline_spec_id\x18\f \x01(\x05R\x0epipelineSpecId\x12!\n" + + "\x12observation_source\x18\v \x01(\tR\x11observationSource\x12!\n" + "\fbridge_names\x18\r \x03(\tR\vbridgeNames\x12(\n" + "\x10feeds_manager_id\x18\x0e \x01(\x03R\x0efeedsManagerId\x12\x1f\n" + "\vremote_uuid\x18\x0f \x01(\tR\n" + @@ -380,10 +326,9 @@ const file_job_spec_v1_job_spec_event_proto_rawDesc = "" + "\fnode_version\x18\x16 \x01(\tR\vnodeVersion\x12\x1a\n" + "\bhostname\x18\x17 \x01(\tR\bhostname\x12G\n" + "\x10emission_trigger\x18\x18 \x01(\x0e2\x1c.job_spec.v1.EmissionTriggerR\x0femissionTrigger\x12\x1c\n" + - "\ttimestamp\x18\x19 \x01(\tR\ttimestamp\x12)\n" + - "\x10contract_address\x18\x1a \x01(\tR\x0fcontractAddress\x12\x19\n" + - "\bchain_id\x18\x1b \x01(\tR\achainId\x12I\n" + - "\x10ocr1_oracle_spec\x18\x1c \x01(\v2\x1f.job_spec.v1.OCR1OracleSpecInfoR\x0eocr1OracleSpecB\f\n" + + "\ttimestamp\x18\x19 \x01(\tR\ttimestampB\f\n" + + "\n" + + "_gas_limitB\f\n" + "\n" + "_stream_id*\x8d\x01\n" + "\x0fEmissionTrigger\x12 \n" + @@ -410,17 +355,15 @@ var file_job_spec_v1_job_spec_event_proto_goTypes = []any{ (EmissionTrigger)(0), // 0: job_spec.v1.EmissionTrigger (*JobSpecEvent)(nil), // 1: job_spec.v1.JobSpecEvent (*OCR2OracleSpecInfo)(nil), // 2: job_spec.v1.OCR2OracleSpecInfo - (*OCR1OracleSpecInfo)(nil), // 3: job_spec.v1.OCR1OracleSpecInfo } var file_job_spec_v1_job_spec_event_proto_depIdxs = []int32{ 2, // 0: job_spec.v1.JobSpecEvent.ocr2_oracle_spec:type_name -> job_spec.v1.OCR2OracleSpecInfo 0, // 1: job_spec.v1.JobSpecEvent.emission_trigger:type_name -> job_spec.v1.EmissionTrigger - 3, // 2: job_spec.v1.JobSpecEvent.ocr1_oracle_spec:type_name -> job_spec.v1.OCR1OracleSpecInfo - 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 - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name + 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 + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_job_spec_v1_job_spec_event_proto_init() } @@ -428,7 +371,6 @@ func file_job_spec_v1_job_spec_event_proto_init() { if File_job_spec_v1_job_spec_event_proto != nil { return } - file_job_spec_v1_ocr1_oracle_spec_info_proto_init() file_job_spec_v1_ocr2_oracle_spec_info_proto_init() file_job_spec_v1_job_spec_event_proto_msgTypes[0].OneofWrappers = []any{} type x struct{} diff --git a/data-feeds/job_spec/v1/job_spec_event.proto b/data-feeds/job_spec/v1/job_spec_event.proto index 52f4fa9f..31e89677 100644 --- a/data-feeds/job_spec/v1/job_spec_event.proto +++ b/data-feeds/job_spec/v1/job_spec_event.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package job_spec.v1; -import "job_spec/v1/ocr1_oracle_spec_info.proto"; import "job_spec/v1/ocr2_oracle_spec_info.proto"; option go_package = "github.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1"; @@ -11,19 +10,16 @@ option go_package = "github.com/smartcontractkit/chainlink-protos/data-feeds/job message JobSpecEvent { // Job identity string external_job_id = 1; - int32 internal_job_id = 2; string name = 3; string job_type = 4; uint32 schema_version = 5; - uint32 gas_limit = 6; + optional uint32 gas_limit = 6; bool forwarding_allowed = 7; optional uint32 stream_id = 8; - double max_task_duration_seconds = 9; string created_at = 10; // Observation pipeline string observation_source = 11; - int32 pipeline_spec_id = 12; // Top-level bridge names in the observation pipeline. repeated string bridge_names = 13; @@ -47,14 +43,6 @@ message JobSpecEvent { // Event metadata EmissionTrigger emission_trigger = 24; string timestamp = 25; - - // Primary on-chain contract, populated for single-contract job types - // (OCR1, OCR2, Flux Monitor, Keeper). - string contract_address = 26; - string chain_id = 27; - - // OCR1-only; absent for other job types. - OCR1OracleSpecInfo ocr1_oracle_spec = 28; } // EmissionTrigger is the reason a JobSpecEvent was emitted. diff --git a/data-feeds/job_spec/v1/ocr1_oracle_spec_info.pb.go b/data-feeds/job_spec/v1/ocr1_oracle_spec_info.pb.go deleted file mode 100644 index 1dcf9de5..00000000 --- a/data-feeds/job_spec/v1/ocr1_oracle_spec_info.pb.go +++ /dev/null @@ -1,260 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.36.6 -// protoc v5.29.3 -// source: job_spec/v1/ocr1_oracle_spec_info.proto - -package v1 - -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) -) - -// OCR1OracleSpecInfo mirrors job.OCROracleSpec. -// contract_address and evm_chain_id live on the parent JobSpecEvent. -type OCR1OracleSpecInfo struct { - state protoimpl.MessageState `protogen:"open.v1"` - SpecId int32 `protobuf:"varint,1,opt,name=spec_id,json=specId,proto3" json:"spec_id,omitempty"` - P2Pv2Bootstrappers []string `protobuf:"bytes,2,rep,name=p2pv2_bootstrappers,json=p2pv2Bootstrappers,proto3" json:"p2pv2_bootstrappers,omitempty"` - IsBootstrapPeer bool `protobuf:"varint,3,opt,name=is_bootstrap_peer,json=isBootstrapPeer,proto3" json:"is_bootstrap_peer,omitempty"` - OcrKeyBundleId string `protobuf:"bytes,4,opt,name=ocr_key_bundle_id,json=ocrKeyBundleId,proto3" json:"ocr_key_bundle_id,omitempty"` - TransmitterAddress string `protobuf:"bytes,5,opt,name=transmitter_address,json=transmitterAddress,proto3" json:"transmitter_address,omitempty"` - ObservationTimeoutSeconds float64 `protobuf:"fixed64,6,opt,name=observation_timeout_seconds,json=observationTimeoutSeconds,proto3" json:"observation_timeout_seconds,omitempty"` - BlockchainTimeoutSeconds float64 `protobuf:"fixed64,7,opt,name=blockchain_timeout_seconds,json=blockchainTimeoutSeconds,proto3" json:"blockchain_timeout_seconds,omitempty"` - ContractConfigTrackerSubscribeIntervalSeconds float64 `protobuf:"fixed64,8,opt,name=contract_config_tracker_subscribe_interval_seconds,json=contractConfigTrackerSubscribeIntervalSeconds,proto3" json:"contract_config_tracker_subscribe_interval_seconds,omitempty"` - ContractConfigTrackerPollIntervalSeconds float64 `protobuf:"fixed64,9,opt,name=contract_config_tracker_poll_interval_seconds,json=contractConfigTrackerPollIntervalSeconds,proto3" json:"contract_config_tracker_poll_interval_seconds,omitempty"` - ContractConfigConfirmations uint32 `protobuf:"varint,10,opt,name=contract_config_confirmations,json=contractConfigConfirmations,proto3" json:"contract_config_confirmations,omitempty"` - DatabaseTimeoutSeconds float64 `protobuf:"fixed64,11,opt,name=database_timeout_seconds,json=databaseTimeoutSeconds,proto3" json:"database_timeout_seconds,omitempty"` - ObservationGracePeriodSeconds float64 `protobuf:"fixed64,12,opt,name=observation_grace_period_seconds,json=observationGracePeriodSeconds,proto3" json:"observation_grace_period_seconds,omitempty"` - ContractTransmitterTransmitTimeoutSeconds float64 `protobuf:"fixed64,13,opt,name=contract_transmitter_transmit_timeout_seconds,json=contractTransmitterTransmitTimeoutSeconds,proto3" json:"contract_transmitter_transmit_timeout_seconds,omitempty"` - CaptureEaTelemetry bool `protobuf:"varint,14,opt,name=capture_ea_telemetry,json=captureEaTelemetry,proto3" json:"capture_ea_telemetry,omitempty"` - SpecCreatedAt string `protobuf:"bytes,15,opt,name=spec_created_at,json=specCreatedAt,proto3" json:"spec_created_at,omitempty"` - SpecUpdatedAt string `protobuf:"bytes,16,opt,name=spec_updated_at,json=specUpdatedAt,proto3" json:"spec_updated_at,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *OCR1OracleSpecInfo) Reset() { - *x = OCR1OracleSpecInfo{} - mi := &file_job_spec_v1_ocr1_oracle_spec_info_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *OCR1OracleSpecInfo) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*OCR1OracleSpecInfo) ProtoMessage() {} - -func (x *OCR1OracleSpecInfo) ProtoReflect() protoreflect.Message { - mi := &file_job_spec_v1_ocr1_oracle_spec_info_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 OCR1OracleSpecInfo.ProtoReflect.Descriptor instead. -func (*OCR1OracleSpecInfo) Descriptor() ([]byte, []int) { - return file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescGZIP(), []int{0} -} - -func (x *OCR1OracleSpecInfo) GetSpecId() int32 { - if x != nil { - return x.SpecId - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetP2Pv2Bootstrappers() []string { - if x != nil { - return x.P2Pv2Bootstrappers - } - return nil -} - -func (x *OCR1OracleSpecInfo) GetIsBootstrapPeer() bool { - if x != nil { - return x.IsBootstrapPeer - } - return false -} - -func (x *OCR1OracleSpecInfo) GetOcrKeyBundleId() string { - if x != nil { - return x.OcrKeyBundleId - } - return "" -} - -func (x *OCR1OracleSpecInfo) GetTransmitterAddress() string { - if x != nil { - return x.TransmitterAddress - } - return "" -} - -func (x *OCR1OracleSpecInfo) GetObservationTimeoutSeconds() float64 { - if x != nil { - return x.ObservationTimeoutSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetBlockchainTimeoutSeconds() float64 { - if x != nil { - return x.BlockchainTimeoutSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetContractConfigTrackerSubscribeIntervalSeconds() float64 { - if x != nil { - return x.ContractConfigTrackerSubscribeIntervalSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetContractConfigTrackerPollIntervalSeconds() float64 { - if x != nil { - return x.ContractConfigTrackerPollIntervalSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetContractConfigConfirmations() uint32 { - if x != nil { - return x.ContractConfigConfirmations - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetDatabaseTimeoutSeconds() float64 { - if x != nil { - return x.DatabaseTimeoutSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetObservationGracePeriodSeconds() float64 { - if x != nil { - return x.ObservationGracePeriodSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetContractTransmitterTransmitTimeoutSeconds() float64 { - if x != nil { - return x.ContractTransmitterTransmitTimeoutSeconds - } - return 0 -} - -func (x *OCR1OracleSpecInfo) GetCaptureEaTelemetry() bool { - if x != nil { - return x.CaptureEaTelemetry - } - return false -} - -func (x *OCR1OracleSpecInfo) GetSpecCreatedAt() string { - if x != nil { - return x.SpecCreatedAt - } - return "" -} - -func (x *OCR1OracleSpecInfo) GetSpecUpdatedAt() string { - if x != nil { - return x.SpecUpdatedAt - } - return "" -} - -var File_job_spec_v1_ocr1_oracle_spec_info_proto protoreflect.FileDescriptor - -const file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDesc = "" + - "\n" + - "'job_spec/v1/ocr1_oracle_spec_info.proto\x12\vjob_spec.v1\"\xdb\a\n" + - "\x12OCR1OracleSpecInfo\x12\x17\n" + - "\aspec_id\x18\x01 \x01(\x05R\x06specId\x12/\n" + - "\x13p2pv2_bootstrappers\x18\x02 \x03(\tR\x12p2pv2Bootstrappers\x12*\n" + - "\x11is_bootstrap_peer\x18\x03 \x01(\bR\x0fisBootstrapPeer\x12)\n" + - "\x11ocr_key_bundle_id\x18\x04 \x01(\tR\x0eocrKeyBundleId\x12/\n" + - "\x13transmitter_address\x18\x05 \x01(\tR\x12transmitterAddress\x12>\n" + - "\x1bobservation_timeout_seconds\x18\x06 \x01(\x01R\x19observationTimeoutSeconds\x12<\n" + - "\x1ablockchain_timeout_seconds\x18\a \x01(\x01R\x18blockchainTimeoutSeconds\x12i\n" + - "2contract_config_tracker_subscribe_interval_seconds\x18\b \x01(\x01R-contractConfigTrackerSubscribeIntervalSeconds\x12_\n" + - "-contract_config_tracker_poll_interval_seconds\x18\t \x01(\x01R(contractConfigTrackerPollIntervalSeconds\x12B\n" + - "\x1dcontract_config_confirmations\x18\n" + - " \x01(\rR\x1bcontractConfigConfirmations\x128\n" + - "\x18database_timeout_seconds\x18\v \x01(\x01R\x16databaseTimeoutSeconds\x12G\n" + - " observation_grace_period_seconds\x18\f \x01(\x01R\x1dobservationGracePeriodSeconds\x12`\n" + - "-contract_transmitter_transmit_timeout_seconds\x18\r \x01(\x01R)contractTransmitterTransmitTimeoutSeconds\x120\n" + - "\x14capture_ea_telemetry\x18\x0e \x01(\bR\x12captureEaTelemetry\x12&\n" + - "\x0fspec_created_at\x18\x0f \x01(\tR\rspecCreatedAt\x12&\n" + - "\x0fspec_updated_at\x18\x10 \x01(\tR\rspecUpdatedAtBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" - -var ( - file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescOnce sync.Once - file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescData []byte -) - -func file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescGZIP() []byte { - file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescOnce.Do(func() { - file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDesc), len(file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDesc))) - }) - return file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDescData -} - -var file_job_spec_v1_ocr1_oracle_spec_info_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_job_spec_v1_ocr1_oracle_spec_info_proto_goTypes = []any{ - (*OCR1OracleSpecInfo)(nil), // 0: job_spec.v1.OCR1OracleSpecInfo -} -var file_job_spec_v1_ocr1_oracle_spec_info_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_job_spec_v1_ocr1_oracle_spec_info_proto_init() } -func file_job_spec_v1_ocr1_oracle_spec_info_proto_init() { - if File_job_spec_v1_ocr1_oracle_spec_info_proto != nil { - return - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDesc), len(file_job_spec_v1_ocr1_oracle_spec_info_proto_rawDesc)), - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_job_spec_v1_ocr1_oracle_spec_info_proto_goTypes, - DependencyIndexes: file_job_spec_v1_ocr1_oracle_spec_info_proto_depIdxs, - MessageInfos: file_job_spec_v1_ocr1_oracle_spec_info_proto_msgTypes, - }.Build() - File_job_spec_v1_ocr1_oracle_spec_info_proto = out.File - file_job_spec_v1_ocr1_oracle_spec_info_proto_goTypes = nil - file_job_spec_v1_ocr1_oracle_spec_info_proto_depIdxs = nil -} diff --git a/data-feeds/job_spec/v1/ocr1_oracle_spec_info.proto b/data-feeds/job_spec/v1/ocr1_oracle_spec_info.proto deleted file mode 100644 index 077c0291..00000000 --- a/data-feeds/job_spec/v1/ocr1_oracle_spec_info.proto +++ /dev/null @@ -1,26 +0,0 @@ -syntax = "proto3"; - -package job_spec.v1; - -option go_package = "github.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1"; - -// OCR1OracleSpecInfo mirrors job.OCROracleSpec. -// contract_address and evm_chain_id live on the parent JobSpecEvent. -message OCR1OracleSpecInfo { - int32 spec_id = 1; - repeated string p2pv2_bootstrappers = 2; - bool is_bootstrap_peer = 3; - string ocr_key_bundle_id = 4; - string transmitter_address = 5; - double observation_timeout_seconds = 6; - double blockchain_timeout_seconds = 7; - double contract_config_tracker_subscribe_interval_seconds = 8; - double contract_config_tracker_poll_interval_seconds = 9; - uint32 contract_config_confirmations = 10; - double database_timeout_seconds = 11; - double observation_grace_period_seconds = 12; - double contract_transmitter_transmit_timeout_seconds = 13; - bool capture_ea_telemetry = 14; - string spec_created_at = 15; - string spec_updated_at = 16; -} diff --git a/data-feeds/job_spec/v1/ocr2_evm_relay_config.pb.go b/data-feeds/job_spec/v1/ocr2_evm_relay_config.pb.go index 0682eb1d..c88d0360 100644 --- a/data-feeds/job_spec/v1/ocr2_evm_relay_config.pb.go +++ b/data-feeds/job_spec/v1/ocr2_evm_relay_config.pb.go @@ -25,14 +25,14 @@ const ( type OCR2EVMRelayConfig struct { state protoimpl.MessageState `protogen:"open.v1"` ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - FromBlock uint64 `protobuf:"varint,2,opt,name=from_block,json=fromBlock,proto3" json:"from_block,omitempty"` + FromBlock *uint64 `protobuf:"varint,2,opt,name=from_block,json=fromBlock,proto3,oneof" json:"from_block,omitempty"` EffectiveTransmitterId string `protobuf:"bytes,3,opt,name=effective_transmitter_id,json=effectiveTransmitterId,proto3" json:"effective_transmitter_id,omitempty"` - EnableDualTransmission bool `protobuf:"varint,4,opt,name=enable_dual_transmission,json=enableDualTransmission,proto3" json:"enable_dual_transmission,omitempty"` - EnableTriggerCapability bool `protobuf:"varint,5,opt,name=enable_trigger_capability,json=enableTriggerCapability,proto3" json:"enable_trigger_capability,omitempty"` - LloDonId uint64 `protobuf:"varint,6,opt,name=llo_don_id,json=lloDonId,proto3" json:"llo_don_id,omitempty"` - FeedId string `protobuf:"bytes,7,opt,name=feed_id,json=feedId,proto3" json:"feed_id,omitempty"` + EnableDualTransmission *bool `protobuf:"varint,4,opt,name=enable_dual_transmission,json=enableDualTransmission,proto3,oneof" json:"enable_dual_transmission,omitempty"` + EnableTriggerCapability *bool `protobuf:"varint,5,opt,name=enable_trigger_capability,json=enableTriggerCapability,proto3,oneof" json:"enable_trigger_capability,omitempty"` + LloDonId *uint64 `protobuf:"varint,6,opt,name=llo_don_id,json=lloDonId,proto3,oneof" json:"llo_don_id,omitempty"` + FeedId *string `protobuf:"bytes,7,opt,name=feed_id,json=feedId,proto3,oneof" json:"feed_id,omitempty"` SendingKeys []string `protobuf:"bytes,8,rep,name=sending_keys,json=sendingKeys,proto3" json:"sending_keys,omitempty"` - ProviderType string `protobuf:"bytes,9,opt,name=provider_type,json=providerType,proto3" json:"provider_type,omitempty"` + ProviderType *string `protobuf:"bytes,9,opt,name=provider_type,json=providerType,proto3,oneof" json:"provider_type,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -75,8 +75,8 @@ func (x *OCR2EVMRelayConfig) GetChainId() string { } func (x *OCR2EVMRelayConfig) GetFromBlock() uint64 { - if x != nil { - return x.FromBlock + if x != nil && x.FromBlock != nil { + return *x.FromBlock } return 0 } @@ -89,29 +89,29 @@ func (x *OCR2EVMRelayConfig) GetEffectiveTransmitterId() string { } func (x *OCR2EVMRelayConfig) GetEnableDualTransmission() bool { - if x != nil { - return x.EnableDualTransmission + if x != nil && x.EnableDualTransmission != nil { + return *x.EnableDualTransmission } return false } func (x *OCR2EVMRelayConfig) GetEnableTriggerCapability() bool { - if x != nil { - return x.EnableTriggerCapability + if x != nil && x.EnableTriggerCapability != nil { + return *x.EnableTriggerCapability } return false } func (x *OCR2EVMRelayConfig) GetLloDonId() uint64 { - if x != nil { - return x.LloDonId + if x != nil && x.LloDonId != nil { + return *x.LloDonId } return 0 } func (x *OCR2EVMRelayConfig) GetFeedId() string { - if x != nil { - return x.FeedId + if x != nil && x.FeedId != nil { + return *x.FeedId } return "" } @@ -124,8 +124,8 @@ func (x *OCR2EVMRelayConfig) GetSendingKeys() []string { } func (x *OCR2EVMRelayConfig) GetProviderType() string { - if x != nil { - return x.ProviderType + if x != nil && x.ProviderType != nil { + return *x.ProviderType } return "" } @@ -134,19 +134,26 @@ var File_job_spec_v1_ocr2_evm_relay_config_proto protoreflect.FileDescriptor const file_job_spec_v1_ocr2_evm_relay_config_proto_rawDesc = "" + "\n" + - "'job_spec/v1/ocr2_evm_relay_config.proto\x12\vjob_spec.v1\"\xfd\x02\n" + + "'job_spec/v1/ocr2_evm_relay_config.proto\x12\vjob_spec.v1\"\x92\x04\n" + "\x12OCR2EVMRelayConfig\x12\x19\n" + - "\bchain_id\x18\x01 \x01(\tR\achainId\x12\x1d\n" + + "\bchain_id\x18\x01 \x01(\tR\achainId\x12\"\n" + + "\n" + + "from_block\x18\x02 \x01(\x04H\x00R\tfromBlock\x88\x01\x01\x128\n" + + "\x18effective_transmitter_id\x18\x03 \x01(\tR\x16effectiveTransmitterId\x12=\n" + + "\x18enable_dual_transmission\x18\x04 \x01(\bH\x01R\x16enableDualTransmission\x88\x01\x01\x12?\n" + + "\x19enable_trigger_capability\x18\x05 \x01(\bH\x02R\x17enableTriggerCapability\x88\x01\x01\x12!\n" + "\n" + - "from_block\x18\x02 \x01(\x04R\tfromBlock\x128\n" + - "\x18effective_transmitter_id\x18\x03 \x01(\tR\x16effectiveTransmitterId\x128\n" + - "\x18enable_dual_transmission\x18\x04 \x01(\bR\x16enableDualTransmission\x12:\n" + - "\x19enable_trigger_capability\x18\x05 \x01(\bR\x17enableTriggerCapability\x12\x1c\n" + + "llo_don_id\x18\x06 \x01(\x04H\x03R\blloDonId\x88\x01\x01\x12\x1c\n" + + "\afeed_id\x18\a \x01(\tH\x04R\x06feedId\x88\x01\x01\x12!\n" + + "\fsending_keys\x18\b \x03(\tR\vsendingKeys\x12(\n" + + "\rprovider_type\x18\t \x01(\tH\x05R\fproviderType\x88\x01\x01B\r\n" + + "\v_from_blockB\x1b\n" + + "\x19_enable_dual_transmissionB\x1c\n" + + "\x1a_enable_trigger_capabilityB\r\n" + + "\v_llo_don_idB\n" + "\n" + - "llo_don_id\x18\x06 \x01(\x04R\blloDonId\x12\x17\n" + - "\afeed_id\x18\a \x01(\tR\x06feedId\x12!\n" + - "\fsending_keys\x18\b \x03(\tR\vsendingKeys\x12#\n" + - "\rprovider_type\x18\t \x01(\tR\fproviderTypeBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" + "\b_feed_idB\x10\n" + + "\x0e_provider_typeBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" var ( file_job_spec_v1_ocr2_evm_relay_config_proto_rawDescOnce sync.Once @@ -177,6 +184,7 @@ func file_job_spec_v1_ocr2_evm_relay_config_proto_init() { if File_job_spec_v1_ocr2_evm_relay_config_proto != nil { return } + file_job_spec_v1_ocr2_evm_relay_config_proto_msgTypes[0].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/data-feeds/job_spec/v1/ocr2_evm_relay_config.proto b/data-feeds/job_spec/v1/ocr2_evm_relay_config.proto index 3c472a13..b2392aaf 100644 --- a/data-feeds/job_spec/v1/ocr2_evm_relay_config.proto +++ b/data-feeds/job_spec/v1/ocr2_evm_relay_config.proto @@ -7,12 +7,12 @@ option go_package = "github.com/smartcontractkit/chainlink-protos/data-feeds/job // OCR2EVMRelayConfig is a typed view of the EVM relay config JSON. message OCR2EVMRelayConfig { string chain_id = 1; - uint64 from_block = 2; + optional uint64 from_block = 2; string effective_transmitter_id = 3; - bool enable_dual_transmission = 4; - bool enable_trigger_capability = 5; - uint64 llo_don_id = 6; - string feed_id = 7; + optional bool enable_dual_transmission = 4; + optional bool enable_trigger_capability = 5; + optional uint64 llo_don_id = 6; + optional string feed_id = 7; repeated string sending_keys = 8; - string provider_type = 9; + optional string provider_type = 9; } diff --git a/data-feeds/job_spec/v1/ocr2_median_plugin_config.pb.go b/data-feeds/job_spec/v1/ocr2_median_plugin_config.pb.go index 0c300227..ec6c8917 100644 --- a/data-feeds/job_spec/v1/ocr2_median_plugin_config.pb.go +++ b/data-feeds/job_spec/v1/ocr2_median_plugin_config.pb.go @@ -25,16 +25,8 @@ const ( type OCR2MedianPluginConfig struct { state protoimpl.MessageState `protogen:"open.v1"` JuelsPerFeeCoinSource string `protobuf:"bytes,1,opt,name=juels_per_fee_coin_source,json=juelsPerFeeCoinSource,proto3" json:"juels_per_fee_coin_source,omitempty"` - // Empty when gasPriceSubunitsSource is not configured. - GasPriceSubunitsSource string `protobuf:"bytes,2,opt,name=gas_price_subunits_source,json=gasPriceSubunitsSource,proto3" json:"gas_price_subunits_source,omitempty"` - // True when JuelsPerFeeCoinCache is nil or its Disable flag is set. - JuelsPerFeeCoinCacheDisabled bool `protobuf:"varint,3,opt,name=juels_per_fee_coin_cache_disabled,json=juelsPerFeeCoinCacheDisabled,proto3" json:"juels_per_fee_coin_cache_disabled,omitempty"` - JuelsPerFeeCoinCacheUpdateIntervalSeconds float64 `protobuf:"fixed64,4,opt,name=juels_per_fee_coin_cache_update_interval_seconds,json=juelsPerFeeCoinCacheUpdateIntervalSeconds,proto3" json:"juels_per_fee_coin_cache_update_interval_seconds,omitempty"` - JuelsPerFeeCoinCacheStalenessAlertThresholdSeconds float64 `protobuf:"fixed64,5,opt,name=juels_per_fee_coin_cache_staleness_alert_threshold_seconds,json=juelsPerFeeCoinCacheStalenessAlertThresholdSeconds,proto3" json:"juels_per_fee_coin_cache_staleness_alert_threshold_seconds,omitempty"` - // Verbatim JSON of DeviationFunctionDefinition. - DeviationFuncJson string `protobuf:"bytes,6,opt,name=deviation_func_json,json=deviationFuncJson,proto3" json:"deviation_func_json,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *OCR2MedianPluginConfig) Reset() { @@ -74,53 +66,13 @@ func (x *OCR2MedianPluginConfig) GetJuelsPerFeeCoinSource() string { return "" } -func (x *OCR2MedianPluginConfig) GetGasPriceSubunitsSource() string { - if x != nil { - return x.GasPriceSubunitsSource - } - return "" -} - -func (x *OCR2MedianPluginConfig) GetJuelsPerFeeCoinCacheDisabled() bool { - if x != nil { - return x.JuelsPerFeeCoinCacheDisabled - } - return false -} - -func (x *OCR2MedianPluginConfig) GetJuelsPerFeeCoinCacheUpdateIntervalSeconds() float64 { - if x != nil { - return x.JuelsPerFeeCoinCacheUpdateIntervalSeconds - } - return 0 -} - -func (x *OCR2MedianPluginConfig) GetJuelsPerFeeCoinCacheStalenessAlertThresholdSeconds() float64 { - if x != nil { - return x.JuelsPerFeeCoinCacheStalenessAlertThresholdSeconds - } - return 0 -} - -func (x *OCR2MedianPluginConfig) GetDeviationFuncJson() string { - if x != nil { - return x.DeviationFuncJson - } - return "" -} - var File_job_spec_v1_ocr2_median_plugin_config_proto protoreflect.FileDescriptor const file_job_spec_v1_ocr2_median_plugin_config_proto_rawDesc = "" + "\n" + - "+job_spec/v1/ocr2_median_plugin_config.proto\x12\vjob_spec.v1\"\xe3\x03\n" + + "+job_spec/v1/ocr2_median_plugin_config.proto\x12\vjob_spec.v1\"R\n" + "\x16OCR2MedianPluginConfig\x128\n" + - "\x19juels_per_fee_coin_source\x18\x01 \x01(\tR\x15juelsPerFeeCoinSource\x129\n" + - "\x19gas_price_subunits_source\x18\x02 \x01(\tR\x16gasPriceSubunitsSource\x12G\n" + - "!juels_per_fee_coin_cache_disabled\x18\x03 \x01(\bR\x1cjuelsPerFeeCoinCacheDisabled\x12c\n" + - "0juels_per_fee_coin_cache_update_interval_seconds\x18\x04 \x01(\x01R)juelsPerFeeCoinCacheUpdateIntervalSeconds\x12v\n" + - ":juels_per_fee_coin_cache_staleness_alert_threshold_seconds\x18\x05 \x01(\x01R2juelsPerFeeCoinCacheStalenessAlertThresholdSeconds\x12.\n" + - "\x13deviation_func_json\x18\x06 \x01(\tR\x11deviationFuncJsonBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" + "\x19juels_per_fee_coin_source\x18\x01 \x01(\tR\x15juelsPerFeeCoinSourceBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" var ( file_job_spec_v1_ocr2_median_plugin_config_proto_rawDescOnce sync.Once diff --git a/data-feeds/job_spec/v1/ocr2_median_plugin_config.proto b/data-feeds/job_spec/v1/ocr2_median_plugin_config.proto index 1c0dd814..c01ae73b 100644 --- a/data-feeds/job_spec/v1/ocr2_median_plugin_config.proto +++ b/data-feeds/job_spec/v1/ocr2_median_plugin_config.proto @@ -7,15 +7,4 @@ option go_package = "github.com/smartcontractkit/chainlink-protos/data-feeds/job // OCR2MedianPluginConfig mirrors median/config.PluginConfig. message OCR2MedianPluginConfig { string juels_per_fee_coin_source = 1; - - // Empty when gasPriceSubunitsSource is not configured. - string gas_price_subunits_source = 2; - - // True when JuelsPerFeeCoinCache is nil or its Disable flag is set. - bool juels_per_fee_coin_cache_disabled = 3; - double juels_per_fee_coin_cache_update_interval_seconds = 4; - double juels_per_fee_coin_cache_staleness_alert_threshold_seconds = 5; - - // Verbatim JSON of DeviationFunctionDefinition. - string deviation_func_json = 6; } diff --git a/data-feeds/job_spec/v1/ocr2_oracle_spec_info.pb.go b/data-feeds/job_spec/v1/ocr2_oracle_spec_info.pb.go index a2059e78..e2d0709d 100644 --- a/data-feeds/job_spec/v1/ocr2_oracle_spec_info.pb.go +++ b/data-feeds/job_spec/v1/ocr2_oracle_spec_info.pb.go @@ -22,30 +22,19 @@ const ( ) // OCR2OracleSpecInfo mirrors job.OCR2OracleSpec. -// contract_id and chain_id live on the parent JobSpecEvent. type OCR2OracleSpecInfo struct { - state protoimpl.MessageState `protogen:"open.v1"` - SpecId int32 `protobuf:"varint,1,opt,name=spec_id,json=specId,proto3" json:"spec_id,omitempty"` - FeedId string `protobuf:"bytes,2,opt,name=feed_id,json=feedId,proto3" json:"feed_id,omitempty"` - Relay string `protobuf:"bytes,3,opt,name=relay,proto3" json:"relay,omitempty"` - PluginType string `protobuf:"bytes,4,opt,name=plugin_type,json=pluginType,proto3" json:"plugin_type,omitempty"` - TransmitterId string `protobuf:"bytes,5,opt,name=transmitter_id,json=transmitterId,proto3" json:"transmitter_id,omitempty"` - OcrKeyBundleId string `protobuf:"bytes,6,opt,name=ocr_key_bundle_id,json=ocrKeyBundleId,proto3" json:"ocr_key_bundle_id,omitempty"` - MonitoringEndpoint string `protobuf:"bytes,7,opt,name=monitoring_endpoint,json=monitoringEndpoint,proto3" json:"monitoring_endpoint,omitempty"` - P2Pv2Bootstrappers []string `protobuf:"bytes,8,rep,name=p2pv2_bootstrappers,json=p2pv2Bootstrappers,proto3" json:"p2pv2_bootstrappers,omitempty"` - AllowNoBootstrappers bool `protobuf:"varint,9,opt,name=allow_no_bootstrappers,json=allowNoBootstrappers,proto3" json:"allow_no_bootstrappers,omitempty"` - BlockchainTimeoutSeconds float64 `protobuf:"fixed64,10,opt,name=blockchain_timeout_seconds,json=blockchainTimeoutSeconds,proto3" json:"blockchain_timeout_seconds,omitempty"` - ContractConfigTrackerPollIntervalSeconds float64 `protobuf:"fixed64,11,opt,name=contract_config_tracker_poll_interval_seconds,json=contractConfigTrackerPollIntervalSeconds,proto3" json:"contract_config_tracker_poll_interval_seconds,omitempty"` - ContractConfigConfirmations uint32 `protobuf:"varint,12,opt,name=contract_config_confirmations,json=contractConfigConfirmations,proto3" json:"contract_config_confirmations,omitempty"` - CaptureEaTelemetry bool `protobuf:"varint,13,opt,name=capture_ea_telemetry,json=captureEaTelemetry,proto3" json:"capture_ea_telemetry,omitempty"` - CaptureAutomationCustomTelemetry bool `protobuf:"varint,14,opt,name=capture_automation_custom_telemetry,json=captureAutomationCustomTelemetry,proto3" json:"capture_automation_custom_telemetry,omitempty"` - SpecCreatedAt string `protobuf:"bytes,15,opt,name=spec_created_at,json=specCreatedAt,proto3" json:"spec_created_at,omitempty"` - SpecUpdatedAt string `protobuf:"bytes,16,opt,name=spec_updated_at,json=specUpdatedAt,proto3" json:"spec_updated_at,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ContractId string `protobuf:"bytes,1,opt,name=contract_id,json=contractId,proto3" json:"contract_id,omitempty"` + FeedId *string `protobuf:"bytes,2,opt,name=feed_id,json=feedId,proto3,oneof" json:"feed_id,omitempty"` + Relay string `protobuf:"bytes,3,opt,name=relay,proto3" json:"relay,omitempty"` + PluginType string `protobuf:"bytes,4,opt,name=plugin_type,json=pluginType,proto3" json:"plugin_type,omitempty"` + TransmitterId *string `protobuf:"bytes,5,opt,name=transmitter_id,json=transmitterId,proto3,oneof" json:"transmitter_id,omitempty"` + OcrKeyBundleId *string `protobuf:"bytes,6,opt,name=ocr_key_bundle_id,json=ocrKeyBundleId,proto3,oneof" json:"ocr_key_bundle_id,omitempty"` + CaptureEaTelemetry bool `protobuf:"varint,13,opt,name=capture_ea_telemetry,json=captureEaTelemetry,proto3" json:"capture_ea_telemetry,omitempty"` // Raw JSON passthroughs are always populated and authoritative over the typed // sub-messages below. - RelayConfigJson string `protobuf:"bytes,17,opt,name=relay_config_json,json=relayConfigJson,proto3" json:"relay_config_json,omitempty"` - PluginConfigJson string `protobuf:"bytes,18,opt,name=plugin_config_json,json=pluginConfigJson,proto3" json:"plugin_config_json,omitempty"` - OnchainSigningStrategyJson string `protobuf:"bytes,19,opt,name=onchain_signing_strategy_json,json=onchainSigningStrategyJson,proto3" json:"onchain_signing_strategy_json,omitempty"` + RelayConfigJson string `protobuf:"bytes,17,opt,name=relay_config_json,json=relayConfigJson,proto3" json:"relay_config_json,omitempty"` + PluginConfigJson string `protobuf:"bytes,18,opt,name=plugin_config_json,json=pluginConfigJson,proto3" json:"plugin_config_json,omitempty"` // Populated when relay == "evm". EvmRelayConfig *OCR2EVMRelayConfig `protobuf:"bytes,20,opt,name=evm_relay_config,json=evmRelayConfig,proto3" json:"evm_relay_config,omitempty"` // Populated when plugin_type == "median". @@ -84,16 +73,16 @@ func (*OCR2OracleSpecInfo) Descriptor() ([]byte, []int) { return file_job_spec_v1_ocr2_oracle_spec_info_proto_rawDescGZIP(), []int{0} } -func (x *OCR2OracleSpecInfo) GetSpecId() int32 { +func (x *OCR2OracleSpecInfo) GetContractId() string { if x != nil { - return x.SpecId + return x.ContractId } - return 0 + return "" } func (x *OCR2OracleSpecInfo) GetFeedId() string { - if x != nil { - return x.FeedId + if x != nil && x.FeedId != nil { + return *x.FeedId } return "" } @@ -113,61 +102,19 @@ func (x *OCR2OracleSpecInfo) GetPluginType() string { } func (x *OCR2OracleSpecInfo) GetTransmitterId() string { - if x != nil { - return x.TransmitterId + if x != nil && x.TransmitterId != nil { + return *x.TransmitterId } return "" } func (x *OCR2OracleSpecInfo) GetOcrKeyBundleId() string { - if x != nil { - return x.OcrKeyBundleId + if x != nil && x.OcrKeyBundleId != nil { + return *x.OcrKeyBundleId } return "" } -func (x *OCR2OracleSpecInfo) GetMonitoringEndpoint() string { - if x != nil { - return x.MonitoringEndpoint - } - return "" -} - -func (x *OCR2OracleSpecInfo) GetP2Pv2Bootstrappers() []string { - if x != nil { - return x.P2Pv2Bootstrappers - } - return nil -} - -func (x *OCR2OracleSpecInfo) GetAllowNoBootstrappers() bool { - if x != nil { - return x.AllowNoBootstrappers - } - return false -} - -func (x *OCR2OracleSpecInfo) GetBlockchainTimeoutSeconds() float64 { - if x != nil { - return x.BlockchainTimeoutSeconds - } - return 0 -} - -func (x *OCR2OracleSpecInfo) GetContractConfigTrackerPollIntervalSeconds() float64 { - if x != nil { - return x.ContractConfigTrackerPollIntervalSeconds - } - return 0 -} - -func (x *OCR2OracleSpecInfo) GetContractConfigConfirmations() uint32 { - if x != nil { - return x.ContractConfigConfirmations - } - return 0 -} - func (x *OCR2OracleSpecInfo) GetCaptureEaTelemetry() bool { if x != nil { return x.CaptureEaTelemetry @@ -175,27 +122,6 @@ func (x *OCR2OracleSpecInfo) GetCaptureEaTelemetry() bool { return false } -func (x *OCR2OracleSpecInfo) GetCaptureAutomationCustomTelemetry() bool { - if x != nil { - return x.CaptureAutomationCustomTelemetry - } - return false -} - -func (x *OCR2OracleSpecInfo) GetSpecCreatedAt() string { - if x != nil { - return x.SpecCreatedAt - } - return "" -} - -func (x *OCR2OracleSpecInfo) GetSpecUpdatedAt() string { - if x != nil { - return x.SpecUpdatedAt - } - return "" -} - func (x *OCR2OracleSpecInfo) GetRelayConfigJson() string { if x != nil { return x.RelayConfigJson @@ -210,13 +136,6 @@ func (x *OCR2OracleSpecInfo) GetPluginConfigJson() string { return "" } -func (x *OCR2OracleSpecInfo) GetOnchainSigningStrategyJson() string { - if x != nil { - return x.OnchainSigningStrategyJson - } - return "" -} - func (x *OCR2OracleSpecInfo) GetEvmRelayConfig() *OCR2EVMRelayConfig { if x != nil { return x.EvmRelayConfig @@ -235,31 +154,25 @@ var File_job_spec_v1_ocr2_oracle_spec_info_proto protoreflect.FileDescriptor const file_job_spec_v1_ocr2_oracle_spec_info_proto_rawDesc = "" + "\n" + - "'job_spec/v1/ocr2_oracle_spec_info.proto\x12\vjob_spec.v1\x1a'job_spec/v1/ocr2_evm_relay_config.proto\x1a+job_spec/v1/ocr2_median_plugin_config.proto\"\xda\b\n" + - "\x12OCR2OracleSpecInfo\x12\x17\n" + - "\aspec_id\x18\x01 \x01(\x05R\x06specId\x12\x17\n" + - "\afeed_id\x18\x02 \x01(\tR\x06feedId\x12\x14\n" + + "'job_spec/v1/ocr2_oracle_spec_info.proto\x12\vjob_spec.v1\x1a'job_spec/v1/ocr2_evm_relay_config.proto\x1a+job_spec/v1/ocr2_median_plugin_config.proto\"\xc9\x04\n" + + "\x12OCR2OracleSpecInfo\x12\x1f\n" + + "\vcontract_id\x18\x01 \x01(\tR\n" + + "contractId\x12\x1c\n" + + "\afeed_id\x18\x02 \x01(\tH\x00R\x06feedId\x88\x01\x01\x12\x14\n" + "\x05relay\x18\x03 \x01(\tR\x05relay\x12\x1f\n" + "\vplugin_type\x18\x04 \x01(\tR\n" + - "pluginType\x12%\n" + - "\x0etransmitter_id\x18\x05 \x01(\tR\rtransmitterId\x12)\n" + - "\x11ocr_key_bundle_id\x18\x06 \x01(\tR\x0eocrKeyBundleId\x12/\n" + - "\x13monitoring_endpoint\x18\a \x01(\tR\x12monitoringEndpoint\x12/\n" + - "\x13p2pv2_bootstrappers\x18\b \x03(\tR\x12p2pv2Bootstrappers\x124\n" + - "\x16allow_no_bootstrappers\x18\t \x01(\bR\x14allowNoBootstrappers\x12<\n" + - "\x1ablockchain_timeout_seconds\x18\n" + - " \x01(\x01R\x18blockchainTimeoutSeconds\x12_\n" + - "-contract_config_tracker_poll_interval_seconds\x18\v \x01(\x01R(contractConfigTrackerPollIntervalSeconds\x12B\n" + - "\x1dcontract_config_confirmations\x18\f \x01(\rR\x1bcontractConfigConfirmations\x120\n" + - "\x14capture_ea_telemetry\x18\r \x01(\bR\x12captureEaTelemetry\x12M\n" + - "#capture_automation_custom_telemetry\x18\x0e \x01(\bR captureAutomationCustomTelemetry\x12&\n" + - "\x0fspec_created_at\x18\x0f \x01(\tR\rspecCreatedAt\x12&\n" + - "\x0fspec_updated_at\x18\x10 \x01(\tR\rspecUpdatedAt\x12*\n" + + "pluginType\x12*\n" + + "\x0etransmitter_id\x18\x05 \x01(\tH\x01R\rtransmitterId\x88\x01\x01\x12.\n" + + "\x11ocr_key_bundle_id\x18\x06 \x01(\tH\x02R\x0eocrKeyBundleId\x88\x01\x01\x120\n" + + "\x14capture_ea_telemetry\x18\r \x01(\bR\x12captureEaTelemetry\x12*\n" + "\x11relay_config_json\x18\x11 \x01(\tR\x0frelayConfigJson\x12,\n" + - "\x12plugin_config_json\x18\x12 \x01(\tR\x10pluginConfigJson\x12A\n" + - "\x1donchain_signing_strategy_json\x18\x13 \x01(\tR\x1aonchainSigningStrategyJson\x12I\n" + + "\x12plugin_config_json\x18\x12 \x01(\tR\x10pluginConfigJson\x12I\n" + "\x10evm_relay_config\x18\x14 \x01(\v2\x1f.job_spec.v1.OCR2EVMRelayConfigR\x0eevmRelayConfig\x12U\n" + - "\x14median_plugin_config\x18\x15 \x01(\v2#.job_spec.v1.OCR2MedianPluginConfigR\x12medianPluginConfigBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" + "\x14median_plugin_config\x18\x15 \x01(\v2#.job_spec.v1.OCR2MedianPluginConfigR\x12medianPluginConfigB\n" + + "\n" + + "\b_feed_idB\x11\n" + + "\x0f_transmitter_idB\x14\n" + + "\x12_ocr_key_bundle_idBEZCgithub.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1b\x06proto3" var ( file_job_spec_v1_ocr2_oracle_spec_info_proto_rawDescOnce sync.Once @@ -296,6 +209,7 @@ func file_job_spec_v1_ocr2_oracle_spec_info_proto_init() { } file_job_spec_v1_ocr2_evm_relay_config_proto_init() file_job_spec_v1_ocr2_median_plugin_config_proto_init() + file_job_spec_v1_ocr2_oracle_spec_info_proto_msgTypes[0].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/data-feeds/job_spec/v1/ocr2_oracle_spec_info.proto b/data-feeds/job_spec/v1/ocr2_oracle_spec_info.proto index 17c2b7f3..ae17afb4 100644 --- a/data-feeds/job_spec/v1/ocr2_oracle_spec_info.proto +++ b/data-feeds/job_spec/v1/ocr2_oracle_spec_info.proto @@ -8,30 +8,19 @@ import "job_spec/v1/ocr2_median_plugin_config.proto"; option go_package = "github.com/smartcontractkit/chainlink-protos/data-feeds/job_spec/v1"; // OCR2OracleSpecInfo mirrors job.OCR2OracleSpec. -// contract_id and chain_id live on the parent JobSpecEvent. message OCR2OracleSpecInfo { - int32 spec_id = 1; - string feed_id = 2; + string contract_id = 1; + optional string feed_id = 2; string relay = 3; string plugin_type = 4; - string transmitter_id = 5; - string ocr_key_bundle_id = 6; - string monitoring_endpoint = 7; - repeated string p2pv2_bootstrappers = 8; - bool allow_no_bootstrappers = 9; - double blockchain_timeout_seconds = 10; - double contract_config_tracker_poll_interval_seconds = 11; - uint32 contract_config_confirmations = 12; + optional string transmitter_id = 5; + optional string ocr_key_bundle_id = 6; bool capture_ea_telemetry = 13; - bool capture_automation_custom_telemetry = 14; - string spec_created_at = 15; - string spec_updated_at = 16; // Raw JSON passthroughs are always populated and authoritative over the typed // sub-messages below. string relay_config_json = 17; string plugin_config_json = 18; - string onchain_signing_strategy_json = 19; // Populated when relay == "evm". OCR2EVMRelayConfig evm_relay_config = 20;