From 2867080da37ba1f863188e6fec3e0d3271d83a75 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 18 Jun 2024 14:54:54 +0200 Subject: [PATCH 1/4] feat(observability-lib): add logPanel for Core Node Components dashboard (#571) --- observability-lib/cmd/deploy.go | 2 +- observability-lib/cmd/generate.go | 2 +- .../core-node-components/component.go | 15 +++++++++++- .../core-node-components/platform.go | 1 + observability-lib/utils/common.go | 23 +++++++++++++++++++ 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/observability-lib/cmd/deploy.go b/observability-lib/cmd/deploy.go index cc9cef327..9dd42583d 100644 --- a/observability-lib/cmd/deploy.go +++ b/observability-lib/cmd/deploy.go @@ -37,7 +37,7 @@ var DeployCmd = &cobra.Command{ case "core-node": builder, err = corenode.BuildDashboard(name, dataSourcesType.Metrics, platform) case "core-node-components": - builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics) + builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs) case "core-node-resources": builder, err = k8sresources.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs) case "ocr": diff --git a/observability-lib/cmd/generate.go b/observability-lib/cmd/generate.go index abf04ee56..901741760 100644 --- a/observability-lib/cmd/generate.go +++ b/observability-lib/cmd/generate.go @@ -36,7 +36,7 @@ var GenerateCmd = &cobra.Command{ case "core-node": builder, err = corenode.BuildDashboard(name, dataSourcesType.Metrics, platform) case "core-node-components": - builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics) + builder, err = corenodecomponents.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs) case "core-node-resources": builder, err = k8sresources.BuildDashboard(name, dataSourcesType.Metrics, dataSourcesType.Logs) case "ocr": diff --git a/observability-lib/core-node-components/component.go b/observability-lib/core-node-components/component.go index b70fba94b..50f15e2aa 100644 --- a/observability-lib/core-node-components/component.go +++ b/observability-lib/core-node-components/component.go @@ -9,9 +9,10 @@ import ( "github.com/smartcontractkit/chainlink-common/observability-lib/utils" ) -func BuildDashboard(name string, dataSourceMetric string) (dashboard.Dashboard, error) { +func BuildDashboard(name string, dataSourceMetric string, dataSourceLog string) (dashboard.Dashboard, error) { props := Props{ MetricsDataSource: dataSourceMetric, + LogsDataSource: dataSourceLog, PlatformOpts: PlatformPanelOpts(), } @@ -140,5 +141,17 @@ func panelsGeneralInfo(p Props) []cog.Builder[dashboard.Panel] { }, ).Min(0).Max(100)) + panelsArray = append(panelsArray, utils.LogPanel( + p.LogsDataSource, + "Logs with severity >= error", + "", + 6, + 24, + utils.PrometheusQuery{ + Query: `{env="${env}", cluster="${cluster}", product="${product}", network_type="${network_type}", instance=~"${service}"} | json | level=~"(error|panic|fatal|crit)"`, + Legend: "", + }, + )) + return panelsArray } diff --git a/observability-lib/core-node-components/platform.go b/observability-lib/core-node-components/platform.go index 430511177..bfa72dfbc 100644 --- a/observability-lib/core-node-components/platform.go +++ b/observability-lib/core-node-components/platform.go @@ -11,6 +11,7 @@ type PlatformOpts struct { type Props struct { MetricsDataSource string + LogsDataSource string PlatformOpts PlatformOpts } diff --git a/observability-lib/utils/common.go b/observability-lib/utils/common.go index cc0700692..96a1106e0 100644 --- a/observability-lib/utils/common.go +++ b/observability-lib/utils/common.go @@ -5,6 +5,7 @@ import ( "github.com/grafana/grafana-foundation-sdk/go/common" "github.com/grafana/grafana-foundation-sdk/go/dashboard" "github.com/grafana/grafana-foundation-sdk/go/gauge" + "github.com/grafana/grafana-foundation-sdk/go/logs" "github.com/grafana/grafana-foundation-sdk/go/prometheus" "github.com/grafana/grafana-foundation-sdk/go/stat" "github.com/grafana/grafana-foundation-sdk/go/table" @@ -189,3 +190,25 @@ func TablePanel( return panel } + +func LogPanel( + datasource string, + title string, + description string, + height uint32, + span uint32, + query ...PrometheusQuery, +) *logs.PanelBuilder { + panel := logs.NewPanelBuilder(). + Datasource(datasourceRef(datasource)). + Height(height). + Span(span). + Title(title). + Description(description) + + for _, q := range query { + panel.WithTarget(prometheusQuery(q.Query, q.Legend)) + } + + return panel +} From de3e17788c18ae4e56df4069ddc7ccc4eeabb066 Mon Sep 17 00:00:00 2001 From: Rens Rooimans Date: Tue, 18 Jun 2024 16:04:44 +0200 Subject: [PATCH 2/4] remove DestinationPool from OffRampTokens (#590) * remove DestinationPool from OffRampTokens * reserve old field --- README.md | 9 + pkg/loop/internal/README.md | 3 + pkg/loop/internal/pb/ccip/offramp.pb.go | 350 +++++++++--------- pkg/loop/internal/pb/ccip/offramp.proto | 2 +- .../pluginprovider/ext/ccip/offramp.go | 10 - .../pluginprovider/ext/ccip/test/offramp.go | 11 +- pkg/types/ccip/offramp.go | 1 - 7 files changed, 182 insertions(+), 204 deletions(-) diff --git a/README.md b/README.md index 2e94e99db..ff40ac696 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ # chainlink-common SDK for implementing Chainlink Services, like Chain Relayers or Product Plugins. + +Internal references + +- [loop](pkg/loop/README.md) + - [loop/internal](./pkg/loop/internal/README.md) + - Reporting plugins + - Protobuf definitions + + diff --git a/pkg/loop/internal/README.md b/pkg/loop/internal/README.md index 5d2568dcb..5e8355a98 100644 --- a/pkg/loop/internal/README.md +++ b/pkg/loop/internal/README.md @@ -77,6 +77,9 @@ Product specific development is the most nuanced kind of development. There are ## Protobuf best practices + It's extremely important to be mindful of compatibility when changing protobuf definition. See the [official best practices](https://protobuf.dev/programming-guides/dos-donts/) for details. +To update protobuf, update the corresponding `.proto` file in the `pb` package. Then run `make generate` to regenerate the code. + ## FAQ \ No newline at end of file diff --git a/pkg/loop/internal/pb/ccip/offramp.pb.go b/pkg/loop/internal/pb/ccip/offramp.pb.go index 153a8cb51..323e08f76 100644 --- a/pkg/loop/internal/pb/ccip/offramp.pb.go +++ b/pkg/loop/internal/pb/ccip/offramp.pb.go @@ -1440,9 +1440,8 @@ type OffRampTokens struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DestinationTokens []string `protobuf:"bytes,1,rep,name=destination_tokens,json=destinationTokens,proto3" json:"destination_tokens,omitempty"` // []Address - SourceTokens []string `protobuf:"bytes,2,rep,name=source_tokens,json=sourceTokens,proto3" json:"source_tokens,omitempty"` // []Address - DestinationPool map[string]string `protobuf:"bytes,3,rep,name=destination_pool,json=destinationPool,proto3" json:"destination_pool,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // map[Address]Address + DestinationTokens []string `protobuf:"bytes,1,rep,name=destination_tokens,json=destinationTokens,proto3" json:"destination_tokens,omitempty"` // []Address + SourceTokens []string `protobuf:"bytes,2,rep,name=source_tokens,json=sourceTokens,proto3" json:"source_tokens,omitempty"` // []Address } func (x *OffRampTokens) Reset() { @@ -1491,13 +1490,6 @@ func (x *OffRampTokens) GetSourceTokens() []string { return nil } -func (x *OffRampTokens) GetDestinationPool() map[string]string { - if x != nil { - return x.DestinationPool - } - return nil -} - var File_offramp_proto protoreflect.FileDescriptor var file_offramp_proto_rawDesc = []byte{ @@ -1706,135 +1698,125 @@ var file_offramp_proto_rawDesc = []byte{ 0x70, 0x72, 0x65, 0x76, 0x5f, 0x6f, 0x66, 0x66, 0x5f, 0x72, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x76, 0x4f, 0x66, 0x66, 0x52, 0x61, 0x6d, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x61, 0x72, 0x6d, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x6d, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x22, 0x8d, 0x02, - 0x0a, 0x0d, 0x4f, 0x66, 0x66, 0x52, 0x61, 0x6d, 0x70, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, - 0x2d, 0x0a, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x64, 0x65, 0x73, - 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x23, - 0x0a, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x73, 0x12, 0x64, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x6d, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x22, 0x69, 0x0a, + 0x0d, 0x4f, 0x66, 0x66, 0x52, 0x61, 0x6d, 0x70, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x2d, + 0x0a, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, + 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x64, 0x65, 0x73, 0x74, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x23, 0x0a, + 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x6f, 0x6b, 0x65, + 0x6e, 0x73, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x32, 0x90, 0x0d, 0x0a, 0x0d, 0x4f, 0x66, 0x66, + 0x52, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x07, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2d, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, - 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x66, 0x66, 0x52, 0x61, 0x6d, 0x70, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x73, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, - 0x6f, 0x6f, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x1a, 0x42, 0x0a, 0x14, 0x44, 0x65, 0x73, - 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x32, 0x90, 0x0d, - 0x0a, 0x0d, 0x4f, 0x66, 0x66, 0x52, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, - 0x52, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x1a, 0x2d, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x66, 0x66, 0x52, 0x61, - 0x6d, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x69, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x12, 0x2a, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x2b, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, - 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6b, - 0x0a, 0x17, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x1a, 0x36, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, - 0x74, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x15, - 0x44, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, + 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x66, 0x66, 0x52, 0x61, 0x6d, 0x70, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x69, + 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2a, + 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, + 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x6c, 0x6f, 0x6f, + 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, + 0x69, 0x70, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6b, 0x0a, 0x17, 0x43, 0x75, 0x72, + 0x72, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x36, 0x2e, 0x6c, + 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, + 0x63, 0x63, 0x69, 0x70, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x74, 0x65, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x15, 0x44, 0x65, 0x63, 0x6f, 0x64, + 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, + 0x12, 0x33, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x44, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x45, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x44, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6c, 0x6f, 0x6f, - 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, - 0x69, 0x70, 0x2e, 0x44, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x2e, 0x6c, + 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, + 0x0a, 0x15, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, + 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x45, 0x78, 0x65, 0x63, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x34, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x65, - 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5f, 0x0a, 0x11, 0x47, 0x61, 0x73, - 0x50, 0x72, 0x69, 0x63, 0x65, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x30, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, - 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x6f, 0x72, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, - 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, - 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, - 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x30, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x8d, 0x01, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, - 0x73, 0x12, 0x36, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, - 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, - 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x72, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x5f, 0x0a, 0x11, 0x47, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, + 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x1a, 0x30, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x61, 0x73, 0x50, 0x72, 0x69, + 0x63, 0x65, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, + 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, + 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x6c, 0x6f, + 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, + 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x8d, 0x01, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x12, 0x36, 0x2e, 0x6c, + 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, + 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, + 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x4f, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x28, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x75, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x6f, 0x44, + 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, + 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x3b, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, + 0x2e, 0x47, 0x65, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x6f, 0x44, 0x65, 0x73, 0x74, + 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x53, 0x74, + 0x61, 0x74, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x1a, 0x2e, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, + 0x61, 0x74, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x28, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, - 0x70, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x53, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x54, 0x6f, 0x44, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x4d, 0x61, - 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x3b, 0x2e, - 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, - 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, - 0x6f, 0x44, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x4d, 0x61, 0x70, 0x70, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x0f, - 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, - 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2e, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, - 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x09, 0x47, 0x65, 0x74, - 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x28, - 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, - 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x10, 0x4c, 0x69, - 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x2e, - 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, - 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, - 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, - 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x59, 0x0a, 0x0e, 0x4f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2d, 0x2e, 0x6c, 0x6f, - 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, - 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0d, - 0x4f, 0x6e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x6e, - 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x05, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x12, 0x16, + 0x70, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x2e, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, + 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, + 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x6e, 0x63, + 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, + 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, + 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x6e, 0x63, + 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x59, 0x0a, 0x0e, + 0x4f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, - 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, - 0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, - 0x63, 0x68, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6c, 0x6f, 0x6f, 0x70, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2f, 0x70, 0x62, 0x2f, 0x63, 0x63, 0x69, 0x70, 0x3b, 0x63, 0x63, 0x69, 0x70, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2d, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, + 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0d, 0x4f, 0x6e, 0x63, 0x68, 0x61, + 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x1a, 0x2c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x6e, 0x63, 0x68, 0x61, 0x69, 0x6e, + 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x39, 0x0a, 0x05, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x4f, 0x5a, 0x4d, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x6b, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x6b, 0x67, 0x2f, + 0x6c, 0x6f, 0x6f, 0x70, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x62, + 0x2f, 0x63, 0x63, 0x69, 0x70, 0x3b, 0x63, 0x63, 0x69, 0x70, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1849,7 +1831,7 @@ func file_offramp_proto_rawDescGZIP() []byte { return file_offramp_proto_rawDescData } -var file_offramp_proto_msgTypes = make([]protoimpl.MessageInfo, 30) +var file_offramp_proto_msgTypes = make([]protoimpl.MessageInfo, 29) var file_offramp_proto_goTypes = []interface{}{ (*EncodeExecutionReportRequest)(nil), // 0: loop.internal.pb.ccip.EncodeExecutionReportRequest (*EncodeExecutionReportResponse)(nil), // 1: loop.internal.pb.ccip.EncodeExecutionReportResponse @@ -1880,68 +1862,66 @@ var file_offramp_proto_goTypes = []interface{}{ (*OffRampTokens)(nil), // 26: loop.internal.pb.ccip.OffRampTokens nil, // 27: loop.internal.pb.ccip.ListSenderNoncesResponse.NonceMappingEntry nil, // 28: loop.internal.pb.ccip.GetSourceToDestTokensMappingResponse.TokenMappingsEntry - nil, // 29: loop.internal.pb.ccip.OffRampTokens.DestinationPoolEntry - (*ExecutionReport)(nil), // 30: loop.internal.pb.ccip.ExecutionReport - (*TokenPoolRateLimit)(nil), // 31: loop.internal.pb.ccip.TokenPoolRateLimit - (*TxMeta)(nil), // 32: loop.internal.pb.ccip.TxMeta - (*durationpb.Duration)(nil), // 33: google.protobuf.Duration - (*emptypb.Empty)(nil), // 34: google.protobuf.Empty + (*ExecutionReport)(nil), // 29: loop.internal.pb.ccip.ExecutionReport + (*TokenPoolRateLimit)(nil), // 30: loop.internal.pb.ccip.TokenPoolRateLimit + (*TxMeta)(nil), // 31: loop.internal.pb.ccip.TxMeta + (*durationpb.Duration)(nil), // 32: google.protobuf.Duration + (*emptypb.Empty)(nil), // 33: google.protobuf.Empty } var file_offramp_proto_depIdxs = []int32{ - 30, // 0: loop.internal.pb.ccip.EncodeExecutionReportRequest.report:type_name -> loop.internal.pb.ccip.ExecutionReport - 30, // 1: loop.internal.pb.ccip.DecodeExecutionReportResponse.report:type_name -> loop.internal.pb.ccip.ExecutionReport + 29, // 0: loop.internal.pb.ccip.EncodeExecutionReportRequest.report:type_name -> loop.internal.pb.ccip.ExecutionReport + 29, // 1: loop.internal.pb.ccip.DecodeExecutionReportResponse.report:type_name -> loop.internal.pb.ccip.ExecutionReport 21, // 2: loop.internal.pb.ccip.GetExecutionStateChangesResponse.execution_state_changes:type_name -> loop.internal.pb.ccip.ExecutionStateChangeWithTxMeta 23, // 3: loop.internal.pb.ccip.OffchainConfigResponse.config:type_name -> loop.internal.pb.ccip.ExecOffchainConfig 24, // 4: loop.internal.pb.ccip.OnchainConfigResponse.config:type_name -> loop.internal.pb.ccip.ExecOnchainConfig 27, // 5: loop.internal.pb.ccip.ListSenderNoncesResponse.nonce_mapping:type_name -> loop.internal.pb.ccip.ListSenderNoncesResponse.NonceMappingEntry - 31, // 6: loop.internal.pb.ccip.CurrentRateLimiterStateResponse.rate_limiter:type_name -> loop.internal.pb.ccip.TokenPoolRateLimit + 30, // 6: loop.internal.pb.ccip.CurrentRateLimiterStateResponse.rate_limiter:type_name -> loop.internal.pb.ccip.TokenPoolRateLimit 25, // 7: loop.internal.pb.ccip.GetStaticConfigResponse.config:type_name -> loop.internal.pb.ccip.OffRampStaticConfig 28, // 8: loop.internal.pb.ccip.GetSourceToDestTokensMappingResponse.token_mappings:type_name -> loop.internal.pb.ccip.GetSourceToDestTokensMappingResponse.TokenMappingsEntry 26, // 9: loop.internal.pb.ccip.GetTokensResponse.tokens:type_name -> loop.internal.pb.ccip.OffRampTokens 22, // 10: loop.internal.pb.ccip.ExecutionStateChangeWithTxMeta.execution_state_change:type_name -> loop.internal.pb.ccip.ExecutionStateChange - 32, // 11: loop.internal.pb.ccip.ExecutionStateChangeWithTxMeta.tx_meta:type_name -> loop.internal.pb.ccip.TxMeta - 33, // 12: loop.internal.pb.ccip.ExecOffchainConfig.inflight_cache_expiry:type_name -> google.protobuf.Duration - 33, // 13: loop.internal.pb.ccip.ExecOffchainConfig.root_snooze_time:type_name -> google.protobuf.Duration - 33, // 14: loop.internal.pb.ccip.ExecOffchainConfig.message_visibility_interval:type_name -> google.protobuf.Duration - 33, // 15: loop.internal.pb.ccip.ExecOnchainConfig.permissionless_exec_threshold_seconds:type_name -> google.protobuf.Duration - 29, // 16: loop.internal.pb.ccip.OffRampTokens.destination_pool:type_name -> loop.internal.pb.ccip.OffRampTokens.DestinationPoolEntry - 34, // 17: loop.internal.pb.ccip.OffRampReader.Address:input_type -> google.protobuf.Empty - 7, // 18: loop.internal.pb.ccip.OffRampReader.ChangeConfig:input_type -> loop.internal.pb.ccip.ChangeConfigRequest - 34, // 19: loop.internal.pb.ccip.OffRampReader.CurrentRateLimiterState:input_type -> google.protobuf.Empty - 2, // 20: loop.internal.pb.ccip.OffRampReader.DecodeExecutionReport:input_type -> loop.internal.pb.ccip.DecodeExecutionReportRequest - 0, // 21: loop.internal.pb.ccip.OffRampReader.EncodeExecutionReport:input_type -> loop.internal.pb.ccip.EncodeExecutionReportRequest - 34, // 22: loop.internal.pb.ccip.OffRampReader.GasPriceEstimator:input_type -> google.protobuf.Empty - 15, // 23: loop.internal.pb.ccip.OffRampReader.GetExecutionState:input_type -> loop.internal.pb.ccip.GetExecutionStateRequest - 4, // 24: loop.internal.pb.ccip.OffRampReader.GetExecutionStateChanges:input_type -> loop.internal.pb.ccip.GetExecutionStateChangesRequest - 34, // 25: loop.internal.pb.ccip.OffRampReader.GetRouter:input_type -> google.protobuf.Empty - 34, // 26: loop.internal.pb.ccip.OffRampReader.GetSourceToDestTokensMapping:input_type -> google.protobuf.Empty - 34, // 27: loop.internal.pb.ccip.OffRampReader.GetStaticConfig:input_type -> google.protobuf.Empty - 34, // 28: loop.internal.pb.ccip.OffRampReader.GetTokens:input_type -> google.protobuf.Empty - 12, // 29: loop.internal.pb.ccip.OffRampReader.ListSenderNonces:input_type -> loop.internal.pb.ccip.ListSenderNoncesRequest - 34, // 30: loop.internal.pb.ccip.OffRampReader.OffchainConfig:input_type -> google.protobuf.Empty - 34, // 31: loop.internal.pb.ccip.OffRampReader.OnchainConfig:input_type -> google.protobuf.Empty - 34, // 32: loop.internal.pb.ccip.OffRampReader.Close:input_type -> google.protobuf.Empty - 6, // 33: loop.internal.pb.ccip.OffRampReader.Address:output_type -> loop.internal.pb.ccip.OffRampAddressResponse - 8, // 34: loop.internal.pb.ccip.OffRampReader.ChangeConfig:output_type -> loop.internal.pb.ccip.ChangeConfigResponse - 14, // 35: loop.internal.pb.ccip.OffRampReader.CurrentRateLimiterState:output_type -> loop.internal.pb.ccip.CurrentRateLimiterStateResponse - 3, // 36: loop.internal.pb.ccip.OffRampReader.DecodeExecutionReport:output_type -> loop.internal.pb.ccip.DecodeExecutionReportResponse - 1, // 37: loop.internal.pb.ccip.OffRampReader.EncodeExecutionReport:output_type -> loop.internal.pb.ccip.EncodeExecutionReportResponse - 11, // 38: loop.internal.pb.ccip.OffRampReader.GasPriceEstimator:output_type -> loop.internal.pb.ccip.GasPriceEstimatorResponse - 16, // 39: loop.internal.pb.ccip.OffRampReader.GetExecutionState:output_type -> loop.internal.pb.ccip.GetExecutionStateResponse - 5, // 40: loop.internal.pb.ccip.OffRampReader.GetExecutionStateChanges:output_type -> loop.internal.pb.ccip.GetExecutionStateChangesResponse - 20, // 41: loop.internal.pb.ccip.OffRampReader.GetRouter:output_type -> loop.internal.pb.ccip.GetRouterResponse - 18, // 42: loop.internal.pb.ccip.OffRampReader.GetSourceToDestTokensMapping:output_type -> loop.internal.pb.ccip.GetSourceToDestTokensMappingResponse - 17, // 43: loop.internal.pb.ccip.OffRampReader.GetStaticConfig:output_type -> loop.internal.pb.ccip.GetStaticConfigResponse - 19, // 44: loop.internal.pb.ccip.OffRampReader.GetTokens:output_type -> loop.internal.pb.ccip.GetTokensResponse - 13, // 45: loop.internal.pb.ccip.OffRampReader.ListSenderNonces:output_type -> loop.internal.pb.ccip.ListSenderNoncesResponse - 9, // 46: loop.internal.pb.ccip.OffRampReader.OffchainConfig:output_type -> loop.internal.pb.ccip.OffchainConfigResponse - 10, // 47: loop.internal.pb.ccip.OffRampReader.OnchainConfig:output_type -> loop.internal.pb.ccip.OnchainConfigResponse - 34, // 48: loop.internal.pb.ccip.OffRampReader.Close:output_type -> google.protobuf.Empty - 33, // [33:49] is the sub-list for method output_type - 17, // [17:33] is the sub-list for method input_type - 17, // [17:17] is the sub-list for extension type_name - 17, // [17:17] is the sub-list for extension extendee - 0, // [0:17] is the sub-list for field type_name + 31, // 11: loop.internal.pb.ccip.ExecutionStateChangeWithTxMeta.tx_meta:type_name -> loop.internal.pb.ccip.TxMeta + 32, // 12: loop.internal.pb.ccip.ExecOffchainConfig.inflight_cache_expiry:type_name -> google.protobuf.Duration + 32, // 13: loop.internal.pb.ccip.ExecOffchainConfig.root_snooze_time:type_name -> google.protobuf.Duration + 32, // 14: loop.internal.pb.ccip.ExecOffchainConfig.message_visibility_interval:type_name -> google.protobuf.Duration + 32, // 15: loop.internal.pb.ccip.ExecOnchainConfig.permissionless_exec_threshold_seconds:type_name -> google.protobuf.Duration + 33, // 16: loop.internal.pb.ccip.OffRampReader.Address:input_type -> google.protobuf.Empty + 7, // 17: loop.internal.pb.ccip.OffRampReader.ChangeConfig:input_type -> loop.internal.pb.ccip.ChangeConfigRequest + 33, // 18: loop.internal.pb.ccip.OffRampReader.CurrentRateLimiterState:input_type -> google.protobuf.Empty + 2, // 19: loop.internal.pb.ccip.OffRampReader.DecodeExecutionReport:input_type -> loop.internal.pb.ccip.DecodeExecutionReportRequest + 0, // 20: loop.internal.pb.ccip.OffRampReader.EncodeExecutionReport:input_type -> loop.internal.pb.ccip.EncodeExecutionReportRequest + 33, // 21: loop.internal.pb.ccip.OffRampReader.GasPriceEstimator:input_type -> google.protobuf.Empty + 15, // 22: loop.internal.pb.ccip.OffRampReader.GetExecutionState:input_type -> loop.internal.pb.ccip.GetExecutionStateRequest + 4, // 23: loop.internal.pb.ccip.OffRampReader.GetExecutionStateChanges:input_type -> loop.internal.pb.ccip.GetExecutionStateChangesRequest + 33, // 24: loop.internal.pb.ccip.OffRampReader.GetRouter:input_type -> google.protobuf.Empty + 33, // 25: loop.internal.pb.ccip.OffRampReader.GetSourceToDestTokensMapping:input_type -> google.protobuf.Empty + 33, // 26: loop.internal.pb.ccip.OffRampReader.GetStaticConfig:input_type -> google.protobuf.Empty + 33, // 27: loop.internal.pb.ccip.OffRampReader.GetTokens:input_type -> google.protobuf.Empty + 12, // 28: loop.internal.pb.ccip.OffRampReader.ListSenderNonces:input_type -> loop.internal.pb.ccip.ListSenderNoncesRequest + 33, // 29: loop.internal.pb.ccip.OffRampReader.OffchainConfig:input_type -> google.protobuf.Empty + 33, // 30: loop.internal.pb.ccip.OffRampReader.OnchainConfig:input_type -> google.protobuf.Empty + 33, // 31: loop.internal.pb.ccip.OffRampReader.Close:input_type -> google.protobuf.Empty + 6, // 32: loop.internal.pb.ccip.OffRampReader.Address:output_type -> loop.internal.pb.ccip.OffRampAddressResponse + 8, // 33: loop.internal.pb.ccip.OffRampReader.ChangeConfig:output_type -> loop.internal.pb.ccip.ChangeConfigResponse + 14, // 34: loop.internal.pb.ccip.OffRampReader.CurrentRateLimiterState:output_type -> loop.internal.pb.ccip.CurrentRateLimiterStateResponse + 3, // 35: loop.internal.pb.ccip.OffRampReader.DecodeExecutionReport:output_type -> loop.internal.pb.ccip.DecodeExecutionReportResponse + 1, // 36: loop.internal.pb.ccip.OffRampReader.EncodeExecutionReport:output_type -> loop.internal.pb.ccip.EncodeExecutionReportResponse + 11, // 37: loop.internal.pb.ccip.OffRampReader.GasPriceEstimator:output_type -> loop.internal.pb.ccip.GasPriceEstimatorResponse + 16, // 38: loop.internal.pb.ccip.OffRampReader.GetExecutionState:output_type -> loop.internal.pb.ccip.GetExecutionStateResponse + 5, // 39: loop.internal.pb.ccip.OffRampReader.GetExecutionStateChanges:output_type -> loop.internal.pb.ccip.GetExecutionStateChangesResponse + 20, // 40: loop.internal.pb.ccip.OffRampReader.GetRouter:output_type -> loop.internal.pb.ccip.GetRouterResponse + 18, // 41: loop.internal.pb.ccip.OffRampReader.GetSourceToDestTokensMapping:output_type -> loop.internal.pb.ccip.GetSourceToDestTokensMappingResponse + 17, // 42: loop.internal.pb.ccip.OffRampReader.GetStaticConfig:output_type -> loop.internal.pb.ccip.GetStaticConfigResponse + 19, // 43: loop.internal.pb.ccip.OffRampReader.GetTokens:output_type -> loop.internal.pb.ccip.GetTokensResponse + 13, // 44: loop.internal.pb.ccip.OffRampReader.ListSenderNonces:output_type -> loop.internal.pb.ccip.ListSenderNoncesResponse + 9, // 45: loop.internal.pb.ccip.OffRampReader.OffchainConfig:output_type -> loop.internal.pb.ccip.OffchainConfigResponse + 10, // 46: loop.internal.pb.ccip.OffRampReader.OnchainConfig:output_type -> loop.internal.pb.ccip.OnchainConfigResponse + 33, // 47: loop.internal.pb.ccip.OffRampReader.Close:output_type -> google.protobuf.Empty + 32, // [32:48] is the sub-list for method output_type + 16, // [16:32] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_offramp_proto_init() } @@ -2282,7 +2262,7 @@ func file_offramp_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_offramp_proto_rawDesc, NumEnums: 0, - NumMessages: 30, + NumMessages: 29, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/loop/internal/pb/ccip/offramp.proto b/pkg/loop/internal/pb/ccip/offramp.proto index e011abb9b..8a2ba0553 100644 --- a/pkg/loop/internal/pb/ccip/offramp.proto +++ b/pkg/loop/internal/pb/ccip/offramp.proto @@ -207,5 +207,5 @@ message OffRampStaticConfig { message OffRampTokens { repeated string destination_tokens = 1; // []Address repeated string source_tokens = 2; // []Address - map destination_pool = 3; // map[Address]Address + reserved 3; } diff --git a/pkg/loop/internal/relayer/pluginprovider/ext/ccip/offramp.go b/pkg/loop/internal/relayer/pluginprovider/ext/ccip/offramp.go index 6e9499827..efab6ee12 100644 --- a/pkg/loop/internal/relayer/pluginprovider/ext/ccip/offramp.go +++ b/pkg/loop/internal/relayer/pluginprovider/ext/ccip/offramp.go @@ -632,15 +632,10 @@ func offRampTokens(in *ccippb.OffRampTokens) cciptypes.OffRampTokens { for i, t := range in.DestinationTokens { dest[i] = cciptypes.Address(t) } - destPool := make(map[cciptypes.Address]cciptypes.Address) - for k, v := range in.DestinationPool { - destPool[cciptypes.Address(k)] = cciptypes.Address(v) - } return cciptypes.OffRampTokens{ SourceTokens: source, DestinationTokens: dest, - DestinationPool: destPool, } } @@ -653,15 +648,10 @@ func offRampTokensToPB(in cciptypes.OffRampTokens) *ccippb.OffRampTokens { for i, t := range in.DestinationTokens { dest[i] = string(t) } - destPool := make(map[string]string) - for k, v := range in.DestinationPool { - destPool[string(k)] = string(v) - } return &ccippb.OffRampTokens{ SourceTokens: source, DestinationTokens: dest, - DestinationPool: destPool, } } diff --git a/pkg/loop/internal/relayer/pluginprovider/ext/ccip/test/offramp.go b/pkg/loop/internal/relayer/pluginprovider/ext/ccip/test/offramp.go index b94788730..f61fa42b4 100644 --- a/pkg/loop/internal/relayer/pluginprovider/ext/ccip/test/offramp.go +++ b/pkg/loop/internal/relayer/pluginprovider/ext/ccip/test/offramp.go @@ -148,9 +148,6 @@ var OffRampReader = staticOffRamp{ ccip.Address("sourceToken1"), ccip.Address("sourceToken2"), }, - DestinationPool: map[ccip.Address]ccip.Address{ - ccip.Address("key1"): ccip.Address("value1"), - }, }, // GetRouter test data @@ -245,7 +242,7 @@ func (s staticOffRamp) DecodeExecutionReport(ctx context.Context, report []byte) // EncodeExecutionReport implements OffRampEvaluator. func (s staticOffRamp) EncodeExecutionReport(ctx context.Context, report ccip.ExecReport) ([]byte, error) { // struggling to get full report equality via reflect.DeepEqual or assert.ObjectsAreEqual - // take a short cut and compare the fields we care about + // take a shortcut and compare the fields we care about if len(report.Messages) != len(s.encodeExecutionReportRequest.Messages) { return nil, fmt.Errorf(" encodeExecutionReport message len %v but got %v", len(s.encodeExecutionReportRequest.Messages), len(report.Messages)) } @@ -378,12 +375,12 @@ func (s staticOffRamp) Evaluate(ctx context.Context, other ccip.OffRampReader) e return fmt.Errorf("expected gasPrice %v but got %v", GasPriceEstimatorExec.getGasPriceResponse, price) } // DenoteInUSD test case - gotusd, err := gasPriceEstimator.DenoteInUSD(GasPriceEstimatorExec.denoteInUSDRequest.p, GasPriceEstimatorExec.denoteInUSDRequest.wrappedNativePrice) + gotUsd, err := gasPriceEstimator.DenoteInUSD(GasPriceEstimatorExec.denoteInUSDRequest.p, GasPriceEstimatorExec.denoteInUSDRequest.wrappedNativePrice) if err != nil { return fmt.Errorf("failed to get other usd: %w", err) } - if gotusd.Cmp(GasPriceEstimatorExec.denoteInUSDResponse.result) != 0 { - return fmt.Errorf("expected usd %v but got %v", GasPriceEstimatorExec.denoteInUSDResponse.result, gotusd) + if gotUsd.Cmp(GasPriceEstimatorExec.denoteInUSDResponse.result) != 0 { + return fmt.Errorf("expected usd %v but got %v", GasPriceEstimatorExec.denoteInUSDResponse.result, gotUsd) } // EstimateMsgCostUSD test case cost, err := gasPriceEstimator.EstimateMsgCostUSD( diff --git a/pkg/types/ccip/offramp.go b/pkg/types/ccip/offramp.go index d1d9e0334..32280cd9f 100644 --- a/pkg/types/ccip/offramp.go +++ b/pkg/types/ccip/offramp.go @@ -106,7 +106,6 @@ type OffRampStaticConfig struct { type OffRampTokens struct { DestinationTokens []Address SourceTokens []Address - DestinationPool map[Address]Address } // MessageExecutionState defines the execution states of CCIP messages. From 25b0d110567c12d18caeb8c909fdef08f2b25bc7 Mon Sep 17 00:00:00 2001 From: ilija42 <57732589+ilija42@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:15:26 +0200 Subject: [PATCH 3/4] BCF-3258 - Fix QueryKey test case flakiness (#577) * Fix QueryKey test case flakiness * Fix common QueryKey testStruct order --- pkg/types/interfacetests/chain_reader_interface_tests.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/types/interfacetests/chain_reader_interface_tests.go b/pkg/types/interfacetests/chain_reader_interface_tests.go index 34ada818c..fe261d0aa 100644 --- a/pkg/types/interfacetests/chain_reader_interface_tests.go +++ b/pkg/types/interfacetests/chain_reader_interface_tests.go @@ -235,13 +235,14 @@ func runQueryKeyInterfaceTests[T TestingT[T]](t T, tester ChainReaderInterfaceTe ctx := tests.Context(t) cr := tester.GetChainReader(t) require.NoError(t, cr.Bind(ctx, tester.GetBindings(t))) - ts1 := CreateTestStruct[T](0, tester) + ts1 := CreateTestStruct[T](1, tester) tester.TriggerEvent(t, &ts1) - ts2 := CreateTestStruct[T](1, tester) + ts2 := CreateTestStruct[T](0, tester) tester.TriggerEvent(t, &ts2) ts := &TestStruct{} assert.Eventually(t, func() bool { + // sequences from queryKey without limit and sort should be in descending order sequences, err := cr.QueryKey(ctx, AnyContractName, query.KeyFilter{Key: EventName}, query.LimitAndSort{}, ts) return err == nil && len(sequences) == 2 && reflect.DeepEqual(&ts1, sequences[0].Data) && reflect.DeepEqual(&ts2, sequences[1].Data) }, tester.MaxWaitTimeForEvents(), time.Millisecond*10) From 86cc58c0305cb8455a319f55ddac8550bf32fd31 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Tue, 18 Jun 2024 10:25:14 -0500 Subject: [PATCH 4/4] golangci-lint: add gomodguard to prevent local replace (#595) --- .golangci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index 239b4da46..ced219549 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -16,6 +16,7 @@ linters: - whitespace - depguard - containedctx + - gomodguard linters-settings: exhaustive: default-signifies-exhaustive: true @@ -113,6 +114,9 @@ linters-settings: desc: Use gopkg.in/guregu/null.v4 instead - pkg: "gopkg.in/guregu/null.v3" desc: Use gopkg.in/guregu/null.v4 instead + gomodguard: + blocked: + local_replace_directives: true issues: exclude-rules: - path: test