diff --git a/go.mod b/go.mod index db8005632..d050ca4c3 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.67 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976 - github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1 + github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 diff --git a/go.sum b/go.sum index b47530616..f34ce7b7b 100644 --- a/go.sum +++ b/go.sum @@ -330,8 +330,8 @@ github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgn github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc= github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976 h1:mF3FiDUoV0QbJcks9R2y7ydqntNL1Z0VCPBJgx/Ms+0= github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA= -github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1 h1:HZt/80mhcNw6/MlYBIRracxfHWNqFF0iZ5nZEVZBUgo= -github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q= +github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8= +github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q= github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 h1:B7itmjy+CMJ26elVw/cAJqqhBQ3Xa/mBYWK0/rQ5MuI= github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0/go.mod h1:h6kqaGajbNRrezm56zhx03p0mVmmA2xxj7E/M4ytLUA= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20250822025801-598d3d86f873 h1:8/qwOmcdSFa8A6ecnj3eH/mwNx7Ybw2tjQFydDymtOc= diff --git a/pkg/capabilities/v2/actions/http/client.pb.go b/pkg/capabilities/v2/actions/http/client.pb.go index ee33d1d2c..969f23fca 100644 --- a/pkg/capabilities/v2/actions/http/client.pb.go +++ b/pkg/capabilities/v2/actions/http/client.pb.go @@ -10,6 +10,7 @@ import ( _ "github.com/smartcontractkit/chainlink-protos/cre/go/tools/generator" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" unsafe "unsafe" @@ -25,8 +26,8 @@ const ( // CacheSettings defines cache control options for outbound HTTP requests. type CacheSettings struct { state protoimpl.MessageState `protogen:"open.v1"` - ReadFromCache bool `protobuf:"varint,1,opt,name=read_from_cache,json=readFromCache,proto3" json:"read_from_cache,omitempty"` // If true, attempt to read a cached response for the request. - MaxAgeMs int32 `protobuf:"varint,2,opt,name=max_age_ms,json=maxAgeMs,proto3" json:"max_age_ms,omitempty"` // Maximum age of a cached response in milliseconds. + Store bool `protobuf:"varint,1,opt,name=store,proto3" json:"store,omitempty"` // If true, cache the response. + MaxAge *durationpb.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Maximum age of a cached response. If zero, do not attempt to read from cache unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -61,18 +62,18 @@ func (*CacheSettings) Descriptor() ([]byte, []int) { return file_capabilities_networking_http_v1alpha_client_proto_rawDescGZIP(), []int{0} } -func (x *CacheSettings) GetReadFromCache() bool { +func (x *CacheSettings) GetStore() bool { if x != nil { - return x.ReadFromCache + return x.Store } return false } -func (x *CacheSettings) GetMaxAgeMs() int32 { +func (x *CacheSettings) GetMaxAge() *durationpb.Duration { if x != nil { - return x.MaxAgeMs + return x.MaxAge } - return 0 + return nil } type Request struct { @@ -81,7 +82,7 @@ type Request struct { Method string `protobuf:"bytes,2,opt,name=method,proto3" json:"method,omitempty"` Headers map[string]string `protobuf:"bytes,3,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Body []byte `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"` - TimeoutMs int32 `protobuf:"varint,5,opt,name=timeout_ms,json=timeoutMs,proto3" json:"timeout_ms,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` // Request timeout duration CacheSettings *CacheSettings `protobuf:"bytes,6,opt,name=cache_settings,json=cacheSettings,proto3" json:"cache_settings,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -145,11 +146,11 @@ func (x *Request) GetBody() []byte { return nil } -func (x *Request) GetTimeoutMs() int32 { +func (x *Request) GetTimeout() *durationpb.Duration { if x != nil { - return x.TimeoutMs + return x.Timeout } - return 0 + return nil } func (x *Request) GetCacheSettings() *CacheSettings { @@ -223,18 +224,16 @@ var File_capabilities_networking_http_v1alpha_client_proto protoreflect.FileDesc const file_capabilities_networking_http_v1alpha_client_proto_rawDesc = "" + "\n" + - "1capabilities/networking/http/v1alpha/client.proto\x12$capabilities.networking.http.v1alpha\x1a*tools/generator/v1alpha/cre_metadata.proto\"U\n" + - "\rCacheSettings\x12&\n" + - "\x0fread_from_cache\x18\x01 \x01(\bR\rreadFromCache\x12\x1c\n" + - "\n" + - "max_age_ms\x18\x02 \x01(\x05R\bmaxAgeMs\"\xd4\x02\n" + + "1capabilities/networking/http/v1alpha/client.proto\x12$capabilities.networking.http.v1alpha\x1a\x1egoogle/protobuf/duration.proto\x1a*tools/generator/v1alpha/cre_metadata.proto\"Y\n" + + "\rCacheSettings\x12\x14\n" + + "\x05store\x18\x01 \x01(\bR\x05store\x122\n" + + "\amax_age\x18\x02 \x01(\v2\x19.google.protobuf.DurationR\x06maxAge\"\xea\x02\n" + "\aRequest\x12\x10\n" + "\x03url\x18\x01 \x01(\tR\x03url\x12\x16\n" + "\x06method\x18\x02 \x01(\tR\x06method\x12T\n" + "\aheaders\x18\x03 \x03(\v2:.capabilities.networking.http.v1alpha.Request.HeadersEntryR\aheaders\x12\x12\n" + - "\x04body\x18\x04 \x01(\fR\x04body\x12\x1d\n" + - "\n" + - "timeout_ms\x18\x05 \x01(\x05R\ttimeoutMs\x12Z\n" + + "\x04body\x18\x04 \x01(\fR\x04body\x123\n" + + "\atimeout\x18\x05 \x01(\v2\x19.google.protobuf.DurationR\atimeout\x12Z\n" + "\x0ecache_settings\x18\x06 \x01(\v23.capabilities.networking.http.v1alpha.CacheSettingsR\rcacheSettings\x1a:\n" + "\fHeadersEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + @@ -264,23 +263,26 @@ func file_capabilities_networking_http_v1alpha_client_proto_rawDescGZIP() []byte var file_capabilities_networking_http_v1alpha_client_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_capabilities_networking_http_v1alpha_client_proto_goTypes = []any{ - (*CacheSettings)(nil), // 0: capabilities.networking.http.v1alpha.CacheSettings - (*Request)(nil), // 1: capabilities.networking.http.v1alpha.Request - (*Response)(nil), // 2: capabilities.networking.http.v1alpha.Response - nil, // 3: capabilities.networking.http.v1alpha.Request.HeadersEntry - nil, // 4: capabilities.networking.http.v1alpha.Response.HeadersEntry + (*CacheSettings)(nil), // 0: capabilities.networking.http.v1alpha.CacheSettings + (*Request)(nil), // 1: capabilities.networking.http.v1alpha.Request + (*Response)(nil), // 2: capabilities.networking.http.v1alpha.Response + nil, // 3: capabilities.networking.http.v1alpha.Request.HeadersEntry + nil, // 4: capabilities.networking.http.v1alpha.Response.HeadersEntry + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration } var file_capabilities_networking_http_v1alpha_client_proto_depIdxs = []int32{ - 3, // 0: capabilities.networking.http.v1alpha.Request.headers:type_name -> capabilities.networking.http.v1alpha.Request.HeadersEntry - 0, // 1: capabilities.networking.http.v1alpha.Request.cache_settings:type_name -> capabilities.networking.http.v1alpha.CacheSettings - 4, // 2: capabilities.networking.http.v1alpha.Response.headers:type_name -> capabilities.networking.http.v1alpha.Response.HeadersEntry - 1, // 3: capabilities.networking.http.v1alpha.Client.SendRequest:input_type -> capabilities.networking.http.v1alpha.Request - 2, // 4: capabilities.networking.http.v1alpha.Client.SendRequest:output_type -> capabilities.networking.http.v1alpha.Response - 4, // [4:5] is the sub-list for method output_type - 3, // [3:4] 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 + 5, // 0: capabilities.networking.http.v1alpha.CacheSettings.max_age:type_name -> google.protobuf.Duration + 3, // 1: capabilities.networking.http.v1alpha.Request.headers:type_name -> capabilities.networking.http.v1alpha.Request.HeadersEntry + 5, // 2: capabilities.networking.http.v1alpha.Request.timeout:type_name -> google.protobuf.Duration + 0, // 3: capabilities.networking.http.v1alpha.Request.cache_settings:type_name -> capabilities.networking.http.v1alpha.CacheSettings + 4, // 4: capabilities.networking.http.v1alpha.Response.headers:type_name -> capabilities.networking.http.v1alpha.Response.HeadersEntry + 1, // 5: capabilities.networking.http.v1alpha.Client.SendRequest:input_type -> capabilities.networking.http.v1alpha.Request + 2, // 6: capabilities.networking.http.v1alpha.Client.SendRequest:output_type -> capabilities.networking.http.v1alpha.Response + 6, // [6:7] is the sub-list for method output_type + 5, // [5:6] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_capabilities_networking_http_v1alpha_client_proto_init() } diff --git a/pkg/capabilities/v2/chain-capabilities/evm/client.pb.go b/pkg/capabilities/v2/chain-capabilities/evm/client.pb.go index c635ddb0d..383e802b8 100644 --- a/pkg/capabilities/v2/chain-capabilities/evm/client.pb.go +++ b/pkg/capabilities/v2/chain-capabilities/evm/client.pb.go @@ -12,7 +12,6 @@ import ( pb "github.com/smartcontractkit/chainlink-protos/cre/go/values/pb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" unsafe "unsafe" @@ -1487,202 +1486,6 @@ func (x *Header) GetParentHash() []byte { return nil } -type RegisterLogTrackingRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - Filter *LPFilter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *RegisterLogTrackingRequest) Reset() { - *x = RegisterLogTrackingRequest{} - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *RegisterLogTrackingRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RegisterLogTrackingRequest) ProtoMessage() {} - -func (x *RegisterLogTrackingRequest) ProtoReflect() protoreflect.Message { - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[23] - 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 RegisterLogTrackingRequest.ProtoReflect.Descriptor instead. -func (*RegisterLogTrackingRequest) Descriptor() ([]byte, []int) { - return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{23} -} - -func (x *RegisterLogTrackingRequest) GetFilter() *LPFilter { - if x != nil { - return x.Filter - } - return nil -} - -type LPFilter struct { - state protoimpl.MessageState `protogen:"open.v1"` - MaxLogsKept uint64 `protobuf:"varint,1,opt,name=max_logs_kept,json=maxLogsKept,proto3" json:"max_logs_kept,omitempty"` // maximum number of logs to retain ( 0 = unlimited ) - RetentionTime int64 `protobuf:"varint,2,opt,name=retention_time,json=retentionTime,proto3" json:"retention_time,omitempty"` // maximum amount of time to retain logs in seconds - LogsPerBlock uint64 `protobuf:"varint,3,opt,name=logs_per_block,json=logsPerBlock,proto3" json:"logs_per_block,omitempty"` // rate limit ( maximum # of logs per block, 0 = unlimited ) - Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` // filter name, has to persist for removing filter - Addresses [][]byte `protobuf:"bytes,5,rep,name=addresses,proto3" json:"addresses,omitempty"` // list of addresses to include in evm address [20]byte fix-sized array format - EventSigs [][]byte `protobuf:"bytes,6,rep,name=event_sigs,json=eventSigs,proto3" json:"event_sigs,omitempty"` // list of possible signatures (aka topic1), in [32]byte fix-sized array format - Topic2 [][]byte `protobuf:"bytes,7,rep,name=topic2,proto3" json:"topic2,omitempty"` // list of possible values for topic2, in [32]byte fix-sized array format - Topic3 [][]byte `protobuf:"bytes,8,rep,name=topic3,proto3" json:"topic3,omitempty"` // list of possible values for topic3, in [32]byte fix-sized array format - Topic4 [][]byte `protobuf:"bytes,9,rep,name=topic4,proto3" json:"topic4,omitempty"` // list of possible values for topic4, in [32]byte fix-sized array format - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *LPFilter) Reset() { - *x = LPFilter{} - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *LPFilter) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*LPFilter) ProtoMessage() {} - -func (x *LPFilter) ProtoReflect() protoreflect.Message { - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[24] - 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 LPFilter.ProtoReflect.Descriptor instead. -func (*LPFilter) Descriptor() ([]byte, []int) { - return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{24} -} - -func (x *LPFilter) GetMaxLogsKept() uint64 { - if x != nil { - return x.MaxLogsKept - } - return 0 -} - -func (x *LPFilter) GetRetentionTime() int64 { - if x != nil { - return x.RetentionTime - } - return 0 -} - -func (x *LPFilter) GetLogsPerBlock() uint64 { - if x != nil { - return x.LogsPerBlock - } - return 0 -} - -func (x *LPFilter) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *LPFilter) GetAddresses() [][]byte { - if x != nil { - return x.Addresses - } - return nil -} - -func (x *LPFilter) GetEventSigs() [][]byte { - if x != nil { - return x.EventSigs - } - return nil -} - -func (x *LPFilter) GetTopic2() [][]byte { - if x != nil { - return x.Topic2 - } - return nil -} - -func (x *LPFilter) GetTopic3() [][]byte { - if x != nil { - return x.Topic3 - } - return nil -} - -func (x *LPFilter) GetTopic4() [][]byte { - if x != nil { - return x.Topic4 - } - return nil -} - -type UnregisterLogTrackingRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - FilterName string `protobuf:"bytes,1,opt,name=filter_name,json=filterName,proto3" json:"filter_name,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *UnregisterLogTrackingRequest) Reset() { - *x = UnregisterLogTrackingRequest{} - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *UnregisterLogTrackingRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UnregisterLogTrackingRequest) ProtoMessage() {} - -func (x *UnregisterLogTrackingRequest) ProtoReflect() protoreflect.Message { - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[25] - 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 UnregisterLogTrackingRequest.ProtoReflect.Descriptor instead. -func (*UnregisterLogTrackingRequest) Descriptor() ([]byte, []int) { - return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{25} -} - -func (x *UnregisterLogTrackingRequest) GetFilterName() string { - if x != nil { - return x.FilterName - } - return "" -} - type WriteReportRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Receiver []byte `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty"` @@ -1694,7 +1497,7 @@ type WriteReportRequest struct { func (x *WriteReportRequest) Reset() { *x = WriteReportRequest{} - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[26] + mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1706,7 +1509,7 @@ func (x *WriteReportRequest) String() string { func (*WriteReportRequest) ProtoMessage() {} func (x *WriteReportRequest) ProtoReflect() protoreflect.Message { - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[26] + mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[23] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1719,7 +1522,7 @@ func (x *WriteReportRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use WriteReportRequest.ProtoReflect.Descriptor instead. func (*WriteReportRequest) Descriptor() ([]byte, []int) { - return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{26} + return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{23} } func (x *WriteReportRequest) GetReceiver() []byte { @@ -1752,7 +1555,7 @@ type GasConfig struct { func (x *GasConfig) Reset() { *x = GasConfig{} - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[27] + mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1764,7 +1567,7 @@ func (x *GasConfig) String() string { func (*GasConfig) ProtoMessage() {} func (x *GasConfig) ProtoReflect() protoreflect.Message { - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[27] + mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[24] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1777,7 +1580,7 @@ func (x *GasConfig) ProtoReflect() protoreflect.Message { // Deprecated: Use GasConfig.ProtoReflect.Descriptor instead. func (*GasConfig) Descriptor() ([]byte, []int) { - return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{27} + return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{24} } func (x *GasConfig) GetGasLimit() uint64 { @@ -1800,7 +1603,7 @@ type WriteReportReply struct { func (x *WriteReportReply) Reset() { *x = WriteReportReply{} - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[28] + mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1812,7 +1615,7 @@ func (x *WriteReportReply) String() string { func (*WriteReportReply) ProtoMessage() {} func (x *WriteReportReply) ProtoReflect() protoreflect.Message { - mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[28] + mi := &file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[25] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1825,7 +1628,7 @@ func (x *WriteReportReply) ProtoReflect() protoreflect.Message { // Deprecated: Use WriteReportReply.ProtoReflect.Descriptor instead. func (*WriteReportReply) Descriptor() ([]byte, []int) { - return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{28} + return file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP(), []int{25} } func (x *WriteReportReply) GetTxStatus() TxStatus { @@ -1867,7 +1670,7 @@ var File_capabilities_blockchain_evm_v1alpha_client_proto protoreflect.FileDescr const file_capabilities_blockchain_evm_v1alpha_client_proto_rawDesc = "" + "\n" + - "0capabilities/blockchain/evm/v1alpha/client.proto\x12#capabilities.blockchain.evm.v1alpha\x1a\x1bgoogle/protobuf/empty.proto\x1a\x15sdk/v1alpha/sdk.proto\x1a*tools/generator/v1alpha/cre_metadata.proto\x1a\x16values/v1/values.proto\"%\n" + + "0capabilities/blockchain/evm/v1alpha/client.proto\x12#capabilities.blockchain.evm.v1alpha\x1a\x15sdk/v1alpha/sdk.proto\x1a*tools/generator/v1alpha/cre_metadata.proto\x1a\x16values/v1/values.proto\"%\n" + "\vTopicValues\x12\x16\n" + "\x06values\x18\x01 \x03(\fR\x06values\"\xd7\x01\n" + "\x17FilterLogTriggerRequest\x12\x1c\n" + @@ -1958,23 +1761,7 @@ const file_capabilities_blockchain_evm_v1alpha_client_proto_rawDesc = "" + "\fblock_number\x18\x02 \x01(\v2\x11.values.v1.BigIntR\vblockNumber\x12\x12\n" + "\x04hash\x18\x03 \x01(\fR\x04hash\x12\x1f\n" + "\vparent_hash\x18\x04 \x01(\fR\n" + - "parentHash\"c\n" + - "\x1aRegisterLogTrackingRequest\x12E\n" + - "\x06filter\x18\x01 \x01(\v2-.capabilities.blockchain.evm.v1alpha.LPFilterR\x06filter\"\x94\x02\n" + - "\bLPFilter\x12\"\n" + - "\rmax_logs_kept\x18\x01 \x01(\x04R\vmaxLogsKept\x12%\n" + - "\x0eretention_time\x18\x02 \x01(\x03R\rretentionTime\x12$\n" + - "\x0elogs_per_block\x18\x03 \x01(\x04R\flogsPerBlock\x12\x12\n" + - "\x04name\x18\x04 \x01(\tR\x04name\x12\x1c\n" + - "\taddresses\x18\x05 \x03(\fR\taddresses\x12\x1d\n" + - "\n" + - "event_sigs\x18\x06 \x03(\fR\teventSigs\x12\x16\n" + - "\x06topic2\x18\a \x03(\fR\x06topic2\x12\x16\n" + - "\x06topic3\x18\b \x03(\fR\x06topic3\x12\x16\n" + - "\x06topic4\x18\t \x03(\fR\x06topic4\"?\n" + - "\x1cUnregisterLogTrackingRequest\x12\x1f\n" + - "\vfilter_name\x18\x01 \x01(\tR\n" + - "filterName\"\xc8\x01\n" + + "parentHash\"\xc8\x01\n" + "\x12WriteReportRequest\x12\x1a\n" + "\breceiver\x18\x01 \x01(\fR\breceiver\x123\n" + "\x06report\x18\x02 \x01(\v2\x1b.sdk.v1alpha.ReportResponseR\x06report\x12R\n" + @@ -2004,7 +1791,7 @@ const file_capabilities_blockchain_evm_v1alpha_client_proto_rawDesc = "" + "\bTxStatus\x12\x13\n" + "\x0fTX_STATUS_FATAL\x10\x00\x12\x16\n" + "\x12TX_STATUS_REVERTED\x10\x01\x12\x15\n" + - "\x11TX_STATUS_SUCCESS\x10\x022\xd7\x0f\n" + + "\x11TX_STATUS_SUCCESS\x10\x022\xf3\r\n" + "\x06Client\x12\x80\x01\n" + "\fCallContract\x128.capabilities.blockchain.evm.v1alpha.CallContractRequest\x1a6.capabilities.blockchain.evm.v1alpha.CallContractReply\x12z\n" + "\n" + @@ -2013,9 +1800,7 @@ const file_capabilities_blockchain_evm_v1alpha_client_proto_rawDesc = "" + "\vEstimateGas\x127.capabilities.blockchain.evm.v1alpha.EstimateGasRequest\x1a5.capabilities.blockchain.evm.v1alpha.EstimateGasReply\x12\x98\x01\n" + "\x14GetTransactionByHash\x12@.capabilities.blockchain.evm.v1alpha.GetTransactionByHashRequest\x1a>.capabilities.blockchain.evm.v1alpha.GetTransactionByHashReply\x12\x9b\x01\n" + "\x15GetTransactionReceipt\x12A.capabilities.blockchain.evm.v1alpha.GetTransactionReceiptRequest\x1a?.capabilities.blockchain.evm.v1alpha.GetTransactionReceiptReply\x12\x86\x01\n" + - "\x0eHeaderByNumber\x12:.capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest\x1a8.capabilities.blockchain.evm.v1alpha.HeaderByNumberReply\x12n\n" + - "\x13RegisterLogTracking\x12?.capabilities.blockchain.evm.v1alpha.RegisterLogTrackingRequest\x1a\x16.google.protobuf.Empty\x12r\n" + - "\x15UnregisterLogTracking\x12A.capabilities.blockchain.evm.v1alpha.UnregisterLogTrackingRequest\x1a\x16.google.protobuf.Empty\x12v\n" + + "\x0eHeaderByNumber\x12:.capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest\x1a8.capabilities.blockchain.evm.v1alpha.HeaderByNumberReply\x12v\n" + "\n" + "LogTrigger\x12<.capabilities.blockchain.evm.v1alpha.FilterLogTriggerRequest\x1a(.capabilities.blockchain.evm.v1alpha.Log0\x01\x12}\n" + "\vWriteReport\x127.capabilities.blockchain.evm.v1alpha.WriteReportRequest\x1a5.capabilities.blockchain.evm.v1alpha.WriteReportReply\x1a\xb8\x04\x82\xb5\x18\xb3\x04\b\x01\x12\tevm@1.0.0\x1a\xa3\x04\n" + @@ -2060,7 +1845,7 @@ func file_capabilities_blockchain_evm_v1alpha_client_proto_rawDescGZIP() []byte } var file_capabilities_blockchain_evm_v1alpha_client_proto_enumTypes = make([]protoimpl.EnumInfo, 3) -var file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes = make([]protoimpl.MessageInfo, 29) +var file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes = make([]protoimpl.MessageInfo, 26) var file_capabilities_blockchain_evm_v1alpha_client_proto_goTypes = []any{ (ConfidenceLevel)(0), // 0: capabilities.blockchain.evm.v1alpha.ConfidenceLevel (ReceiverContractExecutionStatus)(0), // 1: capabilities.blockchain.evm.v1alpha.ReceiverContractExecutionStatus @@ -2088,73 +1873,64 @@ var file_capabilities_blockchain_evm_v1alpha_client_proto_goTypes = []any{ (*HeaderByNumberRequest)(nil), // 23: capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest (*HeaderByNumberReply)(nil), // 24: capabilities.blockchain.evm.v1alpha.HeaderByNumberReply (*Header)(nil), // 25: capabilities.blockchain.evm.v1alpha.Header - (*RegisterLogTrackingRequest)(nil), // 26: capabilities.blockchain.evm.v1alpha.RegisterLogTrackingRequest - (*LPFilter)(nil), // 27: capabilities.blockchain.evm.v1alpha.LPFilter - (*UnregisterLogTrackingRequest)(nil), // 28: capabilities.blockchain.evm.v1alpha.UnregisterLogTrackingRequest - (*WriteReportRequest)(nil), // 29: capabilities.blockchain.evm.v1alpha.WriteReportRequest - (*GasConfig)(nil), // 30: capabilities.blockchain.evm.v1alpha.GasConfig - (*WriteReportReply)(nil), // 31: capabilities.blockchain.evm.v1alpha.WriteReportReply - (*pb.BigInt)(nil), // 32: values.v1.BigInt - (*sdk.ReportResponse)(nil), // 33: sdk.v1alpha.ReportResponse - (*emptypb.Empty)(nil), // 34: google.protobuf.Empty + (*WriteReportRequest)(nil), // 26: capabilities.blockchain.evm.v1alpha.WriteReportRequest + (*GasConfig)(nil), // 27: capabilities.blockchain.evm.v1alpha.GasConfig + (*WriteReportReply)(nil), // 28: capabilities.blockchain.evm.v1alpha.WriteReportReply + (*pb.BigInt)(nil), // 29: values.v1.BigInt + (*sdk.ReportResponse)(nil), // 30: sdk.v1alpha.ReportResponse } var file_capabilities_blockchain_evm_v1alpha_client_proto_depIdxs = []int32{ 3, // 0: capabilities.blockchain.evm.v1alpha.FilterLogTriggerRequest.topics:type_name -> capabilities.blockchain.evm.v1alpha.TopicValues 0, // 1: capabilities.blockchain.evm.v1alpha.FilterLogTriggerRequest.confidence:type_name -> capabilities.blockchain.evm.v1alpha.ConfidenceLevel 10, // 2: capabilities.blockchain.evm.v1alpha.CallContractRequest.call:type_name -> capabilities.blockchain.evm.v1alpha.CallMsg - 32, // 3: capabilities.blockchain.evm.v1alpha.CallContractRequest.block_number:type_name -> values.v1.BigInt + 29, // 3: capabilities.blockchain.evm.v1alpha.CallContractRequest.block_number:type_name -> values.v1.BigInt 11, // 4: capabilities.blockchain.evm.v1alpha.FilterLogsRequest.filter_query:type_name -> capabilities.blockchain.evm.v1alpha.FilterQuery 9, // 5: capabilities.blockchain.evm.v1alpha.FilterLogsReply.logs:type_name -> capabilities.blockchain.evm.v1alpha.Log - 32, // 6: capabilities.blockchain.evm.v1alpha.Log.block_number:type_name -> values.v1.BigInt - 32, // 7: capabilities.blockchain.evm.v1alpha.FilterQuery.from_block:type_name -> values.v1.BigInt - 32, // 8: capabilities.blockchain.evm.v1alpha.FilterQuery.to_block:type_name -> values.v1.BigInt + 29, // 6: capabilities.blockchain.evm.v1alpha.Log.block_number:type_name -> values.v1.BigInt + 29, // 7: capabilities.blockchain.evm.v1alpha.FilterQuery.from_block:type_name -> values.v1.BigInt + 29, // 8: capabilities.blockchain.evm.v1alpha.FilterQuery.to_block:type_name -> values.v1.BigInt 12, // 9: capabilities.blockchain.evm.v1alpha.FilterQuery.topics:type_name -> capabilities.blockchain.evm.v1alpha.Topics - 32, // 10: capabilities.blockchain.evm.v1alpha.BalanceAtRequest.block_number:type_name -> values.v1.BigInt - 32, // 11: capabilities.blockchain.evm.v1alpha.BalanceAtReply.balance:type_name -> values.v1.BigInt + 29, // 10: capabilities.blockchain.evm.v1alpha.BalanceAtRequest.block_number:type_name -> values.v1.BigInt + 29, // 11: capabilities.blockchain.evm.v1alpha.BalanceAtReply.balance:type_name -> values.v1.BigInt 10, // 12: capabilities.blockchain.evm.v1alpha.EstimateGasRequest.msg:type_name -> capabilities.blockchain.evm.v1alpha.CallMsg 19, // 13: capabilities.blockchain.evm.v1alpha.GetTransactionByHashReply.transaction:type_name -> capabilities.blockchain.evm.v1alpha.Transaction - 32, // 14: capabilities.blockchain.evm.v1alpha.Transaction.value:type_name -> values.v1.BigInt - 32, // 15: capabilities.blockchain.evm.v1alpha.Transaction.gas_price:type_name -> values.v1.BigInt + 29, // 14: capabilities.blockchain.evm.v1alpha.Transaction.value:type_name -> values.v1.BigInt + 29, // 15: capabilities.blockchain.evm.v1alpha.Transaction.gas_price:type_name -> values.v1.BigInt 22, // 16: capabilities.blockchain.evm.v1alpha.GetTransactionReceiptReply.receipt:type_name -> capabilities.blockchain.evm.v1alpha.Receipt 9, // 17: capabilities.blockchain.evm.v1alpha.Receipt.logs:type_name -> capabilities.blockchain.evm.v1alpha.Log - 32, // 18: capabilities.blockchain.evm.v1alpha.Receipt.effective_gas_price:type_name -> values.v1.BigInt - 32, // 19: capabilities.blockchain.evm.v1alpha.Receipt.block_number:type_name -> values.v1.BigInt - 32, // 20: capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest.block_number:type_name -> values.v1.BigInt + 29, // 18: capabilities.blockchain.evm.v1alpha.Receipt.effective_gas_price:type_name -> values.v1.BigInt + 29, // 19: capabilities.blockchain.evm.v1alpha.Receipt.block_number:type_name -> values.v1.BigInt + 29, // 20: capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest.block_number:type_name -> values.v1.BigInt 25, // 21: capabilities.blockchain.evm.v1alpha.HeaderByNumberReply.header:type_name -> capabilities.blockchain.evm.v1alpha.Header - 32, // 22: capabilities.blockchain.evm.v1alpha.Header.block_number:type_name -> values.v1.BigInt - 27, // 23: capabilities.blockchain.evm.v1alpha.RegisterLogTrackingRequest.filter:type_name -> capabilities.blockchain.evm.v1alpha.LPFilter - 33, // 24: capabilities.blockchain.evm.v1alpha.WriteReportRequest.report:type_name -> sdk.v1alpha.ReportResponse - 30, // 25: capabilities.blockchain.evm.v1alpha.WriteReportRequest.gas_config:type_name -> capabilities.blockchain.evm.v1alpha.GasConfig - 2, // 26: capabilities.blockchain.evm.v1alpha.WriteReportReply.tx_status:type_name -> capabilities.blockchain.evm.v1alpha.TxStatus - 1, // 27: capabilities.blockchain.evm.v1alpha.WriteReportReply.receiver_contract_execution_status:type_name -> capabilities.blockchain.evm.v1alpha.ReceiverContractExecutionStatus - 32, // 28: capabilities.blockchain.evm.v1alpha.WriteReportReply.transaction_fee:type_name -> values.v1.BigInt - 5, // 29: capabilities.blockchain.evm.v1alpha.Client.CallContract:input_type -> capabilities.blockchain.evm.v1alpha.CallContractRequest - 7, // 30: capabilities.blockchain.evm.v1alpha.Client.FilterLogs:input_type -> capabilities.blockchain.evm.v1alpha.FilterLogsRequest - 13, // 31: capabilities.blockchain.evm.v1alpha.Client.BalanceAt:input_type -> capabilities.blockchain.evm.v1alpha.BalanceAtRequest - 15, // 32: capabilities.blockchain.evm.v1alpha.Client.EstimateGas:input_type -> capabilities.blockchain.evm.v1alpha.EstimateGasRequest - 17, // 33: capabilities.blockchain.evm.v1alpha.Client.GetTransactionByHash:input_type -> capabilities.blockchain.evm.v1alpha.GetTransactionByHashRequest - 20, // 34: capabilities.blockchain.evm.v1alpha.Client.GetTransactionReceipt:input_type -> capabilities.blockchain.evm.v1alpha.GetTransactionReceiptRequest - 23, // 35: capabilities.blockchain.evm.v1alpha.Client.HeaderByNumber:input_type -> capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest - 26, // 36: capabilities.blockchain.evm.v1alpha.Client.RegisterLogTracking:input_type -> capabilities.blockchain.evm.v1alpha.RegisterLogTrackingRequest - 28, // 37: capabilities.blockchain.evm.v1alpha.Client.UnregisterLogTracking:input_type -> capabilities.blockchain.evm.v1alpha.UnregisterLogTrackingRequest - 4, // 38: capabilities.blockchain.evm.v1alpha.Client.LogTrigger:input_type -> capabilities.blockchain.evm.v1alpha.FilterLogTriggerRequest - 29, // 39: capabilities.blockchain.evm.v1alpha.Client.WriteReport:input_type -> capabilities.blockchain.evm.v1alpha.WriteReportRequest - 6, // 40: capabilities.blockchain.evm.v1alpha.Client.CallContract:output_type -> capabilities.blockchain.evm.v1alpha.CallContractReply - 8, // 41: capabilities.blockchain.evm.v1alpha.Client.FilterLogs:output_type -> capabilities.blockchain.evm.v1alpha.FilterLogsReply - 14, // 42: capabilities.blockchain.evm.v1alpha.Client.BalanceAt:output_type -> capabilities.blockchain.evm.v1alpha.BalanceAtReply - 16, // 43: capabilities.blockchain.evm.v1alpha.Client.EstimateGas:output_type -> capabilities.blockchain.evm.v1alpha.EstimateGasReply - 18, // 44: capabilities.blockchain.evm.v1alpha.Client.GetTransactionByHash:output_type -> capabilities.blockchain.evm.v1alpha.GetTransactionByHashReply - 21, // 45: capabilities.blockchain.evm.v1alpha.Client.GetTransactionReceipt:output_type -> capabilities.blockchain.evm.v1alpha.GetTransactionReceiptReply - 24, // 46: capabilities.blockchain.evm.v1alpha.Client.HeaderByNumber:output_type -> capabilities.blockchain.evm.v1alpha.HeaderByNumberReply - 34, // 47: capabilities.blockchain.evm.v1alpha.Client.RegisterLogTracking:output_type -> google.protobuf.Empty - 34, // 48: capabilities.blockchain.evm.v1alpha.Client.UnregisterLogTracking:output_type -> google.protobuf.Empty - 9, // 49: capabilities.blockchain.evm.v1alpha.Client.LogTrigger:output_type -> capabilities.blockchain.evm.v1alpha.Log - 31, // 50: capabilities.blockchain.evm.v1alpha.Client.WriteReport:output_type -> capabilities.blockchain.evm.v1alpha.WriteReportReply - 40, // [40:51] is the sub-list for method output_type - 29, // [29:40] is the sub-list for method input_type - 29, // [29:29] is the sub-list for extension type_name - 29, // [29:29] is the sub-list for extension extendee - 0, // [0:29] is the sub-list for field type_name + 29, // 22: capabilities.blockchain.evm.v1alpha.Header.block_number:type_name -> values.v1.BigInt + 30, // 23: capabilities.blockchain.evm.v1alpha.WriteReportRequest.report:type_name -> sdk.v1alpha.ReportResponse + 27, // 24: capabilities.blockchain.evm.v1alpha.WriteReportRequest.gas_config:type_name -> capabilities.blockchain.evm.v1alpha.GasConfig + 2, // 25: capabilities.blockchain.evm.v1alpha.WriteReportReply.tx_status:type_name -> capabilities.blockchain.evm.v1alpha.TxStatus + 1, // 26: capabilities.blockchain.evm.v1alpha.WriteReportReply.receiver_contract_execution_status:type_name -> capabilities.blockchain.evm.v1alpha.ReceiverContractExecutionStatus + 29, // 27: capabilities.blockchain.evm.v1alpha.WriteReportReply.transaction_fee:type_name -> values.v1.BigInt + 5, // 28: capabilities.blockchain.evm.v1alpha.Client.CallContract:input_type -> capabilities.blockchain.evm.v1alpha.CallContractRequest + 7, // 29: capabilities.blockchain.evm.v1alpha.Client.FilterLogs:input_type -> capabilities.blockchain.evm.v1alpha.FilterLogsRequest + 13, // 30: capabilities.blockchain.evm.v1alpha.Client.BalanceAt:input_type -> capabilities.blockchain.evm.v1alpha.BalanceAtRequest + 15, // 31: capabilities.blockchain.evm.v1alpha.Client.EstimateGas:input_type -> capabilities.blockchain.evm.v1alpha.EstimateGasRequest + 17, // 32: capabilities.blockchain.evm.v1alpha.Client.GetTransactionByHash:input_type -> capabilities.blockchain.evm.v1alpha.GetTransactionByHashRequest + 20, // 33: capabilities.blockchain.evm.v1alpha.Client.GetTransactionReceipt:input_type -> capabilities.blockchain.evm.v1alpha.GetTransactionReceiptRequest + 23, // 34: capabilities.blockchain.evm.v1alpha.Client.HeaderByNumber:input_type -> capabilities.blockchain.evm.v1alpha.HeaderByNumberRequest + 4, // 35: capabilities.blockchain.evm.v1alpha.Client.LogTrigger:input_type -> capabilities.blockchain.evm.v1alpha.FilterLogTriggerRequest + 26, // 36: capabilities.blockchain.evm.v1alpha.Client.WriteReport:input_type -> capabilities.blockchain.evm.v1alpha.WriteReportRequest + 6, // 37: capabilities.blockchain.evm.v1alpha.Client.CallContract:output_type -> capabilities.blockchain.evm.v1alpha.CallContractReply + 8, // 38: capabilities.blockchain.evm.v1alpha.Client.FilterLogs:output_type -> capabilities.blockchain.evm.v1alpha.FilterLogsReply + 14, // 39: capabilities.blockchain.evm.v1alpha.Client.BalanceAt:output_type -> capabilities.blockchain.evm.v1alpha.BalanceAtReply + 16, // 40: capabilities.blockchain.evm.v1alpha.Client.EstimateGas:output_type -> capabilities.blockchain.evm.v1alpha.EstimateGasReply + 18, // 41: capabilities.blockchain.evm.v1alpha.Client.GetTransactionByHash:output_type -> capabilities.blockchain.evm.v1alpha.GetTransactionByHashReply + 21, // 42: capabilities.blockchain.evm.v1alpha.Client.GetTransactionReceipt:output_type -> capabilities.blockchain.evm.v1alpha.GetTransactionReceiptReply + 24, // 43: capabilities.blockchain.evm.v1alpha.Client.HeaderByNumber:output_type -> capabilities.blockchain.evm.v1alpha.HeaderByNumberReply + 9, // 44: capabilities.blockchain.evm.v1alpha.Client.LogTrigger:output_type -> capabilities.blockchain.evm.v1alpha.Log + 28, // 45: capabilities.blockchain.evm.v1alpha.Client.WriteReport:output_type -> capabilities.blockchain.evm.v1alpha.WriteReportReply + 37, // [37:46] is the sub-list for method output_type + 28, // [28:37] is the sub-list for method input_type + 28, // [28:28] is the sub-list for extension type_name + 28, // [28:28] is the sub-list for extension extendee + 0, // [0:28] is the sub-list for field type_name } func init() { file_capabilities_blockchain_evm_v1alpha_client_proto_init() } @@ -2162,15 +1938,15 @@ func file_capabilities_blockchain_evm_v1alpha_client_proto_init() { if File_capabilities_blockchain_evm_v1alpha_client_proto != nil { return } - file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[26].OneofWrappers = []any{} - file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[28].OneofWrappers = []any{} + file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[23].OneofWrappers = []any{} + file_capabilities_blockchain_evm_v1alpha_client_proto_msgTypes[25].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_capabilities_blockchain_evm_v1alpha_client_proto_rawDesc), len(file_capabilities_blockchain_evm_v1alpha_client_proto_rawDesc)), NumEnums: 3, - NumMessages: 29, + NumMessages: 26, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers.go b/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers.go index 93e7707e4..5d095b880 100644 --- a/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers.go +++ b/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers.go @@ -2,7 +2,6 @@ package evm import ( "fmt" - "time" "github.com/smartcontractkit/chainlink-common/pkg/chains/evm" evmtypes "github.com/smartcontractkit/chainlink-common/pkg/types/chains/evm" @@ -187,67 +186,6 @@ func ConvertCallMsgFromProto(protoMsg *CallMsg) (*evmtypes.CallMsg, error) { return callMsg, nil } -func ConvertLPFilterToProto(filter evmtypes.LPFilterQuery) *LPFilter { - return &LPFilter{ - Name: filter.Name, - RetentionTime: int64(filter.Retention), - Addresses: evm.ConvertAddressesToProto(filter.Addresses), - EventSigs: evm.ConvertHashesToProto(filter.EventSigs), - Topic2: evm.ConvertHashesToProto(filter.Topic2), - Topic3: evm.ConvertHashesToProto(filter.Topic3), - Topic4: evm.ConvertHashesToProto(filter.Topic4), - MaxLogsKept: filter.MaxLogsKept, - LogsPerBlock: filter.LogsPerBlock, - } -} - -func ConvertLPFilterFromProto(protoFilter *LPFilter) (evmtypes.LPFilterQuery, error) { - if protoFilter == nil { - return evmtypes.LPFilterQuery{}, evm.ErrEmptyFilter - } - - var addresses []evmtypes.Address - for i, protoAddress := range protoFilter.GetAddresses() { - address, err := evm.ConvertOptionalAddressFromProto(protoAddress) - if err != nil { - return evmtypes.LPFilterQuery{}, fmt.Errorf("failed to convert address[%d]: %w", i, err) - } - addresses = append(addresses, address) - } - - sigs, err := evm.ConvertHashesFromProto(protoFilter.GetEventSigs()) - if err != nil { - return evmtypes.LPFilterQuery{}, fmt.Errorf("failed to convert event sigs: %w", err) - } - - t2, err := evm.ConvertHashesFromProto(protoFilter.GetTopic2()) - if err != nil { - return evmtypes.LPFilterQuery{}, fmt.Errorf("failed to convert topic2: %w", err) - } - - t3, err := evm.ConvertHashesFromProto(protoFilter.GetTopic3()) - if err != nil { - return evmtypes.LPFilterQuery{}, fmt.Errorf("failed to convert topic3: %w", err) - } - - t4, err := evm.ConvertHashesFromProto(protoFilter.GetTopic4()) - if err != nil { - return evmtypes.LPFilterQuery{}, fmt.Errorf("failed to convert topic4: %w", err) - } - - return evmtypes.LPFilterQuery{ - Name: protoFilter.GetName(), - Retention: time.Duration(protoFilter.GetRetentionTime()), - Addresses: addresses, - EventSigs: sigs, - Topic2: t2, - Topic3: t3, - Topic4: t4, - MaxLogsKept: protoFilter.GetMaxLogsKept(), - LogsPerBlock: protoFilter.GetLogsPerBlock(), - }, nil -} - func ConvertFilterToProto(filter evmtypes.FilterQuery) (*FilterQuery, error) { topics, err := convertTopicsToProto(filter.Topics) if err != nil { diff --git a/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers_test.go b/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers_test.go index 0449481cf..53aa4dcc2 100644 --- a/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers_test.go +++ b/pkg/capabilities/v2/chain-capabilities/evm/proto_helpers_test.go @@ -2,7 +2,6 @@ package evm_test import ( "testing" - "time" protoevm "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/chain-capabilities/evm" chainevm "github.com/smartcontractkit/chainlink-common/pkg/chains/evm" @@ -358,62 +357,6 @@ func TestFilterQuery_Conversions(t *testing.T) { }) } -func TestLPFilter_Conversions(t *testing.T) { - t.Run("roundtrip to proto", func(t *testing.T) { - in := evmtypes.LPFilterQuery{ - Name: "my-filter", - Retention: 5 * time.Minute, - Addresses: []evmtypes.Address{a20(0x01)}, - EventSigs: []evmtypes.Hash{h32(0x02)}, - Topic2: []evmtypes.Hash{h32(0x03)}, - Topic3: []evmtypes.Hash{h32(0x04)}, - Topic4: []evmtypes.Hash{h32(0x05)}, - MaxLogsKept: 123, - LogsPerBlock: 7, - } - p := protoevm.ConvertLPFilterToProto(in) - out, err := protoevm.ConvertLPFilterFromProto(p) - require.NoError(t, err) - - assert.Equal(t, in.Name, out.Name) - assert.Equal(t, in.Retention, out.Retention) - assert.Equal(t, in.MaxLogsKept, out.MaxLogsKept) - assert.Equal(t, in.LogsPerBlock, out.LogsPerBlock) - assert.Equal(t, in.Addresses, out.Addresses) - assert.Equal(t, in.EventSigs, out.EventSigs) - assert.Equal(t, in.Topic2, out.Topic2) - assert.Equal(t, in.Topic3, out.Topic3) - assert.Equal(t, in.Topic4, out.Topic4) - }) - - t.Run("roundtrip from proto", func(t *testing.T) { - p := &protoevm.LPFilter{ - Name: "other-filter", - RetentionTime: int64(2 * time.Hour), - Addresses: [][]byte{b20(0x11), b20(0x12)}, - EventSigs: [][]byte{b32(0x21)}, - Topic2: [][]byte{b32(0x22)}, - Topic3: [][]byte{b32(0x23)}, - Topic4: [][]byte{b32(0x24)}, - MaxLogsKept: 456, - LogsPerBlock: 3, - } - d, err := protoevm.ConvertLPFilterFromProto(p) - require.NoError(t, err) - p2 := protoevm.ConvertLPFilterToProto(d) - - assert.Equal(t, p.Name, p2.Name) - assert.Equal(t, p.RetentionTime, p2.RetentionTime) - assert.Equal(t, p.Addresses, p2.Addresses) - assert.Equal(t, p.EventSigs, p2.EventSigs) - assert.Equal(t, p.Topic2, p2.Topic2) - assert.Equal(t, p.Topic3, p2.Topic3) - assert.Equal(t, p.Topic4, p2.Topic4) - assert.Equal(t, p.MaxLogsKept, p2.MaxLogsKept) - assert.Equal(t, p.LogsPerBlock, p2.LogsPerBlock) - }) -} - func TestLog_Conversions(t *testing.T) { t.Run("roundtrip to proto", func(t *testing.T) { l := evmtypes.Log{ diff --git a/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go index 909374ed8..c6c4eeb46 100644 --- a/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go +++ b/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go @@ -33,10 +33,6 @@ type ClientCapability interface { HeaderByNumber(ctx context.Context, metadata capabilities.RequestMetadata, input *evm.HeaderByNumberRequest) (*capabilities.ResponseAndMetadata[*evm.HeaderByNumberReply], error) - RegisterLogTracking(ctx context.Context, metadata capabilities.RequestMetadata, input *evm.RegisterLogTrackingRequest) (*capabilities.ResponseAndMetadata[*emptypb.Empty], error) - - UnregisterLogTracking(ctx context.Context, metadata capabilities.RequestMetadata, input *evm.UnregisterLogTrackingRequest) (*capabilities.ResponseAndMetadata[*emptypb.Empty], error) - RegisterLogTrigger(ctx context.Context, triggerID string, metadata capabilities.RequestMetadata, input *evm.FilterLogTriggerRequest) (<-chan capabilities.TriggerAndId[*evm.Log], error) UnregisterLogTrigger(ctx context.Context, triggerID string, metadata capabilities.RequestMetadata, input *evm.FilterLogTriggerRequest) error @@ -255,34 +251,6 @@ func (c *clientCapability) Execute(ctx context.Context, request capabilities.Cap return output.Response, output.ResponseMetadata, err } return capabilities.Execute(ctx, request, input, config, wrapped) - case "RegisterLogTracking": - input := &evm.RegisterLogTrackingRequest{} - config := &emptypb.Empty{} - wrapped := func(ctx context.Context, metadata capabilities.RequestMetadata, input *evm.RegisterLogTrackingRequest, _ *emptypb.Empty) (*emptypb.Empty, capabilities.ResponseMetadata, error) { - output, err := c.ClientCapability.RegisterLogTracking(ctx, metadata, input) - if err != nil { - return nil, capabilities.ResponseMetadata{}, err - } - if output == nil { - return nil, capabilities.ResponseMetadata{}, fmt.Errorf("output and error is nil for method RegisterLogTracking(..) (if output is nil error must be present)") - } - return output.Response, output.ResponseMetadata, err - } - return capabilities.Execute(ctx, request, input, config, wrapped) - case "UnregisterLogTracking": - input := &evm.UnregisterLogTrackingRequest{} - config := &emptypb.Empty{} - wrapped := func(ctx context.Context, metadata capabilities.RequestMetadata, input *evm.UnregisterLogTrackingRequest, _ *emptypb.Empty) (*emptypb.Empty, capabilities.ResponseMetadata, error) { - output, err := c.ClientCapability.UnregisterLogTracking(ctx, metadata, input) - if err != nil { - return nil, capabilities.ResponseMetadata{}, err - } - if output == nil { - return nil, capabilities.ResponseMetadata{}, fmt.Errorf("output and error is nil for method UnregisterLogTracking(..) (if output is nil error must be present)") - } - return output.Response, output.ResponseMetadata, err - } - return capabilities.Execute(ctx, request, input, config, wrapped) case "WriteReport": input := &evm.WriteReportRequest{} config := &emptypb.Empty{}