diff --git a/chain/ocr/types/ocr.pb.go b/chain/ocr/types/ocr.pb.go index b1efb5d0..df604409 100644 --- a/chain/ocr/types/ocr.pb.go +++ b/chain/ocr/types/ocr.pb.go @@ -99,12 +99,14 @@ type FeedConfig struct { Transmitters []string `protobuf:"bytes,2,rep,name=transmitters,proto3" json:"transmitters,omitempty"` // f maximum number of faulty/dishonest oracles the protocol can tolerate while still working correctly F uint32 `protobuf:"varint,3,opt,name=f,proto3" json:"f,omitempty"` - // onchain_config contains properties relevant only for the Cosmos module. - OnchainConfig *OnchainConfig `protobuf:"bytes,4,opt,name=onchain_config,json=onchainConfig,proto3" json:"onchain_config,omitempty"` + // onchain_config serialized data with reporting plugin params on chain. + OnchainConfig []byte `protobuf:"bytes,4,opt,name=onchain_config,json=onchainConfig,proto3" json:"onchain_config,omitempty"` // offchain_config_version version of the serialization format used for "offchain_config" parameter OffchainConfigVersion uint64 `protobuf:"varint,5,opt,name=offchain_config_version,json=offchainConfigVersion,proto3" json:"offchain_config_version,omitempty"` // offchain_config serialized data used by oracles to configure their offchain operation OffchainConfig []byte `protobuf:"bytes,6,opt,name=offchain_config,json=offchainConfig,proto3" json:"offchain_config,omitempty"` + // feed-specific params for the Cosmos module. + ModuleParams *ModuleParams `protobuf:"bytes,7,opt,name=module_params,json=moduleParams,proto3" json:"module_params,omitempty"` } func (m *FeedConfig) Reset() { *m = FeedConfig{} } @@ -161,7 +163,7 @@ func (m *FeedConfig) GetF() uint32 { return 0 } -func (m *FeedConfig) GetOnchainConfig() *OnchainConfig { +func (m *FeedConfig) GetOnchainConfig() []byte { if m != nil { return m.OnchainConfig } @@ -182,6 +184,13 @@ func (m *FeedConfig) GetOffchainConfig() []byte { return nil } +func (m *FeedConfig) GetModuleParams() *ModuleParams { + if m != nil { + return m.ModuleParams + } + return nil +} + type FeedConfigInfo struct { LatestConfigDigest []byte `protobuf:"bytes,1,opt,name=latest_config_digest,json=latestConfigDigest,proto3" json:"latest_config_digest,omitempty"` F uint32 `protobuf:"varint,2,opt,name=f,proto3" json:"f,omitempty"` @@ -259,43 +268,41 @@ func (m *FeedConfigInfo) GetLatestConfigBlockNumber() int64 { return 0 } -type OnchainConfig struct { - // chain_id the ID of the Cosmos chain itself. - ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` +type ModuleParams struct { // feed_id is an unique ID for the target of this config - FeedId string `protobuf:"bytes,2,opt,name=feed_id,json=feedId,proto3" json:"feed_id,omitempty"` + FeedId string `protobuf:"bytes,1,opt,name=feed_id,json=feedId,proto3" json:"feed_id,omitempty"` // lowest answer the median of a report is allowed to be - MinAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=min_answer,json=minAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_answer"` + MinAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=min_answer,json=minAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_answer"` // highest answer the median of a report is allowed to be - MaxAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=max_answer,json=maxAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_answer"` + MaxAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=max_answer,json=maxAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_answer"` // Fixed LINK reward for each observer - LinkPerObservation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=link_per_observation,json=linkPerObservation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_observation"` + LinkPerObservation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=link_per_observation,json=linkPerObservation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_observation"` // Fixed LINK reward for transmitter - LinkPerTransmission github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=link_per_transmission,json=linkPerTransmission,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_transmission"` + LinkPerTransmission github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=link_per_transmission,json=linkPerTransmission,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_transmission"` // Native denom for LINK coin in the bank keeper - LinkDenom string `protobuf:"bytes,7,opt,name=link_denom,json=linkDenom,proto3" json:"link_denom,omitempty"` + LinkDenom string `protobuf:"bytes,6,opt,name=link_denom,json=linkDenom,proto3" json:"link_denom,omitempty"` // Enables unique reports - UniqueReports bool `protobuf:"varint,8,opt,name=unique_reports,json=uniqueReports,proto3" json:"unique_reports,omitempty"` + UniqueReports bool `protobuf:"varint,7,opt,name=unique_reports,json=uniqueReports,proto3" json:"unique_reports,omitempty"` // short human-readable description of observable this feed's answers pertain to - Description string `protobuf:"bytes,9,opt,name=description,proto3" json:"description,omitempty"` + Description string `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"` // feed administrator - FeedAdmin string `protobuf:"bytes,10,opt,name=feed_admin,json=feedAdmin,proto3" json:"feed_admin,omitempty"` + FeedAdmin string `protobuf:"bytes,9,opt,name=feed_admin,json=feedAdmin,proto3" json:"feed_admin,omitempty"` // feed billing administrator - BillingAdmin string `protobuf:"bytes,11,opt,name=billing_admin,json=billingAdmin,proto3" json:"billing_admin,omitempty"` + BillingAdmin string `protobuf:"bytes,10,opt,name=billing_admin,json=billingAdmin,proto3" json:"billing_admin,omitempty"` } -func (m *OnchainConfig) Reset() { *m = OnchainConfig{} } -func (m *OnchainConfig) String() string { return proto.CompactTextString(m) } -func (*OnchainConfig) ProtoMessage() {} -func (*OnchainConfig) Descriptor() ([]byte, []int) { +func (m *ModuleParams) Reset() { *m = ModuleParams{} } +func (m *ModuleParams) String() string { return proto.CompactTextString(m) } +func (*ModuleParams) ProtoMessage() {} +func (*ModuleParams) Descriptor() ([]byte, []int) { return fileDescriptor_0acb79560f1720fa, []int{3} } -func (m *OnchainConfig) XXX_Unmarshal(b []byte) error { +func (m *ModuleParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *OnchainConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *ModuleParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_OnchainConfig.Marshal(b, m, deterministic) + return xxx_messageInfo_ModuleParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -305,61 +312,54 @@ func (m *OnchainConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *OnchainConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_OnchainConfig.Merge(m, src) +func (m *ModuleParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_ModuleParams.Merge(m, src) } -func (m *OnchainConfig) XXX_Size() int { +func (m *ModuleParams) XXX_Size() int { return m.Size() } -func (m *OnchainConfig) XXX_DiscardUnknown() { - xxx_messageInfo_OnchainConfig.DiscardUnknown(m) +func (m *ModuleParams) XXX_DiscardUnknown() { + xxx_messageInfo_ModuleParams.DiscardUnknown(m) } -var xxx_messageInfo_OnchainConfig proto.InternalMessageInfo +var xxx_messageInfo_ModuleParams proto.InternalMessageInfo -func (m *OnchainConfig) GetChainId() string { - if m != nil { - return m.ChainId - } - return "" -} - -func (m *OnchainConfig) GetFeedId() string { +func (m *ModuleParams) GetFeedId() string { if m != nil { return m.FeedId } return "" } -func (m *OnchainConfig) GetLinkDenom() string { +func (m *ModuleParams) GetLinkDenom() string { if m != nil { return m.LinkDenom } return "" } -func (m *OnchainConfig) GetUniqueReports() bool { +func (m *ModuleParams) GetUniqueReports() bool { if m != nil { return m.UniqueReports } return false } -func (m *OnchainConfig) GetDescription() string { +func (m *ModuleParams) GetDescription() string { if m != nil { return m.Description } return "" } -func (m *OnchainConfig) GetFeedAdmin() string { +func (m *ModuleParams) GetFeedAdmin() string { if m != nil { return m.FeedAdmin } return "" } -func (m *OnchainConfig) GetBillingAdmin() string { +func (m *ModuleParams) GetBillingAdmin() string { if m != nil { return m.BillingAdmin } @@ -375,7 +375,7 @@ type ContractConfig struct { Transmitters []string `protobuf:"bytes,3,rep,name=transmitters,proto3" json:"transmitters,omitempty"` // f maximum number of faulty/dishonest oracles the protocol can tolerate while still working correctly F uint32 `protobuf:"varint,4,opt,name=f,proto3" json:"f,omitempty"` - // onchain_config serialized config that is relevant only for the module. + // onchain_config serialized data with reporting plugin params on chain. OnchainConfig []byte `protobuf:"bytes,5,opt,name=onchain_config,json=onchainConfig,proto3" json:"onchain_config,omitempty"` // offchain_config_version version of the serialization format used for "offchain_config" parameter OffchainConfigVersion uint64 `protobuf:"varint,6,opt,name=offchain_config_version,json=offchainConfigVersion,proto3" json:"offchain_config_version,omitempty"` @@ -509,22 +509,24 @@ type FeedProperties struct { FeedId string `protobuf:"bytes,1,opt,name=feed_id,json=feedId,proto3" json:"feed_id,omitempty"` // f maximum number of faulty/dishonest oracles the protocol can tolerate while still working correctly F uint32 `protobuf:"varint,2,opt,name=f,proto3" json:"f,omitempty"` + // onchain_config serialized data with reporting plugin params on chain. + OnchainConfig []byte `protobuf:"bytes,3,opt,name=onchain_config,json=onchainConfig,proto3" json:"onchain_config,omitempty"` // offchain_config_version version of the serialization format used for "offchain_config" parameter - OffchainConfigVersion uint64 `protobuf:"varint,3,opt,name=offchain_config_version,json=offchainConfigVersion,proto3" json:"offchain_config_version,omitempty"` + OffchainConfigVersion uint64 `protobuf:"varint,4,opt,name=offchain_config_version,json=offchainConfigVersion,proto3" json:"offchain_config_version,omitempty"` // offchain_config serialized data used by oracles to configure their offchain operation - OffchainConfig []byte `protobuf:"bytes,4,opt,name=offchain_config,json=offchainConfig,proto3" json:"offchain_config,omitempty"` + OffchainConfig []byte `protobuf:"bytes,5,opt,name=offchain_config,json=offchainConfig,proto3" json:"offchain_config,omitempty"` // lowest answer the median of a report is allowed to be - MinAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=min_answer,json=minAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_answer"` + MinAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=min_answer,json=minAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_answer"` // highest answer the median of a report is allowed to be - MaxAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=max_answer,json=maxAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_answer"` + MaxAnswer github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=max_answer,json=maxAnswer,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_answer"` // Fixed LINK reward for each observer - LinkPerObservation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=link_per_observation,json=linkPerObservation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_observation"` + LinkPerObservation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=link_per_observation,json=linkPerObservation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_observation"` // Fixed LINK reward for transmitter - LinkPerTransmission github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=link_per_transmission,json=linkPerTransmission,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_transmission"` + LinkPerTransmission github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=link_per_transmission,json=linkPerTransmission,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"link_per_transmission"` // Enables unique reports - UniqueReports bool `protobuf:"varint,9,opt,name=unique_reports,json=uniqueReports,proto3" json:"unique_reports,omitempty"` + UniqueReports bool `protobuf:"varint,10,opt,name=unique_reports,json=uniqueReports,proto3" json:"unique_reports,omitempty"` // short human-readable description of observable this feed's answers pertain to - Description string `protobuf:"bytes,10,opt,name=description,proto3" json:"description,omitempty"` + Description string `protobuf:"bytes,11,opt,name=description,proto3" json:"description,omitempty"` } func (m *FeedProperties) Reset() { *m = FeedProperties{} } @@ -574,6 +576,13 @@ func (m *FeedProperties) GetF() uint32 { return 0 } +func (m *FeedProperties) GetOnchainConfig() []byte { + if m != nil { + return m.OnchainConfig + } + return nil +} + func (m *FeedProperties) GetOffchainConfigVersion() uint64 { if m != nil { return m.OffchainConfigVersion @@ -1405,7 +1414,7 @@ func init() { proto.RegisterType((*Params)(nil), "injective.ocr.v1beta1.Params") proto.RegisterType((*FeedConfig)(nil), "injective.ocr.v1beta1.FeedConfig") proto.RegisterType((*FeedConfigInfo)(nil), "injective.ocr.v1beta1.FeedConfigInfo") - proto.RegisterType((*OnchainConfig)(nil), "injective.ocr.v1beta1.OnchainConfig") + proto.RegisterType((*ModuleParams)(nil), "injective.ocr.v1beta1.ModuleParams") proto.RegisterType((*ContractConfig)(nil), "injective.ocr.v1beta1.ContractConfig") proto.RegisterType((*SetConfigProposal)(nil), "injective.ocr.v1beta1.SetConfigProposal") proto.RegisterType((*FeedProperties)(nil), "injective.ocr.v1beta1.FeedProperties") @@ -1428,106 +1437,106 @@ func init() { func init() { proto.RegisterFile("injective/ocr/v1beta1/ocr.proto", fileDescriptor_0acb79560f1720fa) } var fileDescriptor_0acb79560f1720fa = []byte{ - // 1579 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x73, 0x13, 0xc7, - 0x16, 0xf6, 0x48, 0xb2, 0x1e, 0x47, 0x0f, 0xc3, 0x60, 0x83, 0x70, 0x81, 0x25, 0xe6, 0x5e, 0xdf, - 0xeb, 0x2c, 0x90, 0x82, 0x53, 0x49, 0x2a, 0xb0, 0x48, 0xd9, 0x06, 0x82, 0x2a, 0x3c, 0x5c, 0x63, - 0xc3, 0x22, 0x9b, 0x49, 0x6b, 0xa6, 0x25, 0x4f, 0x90, 0xba, 0x95, 0xee, 0x96, 0xc1, 0xfb, 0x54, - 0x92, 0x25, 0x8b, 0x54, 0xd6, 0xfc, 0x85, 0xfc, 0x81, 0xac, 0x92, 0x2a, 0x96, 0x54, 0x65, 0x93, - 0xca, 0x82, 0xa4, 0xa0, 0x52, 0xc5, 0x2a, 0xfb, 0xec, 0x52, 0xfd, 0x18, 0x79, 0xf4, 0xb0, 0x82, - 0x30, 0xac, 0xa4, 0x3e, 0xaf, 0xee, 0x39, 0xe7, 0x7c, 0xdf, 0x9c, 0x1e, 0xa8, 0x84, 0xe4, 0x0b, - 0xec, 0x8b, 0x70, 0x1f, 0xd7, 0xa9, 0xcf, 0xea, 0xfb, 0x97, 0x9a, 0x58, 0xa0, 0x4b, 0xf2, 0x7f, - 0xad, 0xc7, 0xa8, 0xa0, 0xf6, 0xd2, 0xc0, 0xa0, 0x26, 0x85, 0xc6, 0x60, 0x79, 0xb1, 0x4d, 0xdb, - 0x54, 0x59, 0xd4, 0xe5, 0x3f, 0x6d, 0xbc, 0x5c, 0x69, 0x53, 0xda, 0xee, 0xe0, 0xba, 0x5a, 0x35, - 0xfb, 0xad, 0xba, 0x08, 0xbb, 0x98, 0x0b, 0xd4, 0xed, 0x19, 0x83, 0x15, 0x9f, 0xf2, 0x2e, 0xe5, - 0xf5, 0x26, 0xe2, 0x78, 0xb0, 0x99, 0x4f, 0x43, 0xa2, 0xf5, 0xce, 0x57, 0x16, 0xa4, 0xb7, 0x11, - 0x43, 0x5d, 0x6e, 0x9f, 0x07, 0xe8, 0x84, 0xe4, 0xbe, 0x17, 0x60, 0x42, 0xbb, 0x65, 0xab, 0x6a, - 0xad, 0xe5, 0xdc, 0x9c, 0x94, 0x5c, 0x95, 0x02, 0x7b, 0x1d, 0x96, 0x7a, 0xe8, 0x80, 0xf6, 0x85, - 0xd7, 0xec, 0x50, 0xff, 0xbe, 0x17, 0x12, 0x81, 0xd9, 0x3e, 0xea, 0x94, 0x13, 0x55, 0x6b, 0x2d, - 0xe5, 0x9e, 0xd2, 0xca, 0x4d, 0xa9, 0x6b, 0x18, 0x95, 0x7d, 0x01, 0x0a, 0x5d, 0x1a, 0xf4, 0x3b, - 0xd8, 0x43, 0x41, 0x37, 0x24, 0xe5, 0xa4, 0x0a, 0x9a, 0xd7, 0xb2, 0x0d, 0x29, 0xba, 0x9c, 0x7a, - 0xf9, 0xb8, 0x62, 0x39, 0x5f, 0x27, 0x00, 0xae, 0x63, 0x1c, 0x6c, 0x51, 0xd2, 0x0a, 0xdb, 0x76, - 0x19, 0x32, 0x3c, 0x6c, 0x13, 0xcc, 0x78, 0xd9, 0xaa, 0x26, 0xd7, 0x72, 0x6e, 0xb4, 0xb4, 0x1d, - 0x28, 0x08, 0x86, 0x08, 0xef, 0x86, 0x42, 0x48, 0x75, 0x42, 0xa9, 0x87, 0x64, 0x76, 0x01, 0xac, - 0x96, 0xda, 0xaa, 0xe8, 0x5a, 0x2d, 0xfb, 0x53, 0x28, 0x51, 0xe2, 0xef, 0xa1, 0x90, 0x78, 0xbe, - 0x8a, 0x5e, 0x4e, 0x55, 0xad, 0xb5, 0xfc, 0xfa, 0x7f, 0x6b, 0x13, 0x13, 0x5d, 0xbb, 0xa3, 0x8d, - 0xf5, 0x49, 0xdc, 0x22, 0x8d, 0x2f, 0xed, 0x0f, 0xe0, 0x0c, 0x6d, 0xb5, 0xe2, 0xd1, 0xbc, 0x7d, - 0xcc, 0x78, 0x48, 0x49, 0x79, 0x5e, 0xa5, 0x61, 0x29, 0x52, 0x6b, 0x87, 0x7b, 0x5a, 0x69, 0xff, - 0x1f, 0x16, 0x46, 0xfc, 0xca, 0xe9, 0xaa, 0xb5, 0x56, 0x70, 0x4b, 0xc3, 0xf6, 0xce, 0x8f, 0x16, - 0x94, 0x0e, 0x13, 0xd1, 0x20, 0x2d, 0x6a, 0xbf, 0x0b, 0x8b, 0x1d, 0x24, 0x30, 0x17, 0xd1, 0x8e, - 0x41, 0xd8, 0xc6, 0x5c, 0xa8, 0x0a, 0x15, 0x5c, 0x5b, 0xeb, 0xb4, 0xfd, 0x55, 0xa5, 0xd1, 0x09, - 0x48, 0x44, 0x09, 0x28, 0x80, 0x45, 0xa2, 0x74, 0x10, 0x59, 0x12, 0x13, 0xc6, 0xa7, 0x7d, 0x22, - 0x54, 0x32, 0x52, 0x6e, 0x5e, 0xcb, 0xb6, 0xa4, 0xc8, 0xbe, 0x02, 0xcb, 0xc3, 0x1b, 0xea, 0x82, - 0x93, 0x7e, 0xb7, 0x89, 0x99, 0x7a, 0xce, 0xa4, 0x7b, 0x26, 0xbe, 0xad, 0x2a, 0xfa, 0x6d, 0xa5, - 0x76, 0x7e, 0x49, 0x41, 0x71, 0x28, 0x85, 0xf6, 0x59, 0xc8, 0xea, 0x07, 0x0f, 0x03, 0xd3, 0x55, - 0x19, 0xb5, 0x6e, 0x04, 0xf6, 0x19, 0xc8, 0xb4, 0x30, 0x0e, 0xa4, 0x26, 0xa1, 0x34, 0x69, 0xb9, - 0x6c, 0x04, 0xf6, 0x2d, 0x80, 0x6e, 0x48, 0x3c, 0x44, 0xf8, 0x03, 0xcc, 0x74, 0xdb, 0x6c, 0xd6, - 0x9e, 0x3c, 0xab, 0xcc, 0xfd, 0xf6, 0xac, 0xf2, 0xbf, 0x76, 0x28, 0xf6, 0xfa, 0xcd, 0x9a, 0x4f, - 0xbb, 0x75, 0xd3, 0xdd, 0xfa, 0xe7, 0x22, 0x0f, 0xee, 0xd7, 0xc5, 0x41, 0x0f, 0xf3, 0xda, 0x55, - 0xec, 0xbb, 0xb9, 0x6e, 0x48, 0x36, 0x54, 0x00, 0x15, 0x0e, 0x3d, 0x8c, 0xc2, 0xa5, 0x5e, 0x33, - 0x1c, 0x7a, 0x68, 0xc2, 0x7d, 0x0e, 0x8b, 0x0a, 0x29, 0x3d, 0xcc, 0x3c, 0xda, 0xe4, 0xb2, 0xd7, - 0x45, 0xd4, 0x02, 0xb3, 0x05, 0x6e, 0x10, 0xe1, 0xda, 0x32, 0xd6, 0x36, 0x66, 0x77, 0x0e, 0x23, - 0xd9, 0x4d, 0x58, 0x1a, 0xec, 0x60, 0x7a, 0x9b, 0xab, 0x2e, 0x4b, 0xbf, 0xd6, 0x16, 0xa7, 0xcc, - 0x16, 0xbb, 0xb1, 0x50, 0x23, 0x78, 0xcf, 0x8c, 0xe2, 0x7d, 0x15, 0x4a, 0x7d, 0x12, 0x7e, 0xd9, - 0xc7, 0x1e, 0xc3, 0x3d, 0xca, 0x04, 0x2f, 0x67, 0xab, 0xd6, 0x5a, 0xd6, 0x2d, 0x6a, 0xa9, 0xab, - 0x85, 0x76, 0x15, 0xf2, 0x01, 0xe6, 0x3e, 0x0b, 0x7b, 0x2a, 0x05, 0x39, 0x8d, 0xf0, 0x98, 0x48, - 0xee, 0xa3, 0x8a, 0xac, 0x29, 0x00, 0xf4, 0x3e, 0x52, 0xa2, 0x08, 0xc0, 0xfe, 0x0f, 0x14, 0x9b, - 0x61, 0xa7, 0x13, 0x92, 0xb6, 0xb1, 0xc8, 0x2b, 0x8b, 0x82, 0x11, 0x2a, 0x23, 0xe7, 0x9b, 0x04, - 0x94, 0xb6, 0x28, 0x11, 0x0c, 0xf9, 0xa6, 0xe7, 0xc6, 0x1a, 0xd9, 0x1a, 0x6f, 0xe4, 0x18, 0x8d, - 0x24, 0xa6, 0xd3, 0x48, 0xf2, 0x28, 0x1a, 0x49, 0x45, 0x28, 0x5a, 0x1d, 0xa3, 0x91, 0x79, 0x85, - 0xbf, 0x57, 0x27, 0x88, 0xf4, 0x8c, 0x04, 0x91, 0x99, 0x48, 0x10, 0x8f, 0x2c, 0x38, 0xb9, 0x83, - 0x4d, 0x12, 0xb6, 0x19, 0xed, 0x51, 0x8e, 0x3a, 0xf6, 0x22, 0xcc, 0x8b, 0x50, 0x74, 0xb0, 0x01, - 0x98, 0x5e, 0x8c, 0xd6, 0x26, 0x31, 0x5e, 0x9b, 0x8f, 0x20, 0x6d, 0x76, 0x4b, 0x2a, 0x52, 0xbc, - 0x70, 0x04, 0x29, 0x1e, 0x52, 0x92, 0x6b, 0x1c, 0x2e, 0x67, 0xbf, 0x7d, 0x5c, 0x99, 0x7b, 0xf9, - 0xb8, 0x32, 0xe7, 0xfc, 0x9c, 0xd2, 0x9c, 0x25, 0x4f, 0x83, 0x99, 0x08, 0x31, 0x8f, 0x03, 0xdb, - 0x1a, 0x02, 0xf6, 0x30, 0x35, 0x4d, 0xc9, 0x56, 0x72, 0xc6, 0x6c, 0xa5, 0x26, 0x65, 0x6b, 0x84, - 0x47, 0xe6, 0xdf, 0x2c, 0x8f, 0xa4, 0xdf, 0x16, 0x8f, 0x64, 0xde, 0x3e, 0x8f, 0x64, 0xdf, 0x1c, - 0x8f, 0x8c, 0x13, 0x45, 0xee, 0x15, 0x88, 0x02, 0xc6, 0x9a, 0x51, 0x82, 0xfc, 0xf4, 0x0e, 0x16, - 0x9b, 0x48, 0xf8, 0x7b, 0x6f, 0xa8, 0xbf, 0x63, 0x0c, 0x90, 0x9c, 0xce, 0x00, 0xa9, 0x09, 0x0c, - 0x30, 0xcc, 0x90, 0xf3, 0xa3, 0x0c, 0x79, 0x1b, 0x16, 0x54, 0x93, 0xf7, 0x06, 0x7d, 0x5f, 0x4e, - 0x57, 0x93, 0x6b, 0xf9, 0xf5, 0xd5, 0x29, 0x28, 0x3a, 0x04, 0x89, 0x5b, 0x6a, 0x0d, 0xad, 0x63, - 0x88, 0x5a, 0x87, 0xf2, 0x1d, 0x86, 0xfc, 0x0e, 0x8e, 0xd5, 0x92, 0x2b, 0x4e, 0xe3, 0xf6, 0x69, - 0x09, 0x59, 0xf9, 0x4f, 0x8d, 0x46, 0x45, 0xd7, 0xac, 0x9c, 0x7b, 0x70, 0xf2, 0x13, 0xc4, 0x5d, - 0x1c, 0x76, 0x9b, 0x7d, 0xc6, 0x71, 0x17, 0x4b, 0xe3, 0x0d, 0x28, 0xb1, 0x21, 0x89, 0x72, 0xca, - 0xaf, 0x9f, 0xad, 0xe9, 0xfa, 0xd6, 0xe4, 0x5c, 0x38, 0x38, 0xdf, 0x16, 0x0d, 0x89, 0x3b, 0xe2, - 0xe0, 0xdc, 0x85, 0xf9, 0x6d, 0x74, 0x80, 0xb1, 0xfd, 0x0e, 0x9c, 0x88, 0x65, 0xc7, 0x43, 0x41, - 0xc0, 0x4c, 0x39, 0x16, 0x62, 0xf2, 0x8d, 0x20, 0x60, 0x92, 0x9b, 0x7b, 0xe8, 0x40, 0xfa, 0x6b, - 0x33, 0x53, 0x19, 0x23, 0x93, 0x26, 0xce, 0x4f, 0x16, 0x14, 0x86, 0xda, 0xe8, 0x3a, 0xa4, 0x0d, - 0xae, 0xac, 0xd7, 0xc2, 0x95, 0xf1, 0xb6, 0xdf, 0x87, 0xd3, 0x31, 0x2c, 0x71, 0x6f, 0x30, 0x11, - 0xab, 0x53, 0x24, 0xdd, 0xa5, 0xb8, 0x76, 0x37, 0x52, 0x4a, 0xb7, 0x38, 0x40, 0x62, 0x6e, 0x49, - 0xed, 0x16, 0xd7, 0x0e, 0xdc, 0x9c, 0x2b, 0x50, 0xbc, 0xd6, 0xa3, 0xfe, 0xde, 0x06, 0x09, 0x5c, - 0xda, 0x27, 0x81, 0xec, 0x54, 0x2c, 0x05, 0xe6, 0x7d, 0xa4, 0x17, 0x52, 0xca, 0xa4, 0xda, 0x0c, - 0xcb, 0x7a, 0xe1, 0xfc, 0x60, 0x41, 0x5a, 0xc3, 0x63, 0xca, 0xa9, 0xad, 0x69, 0xa7, 0x3e, 0x07, - 0x39, 0xad, 0xd0, 0xef, 0x38, 0x49, 0x81, 0x87, 0x02, 0xdb, 0x85, 0x42, 0xdc, 0x4d, 0x43, 0x60, - 0xe6, 0xc4, 0x0e, 0xc5, 0x70, 0xbe, 0xb7, 0xa0, 0xa0, 0xcf, 0xbc, 0x4b, 0x77, 0xc2, 0xb6, 0x7a, - 0x7f, 0x4f, 0x9a, 0x4b, 0xcd, 0xcb, 0xd9, 0x4c, 0xa4, 0x83, 0xac, 0x24, 0x26, 0x66, 0x25, 0x19, - 0xcb, 0x8a, 0x44, 0x1d, 0x7e, 0x28, 0x18, 0xf2, 0xf6, 0x10, 0xdf, 0x33, 0xbc, 0x9e, 0x53, 0x92, - 0x1b, 0x88, 0xef, 0xc9, 0xfe, 0xd7, 0x3c, 0x63, 0x5e, 0xc0, 0x66, 0xe5, 0x7c, 0x67, 0xc1, 0xc2, - 0xb5, 0x7d, 0x4c, 0x84, 0x46, 0xce, 0x36, 0x0a, 0x83, 0x59, 0x5a, 0xf6, 0x3c, 0x40, 0x4f, 0xb6, - 0x79, 0xbc, 0x61, 0x73, 0x4a, 0xa2, 0xd4, 0x1f, 0x42, 0x1a, 0x75, 0xd5, 0x9c, 0xa1, 0x5f, 0x94, - 0x47, 0x03, 0x68, 0x33, 0x25, 0xf3, 0xeb, 0x1a, 0x73, 0xe7, 0x2f, 0x0b, 0x6c, 0x75, 0x2c, 0xcd, - 0xf9, 0x77, 0x7b, 0x01, 0x12, 0x38, 0xb0, 0x6f, 0x40, 0xc6, 0xef, 0x33, 0x86, 0xcd, 0xe0, 0x32, - 0x3b, 0x15, 0x47, 0xee, 0x76, 0x03, 0xb2, 0x2a, 0x6f, 0x83, 0x21, 0x7a, 0xf6, 0x50, 0xca, 0xbf, - 0x11, 0xd8, 0x5b, 0x00, 0x7d, 0x7d, 0x3e, 0x0f, 0x45, 0x0f, 0xba, 0x5c, 0xd3, 0x57, 0xcc, 0x5a, - 0x74, 0xc5, 0xac, 0x0d, 0xba, 0x6f, 0x33, 0x2b, 0x37, 0x7a, 0xf4, 0x7b, 0xc5, 0x72, 0x73, 0xc6, - 0x6f, 0x43, 0xc8, 0x1b, 0x4c, 0x51, 0x3d, 0xf0, 0x6d, 0xfc, 0x40, 0x43, 0x22, 0x7e, 0x42, 0xeb, - 0x78, 0x27, 0x3c, 0x0f, 0xc0, 0x05, 0x62, 0xf2, 0x84, 0xcd, 0x83, 0xa8, 0x4a, 0x46, 0xb2, 0x79, - 0x20, 0x1f, 0x20, 0x52, 0xcf, 0xfa, 0x00, 0xc6, 0x6f, 0x43, 0x38, 0xb7, 0xe0, 0x84, 0x3a, 0xff, - 0xee, 0xa0, 0x43, 0x82, 0x63, 0x34, 0xb9, 0xf3, 0x67, 0x12, 0x16, 0xa3, 0x7c, 0x0c, 0x11, 0xde, - 0x91, 0x33, 0x52, 0x0d, 0x4e, 0xa1, 0x76, 0x9b, 0xe1, 0x36, 0x12, 0x94, 0x79, 0x43, 0xc5, 0x2d, - 0xba, 0x27, 0x0f, 0x55, 0xae, 0x49, 0xca, 0x21, 0x73, 0x26, 0x8f, 0xc5, 0x9c, 0x55, 0xc8, 0xc7, - 0x50, 0xa1, 0xaf, 0x49, 0x6e, 0x5c, 0x34, 0x85, 0xa5, 0xe6, 0xa7, 0xb1, 0xd4, 0x28, 0x0f, 0xa5, - 0x8f, 0xcf, 0x43, 0xc3, 0xcc, 0x97, 0x19, 0x65, 0xbe, 0xb1, 0x7a, 0x65, 0x27, 0xd4, 0xeb, 0x26, - 0x2c, 0xa8, 0x12, 0x79, 0x88, 0x04, 0x3a, 0xcd, 0x6a, 0x72, 0x39, 0xfa, 0xd3, 0xc0, 0x10, 0xd3, - 0xbb, 0x45, 0x1c, 0x5f, 0x3a, 0x7f, 0x5b, 0x50, 0x52, 0x75, 0xd6, 0xa3, 0xcb, 0x0e, 0x16, 0xaf, - 0xd6, 0x35, 0x1f, 0xc3, 0xb9, 0x1e, 0xc3, 0xfb, 0x21, 0xed, 0xf3, 0x89, 0xf7, 0x6d, 0xfd, 0xd6, - 0x3a, 0x1b, 0xd9, 0x8c, 0xdd, 0xb8, 0x8f, 0x31, 0xc3, 0xdb, 0xd7, 0xc1, 0xdc, 0x97, 0xbc, 0x90, - 0xb4, 0xa8, 0xf9, 0x30, 0xb2, 0xfa, 0xaf, 0xfe, 0x0d, 0xd2, 0xa2, 0x2e, 0xf8, 0x83, 0xff, 0x9b, - 0xfe, 0x93, 0xe7, 0x2b, 0xd6, 0xd3, 0xe7, 0x2b, 0xd6, 0x1f, 0xcf, 0x57, 0xac, 0x47, 0x2f, 0x56, - 0xe6, 0x9e, 0xbe, 0x58, 0x99, 0xfb, 0xf5, 0xc5, 0xca, 0xdc, 0x67, 0x8d, 0x58, 0x71, 0x1b, 0x51, - 0xd8, 0x9b, 0xa8, 0xc9, 0xeb, 0x83, 0x4d, 0x2e, 0xfa, 0x94, 0xe1, 0xf8, 0x52, 0xce, 0xef, 0x75, - 0xfd, 0x8d, 0x88, 0xab, 0x8f, 0x64, 0xaa, 0x07, 0x9a, 0x69, 0x05, 0xe0, 0xf7, 0xfe, 0x09, 0x00, - 0x00, 0xff, 0xff, 0x61, 0xe8, 0xc5, 0x3e, 0x42, 0x13, 0x00, 0x00, + // 1574 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x3b, 0x70, 0x13, 0xd7, + 0x1a, 0xf6, 0x4a, 0xb2, 0x6c, 0xfd, 0x7a, 0x18, 0x16, 0x1b, 0x84, 0x07, 0x2c, 0xb1, 0x5c, 0xee, + 0xf5, 0x2d, 0x90, 0x2e, 0xbe, 0x93, 0x64, 0x02, 0x45, 0xc6, 0x36, 0x10, 0x34, 0xc3, 0xc3, 0xb3, + 0x36, 0x14, 0x69, 0x36, 0x47, 0xbb, 0x47, 0xf2, 0x06, 0xe9, 0x9c, 0xcd, 0x39, 0x47, 0x06, 0xf7, + 0x99, 0x49, 0x4a, 0x8a, 0x4c, 0x6a, 0xea, 0x74, 0xa9, 0xd2, 0xa5, 0x4a, 0x41, 0x49, 0x99, 0x49, + 0x41, 0x32, 0x30, 0x99, 0xa1, 0xc8, 0xa4, 0x4f, 0x97, 0x39, 0x8f, 0x95, 0x56, 0x0f, 0x6b, 0x10, + 0x86, 0x4a, 0x7b, 0xfe, 0xf7, 0xfe, 0x8f, 0xef, 0xfc, 0x2b, 0xa8, 0x84, 0xe4, 0x0b, 0xec, 0x8b, + 0xf0, 0x00, 0xd7, 0xa9, 0xcf, 0xea, 0x07, 0x57, 0x9a, 0x58, 0xa0, 0x2b, 0xf2, 0xb9, 0x16, 0x31, + 0x2a, 0xa8, 0xbd, 0xd2, 0x17, 0xa8, 0x49, 0xa2, 0x11, 0x58, 0x5d, 0x6e, 0xd3, 0x36, 0x55, 0x12, + 0x75, 0xf9, 0xa4, 0x85, 0x57, 0x2b, 0x6d, 0x4a, 0xdb, 0x1d, 0x5c, 0x57, 0xa7, 0x66, 0xaf, 0x55, + 0x17, 0x61, 0x17, 0x73, 0x81, 0xba, 0x91, 0x11, 0x58, 0xf3, 0x29, 0xef, 0x52, 0x5e, 0x6f, 0x22, + 0x8e, 0xfb, 0xce, 0x7c, 0x1a, 0x12, 0xcd, 0x77, 0xbe, 0xb2, 0x20, 0xbb, 0x83, 0x18, 0xea, 0x72, + 0xfb, 0x3c, 0x40, 0x27, 0x24, 0x0f, 0xbd, 0x00, 0x13, 0xda, 0x2d, 0x5b, 0x55, 0x6b, 0x3d, 0xe7, + 0xe6, 0x24, 0xe5, 0xba, 0x24, 0xd8, 0x1b, 0xb0, 0x12, 0xa1, 0x43, 0xda, 0x13, 0x5e, 0xb3, 0x43, + 0xfd, 0x87, 0x5e, 0x48, 0x04, 0x66, 0x07, 0xa8, 0x53, 0x4e, 0x55, 0xad, 0xf5, 0x8c, 0x7b, 0x4a, + 0x33, 0xb7, 0x24, 0xaf, 0x61, 0x58, 0xf6, 0x05, 0x28, 0x74, 0x69, 0xd0, 0xeb, 0x60, 0x0f, 0x05, + 0xdd, 0x90, 0x94, 0xd3, 0xca, 0x68, 0x5e, 0xd3, 0x36, 0x25, 0xe9, 0x6a, 0xe6, 0xf5, 0xd3, 0x8a, + 0xe5, 0x7c, 0x9f, 0x02, 0xb8, 0x89, 0x71, 0xb0, 0x4d, 0x49, 0x2b, 0x6c, 0xdb, 0x65, 0x58, 0xe0, + 0x61, 0x9b, 0x60, 0xc6, 0xcb, 0x56, 0x35, 0xbd, 0x9e, 0x73, 0xe3, 0xa3, 0xed, 0x40, 0x41, 0x30, + 0x44, 0x78, 0x37, 0x14, 0x42, 0xb2, 0x53, 0x8a, 0x3d, 0x44, 0xb3, 0x0b, 0x60, 0xb5, 0x94, 0xab, + 0xa2, 0x6b, 0xb5, 0xec, 0x4b, 0x50, 0xa2, 0xc4, 0xdf, 0x47, 0x21, 0xf1, 0x7c, 0x65, 0xbd, 0x9c, + 0xa9, 0x5a, 0xeb, 0x05, 0xb7, 0x68, 0xa8, 0xc6, 0xe5, 0x87, 0x70, 0x86, 0xb6, 0x5a, 0x49, 0x39, + 0xef, 0x00, 0x33, 0x1e, 0x52, 0x52, 0x9e, 0x57, 0x2f, 0xb8, 0x12, 0xb3, 0xb5, 0xc2, 0x03, 0xcd, + 0xb4, 0xff, 0x03, 0x4b, 0x23, 0x7a, 0xe5, 0xac, 0xb2, 0x5f, 0x1a, 0x96, 0xb7, 0x6f, 0x41, 0xd1, + 0xe4, 0x22, 0x52, 0xf9, 0x2e, 0x2f, 0x54, 0xad, 0xf5, 0xfc, 0xc6, 0xc5, 0xda, 0xc4, 0x7a, 0xd7, + 0xee, 0x28, 0x59, 0x5d, 0x1a, 0xd7, 0x64, 0x51, 0x9f, 0x9c, 0x9f, 0x2c, 0x28, 0x0d, 0x92, 0xd5, + 0x20, 0x2d, 0x6a, 0xff, 0x0f, 0x96, 0x3b, 0x48, 0x60, 0x2e, 0xe2, 0xd8, 0x83, 0xb0, 0x8d, 0xb9, + 0x50, 0x55, 0x2c, 0xb8, 0xb6, 0xe6, 0x69, 0xf9, 0xeb, 0x8a, 0xa3, 0x93, 0x94, 0x8a, 0x93, 0x54, + 0x00, 0x8b, 0xc4, 0x29, 0x23, 0xb2, 0x6c, 0xc6, 0x8c, 0x4f, 0x7b, 0x44, 0xa8, 0x84, 0x65, 0xdc, + 0xbc, 0xa6, 0x6d, 0x4b, 0x92, 0x7d, 0x0d, 0x56, 0x87, 0x1d, 0xea, 0xa6, 0x20, 0xbd, 0x6e, 0x13, + 0x33, 0x95, 0xb1, 0xb4, 0x7b, 0x26, 0xe9, 0x56, 0x35, 0xc6, 0x5d, 0xc5, 0x76, 0x7e, 0xcc, 0x40, + 0x21, 0xf9, 0x7e, 0xf6, 0x19, 0x58, 0x68, 0x61, 0x1c, 0x78, 0x61, 0x60, 0xfa, 0x2e, 0x2b, 0x8f, + 0x8d, 0xc0, 0xbe, 0x03, 0xd0, 0x0d, 0x89, 0x87, 0x08, 0x7f, 0x84, 0x99, 0x0a, 0x37, 0xb7, 0x55, + 0x7b, 0xf6, 0xa2, 0x32, 0xf7, 0xeb, 0x8b, 0xca, 0xbf, 0xdb, 0xa1, 0xd8, 0xef, 0x35, 0x6b, 0x3e, + 0xed, 0xd6, 0x4d, 0x97, 0xeb, 0x9f, 0xcb, 0x3c, 0x78, 0x58, 0x17, 0x87, 0x11, 0xe6, 0xb5, 0xeb, + 0xd8, 0x77, 0x73, 0xdd, 0x90, 0x6c, 0x2a, 0x03, 0xca, 0x1c, 0x7a, 0x1c, 0x9b, 0x4b, 0xbf, 0xa5, + 0x39, 0xf4, 0xd8, 0x98, 0xfb, 0x1c, 0x96, 0xd5, 0xc4, 0x44, 0x98, 0x79, 0xb4, 0xc9, 0x65, 0xcf, + 0x0b, 0xd9, 0x30, 0x99, 0x99, 0x0d, 0x37, 0x88, 0x70, 0x6d, 0x69, 0x6b, 0x07, 0xb3, 0x7b, 0x03, + 0x4b, 0x76, 0x13, 0x56, 0xfa, 0x1e, 0x4c, 0x8f, 0xf3, 0x7e, 0x4f, 0xce, 0xee, 0xe2, 0x94, 0x71, + 0xb1, 0x97, 0x30, 0x35, 0x32, 0xf7, 0xd9, 0xd1, 0xb9, 0xbf, 0x04, 0xa5, 0x1e, 0x09, 0xbf, 0xec, + 0x61, 0x8f, 0xe1, 0x88, 0x32, 0xa1, 0x1b, 0x77, 0xd1, 0x2d, 0x6a, 0xaa, 0xab, 0x89, 0x76, 0x15, + 0xf2, 0x01, 0xe6, 0x3e, 0x0b, 0x23, 0x95, 0x82, 0x45, 0x3d, 0xe9, 0x09, 0x92, 0xf4, 0xa3, 0x8a, + 0xac, 0xa1, 0x20, 0xa7, 0xfd, 0x48, 0x8a, 0x02, 0x02, 0xfb, 0x22, 0x14, 0x9b, 0x61, 0xa7, 0x13, + 0x92, 0xb6, 0x91, 0x00, 0x25, 0x51, 0x30, 0x44, 0x25, 0xe4, 0x7c, 0x9d, 0x82, 0xd2, 0x36, 0x25, + 0x82, 0x21, 0xdf, 0xf4, 0xd5, 0x58, 0xb3, 0x5a, 0xe3, 0xcd, 0x9a, 0x80, 0x93, 0xd4, 0x74, 0x38, + 0x49, 0x1f, 0x05, 0x27, 0x99, 0xa3, 0xe1, 0x64, 0x7e, 0x46, 0x38, 0xc9, 0xce, 0x08, 0x27, 0x0b, + 0x93, 0xe0, 0xc4, 0x79, 0x62, 0xc1, 0xc9, 0x5d, 0x6c, 0x92, 0xb0, 0xc3, 0x68, 0x44, 0x39, 0xea, + 0xd8, 0xcb, 0x30, 0x2f, 0x42, 0xd1, 0xc1, 0x66, 0x8c, 0xf4, 0x61, 0xb4, 0x36, 0xa9, 0xf1, 0xda, + 0x7c, 0x0c, 0x59, 0xe3, 0x2d, 0xad, 0x50, 0xe9, 0xc2, 0x11, 0xa8, 0x34, 0x80, 0x1d, 0xd7, 0x28, + 0x5c, 0x5d, 0xfc, 0xe6, 0x69, 0x65, 0xee, 0xf5, 0xd3, 0xca, 0x9c, 0xf3, 0x67, 0x46, 0xe3, 0x92, + 0x8c, 0x06, 0x33, 0x11, 0xe2, 0x29, 0x83, 0x3d, 0x0c, 0x3f, 0xe3, 0x49, 0x4d, 0xcf, 0x98, 0xd4, + 0xcc, 0x8c, 0x49, 0x9d, 0x9f, 0x88, 0xd1, 0xc3, 0x70, 0x93, 0x7d, 0xb7, 0x70, 0xb3, 0xf0, 0xbe, + 0xe0, 0x66, 0xf1, 0xfd, 0xc3, 0x4d, 0xee, 0xdd, 0xc1, 0xcd, 0x38, 0x9e, 0xc0, 0x1b, 0xe0, 0x49, + 0x7e, 0xac, 0x67, 0x25, 0x16, 0x9c, 0xde, 0xc5, 0x62, 0x0b, 0x09, 0x7f, 0xff, 0x1d, 0x8d, 0x41, + 0x02, 0x28, 0xd2, 0xd3, 0x81, 0x22, 0x33, 0x01, 0x28, 0x86, 0x81, 0x74, 0x7e, 0x14, 0x48, 0xef, + 0xc2, 0x92, 0x9a, 0x85, 0xa8, 0x3f, 0x1e, 0xe5, 0x6c, 0x35, 0xbd, 0x9e, 0xdf, 0xb8, 0x34, 0x65, + 0xd8, 0x06, 0xb3, 0xe4, 0x96, 0x5a, 0x43, 0xe7, 0xc4, 0xe0, 0x6d, 0x40, 0xf9, 0x1e, 0x43, 0x7e, + 0x07, 0x27, 0x6a, 0xc9, 0x15, 0xf4, 0x71, 0xfb, 0xb4, 0x9c, 0x6c, 0xf9, 0xa4, 0x36, 0xa9, 0xa2, + 0x6b, 0x4e, 0xce, 0x03, 0x38, 0xf9, 0x29, 0xe2, 0x2e, 0x0e, 0xbb, 0xcd, 0x1e, 0xe3, 0xb8, 0x8b, + 0xa5, 0xf0, 0x26, 0x94, 0xd8, 0x10, 0x45, 0x29, 0xe5, 0x37, 0xce, 0xd6, 0x74, 0x7d, 0x6b, 0x72, + 0x8d, 0xec, 0xc7, 0xb7, 0x4d, 0x43, 0xe2, 0x8e, 0x28, 0x38, 0xf7, 0x61, 0x7e, 0x07, 0x1d, 0x62, + 0x6c, 0xff, 0x17, 0x4e, 0x24, 0xb2, 0xe3, 0xa1, 0x20, 0x60, 0xa6, 0x1c, 0x4b, 0x09, 0xfa, 0x66, + 0x10, 0x30, 0x09, 0xe1, 0x11, 0x3a, 0x94, 0xfa, 0x5a, 0xcc, 0x54, 0xc6, 0xd0, 0xa4, 0x88, 0xf3, + 0xb3, 0x05, 0x85, 0xa1, 0x36, 0xba, 0x09, 0x59, 0x33, 0x57, 0xd6, 0x5b, 0xcd, 0x95, 0xd1, 0xb6, + 0x3f, 0x80, 0xd3, 0x89, 0x59, 0xe2, 0x5e, 0x7f, 0x81, 0x56, 0x51, 0xa4, 0xdd, 0x95, 0x24, 0x77, + 0x2f, 0x66, 0x4a, 0xb5, 0xe4, 0x80, 0x24, 0xd4, 0xd2, 0x5a, 0x2d, 0xc9, 0xed, 0xab, 0x39, 0xd7, + 0xa0, 0x78, 0x23, 0xa2, 0xfe, 0xfe, 0x26, 0x09, 0x5c, 0xda, 0x23, 0x81, 0xec, 0x54, 0x2c, 0x09, + 0xe6, 0xda, 0xd2, 0x07, 0x49, 0x65, 0x92, 0x6d, 0x76, 0x6b, 0x7d, 0x70, 0x7e, 0xb0, 0x20, 0xab, + 0xc7, 0x63, 0x4a, 0xd4, 0xd6, 0xb4, 0xa8, 0xcf, 0x41, 0x4e, 0x33, 0xf4, 0x55, 0x28, 0x21, 0x70, + 0x40, 0xb0, 0x5d, 0x28, 0x24, 0xd5, 0xf4, 0x08, 0xcc, 0x9c, 0xd8, 0x21, 0x1b, 0xce, 0x77, 0x16, + 0x14, 0x74, 0xcc, 0x7b, 0x74, 0x37, 0x6c, 0xab, 0x6b, 0x7e, 0xd2, 0x8a, 0x6a, 0xee, 0x70, 0xb3, + 0x9c, 0xf6, 0xb3, 0x92, 0x9a, 0x98, 0x95, 0x74, 0x22, 0x2b, 0x72, 0xea, 0xf0, 0x63, 0xc1, 0x90, + 0xb7, 0x8f, 0xf8, 0xbe, 0xd9, 0xed, 0x73, 0x8a, 0x72, 0x0b, 0xf1, 0x7d, 0xd9, 0xff, 0x1a, 0x67, + 0x0c, 0xe4, 0x9b, 0x93, 0xf3, 0xad, 0x05, 0x4b, 0x37, 0x0e, 0x30, 0x11, 0x7a, 0x72, 0x76, 0x50, + 0x18, 0xcc, 0xd2, 0xb2, 0xe7, 0x01, 0x22, 0xd9, 0xe6, 0xc9, 0x86, 0xcd, 0x29, 0x8a, 0x62, 0x7f, + 0x04, 0x59, 0xd4, 0x55, 0xeb, 0x88, 0xbe, 0x4f, 0x8f, 0x1e, 0xa0, 0xad, 0x8c, 0xcc, 0xaf, 0x6b, + 0xc4, 0x9d, 0xbf, 0x2c, 0xb0, 0x55, 0x58, 0x1a, 0xf3, 0xef, 0x47, 0x01, 0x12, 0x38, 0xb0, 0x6f, + 0xc1, 0x82, 0xdf, 0x63, 0x0c, 0x9b, 0xfd, 0x66, 0x76, 0x28, 0x8e, 0xd5, 0xed, 0x06, 0x2c, 0xaa, + 0xbc, 0xc9, 0x2b, 0x39, 0xf5, 0x76, 0xa6, 0x94, 0x7e, 0x23, 0xb0, 0xb7, 0x01, 0x7a, 0x3a, 0x3e, + 0x0f, 0xc5, 0x2f, 0xba, 0x5a, 0xd3, 0x5f, 0xa4, 0xb5, 0xf8, 0x8b, 0xb4, 0xd6, 0xef, 0xbe, 0xad, + 0x45, 0xe9, 0xe8, 0xc9, 0x6f, 0x15, 0xcb, 0xcd, 0x19, 0xbd, 0x4d, 0x21, 0x3f, 0x66, 0x8a, 0xea, + 0x85, 0xef, 0xe2, 0x47, 0x7a, 0x24, 0x92, 0x11, 0x5a, 0xc7, 0x8b, 0xf0, 0x3c, 0x00, 0x17, 0x88, + 0xc9, 0x08, 0x9b, 0x87, 0x71, 0x95, 0x0c, 0x65, 0xeb, 0x50, 0xbe, 0x40, 0xcc, 0x9e, 0xf5, 0x05, + 0x8c, 0xde, 0xa6, 0x70, 0xee, 0xc0, 0x09, 0x15, 0xff, 0x5e, 0xbf, 0x43, 0x82, 0x63, 0x34, 0xb9, + 0xf3, 0x47, 0x1a, 0x96, 0xe3, 0x7c, 0x0c, 0x01, 0xde, 0x91, 0xab, 0x54, 0x0d, 0x4e, 0xa1, 0x76, + 0x9b, 0xe1, 0x36, 0x12, 0x94, 0x79, 0x43, 0xc5, 0x2d, 0xba, 0x27, 0x07, 0x2c, 0xd7, 0x24, 0x65, + 0x80, 0x9c, 0xe9, 0x63, 0x21, 0x67, 0x15, 0xf2, 0x89, 0xa9, 0xd0, 0x1f, 0x3d, 0x6e, 0x92, 0x34, + 0x05, 0xa5, 0xe6, 0xa7, 0xa1, 0xd4, 0x28, 0x0e, 0x65, 0x8f, 0x8f, 0x43, 0xc3, 0xc8, 0xb7, 0x30, + 0x8a, 0x7c, 0x63, 0xf5, 0x5a, 0x9c, 0x50, 0xaf, 0xdb, 0xb0, 0xa4, 0x4a, 0xe4, 0x21, 0x12, 0xe8, + 0x34, 0xab, 0xb5, 0x28, 0xbf, 0xf1, 0xaf, 0x23, 0xee, 0xef, 0x21, 0xa4, 0x77, 0x8b, 0x38, 0x79, + 0x74, 0xfe, 0xb6, 0xa0, 0xa4, 0xea, 0xac, 0x57, 0x97, 0x5d, 0x2c, 0xde, 0xac, 0x6b, 0x3e, 0x81, + 0x73, 0x11, 0xc3, 0x07, 0x21, 0xed, 0xf1, 0x89, 0x9f, 0xde, 0xfa, 0xd6, 0x3a, 0x1b, 0xcb, 0x8c, + 0x7d, 0x7c, 0x1f, 0x63, 0xd5, 0xb7, 0x6f, 0x82, 0xf9, 0xac, 0xf2, 0x42, 0xd2, 0xa2, 0xaa, 0xe2, + 0xd3, 0xb7, 0x97, 0xc1, 0x3f, 0x14, 0x2e, 0xf8, 0xfd, 0xe7, 0x2d, 0xff, 0xd9, 0xcb, 0x35, 0xeb, + 0xf9, 0xcb, 0x35, 0xeb, 0xf7, 0x97, 0x6b, 0xd6, 0x93, 0x57, 0x6b, 0x73, 0xcf, 0x5f, 0xad, 0xcd, + 0xfd, 0xf2, 0x6a, 0x6d, 0xee, 0xb3, 0x46, 0xa2, 0xb8, 0x8d, 0xd8, 0xec, 0x6d, 0xd4, 0xe4, 0xf5, + 0xbe, 0x93, 0xcb, 0x3e, 0x65, 0x38, 0x79, 0x94, 0xfb, 0x7b, 0x5d, 0xff, 0x41, 0xc2, 0xd5, 0x7f, + 0x6a, 0xaa, 0x07, 0x9a, 0x59, 0x35, 0xc0, 0xff, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0xae, 0x33, + 0x35, 0xdd, 0x71, 0x13, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -1622,6 +1631,18 @@ func (m *FeedConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.ModuleParams != nil { + { + size, err := m.ModuleParams.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOcr(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + } if len(m.OffchainConfig) > 0 { i -= len(m.OffchainConfig) copy(dAtA[i:], m.OffchainConfig) @@ -1634,15 +1655,10 @@ func (m *FeedConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - if m.OnchainConfig != nil { - { - size, err := m.OnchainConfig.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOcr(dAtA, i, uint64(size)) - } + if len(m.OnchainConfig) > 0 { + i -= len(m.OnchainConfig) + copy(dAtA[i:], m.OnchainConfig) + i = encodeVarintOcr(dAtA, i, uint64(len(m.OnchainConfig))) i-- dAtA[i] = 0x22 } @@ -1722,7 +1738,7 @@ func (m *FeedConfigInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *OnchainConfig) Marshal() (dAtA []byte, err error) { +func (m *ModuleParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1732,12 +1748,12 @@ func (m *OnchainConfig) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *OnchainConfig) MarshalTo(dAtA []byte) (int, error) { +func (m *ModuleParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ModuleParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1747,21 +1763,21 @@ func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.BillingAdmin) i = encodeVarintOcr(dAtA, i, uint64(len(m.BillingAdmin))) i-- - dAtA[i] = 0x5a + dAtA[i] = 0x52 } if len(m.FeedAdmin) > 0 { i -= len(m.FeedAdmin) copy(dAtA[i:], m.FeedAdmin) i = encodeVarintOcr(dAtA, i, uint64(len(m.FeedAdmin))) i-- - dAtA[i] = 0x52 + dAtA[i] = 0x4a } if len(m.Description) > 0 { i -= len(m.Description) copy(dAtA[i:], m.Description) i = encodeVarintOcr(dAtA, i, uint64(len(m.Description))) i-- - dAtA[i] = 0x4a + dAtA[i] = 0x42 } if m.UniqueReports { i-- @@ -1771,14 +1787,14 @@ func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0 } i-- - dAtA[i] = 0x40 + dAtA[i] = 0x38 } if len(m.LinkDenom) > 0 { i -= len(m.LinkDenom) copy(dAtA[i:], m.LinkDenom) i = encodeVarintOcr(dAtA, i, uint64(len(m.LinkDenom))) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x32 } { size := m.LinkPerTransmission.Size() @@ -1789,7 +1805,7 @@ func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x2a { size := m.LinkPerObservation.Size() i -= size @@ -1799,7 +1815,7 @@ func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 { size := m.MaxAnswer.Size() i -= size @@ -1809,7 +1825,7 @@ func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a { size := m.MinAnswer.Size() i -= size @@ -1819,19 +1835,12 @@ func (m *OnchainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 if len(m.FeedId) > 0 { i -= len(m.FeedId) copy(dAtA[i:], m.FeedId) i = encodeVarintOcr(dAtA, i, uint64(len(m.FeedId))) i-- - dAtA[i] = 0x12 - } - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintOcr(dAtA, i, uint64(len(m.ChainId))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -1981,7 +1990,7 @@ func (m *FeedProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Description) i = encodeVarintOcr(dAtA, i, uint64(len(m.Description))) i-- - dAtA[i] = 0x52 + dAtA[i] = 0x5a } if m.UniqueReports { i-- @@ -1991,7 +2000,7 @@ func (m *FeedProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0 } i-- - dAtA[i] = 0x48 + dAtA[i] = 0x50 } { size := m.LinkPerTransmission.Size() @@ -2002,7 +2011,7 @@ func (m *FeedProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a { size := m.LinkPerObservation.Size() i -= size @@ -2012,7 +2021,7 @@ func (m *FeedProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 { size := m.MaxAnswer.Size() i -= size @@ -2022,7 +2031,7 @@ func (m *FeedProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x3a { size := m.MinAnswer.Size() i -= size @@ -2032,18 +2041,25 @@ func (m *FeedProperties) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOcr(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 if len(m.OffchainConfig) > 0 { i -= len(m.OffchainConfig) copy(dAtA[i:], m.OffchainConfig) i = encodeVarintOcr(dAtA, i, uint64(len(m.OffchainConfig))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if m.OffchainConfigVersion != 0 { i = encodeVarintOcr(dAtA, i, uint64(m.OffchainConfigVersion)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x20 + } + if len(m.OnchainConfig) > 0 { + i -= len(m.OnchainConfig) + copy(dAtA[i:], m.OnchainConfig) + i = encodeVarintOcr(dAtA, i, uint64(len(m.OnchainConfig))) + i-- + dAtA[i] = 0x1a } if m.F != 0 { i = encodeVarintOcr(dAtA, i, uint64(m.F)) @@ -2819,8 +2835,8 @@ func (m *FeedConfig) Size() (n int) { if m.F != 0 { n += 1 + sovOcr(uint64(m.F)) } - if m.OnchainConfig != nil { - l = m.OnchainConfig.Size() + l = len(m.OnchainConfig) + if l > 0 { n += 1 + l + sovOcr(uint64(l)) } if m.OffchainConfigVersion != 0 { @@ -2830,6 +2846,10 @@ func (m *FeedConfig) Size() (n int) { if l > 0 { n += 1 + l + sovOcr(uint64(l)) } + if m.ModuleParams != nil { + l = m.ModuleParams.Size() + n += 1 + l + sovOcr(uint64(l)) + } return n } @@ -2858,16 +2878,12 @@ func (m *FeedConfigInfo) Size() (n int) { return n } -func (m *OnchainConfig) Size() (n int) { +func (m *ModuleParams) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.ChainId) - if l > 0 { - n += 1 + l + sovOcr(uint64(l)) - } l = len(m.FeedId) if l > 0 { n += 1 + l + sovOcr(uint64(l)) @@ -2974,6 +2990,10 @@ func (m *FeedProperties) Size() (n int) { if m.F != 0 { n += 1 + sovOcr(uint64(m.F)) } + l = len(m.OnchainConfig) + if l > 0 { + n += 1 + l + sovOcr(uint64(l)) + } if m.OffchainConfigVersion != 0 { n += 1 + sovOcr(uint64(m.OffchainConfigVersion)) } @@ -3556,7 +3576,7 @@ func (m *FeedConfig) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OnchainConfig", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOcr @@ -3566,26 +3586,24 @@ func (m *FeedConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthOcr } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthOcr } if postIndex > l { return io.ErrUnexpectedEOF } + m.OnchainConfig = append(m.OnchainConfig[:0], dAtA[iNdEx:postIndex]...) if m.OnchainConfig == nil { - m.OnchainConfig = &OnchainConfig{} - } - if err := m.OnchainConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.OnchainConfig = []byte{} } iNdEx = postIndex case 5: @@ -3641,6 +3659,42 @@ func (m *FeedConfig) Unmarshal(dAtA []byte) error { m.OffchainConfig = []byte{} } iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ModuleParams", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOcr + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthOcr + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthOcr + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ModuleParams == nil { + m.ModuleParams = &ModuleParams{} + } + if err := m.ModuleParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOcr(dAtA[iNdEx:]) @@ -3822,7 +3876,7 @@ func (m *FeedConfigInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *OnchainConfig) Unmarshal(dAtA []byte) error { +func (m *ModuleParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3845,45 +3899,13 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: OnchainConfig: wiretype end group for non-group") + return fmt.Errorf("proto: ModuleParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: OnchainConfig: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ModuleParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOcr - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOcr - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOcr - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChainId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field FeedId", wireType) } @@ -3915,7 +3937,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { } m.FeedId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MinAnswer", wireType) } @@ -3949,7 +3971,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxAnswer", wireType) } @@ -3983,7 +4005,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LinkPerObservation", wireType) } @@ -4017,7 +4039,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LinkPerTransmission", wireType) } @@ -4051,7 +4073,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LinkDenom", wireType) } @@ -4083,7 +4105,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { } m.LinkDenom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 8: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field UniqueReports", wireType) } @@ -4103,7 +4125,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { } } m.UniqueReports = bool(v != 0) - case 9: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Description", wireType) } @@ -4135,7 +4157,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { } m.Description = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 10: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field FeedAdmin", wireType) } @@ -4167,7 +4189,7 @@ func (m *OnchainConfig) Unmarshal(dAtA []byte) error { } m.FeedAdmin = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 11: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BillingAdmin", wireType) } @@ -4690,6 +4712,40 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { } } case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OnchainConfig", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOcr + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthOcr + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthOcr + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.OnchainConfig = append(m.OnchainConfig[:0], dAtA[iNdEx:postIndex]...) + if m.OnchainConfig == nil { + m.OnchainConfig = []byte{} + } + iNdEx = postIndex + case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field OffchainConfigVersion", wireType) } @@ -4708,7 +4764,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { break } } - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OffchainConfig", wireType) } @@ -4742,7 +4798,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { m.OffchainConfig = []byte{} } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MinAnswer", wireType) } @@ -4776,7 +4832,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxAnswer", wireType) } @@ -4810,7 +4866,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LinkPerObservation", wireType) } @@ -4844,7 +4900,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LinkPerTransmission", wireType) } @@ -4878,7 +4934,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 9: + case 10: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field UniqueReports", wireType) } @@ -4898,7 +4954,7 @@ func (m *FeedProperties) Unmarshal(dAtA []byte) error { } } m.UniqueReports = bool(v != 0) - case 10: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Description", wireType) } diff --git a/chain/ocr/types/proposal.go b/chain/ocr/types/proposal.go index 3e8928cd..3a4eabbd 100644 --- a/chain/ocr/types/proposal.go +++ b/chain/ocr/types/proposal.go @@ -78,10 +78,13 @@ func (p *SetBatchConfigProposal) ValidateBasic() error { for _, feed := range p.FeedProperties { f := FeedConfig{ - Signers: p.Signers, - Transmitters: p.Transmitters, - F: feed.F, - OnchainConfig: &OnchainConfig{ + Signers: p.Signers, + Transmitters: p.Transmitters, + F: feed.F, + OnchainConfig: feed.OnchainConfig, + OffchainConfigVersion: feed.OffchainConfigVersion, + OffchainConfig: feed.OffchainConfig, + ModuleParams: &ModuleParams{ FeedId: feed.FeedId, MinAnswer: feed.MinAnswer, MaxAnswer: feed.MaxAnswer, @@ -91,8 +94,6 @@ func (p *SetBatchConfigProposal) ValidateBasic() error { UniqueReports: feed.UniqueReports, Description: feed.Description, }, - OffchainConfigVersion: feed.OffchainConfigVersion, - OffchainConfig: feed.OffchainConfig, } if err := f.ValidateBasic(); err != nil { diff --git a/chain/ocr/types/types.go b/chain/ocr/types/types.go index b6b9a50d..800a68c2 100644 --- a/chain/ocr/types/types.go +++ b/chain/ocr/types/types.go @@ -13,19 +13,29 @@ import ( const FeedIDMaxLength = 20 var digestPrefixCosmos = []byte("\x00\x02") +var digestSeparator = []byte("\x00\x00") -func (cfg *ContractConfig) Digest() []byte { +func (cfg *ContractConfig) Digest(chainID, feedID string) []byte { data, err := proto.Marshal(cfg) if err != nil { panic("unmarshable") } w := sha3.NewLegacyKeccak256() - n, err := w.Write(data) - if err != nil { + if _, err := w.Write(data); err != nil { + panic(err) + } + if _, err := w.Write(digestSeparator); err != nil { + panic(err) + } + if _, err := w.Write([]byte(chainID)); err != nil { + panic(err) + } + if _, err := w.Write(digestSeparator); err != nil { + panic(err) + } + if _, err := w.Write([]byte(feedID)); err != nil { panic(err) - } else if n != len(data) { - panic("short read") } configDigest := w.Sum(nil) @@ -61,40 +71,40 @@ func (cfg *FeedConfig) ValidateBasic() error { return err } - if cfg.OnchainConfig == nil { + if cfg.ModuleParams == nil { return sdkerrors.Wrap(ErrIncorrectConfig, "onchain config is not specified") } // TODO: determine whether this is a sensible enough limitation - if len(cfg.OnchainConfig.FeedId) == 0 || len(cfg.OnchainConfig.FeedId) > FeedIDMaxLength { + if len(cfg.ModuleParams.FeedId) == 0 || len(cfg.ModuleParams.FeedId) > FeedIDMaxLength { return sdkerrors.Wrap(ErrIncorrectConfig, "feed_id is missing or incorrect length") } - if strings.TrimSpace(cfg.OnchainConfig.FeedId) != cfg.OnchainConfig.FeedId { + if strings.TrimSpace(cfg.ModuleParams.FeedId) != cfg.ModuleParams.FeedId { return sdkerrors.Wrap(ErrIncorrectConfig, "feed_id cannot have leading or trailing space characters") } - if len(cfg.OnchainConfig.FeedAdmin) > 0 { - if _, err := sdk.AccAddressFromBech32(cfg.OnchainConfig.FeedAdmin); err != nil { + if len(cfg.ModuleParams.FeedAdmin) > 0 { + if _, err := sdk.AccAddressFromBech32(cfg.ModuleParams.FeedAdmin); err != nil { return err } } - if len(cfg.OnchainConfig.BillingAdmin) > 0 { - if _, err := sdk.AccAddressFromBech32(cfg.OnchainConfig.BillingAdmin); err != nil { + if len(cfg.ModuleParams.BillingAdmin) > 0 { + if _, err := sdk.AccAddressFromBech32(cfg.ModuleParams.BillingAdmin); err != nil { return err } } - if cfg.OnchainConfig.MinAnswer.IsNil() || cfg.OnchainConfig.MaxAnswer.IsNil() { + if cfg.ModuleParams.MinAnswer.IsNil() || cfg.ModuleParams.MaxAnswer.IsNil() { return sdkerrors.Wrap(ErrIncorrectConfig, "MinAnswer and MaxAnswer cannot be nil") } - if cfg.OnchainConfig.LinkPerTransmission.IsNil() || !cfg.OnchainConfig.LinkPerTransmission.IsPositive() { + if cfg.ModuleParams.LinkPerTransmission.IsNil() || !cfg.ModuleParams.LinkPerTransmission.IsPositive() { return sdkerrors.Wrap(ErrIncorrectConfig, "LinkPerTransmission must be positive") } - if cfg.OnchainConfig.LinkPerObservation.IsNil() || !cfg.OnchainConfig.LinkPerObservation.IsPositive() { + if cfg.ModuleParams.LinkPerObservation.IsNil() || !cfg.ModuleParams.LinkPerObservation.IsPositive() { return sdkerrors.Wrap(ErrIncorrectConfig, "LinkPerObservation must be positive") } @@ -126,7 +136,7 @@ func (cfg *FeedConfig) ValidateBasic() error { } } - if len(cfg.OnchainConfig.LinkDenom) == 0 { + if len(cfg.ModuleParams.LinkDenom) == 0 { return sdkerrors.ErrInvalidCoins }