From 574a882e59d4a84ef0178f7a75c214acbcf6d8c4 Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Fri, 1 Apr 2022 18:18:21 -0400 Subject: [PATCH 1/8] feat: enforce msg restriction rules --- Makefile | 37 +- docs/proto/proto-docs.md | 124 ++- proto/permission/exported/v1beta1/types.proto | 2 +- proto/utils/v1beta1/custom_options.proto | 12 + scripts/protocgen.sh | 3 +- .../proto/google/protobuf/descriptor.proto | 921 ++++++++++++++++++ utils/custom_options.pb.go | 60 ++ utils/proto.go | 17 + x/ante/restricted_tx.go | 30 +- x/axelarnet/types/tx.pb.go | 454 ++++++++- x/permission/exported/types.go | 2 +- x/permission/exported/types.pb.go | 29 +- x/permission/exported/types_test.go | 47 + x/permission/keeper/keeper.go | 2 +- 14 files changed, 1608 insertions(+), 132 deletions(-) create mode 100644 proto/utils/v1beta1/custom_options.proto create mode 100644 third_party/proto/google/protobuf/descriptor.proto create mode 100644 utils/custom_options.pb.go create mode 100644 utils/proto.go create mode 100644 x/permission/exported/types_test.go diff --git a/Makefile b/Makefile index 11eddf6a4..d9517119b 100644 --- a/Makefile +++ b/Makefile @@ -143,24 +143,26 @@ proto-lint: proto-check-breaking: @$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main -TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.0-rc6/proto/tendermint -GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos -GOOGLE_API_URL = https://raw.githubusercontent.com/googleapis/googleapis/master/google/api -COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master -CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.6.4 - -TM_CRYPTO_TYPES = third_party/proto/tendermint/crypto -TM_ABCI_TYPES = third_party/proto/tendermint/abci -TM_TYPES = third_party/proto/tendermint/types -TM_VERSION = third_party/proto/tendermint/version -TM_LIBS = third_party/proto/tendermint/libs/bits -TM_P2P = third_party/proto/tendermint/p2p - -GOGO_PROTO_TYPES = third_party/proto/gogoproto +TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.0-rc6/proto/tendermint +GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos +GOOGLE_PROTOBUF_URL = https://raw.githubusercontent.com/protocolbuffers/protobuf/main/src/google/protobuf +GOOGLE_API_URL = https://raw.githubusercontent.com/googleapis/googleapis/master/google/api +COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master +CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.6.4 + +TM_CRYPTO_TYPES = third_party/proto/tendermint/crypto +TM_ABCI_TYPES = third_party/proto/tendermint/abci +TM_TYPES = third_party/proto/tendermint/types +TM_VERSION = third_party/proto/tendermint/version +TM_LIBS = third_party/proto/tendermint/libs/bits +TM_P2P = third_party/proto/tendermint/p2p + +GOGO_PROTO_TYPES = third_party/proto/gogoproto GOOGLE_API_TYPES = third_party/proto/google/api -COSMOS_PROTO_TYPES = third_party/proto/cosmos_proto +GOOGLE_PROTOBUF_TYPES = third_party/proto/google/protobuf +COSMOS_PROTO_TYPES = third_party/proto/cosmos_proto # For some reason ibc expects confio proto files to be in the main folder -CONFIO_TYPES = third_party/proto +CONFIO_TYPES = third_party/proto proto-update-deps: @mkdir -p $(GOGO_PROTO_TYPES) @@ -170,6 +172,9 @@ proto-update-deps: @curl -sSL $(GOOGLE_API_URL)/annotations.proto > $(GOOGLE_API_TYPES)/annotations.proto @curl -sSL $(GOOGLE_API_URL)/http.proto > $(GOOGLE_API_TYPES)/http.proto + @mkdir -p $(GOOGLE_PROTOBUF_TYPES) + @curl -sSL $(GOOGLE_PROTOBUF_URL)/descriptor.proto > $(GOOGLE_PROTOBUF_TYPES)/descriptor.proto + @mkdir -p $(COSMOS_PROTO_TYPES) @curl -sSL $(COSMOS_PROTO_URL)/cosmos.proto > $(COSMOS_PROTO_TYPES)/cosmos.proto diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 8fd51983d..529088b8b 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -73,9 +73,17 @@ - [PendingIBCTransferCountResponse](#axelarnet.v1beta1.PendingIBCTransferCountResponse) - [PendingIBCTransferCountResponse.TransfersByChainEntry](#axelarnet.v1beta1.PendingIBCTransferCountResponse.TransfersByChainEntry) +- [permission/exported/v1beta1/types.proto](#permission/exported/v1beta1/types.proto) + - [Role](#permission.exported.v1beta1.Role) + +- [utils/v1beta1/custom_options.proto](#utils/v1beta1/custom_options.proto) + - [File-level Extensions](#utils/v1beta1/custom_options.proto-extensions) + - [axelarnet/v1beta1/tx.proto](#axelarnet/v1beta1/tx.proto) + - [AccessControlRequest](#axelarnet.v1beta1.AccessControlRequest) - [AddCosmosBasedChainRequest](#axelarnet.v1beta1.AddCosmosBasedChainRequest) - [AddCosmosBasedChainResponse](#axelarnet.v1beta1.AddCosmosBasedChainResponse) + - [ChainManagementRequest](#axelarnet.v1beta1.ChainManagementRequest) - [ConfirmDepositRequest](#axelarnet.v1beta1.ConfirmDepositRequest) - [ConfirmDepositResponse](#axelarnet.v1beta1.ConfirmDepositResponse) - [ExecutePendingTransfersRequest](#axelarnet.v1beta1.ExecutePendingTransfersRequest) @@ -90,6 +98,7 @@ - [RegisterIBCPathResponse](#axelarnet.v1beta1.RegisterIBCPathResponse) - [RouteIBCTransfersRequest](#axelarnet.v1beta1.RouteIBCTransfersRequest) - [RouteIBCTransfersResponse](#axelarnet.v1beta1.RouteIBCTransfersResponse) + - [UnrestrictedRequest](#axelarnet.v1beta1.UnrestrictedRequest) - [axelarnet/v1beta1/service.proto](#axelarnet/v1beta1/service.proto) - [MsgService](#axelarnet.v1beta1.MsgService) @@ -294,9 +303,6 @@ - [MsgService](#nexus.v1beta1.MsgService) - [QueryService](#nexus.v1beta1.QueryService) -- [permission/exported/v1beta1/types.proto](#permission/exported/v1beta1/types.proto) - - [Role](#permission.exported.v1beta1.Role) - - [permission/v1beta1/types.proto](#permission/v1beta1/types.proto) - [GovAccount](#permission.v1beta1.GovAccount) @@ -1411,6 +1417,59 @@ transfers for the specified chain + +

Top

+ +## permission/exported/v1beta1/types.proto + + + + + + + +### Role + + +| Name | Number | Description | +| ---- | ------ | ----------- | +| ROLE_UNSPECIFIED | 0 | | +| ROLE_ACCESS_CONTROL | 1 | | +| ROLE_CHAIN_MANAGEMENT | 2 | | + + + + + + + + + + + +

Top

+ +## utils/v1beta1/custom_options.proto + + + + + + + + + +### File-level Extensions +| Extension | Type | Base | Number | Description | +| --------- | ---- | ---- | ------ | ----------- | +| `permission_role` | permission.exported.v1beta1.Role | .google.protobuf.MessageOptions | 50000 | 50000-99999 reserved for use withing individual organizations | + + + + + + +

Top

@@ -1418,6 +1477,16 @@ transfers for the specified chain + + +### AccessControlRequest + + + + + + + ### AddCosmosBasedChainRequest @@ -1447,6 +1516,16 @@ to nexus + + +### ChainManagementRequest + + + + + + + ### ConfirmDepositRequest @@ -1642,6 +1721,16 @@ cosmos based chains + + + +### UnrestrictedRequest + + + + + + @@ -4505,35 +4594,6 @@ QueryService defines the gRPC querier service. - -

Top

- -## permission/exported/v1beta1/types.proto - - - - - - - -### Role - - -| Name | Number | Description | -| ---- | ------ | ----------- | -| ROLE_UNSPECIFIED | 0 | | -| ROLE_ACCESS_CONTROL | 1 | | -| ROLE_CHAIN_MANAGEMENT | 2 | | - - - - - - - - - -

Top

diff --git a/proto/permission/exported/v1beta1/types.proto b/proto/permission/exported/v1beta1/types.proto index 78fdd9006..3928c7078 100644 --- a/proto/permission/exported/v1beta1/types.proto +++ b/proto/permission/exported/v1beta1/types.proto @@ -11,7 +11,7 @@ enum Role { option (gogoproto.goproto_enum_prefix) = false; option (gogoproto.goproto_enum_stringer) = true; - ROLE_UNSPECIFIED = 0; + ROLE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname)="ROLE_UNRESTRICTED"]; ROLE_ACCESS_CONTROL = 1; ROLE_CHAIN_MANAGEMENT = 2; } diff --git a/proto/utils/v1beta1/custom_options.proto b/proto/utils/v1beta1/custom_options.proto new file mode 100644 index 000000000..5563ac899 --- /dev/null +++ b/proto/utils/v1beta1/custom_options.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +package utils.v1beta1; + +option go_package = "github.com/axelarnetwork/axelar-core/utils"; + +import "google/protobuf/descriptor.proto"; +import "permission/exported/v1beta1/types.proto"; + +extend google.protobuf.MessageOptions { + permission.exported.v1beta1.Role permission_role = + 50000; // 50000-99999 reserved for use withing individual organizations +} diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 7ff5f626a..dfa8b8f9c 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -18,7 +18,8 @@ for dir in $proto_dirs; do -I "proto" \ -I "third_party/proto" \ --gocosmos_out=plugins=interfacetype+grpc,\ -Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \ +Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types,\ +Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. \ --grpc-gateway_out=logtostderr=true:. \ $(find "${dir}" -maxdepth 1 -name '*.proto') # this needs to remain unquoted because we want word splitting done diff --git a/third_party/proto/google/protobuf/descriptor.proto b/third_party/proto/google/protobuf/descriptor.proto new file mode 100644 index 000000000..49ec6534b --- /dev/null +++ b/third_party/proto/google/protobuf/descriptor.proto @@ -0,0 +1,921 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Author: kenton@google.com (Kenton Varda) +// Based on original Protocol Buffers design by +// Sanjay Ghemawat, Jeff Dean, and others. +// +// The messages in this file describe the definitions found in .proto files. +// A valid .proto file can be translated directly to a FileDescriptorProto +// without any other information (e.g. without reading its imports). + + +syntax = "proto2"; + +package google.protobuf; + +option go_package = "google.golang.org/protobuf/types/descriptorpb"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "DescriptorProtos"; +option csharp_namespace = "Google.Protobuf.Reflection"; +option objc_class_prefix = "GPB"; +option cc_enable_arenas = true; + +// descriptor.proto must be optimized for speed because reflection-based +// algorithms don't work during bootstrapping. +option optimize_for = SPEED; + +// The protocol compiler can output a FileDescriptorSet containing the .proto +// files it parses. +message FileDescriptorSet { + repeated FileDescriptorProto file = 1; +} + +// Describes a complete .proto file. +message FileDescriptorProto { + optional string name = 1; // file name, relative to root of source tree + optional string package = 2; // e.g. "foo", "foo.bar", etc. + + // Names of files imported by this file. + repeated string dependency = 3; + // Indexes of the public imported files in the dependency list above. + repeated int32 public_dependency = 10; + // Indexes of the weak imported files in the dependency list. + // For Google-internal migration only. Do not use. + repeated int32 weak_dependency = 11; + + // All top-level definitions in this file. + repeated DescriptorProto message_type = 4; + repeated EnumDescriptorProto enum_type = 5; + repeated ServiceDescriptorProto service = 6; + repeated FieldDescriptorProto extension = 7; + + optional FileOptions options = 8; + + // This field contains optional information about the original source code. + // You may safely remove this entire field without harming runtime + // functionality of the descriptors -- the information is needed only by + // development tools. + optional SourceCodeInfo source_code_info = 9; + + // The syntax of the proto file. + // The supported values are "proto2" and "proto3". + optional string syntax = 12; +} + +// Describes a message type. +message DescriptorProto { + optional string name = 1; + + repeated FieldDescriptorProto field = 2; + repeated FieldDescriptorProto extension = 6; + + repeated DescriptorProto nested_type = 3; + repeated EnumDescriptorProto enum_type = 4; + + message ExtensionRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. + + optional ExtensionRangeOptions options = 3; + } + repeated ExtensionRange extension_range = 5; + + repeated OneofDescriptorProto oneof_decl = 8; + + optional MessageOptions options = 7; + + // Range of reserved tag numbers. Reserved tag numbers may not be used by + // fields or extension ranges in the same message. Reserved ranges may + // not overlap. + message ReservedRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. + } + repeated ReservedRange reserved_range = 9; + // Reserved field names, which may not be used by fields in the same message. + // A given name may only be reserved once. + repeated string reserved_name = 10; +} + +message ExtensionRangeOptions { + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +// Describes a field within a message. +message FieldDescriptorProto { + enum Type { + // 0 is reserved for errors. + // Order is weird for historical reasons. + TYPE_DOUBLE = 1; + TYPE_FLOAT = 2; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if + // negative values are likely. + TYPE_INT64 = 3; + TYPE_UINT64 = 4; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if + // negative values are likely. + TYPE_INT32 = 5; + TYPE_FIXED64 = 6; + TYPE_FIXED32 = 7; + TYPE_BOOL = 8; + TYPE_STRING = 9; + // Tag-delimited aggregate. + // Group type is deprecated and not supported in proto3. However, Proto3 + // implementations should still be able to parse the group wire format and + // treat group fields as unknown fields. + TYPE_GROUP = 10; + TYPE_MESSAGE = 11; // Length-delimited aggregate. + + // New in version 2. + TYPE_BYTES = 12; + TYPE_UINT32 = 13; + TYPE_ENUM = 14; + TYPE_SFIXED32 = 15; + TYPE_SFIXED64 = 16; + TYPE_SINT32 = 17; // Uses ZigZag encoding. + TYPE_SINT64 = 18; // Uses ZigZag encoding. + } + + enum Label { + // 0 is reserved for errors + LABEL_OPTIONAL = 1; + LABEL_REQUIRED = 2; + LABEL_REPEATED = 3; + } + + optional string name = 1; + optional int32 number = 3; + optional Label label = 4; + + // If type_name is set, this need not be set. If both this and type_name + // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. + optional Type type = 5; + + // For message and enum types, this is the name of the type. If the name + // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping + // rules are used to find the type (i.e. first the nested types within this + // message are searched, then within the parent, on up to the root + // namespace). + optional string type_name = 6; + + // For extensions, this is the name of the type being extended. It is + // resolved in the same manner as type_name. + optional string extendee = 2; + + // For numeric types, contains the original text representation of the value. + // For booleans, "true" or "false". + // For strings, contains the default text contents (not escaped in any way). + // For bytes, contains the C escaped value. All bytes >= 128 are escaped. + optional string default_value = 7; + + // If set, gives the index of a oneof in the containing type's oneof_decl + // list. This field is a member of that oneof. + optional int32 oneof_index = 9; + + // JSON name of this field. The value is set by protocol compiler. If the + // user has set a "json_name" option on this field, that option's value + // will be used. Otherwise, it's deduced from the field's name by converting + // it to camelCase. + optional string json_name = 10; + + optional FieldOptions options = 8; + + // If true, this is a proto3 "optional". When a proto3 field is optional, it + // tracks presence regardless of field type. + // + // When proto3_optional is true, this field must be belong to a oneof to + // signal to old proto3 clients that presence is tracked for this field. This + // oneof is known as a "synthetic" oneof, and this field must be its sole + // member (each proto3 optional field gets its own synthetic oneof). Synthetic + // oneofs exist in the descriptor only, and do not generate any API. Synthetic + // oneofs must be ordered after all "real" oneofs. + // + // For message fields, proto3_optional doesn't create any semantic change, + // since non-repeated message fields always track presence. However it still + // indicates the semantic detail of whether the user wrote "optional" or not. + // This can be useful for round-tripping the .proto file. For consistency we + // give message fields a synthetic oneof also, even though it is not required + // to track presence. This is especially important because the parser can't + // tell if a field is a message or an enum, so it must always create a + // synthetic oneof. + // + // Proto2 optional fields do not set this flag, because they already indicate + // optional with `LABEL_OPTIONAL`. + optional bool proto3_optional = 17; +} + +// Describes a oneof. +message OneofDescriptorProto { + optional string name = 1; + optional OneofOptions options = 2; +} + +// Describes an enum type. +message EnumDescriptorProto { + optional string name = 1; + + repeated EnumValueDescriptorProto value = 2; + + optional EnumOptions options = 3; + + // Range of reserved numeric values. Reserved values may not be used by + // entries in the same enum. Reserved ranges may not overlap. + // + // Note that this is distinct from DescriptorProto.ReservedRange in that it + // is inclusive such that it can appropriately represent the entire int32 + // domain. + message EnumReservedRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Inclusive. + } + + // Range of reserved numeric values. Reserved numeric values may not be used + // by enum values in the same enum declaration. Reserved ranges may not + // overlap. + repeated EnumReservedRange reserved_range = 4; + + // Reserved enum value names, which may not be reused. A given name may only + // be reserved once. + repeated string reserved_name = 5; +} + +// Describes a value within an enum. +message EnumValueDescriptorProto { + optional string name = 1; + optional int32 number = 2; + + optional EnumValueOptions options = 3; +} + +// Describes a service. +message ServiceDescriptorProto { + optional string name = 1; + repeated MethodDescriptorProto method = 2; + + optional ServiceOptions options = 3; +} + +// Describes a method of a service. +message MethodDescriptorProto { + optional string name = 1; + + // Input and output type names. These are resolved in the same way as + // FieldDescriptorProto.type_name, but must refer to a message type. + optional string input_type = 2; + optional string output_type = 3; + + optional MethodOptions options = 4; + + // Identifies if client streams multiple client messages + optional bool client_streaming = 5 [default = false]; + // Identifies if server streams multiple server messages + optional bool server_streaming = 6 [default = false]; +} + + +// =================================================================== +// Options + +// Each of the definitions above may have "options" attached. These are +// just annotations which may cause code to be generated slightly differently +// or may contain hints for code that manipulates protocol messages. +// +// Clients may define custom options as extensions of the *Options messages. +// These extensions may not yet be known at parsing time, so the parser cannot +// store the values in them. Instead it stores them in a field in the *Options +// message called uninterpreted_option. This field must have the same name +// across all *Options messages. We then use this field to populate the +// extensions when we build a descriptor, at which point all protos have been +// parsed and so all extensions are known. +// +// Extension numbers for custom options may be chosen as follows: +// * For options which will only be used within a single application or +// organization, or for experimental options, use field numbers 50000 +// through 99999. It is up to you to ensure that you do not use the +// same number for multiple options. +// * For options which will be published and used publicly by multiple +// independent entities, e-mail protobuf-global-extension-registry@google.com +// to reserve extension numbers. Simply provide your project name (e.g. +// Objective-C plugin) and your project website (if available) -- there's no +// need to explain how you intend to use them. Usually you only need one +// extension number. You can declare multiple options with only one extension +// number by putting them in a sub-message. See the Custom Options section of +// the docs for examples: +// https://developers.google.com/protocol-buffers/docs/proto#options +// If this turns out to be popular, a web service will be set up +// to automatically assign option numbers. + +message FileOptions { + + // Sets the Java package where classes generated from this .proto will be + // placed. By default, the proto package is used, but this is often + // inappropriate because proto packages do not normally start with backwards + // domain names. + optional string java_package = 1; + + + // Controls the name of the wrapper Java class generated for the .proto file. + // That class will always contain the .proto file's getDescriptor() method as + // well as any top-level extensions defined in the .proto file. + // If java_multiple_files is disabled, then all the other classes from the + // .proto file will be nested inside the single wrapper outer class. + optional string java_outer_classname = 8; + + // If enabled, then the Java code generator will generate a separate .java + // file for each top-level message, enum, and service defined in the .proto + // file. Thus, these types will *not* be nested inside the wrapper class + // named by java_outer_classname. However, the wrapper class will still be + // generated to contain the file's getDescriptor() method as well as any + // top-level extensions defined in the file. + optional bool java_multiple_files = 10 [default = false]; + + // This option does nothing. + optional bool java_generate_equals_and_hash = 20 [deprecated=true]; + + // If set true, then the Java2 code generator will generate code that + // throws an exception whenever an attempt is made to assign a non-UTF-8 + // byte sequence to a string field. + // Message reflection will do the same. + // However, an extension field still accepts non-UTF-8 byte sequences. + // This option has no effect on when used with the lite runtime. + optional bool java_string_check_utf8 = 27 [default = false]; + + + // Generated classes can be optimized for speed or code size. + enum OptimizeMode { + SPEED = 1; // Generate complete code for parsing, serialization, + // etc. + CODE_SIZE = 2; // Use ReflectionOps to implement these methods. + LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. + } + optional OptimizeMode optimize_for = 9 [default = SPEED]; + + // Sets the Go package where structs generated from this .proto will be + // placed. If omitted, the Go package will be derived from the following: + // - The basename of the package import path, if provided. + // - Otherwise, the package statement in the .proto file, if present. + // - Otherwise, the basename of the .proto file, without extension. + optional string go_package = 11; + + + + + // Should generic services be generated in each language? "Generic" services + // are not specific to any particular RPC system. They are generated by the + // main code generators in each language (without additional plugins). + // Generic services were the only kind of service generation supported by + // early versions of google.protobuf. + // + // Generic services are now considered deprecated in favor of using plugins + // that generate code specific to your particular RPC system. Therefore, + // these default to false. Old code which depends on generic services should + // explicitly set them to true. + optional bool cc_generic_services = 16 [default = false]; + optional bool java_generic_services = 17 [default = false]; + optional bool py_generic_services = 18 [default = false]; + optional bool php_generic_services = 42 [default = false]; + + // Is this file deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for everything in the file, or it will be completely ignored; in the very + // least, this is a formalization for deprecating files. + optional bool deprecated = 23 [default = false]; + + // Enables the use of arenas for the proto messages in this file. This applies + // only to generated classes for C++. + optional bool cc_enable_arenas = 31 [default = true]; + + + // Sets the objective c class prefix which is prepended to all objective c + // generated classes from this .proto. There is no default. + optional string objc_class_prefix = 36; + + // Namespace for generated classes; defaults to the package. + optional string csharp_namespace = 37; + + // By default Swift generators will take the proto package and CamelCase it + // replacing '.' with underscore and use that to prefix the types/symbols + // defined. When this options is provided, they will use this value instead + // to prefix the types/symbols defined. + optional string swift_prefix = 39; + + // Sets the php class prefix which is prepended to all php generated classes + // from this .proto. Default is empty. + optional string php_class_prefix = 40; + + // Use this option to change the namespace of php generated classes. Default + // is empty. When this option is empty, the package name will be used for + // determining the namespace. + optional string php_namespace = 41; + + // Use this option to change the namespace of php generated metadata classes. + // Default is empty. When this option is empty, the proto file name will be + // used for determining the namespace. + optional string php_metadata_namespace = 44; + + // Use this option to change the package of ruby generated classes. Default + // is empty. When this option is not set, the package name will be used for + // determining the ruby package. + optional string ruby_package = 45; + + + // The parser stores options it doesn't recognize here. + // See the documentation for the "Options" section above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. + // See the documentation for the "Options" section above. + extensions 1000 to max; + + reserved 38; +} + +message MessageOptions { + // Set true to use the old proto1 MessageSet wire format for extensions. + // This is provided for backwards-compatibility with the MessageSet wire + // format. You should not use this for any other reason: It's less + // efficient, has fewer features, and is more complicated. + // + // The message must be defined exactly as follows: + // message Foo { + // option message_set_wire_format = true; + // extensions 4 to max; + // } + // Note that the message cannot have any defined fields; MessageSets only + // have extensions. + // + // All extensions of your type must be singular messages; e.g. they cannot + // be int32s, enums, or repeated messages. + // + // Because this is an option, the above two restrictions are not enforced by + // the protocol compiler. + optional bool message_set_wire_format = 1 [default = false]; + + // Disables the generation of the standard "descriptor()" accessor, which can + // conflict with a field of the same name. This is meant to make migration + // from proto1 easier; new code should avoid fields named "descriptor". + optional bool no_standard_descriptor_accessor = 2 [default = false]; + + // Is this message deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the message, or it will be completely ignored; in the very least, + // this is a formalization for deprecating messages. + optional bool deprecated = 3 [default = false]; + + reserved 4, 5, 6; + + // Whether the message is an automatically generated map entry type for the + // maps field. + // + // For maps fields: + // map map_field = 1; + // The parsed descriptor looks like: + // message MapFieldEntry { + // option map_entry = true; + // optional KeyType key = 1; + // optional ValueType value = 2; + // } + // repeated MapFieldEntry map_field = 1; + // + // Implementations may choose not to generate the map_entry=true message, but + // use a native map in the target language to hold the keys and values. + // The reflection APIs in such implementations still need to work as + // if the field is a repeated message field. + // + // NOTE: Do not set the option in .proto files. Always use the maps syntax + // instead. The option should only be implicitly set by the proto compiler + // parser. + optional bool map_entry = 7; + + reserved 8; // javalite_serializable + reserved 9; // javanano_as_lite + + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message FieldOptions { + // The ctype option instructs the C++ code generator to use a different + // representation of the field than it normally would. See the specific + // options below. This option is not yet implemented in the open source + // release -- sorry, we'll try to include it in a future version! + optional CType ctype = 1 [default = STRING]; + enum CType { + // Default mode. + STRING = 0; + + CORD = 1; + + STRING_PIECE = 2; + } + // The packed option can be enabled for repeated primitive fields to enable + // a more efficient representation on the wire. Rather than repeatedly + // writing the tag and type for each element, the entire array is encoded as + // a single length-delimited blob. In proto3, only explicit setting it to + // false will avoid using packed encoding. + optional bool packed = 2; + + // The jstype option determines the JavaScript type used for values of the + // field. The option is permitted only for 64 bit integral and fixed types + // (int64, uint64, sint64, fixed64, sfixed64). A field with jstype JS_STRING + // is represented as JavaScript string, which avoids loss of precision that + // can happen when a large value is converted to a floating point JavaScript. + // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to + // use the JavaScript "number" type. The behavior of the default option + // JS_NORMAL is implementation dependent. + // + // This option is an enum to permit additional types to be added, e.g. + // goog.math.Integer. + optional JSType jstype = 6 [default = JS_NORMAL]; + enum JSType { + // Use the default type. + JS_NORMAL = 0; + + // Use JavaScript strings. + JS_STRING = 1; + + // Use JavaScript numbers. + JS_NUMBER = 2; + } + + // Should this field be parsed lazily? Lazy applies only to message-type + // fields. It means that when the outer message is initially parsed, the + // inner message's contents will not be parsed but instead stored in encoded + // form. The inner message will actually be parsed when it is first accessed. + // + // This is only a hint. Implementations are free to choose whether to use + // eager or lazy parsing regardless of the value of this option. However, + // setting this option true suggests that the protocol author believes that + // using lazy parsing on this field is worth the additional bookkeeping + // overhead typically needed to implement it. + // + // This option does not affect the public interface of any generated code; + // all method signatures remain the same. Furthermore, thread-safety of the + // interface is not affected by this option; const methods remain safe to + // call from multiple threads concurrently, while non-const methods continue + // to require exclusive access. + // + // + // Note that implementations may choose not to check required fields within + // a lazy sub-message. That is, calling IsInitialized() on the outer message + // may return true even if the inner message has missing required fields. + // This is necessary because otherwise the inner message would have to be + // parsed in order to perform the check, defeating the purpose of lazy + // parsing. An implementation which chooses not to check required fields + // must be consistent about it. That is, for any particular sub-message, the + // implementation must either *always* check its required fields, or *never* + // check its required fields, regardless of whether or not the message has + // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. + optional bool lazy = 5 [default = false]; + + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + + // Is this field deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for accessors, or it will be completely ignored; in the very least, this + // is a formalization for deprecating fields. + optional bool deprecated = 3 [default = false]; + + // For Google-internal migration only. Do not use. + optional bool weak = 10 [default = false]; + + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; + + reserved 4; // removed jtype +} + +message OneofOptions { + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumOptions { + + // Set this option to true to allow mapping different tag names to the same + // value. + optional bool allow_alias = 2; + + // Is this enum deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum, or it will be completely ignored; in the very least, this + // is a formalization for deprecating enums. + optional bool deprecated = 3 [default = false]; + + reserved 5; // javanano_as_lite + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumValueOptions { + // Is this enum value deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum value, or it will be completely ignored; in the very least, + // this is a formalization for deprecating enum values. + optional bool deprecated = 1 [default = false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message ServiceOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this service deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the service, or it will be completely ignored; in the very least, + // this is a formalization for deprecating services. + optional bool deprecated = 33 [default = false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message MethodOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this method deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the method, or it will be completely ignored; in the very least, + // this is a formalization for deprecating methods. + optional bool deprecated = 33 [default = false]; + + // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, + // or neither? HTTP based RPC implementation may choose GET verb for safe + // methods, and PUT verb for idempotent methods instead of the default POST. + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0; + NO_SIDE_EFFECTS = 1; // implies idempotent + IDEMPOTENT = 2; // idempotent, but may have side effects + } + optional IdempotencyLevel idempotency_level = 34 + [default = IDEMPOTENCY_UNKNOWN]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + + +// A message representing a option the parser does not recognize. This only +// appears in options protos created by the compiler::Parser class. +// DescriptorPool resolves these when building Descriptor objects. Therefore, +// options protos in descriptor objects (e.g. returned by Descriptor::options(), +// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions +// in them. +message UninterpretedOption { + // The name of the uninterpreted option. Each string represents a segment in + // a dot-separated name. is_extension is true iff a segment represents an + // extension (denoted with parentheses in options specs in .proto files). + // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents + // "foo.(bar.baz).qux". + message NamePart { + required string name_part = 1; + required bool is_extension = 2; + } + repeated NamePart name = 2; + + // The value of the uninterpreted option, in whatever type the tokenizer + // identified it as during parsing. Exactly one of these should be set. + optional string identifier_value = 3; + optional uint64 positive_int_value = 4; + optional int64 negative_int_value = 5; + optional double double_value = 6; + optional bytes string_value = 7; + optional string aggregate_value = 8; +} + +// =================================================================== +// Optional source code info + +// Encapsulates information about the original source file from which a +// FileDescriptorProto was generated. +message SourceCodeInfo { + // A Location identifies a piece of source code in a .proto file which + // corresponds to a particular definition. This information is intended + // to be useful to IDEs, code indexers, documentation generators, and similar + // tools. + // + // For example, say we have a file like: + // message Foo { + // optional string foo = 1; + // } + // Let's look at just the field definition: + // optional string foo = 1; + // ^ ^^ ^^ ^ ^^^ + // a bc de f ghi + // We have the following locations: + // span path represents + // [a,i) [ 4, 0, 2, 0 ] The whole field definition. + // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). + // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). + // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). + // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). + // + // Notes: + // - A location may refer to a repeated field itself (i.e. not to any + // particular index within it). This is used whenever a set of elements are + // logically enclosed in a single code segment. For example, an entire + // extend block (possibly containing multiple extension definitions) will + // have an outer location whose path refers to the "extensions" repeated + // field without an index. + // - Multiple locations may have the same path. This happens when a single + // logical declaration is spread out across multiple places. The most + // obvious example is the "extend" block again -- there may be multiple + // extend blocks in the same scope, each of which will have the same path. + // - A location's span is not always a subset of its parent's span. For + // example, the "extendee" of an extension declaration appears at the + // beginning of the "extend" block and is shared by all extensions within + // the block. + // - Just because a location's span is a subset of some other location's span + // does not mean that it is a descendant. For example, a "group" defines + // both a type and a field in a single declaration. Thus, the locations + // corresponding to the type and field and their components will overlap. + // - Code which tries to interpret locations should probably be designed to + // ignore those that it doesn't understand, as more types of locations could + // be recorded in the future. + repeated Location location = 1; + message Location { + // Identifies which part of the FileDescriptorProto was defined at this + // location. + // + // Each element is a field number or an index. They form a path from + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: + // [ 4, 3, 2, 7, 1 ] + // refers to: + // file.message_type(3) // 4, 3 + // .field(7) // 2, 7 + // .name() // 1 + // This is because FileDescriptorProto.message_type has field number 4: + // repeated DescriptorProto message_type = 4; + // and DescriptorProto.field has field number 2: + // repeated FieldDescriptorProto field = 2; + // and FieldDescriptorProto.name has field number 1: + // optional string name = 1; + // + // Thus, the above path gives the location of a field name. If we removed + // the last element: + // [ 4, 3, 2, 7 ] + // this path refers to the whole field declaration (from the beginning + // of the label to the terminating semicolon). + repeated int32 path = 1 [packed = true]; + + // Always has exactly three or four elements: start line, start column, + // end line (optional, otherwise assumed same as start line), end column. + // These are packed into a single field for efficiency. Note that line + // and column numbers are zero-based -- typically you will want to add + // 1 to each before displaying to a user. + repeated int32 span = 2 [packed = true]; + + // If this SourceCodeInfo represents a complete declaration, these are any + // comments appearing before and after the declaration which appear to be + // attached to the declaration. + // + // A series of line comments appearing on consecutive lines, with no other + // tokens appearing on those lines, will be treated as a single comment. + // + // leading_detached_comments will keep paragraphs of comments that appear + // before (but not connected to) the current element. Each paragraph, + // separated by empty lines, will be one comment element in the repeated + // field. + // + // Only the comment content is provided; comment markers (e.g. //) are + // stripped out. For block comments, leading whitespace and an asterisk + // will be stripped from the beginning of each line other than the first. + // Newlines are included in the output. + // + // Examples: + // + // optional int32 foo = 1; // Comment attached to foo. + // // Comment attached to bar. + // optional int32 bar = 2; + // + // optional string baz = 3; + // // Comment attached to baz. + // // Another line attached to baz. + // + // // Comment attached to qux. + // // + // // Another line attached to qux. + // optional double qux = 4; + // + // // Detached comment for corge. This is not leading or trailing comments + // // to qux or corge because there are blank lines separating it from + // // both. + // + // // Detached comment for corge paragraph 2. + // + // optional string corge = 5; + // /* Block comment attached + // * to corge. Leading asterisks + // * will be removed. */ + // /* Block comment attached to + // * grault. */ + // optional int32 grault = 6; + // + // // ignored detached comments. + optional string leading_comments = 3; + optional string trailing_comments = 4; + repeated string leading_detached_comments = 6; + } +} + +// Describes the relationship between generated code and its original source +// file. A GeneratedCodeInfo message is associated with only one generated +// source file, but may contain references to different source .proto files. +message GeneratedCodeInfo { + // An Annotation connects some span of text in generated code to an element + // of its generating .proto file. + repeated Annotation annotation = 1; + message Annotation { + // Identifies the element in the original source .proto file. This field + // is formatted the same as SourceCodeInfo.Location.path. + repeated int32 path = 1 [packed = true]; + + // Identifies the filesystem path to the original source .proto. + optional string source_file = 2; + + // Identifies the starting offset in bytes in the generated code + // that relates to the identified object. + optional int32 begin = 3; + + // Identifies the ending offset in bytes in the generated code that + // relates to the identified offset. The end offset should be one past + // the last relevant byte (so the length of the text = end - begin). + optional int32 end = 4; + } +} diff --git a/utils/custom_options.pb.go b/utils/custom_options.pb.go new file mode 100644 index 000000000..f3836c85c --- /dev/null +++ b/utils/custom_options.pb.go @@ -0,0 +1,60 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: utils/v1beta1/custom_options.proto + +package utils + +import ( + fmt "fmt" + exported "github.com/axelarnetwork/axelar-core/x/permission/exported" + proto "github.com/gogo/protobuf/proto" + descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +var E_PermissionRole = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.MessageOptions)(nil), + ExtensionType: (*exported.Role)(nil), + Field: 50000, + Name: "utils.v1beta1.permission_role", + Tag: "varint,50000,opt,name=permission_role,enum=permission.exported.v1beta1.Role", + Filename: "utils/v1beta1/custom_options.proto", +} + +func init() { + proto.RegisterExtension(E_PermissionRole) +} + +func init() { + proto.RegisterFile("utils/v1beta1/custom_options.proto", fileDescriptor_cb337de90b41f502) +} + +var fileDescriptor_cb337de90b41f502 = []byte{ + // 245 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x90, 0xbf, 0x4a, 0xc4, 0x40, + 0x10, 0xc6, 0x13, 0x04, 0x8b, 0x03, 0x4f, 0xb8, 0x4a, 0xae, 0x58, 0x4f, 0x1b, 0x45, 0x70, 0x96, + 0xd3, 0xce, 0x52, 0x6c, 0x45, 0xb8, 0xd2, 0xe6, 0x48, 0x72, 0x63, 0x5c, 0xdc, 0x64, 0x96, 0xd9, + 0x89, 0xc6, 0x17, 0xb0, 0xf6, 0xb1, 0x2c, 0x53, 0x5a, 0x4a, 0xf2, 0x22, 0xe2, 0x26, 0x31, 0xe5, + 0xc7, 0xfc, 0xbe, 0x3f, 0xcc, 0xec, 0xb4, 0x12, 0x63, 0xbd, 0x7e, 0x5d, 0xa7, 0x28, 0xc9, 0x5a, + 0x67, 0x95, 0x17, 0x2a, 0xb6, 0xe4, 0xc4, 0x50, 0xe9, 0xc1, 0x31, 0x09, 0x2d, 0x0e, 0x02, 0x03, + 0x03, 0xb3, 0x5c, 0xe5, 0x44, 0xb9, 0x45, 0x1d, 0x8e, 0x69, 0xf5, 0xa4, 0x77, 0xe8, 0x33, 0x36, + 0x4e, 0x88, 0x7b, 0xc3, 0xf2, 0xcc, 0x21, 0x17, 0xc6, 0x7b, 0x43, 0xa5, 0xc6, 0xda, 0x11, 0x0b, + 0xee, 0xfe, 0x2b, 0xe4, 0xdd, 0xe1, 0x90, 0x7c, 0x53, 0xcc, 0x0e, 0x27, 0x74, 0xcb, 0x64, 0x71, + 0x71, 0x0c, 0x7d, 0x3c, 0x8c, 0xf1, 0x70, 0x8f, 0xde, 0x27, 0x39, 0x3e, 0xf4, 0x9b, 0x8e, 0x9a, + 0x8f, 0xbd, 0x55, 0x7c, 0x3e, 0xbf, 0x3a, 0x81, 0xc9, 0x0a, 0x63, 0xcb, 0x38, 0x12, 0x36, 0x64, + 0x71, 0x33, 0x9f, 0x88, 0x3f, 0x7d, 0x7b, 0xf7, 0xd5, 0xaa, 0xb8, 0x69, 0x55, 0xfc, 0xd3, 0xaa, + 0xf8, 0xb3, 0x53, 0x51, 0xd3, 0xa9, 0xe8, 0xbb, 0x53, 0xd1, 0xe3, 0x45, 0x6e, 0xe4, 0xb9, 0x4a, + 0x21, 0xa3, 0x42, 0x27, 0x35, 0xda, 0x84, 0x4b, 0x94, 0x37, 0xe2, 0x97, 0x41, 0x5d, 0x66, 0xc4, + 0xa8, 0xc3, 0x1f, 0xd2, 0xfd, 0xb0, 0xec, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xcc, 0x28, + 0x74, 0x3b, 0x01, 0x00, 0x00, +} diff --git a/utils/proto.go b/utils/proto.go new file mode 100644 index 000000000..40dcf31c1 --- /dev/null +++ b/utils/proto.go @@ -0,0 +1,17 @@ +package utils + +import ( + "github.com/gogo/protobuf/proto" + "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + + "github.com/axelarnetwork/axelar-core/x/permission/exported" +) + +func GetPermissionRole(message descriptor.Message) exported.Role { + _, d := descriptor.ForMessage(message) + v, err := proto.GetExtension(d.GetOptions(), E_PermissionRole) + if err != nil { + return exported.ROLE_CHAIN_MANAGEMENT + } + return *v.(*exported.Role) +} diff --git a/x/ante/restricted_tx.go b/x/ante/restricted_tx.go index 7d4b13532..9fb49f259 100644 --- a/x/ante/restricted_tx.go +++ b/x/ante/restricted_tx.go @@ -3,14 +3,11 @@ package ante import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + "github.com/axelarnetwork/axelar-core/utils" "github.com/axelarnetwork/axelar-core/x/ante/types" - axelarnet "github.com/axelarnetwork/axelar-core/x/axelarnet/types" - evm "github.com/axelarnetwork/axelar-core/x/evm/types" - nexus "github.com/axelarnetwork/axelar-core/x/nexus/types" permission "github.com/axelarnetwork/axelar-core/x/permission/exported" - permissionTypes "github.com/axelarnetwork/axelar-core/x/permission/types" - tss "github.com/axelarnetwork/axelar-core/x/tss/types" ) // RestrictedTx checks if the signer is authorized to send restricted transactions @@ -27,27 +24,18 @@ func NewRestrictedTx(permission types.Permission) RestrictedTx { // AnteHandle fails if the signer is not authorized to send the transaction func (d RestrictedTx) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) { - msgs := tx.GetMsgs() for _, msg := range msgs { - switch msg := msg.(type) { - case *permissionTypes.UpdateGovernanceKeyRequest, *permissionTypes.RegisterControllerRequest, - *axelarnet.RegisterFeeCollectorRequest, *nexus.ActivateChainRequest, *nexus.DeactivateChainRequest, - *evm.SetGatewayRequest: + signer := msg.GetSigners()[0] + signerRole := d.permission.GetRole(ctx, signer) - signer := msg.GetSigners()[0] - if permission.ROLE_ACCESS_CONTROL != d.permission.GetRole(ctx, signer) { + switch utils.GetPermissionRole((msg).(descriptor.Message)) { + case permission.ROLE_ACCESS_CONTROL: + if permission.ROLE_ACCESS_CONTROL != signerRole { return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "%s is not authorized to send transaction %T", signer, msg) } - case *tss.RegisterExternalKeysRequest, *tss.StartKeygenRequest, - *tss.RotateKeyRequest, *axelarnet.RegisterIBCPathRequest, - *axelarnet.RegisterAssetRequest, *axelarnet.AddCosmosBasedChainRequest, - *evm.AddChainRequest, - *evm.CreateDeployTokenRequest, *evm.CreateTransferOwnershipRequest, - *evm.CreateTransferOperatorshipRequest, *nexus.RegisterAssetFeeRequest: - - signer := msg.GetSigners()[0] - if permission.ROLE_CHAIN_MANAGEMENT != d.permission.GetRole(ctx, signer) { + case permission.ROLE_CHAIN_MANAGEMENT: + if permission.ROLE_CHAIN_MANAGEMENT != signerRole { return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "%s is not authorized to send transaction %T", signer, msg) } default: diff --git a/x/axelarnet/types/tx.pb.go b/x/axelarnet/types/tx.pb.go index e5e71fe62..7a6ed4582 100644 --- a/x/axelarnet/types/tx.pb.go +++ b/x/axelarnet/types/tx.pb.go @@ -5,7 +5,9 @@ package types import ( fmt "fmt" + _ "github.com/axelarnetwork/axelar-core/utils" exported "github.com/axelarnetwork/axelar-core/x/nexus/exported" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" _ "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -641,6 +643,114 @@ func (m *RegisterFeeCollectorResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RegisterFeeCollectorResponse proto.InternalMessageInfo +type ChainManagementRequest struct { +} + +func (m *ChainManagementRequest) Reset() { *m = ChainManagementRequest{} } +func (m *ChainManagementRequest) String() string { return proto.CompactTextString(m) } +func (*ChainManagementRequest) ProtoMessage() {} +func (*ChainManagementRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_a791a0da77994a4e, []int{16} +} +func (m *ChainManagementRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ChainManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ChainManagementRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ChainManagementRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ChainManagementRequest.Merge(m, src) +} +func (m *ChainManagementRequest) XXX_Size() int { + return m.Size() +} +func (m *ChainManagementRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ChainManagementRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ChainManagementRequest proto.InternalMessageInfo + +type AccessControlRequest struct { +} + +func (m *AccessControlRequest) Reset() { *m = AccessControlRequest{} } +func (m *AccessControlRequest) String() string { return proto.CompactTextString(m) } +func (*AccessControlRequest) ProtoMessage() {} +func (*AccessControlRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_a791a0da77994a4e, []int{17} +} +func (m *AccessControlRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AccessControlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AccessControlRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AccessControlRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_AccessControlRequest.Merge(m, src) +} +func (m *AccessControlRequest) XXX_Size() int { + return m.Size() +} +func (m *AccessControlRequest) XXX_DiscardUnknown() { + xxx_messageInfo_AccessControlRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_AccessControlRequest proto.InternalMessageInfo + +type UnrestrictedRequest struct { +} + +func (m *UnrestrictedRequest) Reset() { *m = UnrestrictedRequest{} } +func (m *UnrestrictedRequest) String() string { return proto.CompactTextString(m) } +func (*UnrestrictedRequest) ProtoMessage() {} +func (*UnrestrictedRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_a791a0da77994a4e, []int{18} +} +func (m *UnrestrictedRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UnrestrictedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UnrestrictedRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UnrestrictedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UnrestrictedRequest.Merge(m, src) +} +func (m *UnrestrictedRequest) XXX_Size() int { + return m.Size() +} +func (m *UnrestrictedRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UnrestrictedRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UnrestrictedRequest proto.InternalMessageInfo + func init() { proto.RegisterType((*LinkRequest)(nil), "axelarnet.v1beta1.LinkRequest") proto.RegisterType((*LinkResponse)(nil), "axelarnet.v1beta1.LinkResponse") @@ -658,56 +768,64 @@ func init() { proto.RegisterType((*RouteIBCTransfersResponse)(nil), "axelarnet.v1beta1.RouteIBCTransfersResponse") proto.RegisterType((*RegisterFeeCollectorRequest)(nil), "axelarnet.v1beta1.RegisterFeeCollectorRequest") proto.RegisterType((*RegisterFeeCollectorResponse)(nil), "axelarnet.v1beta1.RegisterFeeCollectorResponse") + proto.RegisterType((*ChainManagementRequest)(nil), "axelarnet.v1beta1.ChainManagementRequest") + proto.RegisterType((*AccessControlRequest)(nil), "axelarnet.v1beta1.AccessControlRequest") + proto.RegisterType((*UnrestrictedRequest)(nil), "axelarnet.v1beta1.UnrestrictedRequest") } func init() { proto.RegisterFile("axelarnet/v1beta1/tx.proto", fileDescriptor_a791a0da77994a4e) } var fileDescriptor_a791a0da77994a4e = []byte{ - // 701 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x8e, 0x1b, 0xa7, 0x2a, 0x93, 0xf4, 0x07, 0x2b, 0x6d, 0x9d, 0x94, 0x3a, 0xad, 0x25, 0x44, - 0x2f, 0x8d, 0x15, 0x90, 0x90, 0x7a, 0x4c, 0x02, 0x88, 0x56, 0x1c, 0xaa, 0xa8, 0xe2, 0xd0, 0x4b, - 0xe4, 0xd8, 0x93, 0xc4, 0x4a, 0xe2, 0x35, 0xbb, 0x9b, 0x92, 0x3e, 0x04, 0x12, 0x12, 0x6f, 0xc2, - 0x03, 0x20, 0x8e, 0x3d, 0xf6, 0xc8, 0xa9, 0x2a, 0xed, 0x5b, 0x70, 0x42, 0xde, 0x5d, 0x27, 0x51, - 0x09, 0x3d, 0x54, 0x84, 0x93, 0x77, 0xfe, 0xf6, 0xfb, 0xe6, 0xf3, 0xec, 0x2e, 0x14, 0xdd, 0x11, - 0xf6, 0x5d, 0x1a, 0x22, 0x77, 0xce, 0x2a, 0x2d, 0xe4, 0x6e, 0xc5, 0xe1, 0xa3, 0x72, 0x44, 0x09, - 0x27, 0xc6, 0xe3, 0x71, 0xac, 0xac, 0x62, 0xc5, 0x42, 0x87, 0x90, 0x4e, 0x1f, 0x1d, 0x91, 0xd0, - 0x1a, 0xb6, 0x1d, 0x37, 0x3c, 0x97, 0xd9, 0xc5, 0x7c, 0x87, 0x74, 0x88, 0x58, 0x3a, 0xf1, 0x4a, - 0x79, 0x2d, 0x8f, 0xb0, 0x01, 0x61, 0x4e, 0xcb, 0x65, 0x38, 0x46, 0xf0, 0x48, 0x10, 0xaa, 0x78, - 0x41, 0xc6, 0x9b, 0xb2, 0x50, 0x1a, 0x2a, 0x64, 0x87, 0x38, 0x1a, 0x32, 0x07, 0x47, 0x11, 0xa1, - 0x1c, 0xfd, 0x09, 0xbf, 0xf3, 0x08, 0x93, 0x9c, 0xed, 0x19, 0xf4, 0x27, 0x61, 0xfb, 0x9b, 0x06, - 0xd9, 0x77, 0x41, 0xd8, 0x6b, 0xe0, 0x87, 0x21, 0x32, 0x6e, 0x1c, 0xc2, 0x22, 0xc3, 0xd0, 0x47, - 0x6a, 0x6a, 0x3b, 0xda, 0x5e, 0xae, 0x56, 0xf9, 0x75, 0x55, 0xda, 0xef, 0x04, 0xbc, 0x3b, 0x6c, - 0x95, 0x3d, 0x32, 0x50, 0xf8, 0xea, 0xb3, 0xcf, 0xfc, 0x9e, 0xda, 0xad, 0xea, 0x79, 0x55, 0xdf, - 0xa7, 0xc8, 0x58, 0x43, 0x6d, 0x60, 0x3c, 0x85, 0x15, 0x8a, 0x5e, 0x10, 0x05, 0x18, 0xf2, 0xa6, - 0xeb, 0xfb, 0xd4, 0x5c, 0xd8, 0xd1, 0xf6, 0x1e, 0x35, 0x96, 0xc7, 0xde, 0xb8, 0xc2, 0x78, 0x06, - 0xab, 0x93, 0x34, 0xaf, 0xeb, 0x06, 0xa1, 0x99, 0x16, 0x79, 0x93, 0xea, 0x7a, 0xec, 0x35, 0xf2, - 0x90, 0x71, 0x19, 0x43, 0x6e, 0xea, 0x22, 0x2c, 0x0d, 0xbb, 0x02, 0x39, 0xc9, 0x9f, 0x45, 0x24, - 0x64, 0x68, 0xec, 0x42, 0xce, 0xc7, 0x88, 0xb0, 0x40, 0x61, 0x6a, 0x22, 0x39, 0xab, 0x7c, 0x31, - 0xa2, 0x7d, 0xad, 0xc1, 0x7a, 0x9d, 0x84, 0xed, 0x80, 0x0e, 0x5e, 0x49, 0xf7, 0x1c, 0xba, 0x3f, - 0x85, 0xd5, 0x69, 0x1e, 0xc8, 0x98, 0xe0, 0xfd, 0xa0, 0x3d, 0x57, 0xa6, 0xd8, 0x23, 0x63, 0xb1, - 0x12, 0x3e, 0x86, 0x64, 0x60, 0x66, 0xa4, 0x12, 0xc2, 0x38, 0xd2, 0x97, 0x16, 0xd6, 0xd2, 0x47, - 0xfa, 0x52, 0x7a, 0x4d, 0xb7, 0x4d, 0xd8, 0xb8, 0xdb, 0xa1, 0xd4, 0xc7, 0xee, 0x81, 0xf5, 0x7a, - 0x84, 0xde, 0x90, 0xe3, 0x31, 0x86, 0x7e, 0x10, 0x76, 0x4e, 0xa8, 0x1b, 0xb2, 0x36, 0x52, 0xf6, - 0xef, 0x45, 0xb0, 0x77, 0xa1, 0xf4, 0x57, 0x30, 0xc5, 0xe7, 0x93, 0x06, 0x1b, 0x0d, 0xec, 0x04, - 0x8c, 0x23, 0x3d, 0xac, 0xd5, 0x8f, 0x5d, 0xde, 0x9d, 0xc3, 0xdf, 0xc8, 0x43, 0x46, 0x8e, 0x96, - 0x1c, 0x41, 0x69, 0x18, 0x06, 0xe8, 0x91, 0xcb, 0xbb, 0x6a, 0xde, 0xc4, 0xda, 0x2e, 0xc0, 0xe6, - 0x1f, 0x74, 0x14, 0xd5, 0x2f, 0x0b, 0x50, 0xac, 0xfa, 0x7e, 0x5d, 0xe0, 0xd5, 0x5c, 0x86, 0xbe, - 0x18, 0xcc, 0x39, 0xd0, 0x3d, 0x98, 0xa6, 0x9b, 0x7d, 0xbe, 0x5d, 0x16, 0x07, 0xbd, 0x9c, 0x1c, - 0xf4, 0xe4, 0xb2, 0x29, 0x0b, 0xfc, 0x9a, 0x7e, 0x71, 0x55, 0x4a, 0x25, 0x3d, 0x95, 0x20, 0x1b, - 0xcf, 0x5b, 0x33, 0xa2, 0xd8, 0x0e, 0x46, 0xaa, 0x35, 0x88, 0x5d, 0xc7, 0xc2, 0x63, 0xbc, 0x85, - 0xe5, 0xd0, 0xe5, 0xc1, 0x19, 0x36, 0xc5, 0x01, 0x62, 0x66, 0x66, 0x27, 0x7d, 0x1f, 0x46, 0x35, - 0xce, 0x52, 0x18, 0x39, 0x59, 0x29, 0x5c, 0xec, 0x48, 0x5f, 0xd2, 0xd7, 0x32, 0xf6, 0x36, 0x6c, - 0xcd, 0x14, 0x45, 0x89, 0xf6, 0x55, 0x83, 0x7c, 0x22, 0xa8, 0xa8, 0xfb, 0x6f, 0x7f, 0xf7, 0x20, - 0xb9, 0x2f, 0xd2, 0xf7, 0x8b, 0x38, 0xdd, 0xa0, 0xba, 0x54, 0x36, 0x61, 0xfd, 0x0e, 0x67, 0xd5, - 0x0d, 0x82, 0xd9, 0x20, 0x43, 0x8e, 0x87, 0xb5, 0xfa, 0x3c, 0xcf, 0xcd, 0x16, 0x14, 0x66, 0xc0, - 0x28, 0x0e, 0xdf, 0x35, 0xd8, 0x4a, 0xd8, 0xbd, 0x41, 0xac, 0x93, 0x7e, 0x1f, 0x3d, 0x4e, 0xe8, - 0x1c, 0x84, 0x7d, 0x0f, 0xcb, 0x6d, 0xc4, 0xa6, 0x97, 0x40, 0x08, 0x81, 0x1f, 0xb4, 0x63, 0xae, - 0x3d, 0xc5, 0xd4, 0xb6, 0xe0, 0xc9, 0xec, 0x0e, 0x64, 0x8b, 0xb5, 0x93, 0x8b, 0x9f, 0x56, 0xea, - 0xe2, 0xc6, 0xd2, 0x2e, 0x6f, 0x2c, 0xed, 0xfa, 0xc6, 0xd2, 0x3e, 0xdf, 0x5a, 0xa9, 0xcb, 0x5b, - 0x2b, 0xf5, 0xe3, 0xd6, 0x4a, 0x9d, 0xbe, 0x9c, 0x82, 0x1e, 0xbf, 0x6e, 0x1f, 0x09, 0xed, 0x29, - 0x6b, 0xdf, 0x23, 0x14, 0x9d, 0xd1, 0x24, 0x26, 0xe9, 0xb4, 0x16, 0xc5, 0x93, 0xf7, 0xe2, 0x77, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0x86, 0xc3, 0x02, 0xd2, 0x07, 0x00, 0x00, + // 782 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0x8f, 0x13, 0x67, 0x55, 0x5e, 0xd2, 0xdd, 0x62, 0xb2, 0x5d, 0x27, 0xd9, 0x3a, 0x5d, 0x4b, + 0x68, 0xf7, 0xd2, 0x58, 0x01, 0x09, 0x69, 0xb9, 0x25, 0x01, 0x44, 0x2b, 0x90, 0xaa, 0x68, 0xe1, + 0xb0, 0x97, 0xc8, 0xb1, 0x5f, 0x9c, 0x51, 0x92, 0x19, 0x33, 0x33, 0x5e, 0xb2, 0x37, 0xbe, 0x00, + 0x12, 0x12, 0xdf, 0x04, 0x89, 0x2b, 0xe2, 0xd8, 0xe3, 0x1e, 0x39, 0x55, 0xa5, 0xfd, 0x16, 0x9c, + 0x90, 0xc7, 0xe3, 0xc4, 0x2a, 0xa1, 0x87, 0x8a, 0x70, 0xca, 0xcc, 0xfb, 0x33, 0xbf, 0x3f, 0x79, + 0x33, 0x86, 0x96, 0xbf, 0xc2, 0x85, 0xcf, 0x29, 0x4a, 0xef, 0x4d, 0x6f, 0x82, 0xd2, 0xef, 0x79, + 0x72, 0xd5, 0x8d, 0x39, 0x93, 0xcc, 0x7a, 0x7f, 0x9d, 0xeb, 0xea, 0x5c, 0xab, 0x19, 0x31, 0x16, + 0x2d, 0xd0, 0x53, 0x05, 0x93, 0x64, 0xea, 0xf9, 0xf4, 0x6d, 0x56, 0xdd, 0x6a, 0x44, 0x2c, 0x62, + 0x6a, 0xe9, 0xa5, 0x2b, 0x1d, 0x75, 0x02, 0x26, 0x96, 0x4c, 0x78, 0x13, 0x5f, 0xe0, 0x1a, 0x21, + 0x60, 0x84, 0xea, 0x7c, 0x33, 0xcb, 0x8f, 0xb3, 0xc6, 0x6c, 0xa3, 0x53, 0x2e, 0xc5, 0x55, 0x22, + 0x3c, 0x5c, 0xc5, 0x8c, 0x4b, 0x0c, 0x37, 0xfc, 0xde, 0xc6, 0x98, 0xd7, 0x1c, 0x6d, 0xa1, 0x5f, + 0x48, 0xbb, 0x89, 0x24, 0x0b, 0xb1, 0xc1, 0x4d, 0x84, 0x64, 0xcb, 0x31, 0x8b, 0x25, 0x61, 0x34, + 0xaf, 0x79, 0x1e, 0x23, 0x5f, 0x12, 0x21, 0x08, 0xa3, 0x77, 0x62, 0xb9, 0xbf, 0x19, 0x50, 0xfb, + 0x8a, 0xd0, 0xf9, 0x08, 0xbf, 0x4b, 0x50, 0x48, 0xeb, 0x14, 0x1e, 0x08, 0xa4, 0x21, 0x72, 0xdb, + 0x38, 0x36, 0x5e, 0xd4, 0x07, 0xbd, 0xbf, 0x2e, 0x3b, 0x27, 0x11, 0x91, 0xb3, 0x64, 0xd2, 0x0d, + 0xd8, 0x52, 0x8b, 0xd1, 0x3f, 0x27, 0x22, 0x9c, 0xeb, 0xd3, 0xfa, 0x41, 0xd0, 0x0f, 0x43, 0x8e, + 0x42, 0x8c, 0xf4, 0x01, 0xd6, 0x87, 0xf0, 0x90, 0x63, 0x40, 0x62, 0x82, 0x54, 0x8e, 0xfd, 0x30, + 0xe4, 0x76, 0xf9, 0xd8, 0x78, 0xf1, 0xde, 0x68, 0x7f, 0x1d, 0x4d, 0x3b, 0xac, 0xe7, 0xf0, 0x68, + 0x53, 0x16, 0xcc, 0x7c, 0x42, 0xed, 0x8a, 0xaa, 0xdb, 0x74, 0x0f, 0xd3, 0xa8, 0xd5, 0x80, 0xaa, + 0x2f, 0x04, 0x4a, 0xdb, 0x54, 0xe9, 0x6c, 0xe3, 0xf6, 0xa0, 0x9e, 0xf1, 0x17, 0x31, 0xa3, 0x02, + 0xad, 0x67, 0x50, 0x0f, 0x31, 0x66, 0x82, 0x68, 0x4c, 0x43, 0x15, 0xd7, 0x74, 0x2c, 0x45, 0x74, + 0xaf, 0x0c, 0x78, 0x3c, 0x64, 0x74, 0x4a, 0xf8, 0xf2, 0xb3, 0x2c, 0xbc, 0x03, 0xf5, 0xaf, 0xe1, + 0x51, 0x91, 0x07, 0x0a, 0xa1, 0x78, 0xdf, 0xeb, 0xcc, 0x87, 0x05, 0xf6, 0x28, 0x44, 0xea, 0x44, + 0x88, 0x94, 0x2d, 0xed, 0x6a, 0xe6, 0x84, 0xda, 0x9c, 0x99, 0x7b, 0xe5, 0x83, 0xca, 0x99, 0xb9, + 0x57, 0x39, 0x30, 0x5d, 0x1b, 0x0e, 0x6f, 0x2b, 0xcc, 0xfc, 0x71, 0xe7, 0xe0, 0x7c, 0xbe, 0xc2, + 0x20, 0x91, 0x78, 0x8e, 0x34, 0x24, 0x34, 0x7a, 0xc5, 0x7d, 0x2a, 0xa6, 0xc8, 0xc5, 0x7f, 0x6f, + 0x82, 0xfb, 0x0c, 0x3a, 0xff, 0x0a, 0xa6, 0xf9, 0xfc, 0x68, 0xc0, 0xe1, 0x08, 0x23, 0x22, 0x24, + 0xf2, 0xd3, 0xc1, 0xf0, 0xdc, 0x97, 0xb3, 0x1d, 0xfc, 0x1b, 0x0d, 0xa8, 0x66, 0xa3, 0x95, 0x8d, + 0x60, 0xb6, 0xb1, 0x2c, 0x30, 0x63, 0x5f, 0xce, 0xf4, 0xbc, 0xa9, 0xb5, 0xdb, 0x84, 0x27, 0xff, + 0xa0, 0xa3, 0xa9, 0xfe, 0x5c, 0x86, 0x56, 0x3f, 0x0c, 0x87, 0x0a, 0x6f, 0xe0, 0x0b, 0x0c, 0xd5, + 0x60, 0xee, 0x80, 0xee, 0xcb, 0x22, 0xdd, 0xda, 0x47, 0x47, 0x5d, 0xf5, 0x6a, 0x74, 0xf3, 0x9b, + 0x9c, 0xbf, 0x5c, 0x5d, 0x85, 0x3f, 0x30, 0x2f, 0x2e, 0x3b, 0xa5, 0x5c, 0x53, 0x07, 0x6a, 0xe9, + 0xbc, 0x8d, 0x63, 0x8e, 0x53, 0xb2, 0xd2, 0xd2, 0x20, 0x0d, 0x9d, 0xab, 0x88, 0xf5, 0x25, 0xec, + 0x53, 0x5f, 0x92, 0x37, 0x38, 0x56, 0x17, 0x48, 0xd8, 0xd5, 0xe3, 0xca, 0x5d, 0x18, 0xfd, 0xb4, + 0x4a, 0x63, 0xd4, 0xb3, 0x4e, 0x15, 0x12, 0x67, 0xe6, 0x9e, 0x79, 0x50, 0x75, 0x8f, 0xa0, 0xbd, + 0xd5, 0x14, 0x6d, 0xda, 0x2f, 0x06, 0x34, 0x72, 0x43, 0x55, 0xdf, 0xff, 0xf6, 0xef, 0xbe, 0xcc, + 0xdf, 0x8b, 0xca, 0xdd, 0x26, 0x16, 0x05, 0xea, 0x47, 0xe5, 0x09, 0x3c, 0xbe, 0xc5, 0x59, 0xab, + 0x41, 0xb0, 0x47, 0x2c, 0x91, 0x78, 0x3a, 0x18, 0xee, 0xf2, 0xde, 0xb4, 0xa1, 0xb9, 0x05, 0x46, + 0x73, 0xf8, 0xdd, 0x80, 0x76, 0xce, 0xee, 0x0b, 0xc4, 0x21, 0x5b, 0x2c, 0x30, 0x90, 0x8c, 0xef, + 0xc0, 0xd8, 0x6f, 0x61, 0x7f, 0x8a, 0x38, 0x0e, 0x72, 0x08, 0x65, 0xf0, 0xbd, 0x4e, 0xac, 0x4f, + 0x0b, 0x4c, 0x5d, 0x07, 0x9e, 0x6e, 0x57, 0xa0, 0x25, 0x3a, 0x70, 0xa8, 0xa6, 0xe8, 0x6b, 0x9f, + 0xfa, 0x11, 0x2e, 0x91, 0xe6, 0x53, 0xf3, 0xa9, 0xf9, 0xc3, 0xaf, 0x76, 0xd9, 0x7d, 0x0a, 0x8d, + 0x7e, 0x10, 0xa0, 0x10, 0x43, 0x46, 0x25, 0x67, 0x8b, 0x62, 0xd6, 0x70, 0xdb, 0xf0, 0xc1, 0x37, + 0x94, 0xa3, 0x90, 0x9c, 0x04, 0x12, 0xc3, 0x62, 0xb2, 0x34, 0x78, 0x75, 0xf1, 0xa7, 0x53, 0xba, + 0xb8, 0x76, 0x8c, 0x77, 0xd7, 0x8e, 0x71, 0x75, 0xed, 0x18, 0x3f, 0xdd, 0x38, 0xa5, 0x77, 0x37, + 0x4e, 0xe9, 0x8f, 0x1b, 0xa7, 0xf4, 0xfa, 0x93, 0x82, 0xaa, 0xf5, 0x57, 0xf8, 0x7b, 0xc6, 0xe7, + 0x7a, 0x77, 0x12, 0x30, 0x8e, 0xde, 0x6a, 0x93, 0xcb, 0x94, 0x4e, 0x1e, 0xa8, 0xaf, 0xe9, 0xc7, + 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x58, 0x1a, 0x6c, 0x2f, 0x7a, 0x08, 0x00, 0x00, } func (m *LinkRequest) Marshal() (dAtA []byte, err error) { @@ -1245,6 +1363,75 @@ func (m *RegisterFeeCollectorResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } +func (m *ChainManagementRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ChainManagementRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ChainManagementRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *AccessControlRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *AccessControlRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AccessControlRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *UnrestrictedRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *UnrestrictedRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrestrictedRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func encodeVarintTx(dAtA []byte, offset int, v uint64) int { offset -= sovTx(v) base := offset @@ -1486,6 +1673,33 @@ func (m *RegisterFeeCollectorResponse) Size() (n int) { return n } +func (m *ChainManagementRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *AccessControlRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *UnrestrictedRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3020,6 +3234,156 @@ func (m *RegisterFeeCollectorResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *ChainManagementRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ChainManagementRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ChainManagementRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *AccessControlRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: AccessControlRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AccessControlRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *UnrestrictedRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: UnrestrictedRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: UnrestrictedRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/permission/exported/types.go b/x/permission/exported/types.go index b10fcf505..f9e042bc8 100644 --- a/x/permission/exported/types.go +++ b/x/permission/exported/types.go @@ -11,7 +11,7 @@ func (x Role) Validate() error { return fmt.Errorf("unknown gov role") } - if x == ROLE_UNSPECIFIED { + if x == ROLE_UNRESTRICTED { return fmt.Errorf("unspecified gov role") } diff --git a/x/permission/exported/types.pb.go b/x/permission/exported/types.pb.go index 19eb93934..6e8050b97 100644 --- a/x/permission/exported/types.pb.go +++ b/x/permission/exported/types.pb.go @@ -24,7 +24,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Role int32 const ( - ROLE_UNSPECIFIED Role = 0 + ROLE_UNRESTRICTED Role = 0 ROLE_ACCESS_CONTROL Role = 1 ROLE_CHAIN_MANAGEMENT Role = 2 ) @@ -58,21 +58,22 @@ func init() { } var fileDescriptor_122b0697c9fb828e = []byte{ - // 249 bytes of a gzipped FileDescriptorProto + // 267 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x48, 0x2d, 0xca, 0xcd, 0x2c, 0x2e, 0xce, 0xcc, 0xcf, 0xd3, 0x4f, 0xad, 0x28, 0xc8, 0x2f, 0x2a, 0x49, 0x4d, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x46, 0x28, 0xd4, 0x83, 0x29, 0xd4, 0x83, 0x2a, 0x94, 0x12, 0x49, - 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd3, 0x07, 0xb1, 0x20, 0x5a, 0xb4, 0xa2, 0xb8, 0x58, 0x82, 0xf2, - 0x73, 0x52, 0x85, 0x44, 0xb8, 0x04, 0x82, 0xfc, 0x7d, 0x5c, 0xe3, 0x43, 0xfd, 0x82, 0x03, 0x5c, - 0x9d, 0x3d, 0xdd, 0x3c, 0x5d, 0x5d, 0x04, 0x18, 0x84, 0xc4, 0xb9, 0x84, 0xc1, 0xa2, 0x8e, 0xce, - 0xce, 0xae, 0xc1, 0xc1, 0xf1, 0xce, 0xfe, 0x7e, 0x21, 0x41, 0xfe, 0x3e, 0x02, 0x8c, 0x42, 0x92, - 0x5c, 0xa2, 0x60, 0x09, 0x67, 0x0f, 0x47, 0x4f, 0xbf, 0x78, 0x5f, 0x47, 0x3f, 0x47, 0x77, 0x57, - 0x5f, 0x57, 0xbf, 0x10, 0x01, 0x26, 0x29, 0x8e, 0x8e, 0xc5, 0x72, 0x0c, 0x2b, 0x96, 0xc8, 0x31, - 0x3a, 0x45, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, - 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, - 0x51, 0x56, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x89, 0x15, 0xa9, - 0x39, 0x89, 0x45, 0x79, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x50, 0x9e, 0x6e, 0x72, 0x7e, 0x51, - 0xaa, 0x7e, 0x85, 0x3e, 0x16, 0xcf, 0x27, 0xb1, 0x81, 0x1d, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, - 0xff, 0x99, 0x0f, 0xa8, 0xf9, 0x1a, 0x01, 0x00, 0x00, + 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd3, 0x07, 0xb1, 0x20, 0x5a, 0xb4, 0x0a, 0xb9, 0x58, 0x82, 0xf2, + 0x73, 0x52, 0x85, 0xb4, 0xb9, 0x04, 0x82, 0xfc, 0x7d, 0x5c, 0xe3, 0x43, 0xfd, 0x82, 0x03, 0x5c, + 0x9d, 0x3d, 0xdd, 0x3c, 0x5d, 0x5d, 0x04, 0x18, 0xa4, 0x44, 0xbb, 0xe6, 0x2a, 0x08, 0x42, 0xc5, + 0x83, 0x5c, 0x83, 0x43, 0x82, 0x3c, 0x9d, 0x43, 0x5c, 0x5d, 0x84, 0xc4, 0xb9, 0x84, 0xc1, 0x82, + 0x8e, 0xce, 0xce, 0xae, 0xc1, 0xc1, 0xf1, 0xce, 0xfe, 0x7e, 0x21, 0x41, 0xfe, 0x3e, 0x02, 0x8c, + 0x42, 0x92, 0x5c, 0xa2, 0x60, 0x09, 0x67, 0x0f, 0x47, 0x4f, 0xbf, 0x78, 0x5f, 0x47, 0x3f, 0x47, + 0x77, 0x57, 0x5f, 0x57, 0xbf, 0x10, 0x01, 0x26, 0x29, 0x8e, 0x8e, 0xc5, 0x72, 0x0c, 0x2b, 0x96, + 0xc8, 0x31, 0x3a, 0x45, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, + 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, + 0x72, 0x0c, 0x51, 0x56, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x89, + 0x15, 0xa9, 0x39, 0x89, 0x45, 0x79, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x50, 0x9e, 0x6e, 0x72, + 0x7e, 0x51, 0xaa, 0x7e, 0x85, 0x3e, 0x96, 0x30, 0x49, 0x62, 0x03, 0xfb, 0xc9, 0x18, 0x10, 0x00, + 0x00, 0xff, 0xff, 0x90, 0xeb, 0x78, 0xbe, 0x31, 0x01, 0x00, 0x00, } diff --git a/x/permission/exported/types_test.go b/x/permission/exported/types_test.go new file mode 100644 index 000000000..d8c517e7d --- /dev/null +++ b/x/permission/exported/types_test.go @@ -0,0 +1,47 @@ +package exported_test + +import ( + "strings" + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/gogo/protobuf/proto" + "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + "github.com/stretchr/testify/assert" + "golang.org/x/exp/slices" + + "github.com/axelarnetwork/axelar-core/app" + "github.com/axelarnetwork/axelar-core/utils" +) + +func TestMsgRoles(t *testing.T) { + registry := app.MakeEncodingConfig().InterfaceRegistry + implementations := registry.ListImplementations(sdk.MsgInterfaceProtoName) + slices.Sort(implementations) + + var missingRoles []string + for _, implementation := range implementations { + if strings.HasPrefix(implementation, "/ibc") || + strings.HasPrefix(implementation, "/cosmos") { + continue + } + + msg, err := registry.Resolve(implementation) + assert.NoError(t, err) + _, d := descriptor.ForMessage(msg.(descriptor.Message)) + options := d.GetOptions() + if options == nil { + missingRoles = append(missingRoles, implementation) + continue + } + _, err = proto.GetExtension(options, utils.E_PermissionRole) + if err != nil { + missingRoles = append(missingRoles, implementation) + continue + } + } + + if len(implementations) > 0 { + assert.Fail(t, "Found msgs without defined role", strings.Join(missingRoles, "\n")) + } +} diff --git a/x/permission/keeper/keeper.go b/x/permission/keeper/keeper.go index ba088f891..f0004de2f 100644 --- a/x/permission/keeper/keeper.go +++ b/x/permission/keeper/keeper.go @@ -69,7 +69,7 @@ func (k Keeper) GetGovernanceKey(ctx sdk.Context) (multisig.LegacyAminoPubKey, b func (k Keeper) GetRole(ctx sdk.Context, address sdk.AccAddress) exported.Role { govAccount, ok := k.getGovAccount(ctx, address) if !ok { - return exported.ROLE_UNSPECIFIED + return exported.ROLE_UNRESTRICTED } return govAccount.Role From 4f06916f91359aeb3b09d4c77c52935bd65772fb Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Fri, 1 Apr 2022 18:24:07 -0400 Subject: [PATCH 2/8] lint --- utils/proto.go | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/proto.go b/utils/proto.go index 40dcf31c1..7480e367b 100644 --- a/utils/proto.go +++ b/utils/proto.go @@ -7,6 +7,7 @@ import ( "github.com/axelarnetwork/axelar-core/x/permission/exported" ) +// GetPermissionRole returns the role that is defined for the given message. Returns ROLE_CHAIN_MANAGEMENT if none is set. func GetPermissionRole(message descriptor.Message) exported.Role { _, d := descriptor.ForMessage(message) v, err := proto.GetExtension(d.GetOptions(), E_PermissionRole) From 8cae7d4fa84de5b4db846600c1fac5fd68f38183 Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Fri, 1 Apr 2022 18:29:38 -0400 Subject: [PATCH 3/8] fix --- x/permission/exported/types_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/permission/exported/types_test.go b/x/permission/exported/types_test.go index d8c517e7d..4d170c509 100644 --- a/x/permission/exported/types_test.go +++ b/x/permission/exported/types_test.go @@ -41,7 +41,7 @@ func TestMsgRoles(t *testing.T) { } } - if len(implementations) > 0 { + if len(missingRoles) > 0 { assert.Fail(t, "Found msgs without defined role", strings.Join(missingRoles, "\n")) } } From 5d5334585b8969fe7c39a63061b38e6ae12def00 Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Fri, 1 Apr 2022 19:05:03 -0400 Subject: [PATCH 4/8] adding all roles --- docs/proto/proto-docs.md | 56 +-- proto/axelarnet/v1beta1/tx.proto | 9 + proto/evm/v1beta1/tx.proto | 20 + proto/nexus/v1beta1/tx.proto | 6 + proto/permission/exported/v1beta1/types.proto | 6 + proto/permission/v1beta1/tx.proto | 4 + proto/reward/v1beta1/tx.proto | 2 + proto/snapshot/v1beta1/tx.proto | 3 + proto/tss/v1beta1/tx.proto | 11 + proto/utils/v1beta1/custom_options.proto | 12 - utils/custom_options.pb.go | 60 --- x/ante/restricted_tx.go | 3 +- x/axelarnet/types/tx.pb.go | 456 ++---------------- x/evm/types/tx.pb.go | 157 +++--- x/nexus/types/tx.pb.go | 57 +-- {utils => x/permission/exported}/proto.go | 10 +- x/permission/exported/types.pb.go | 44 +- x/permission/exported/types_test.go | 4 +- x/permission/types/tx.pb.go | 54 ++- x/reward/types/tx.pb.go | 47 +- x/snapshot/types/tx.pb.go | 45 +- x/tss/types/tx.pb.go | 131 ++--- 22 files changed, 403 insertions(+), 794 deletions(-) delete mode 100644 proto/utils/v1beta1/custom_options.proto delete mode 100644 utils/custom_options.pb.go rename {utils => x/permission/exported}/proto.go (62%) diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 529088b8b..c696cda1b 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -76,14 +76,11 @@ - [permission/exported/v1beta1/types.proto](#permission/exported/v1beta1/types.proto) - [Role](#permission.exported.v1beta1.Role) -- [utils/v1beta1/custom_options.proto](#utils/v1beta1/custom_options.proto) - - [File-level Extensions](#utils/v1beta1/custom_options.proto-extensions) + - [File-level Extensions](#permission/exported/v1beta1/types.proto-extensions) - [axelarnet/v1beta1/tx.proto](#axelarnet/v1beta1/tx.proto) - - [AccessControlRequest](#axelarnet.v1beta1.AccessControlRequest) - [AddCosmosBasedChainRequest](#axelarnet.v1beta1.AddCosmosBasedChainRequest) - [AddCosmosBasedChainResponse](#axelarnet.v1beta1.AddCosmosBasedChainResponse) - - [ChainManagementRequest](#axelarnet.v1beta1.ChainManagementRequest) - [ConfirmDepositRequest](#axelarnet.v1beta1.ConfirmDepositRequest) - [ConfirmDepositResponse](#axelarnet.v1beta1.ConfirmDepositResponse) - [ExecutePendingTransfersRequest](#axelarnet.v1beta1.ExecutePendingTransfersRequest) @@ -98,7 +95,6 @@ - [RegisterIBCPathResponse](#axelarnet.v1beta1.RegisterIBCPathResponse) - [RouteIBCTransfersRequest](#axelarnet.v1beta1.RouteIBCTransfersRequest) - [RouteIBCTransfersResponse](#axelarnet.v1beta1.RouteIBCTransfersResponse) - - [UnrestrictedRequest](#axelarnet.v1beta1.UnrestrictedRequest) - [axelarnet/v1beta1/service.proto](#axelarnet/v1beta1/service.proto) - [MsgService](#axelarnet.v1beta1.MsgService) @@ -1440,29 +1436,13 @@ transfers for the specified chain - - - - - - -

Top

- -## utils/v1beta1/custom_options.proto - - - - - - - - + ### File-level Extensions | Extension | Type | Base | Number | Description | | --------- | ---- | ---- | ------ | ----------- | -| `permission_role` | permission.exported.v1beta1.Role | .google.protobuf.MessageOptions | 50000 | 50000-99999 reserved for use withing individual organizations | +| `permission_role` | Role | .google.protobuf.MessageOptions | 50000 | 50000-99999 reserved for use withing individual organizations | @@ -1477,16 +1457,6 @@ transfers for the specified chain - - -### AccessControlRequest - - - - - - - ### AddCosmosBasedChainRequest @@ -1516,16 +1486,6 @@ to nexus - - -### ChainManagementRequest - - - - - - - ### ConfirmDepositRequest @@ -1721,16 +1681,6 @@ cosmos based chains - - - -### UnrestrictedRequest - - - - - - diff --git a/proto/axelarnet/v1beta1/tx.proto b/proto/axelarnet/v1beta1/tx.proto index 5b9a4497f..eeb77450e 100644 --- a/proto/axelarnet/v1beta1/tx.proto +++ b/proto/axelarnet/v1beta1/tx.proto @@ -9,12 +9,14 @@ import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "nexus/exported/v1beta1/types.proto"; import "axelarnet/v1beta1/types.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; // MsgLink represents a message to link a cross-chain address to an Axelar // address message LinkRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string recipient_addr = 2; @@ -26,6 +28,7 @@ message LinkResponse { string deposit_addr = 1; }; // MsgConfirmDeposit represents a deposit confirmation message message ConfirmDepositRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; @@ -45,6 +48,7 @@ message ConfirmDepositResponse {} // MsgExecutePendingTransfers represents a message to trigger transfer all // pending transfers message ExecutePendingTransfersRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; } @@ -54,6 +58,7 @@ message ExecutePendingTransfersResponse {} // MSgRegisterIBCPath represents a message to register an IBC tracing path for // a cosmos chain message RegisterIBCPathRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -65,6 +70,7 @@ message RegisterIBCPathResponse {} // MsgAddCosmosBasedChain represents a message to register a cosmos based chain // to nexus message AddCosmosBasedChainRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; nexus.exported.v1beta1.Chain chain = 2 [ (gogoproto.nullable) = false ]; @@ -79,6 +85,7 @@ message AddCosmosBasedChainResponse {} // RegisterAssetRequest represents a message to register an asset to a cosmos // based chain message RegisterAssetRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -90,6 +97,7 @@ message RegisterAssetResponse {} // RouteIBCTransfersRequest represents a message to route pending transfers to // cosmos based chains message RouteIBCTransfersRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; } @@ -99,6 +107,7 @@ message RouteIBCTransfersResponse {} // RegisterFeeCollectorRequest represents a message to register axelarnet fee // collector account message RegisterFeeCollectorRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; bytes fee_collector = 2 diff --git a/proto/evm/v1beta1/tx.proto b/proto/evm/v1beta1/tx.proto index 2e7bdd7d5..280cfd1fa 100644 --- a/proto/evm/v1beta1/tx.proto +++ b/proto/evm/v1beta1/tx.proto @@ -7,10 +7,12 @@ import "gogoproto/gogo.proto"; import "vote/exported/v1beta1/types.proto"; import "tss/exported/v1beta1/types.proto"; import "evm/v1beta1/types.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message SetGatewayRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -21,6 +23,7 @@ message SetGatewayRequest { message SetGatewayResponse {} message ConfirmGatewayTxRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -34,6 +37,7 @@ message ConfirmGatewayTxRequest { message ConfirmGatewayTxResponse {} message VoteConfirmGatewayTxRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; message Vote { repeated Event events = 1 [ (gogoproto.nullable) = false ]; } bytes sender = 1 [ (gogoproto.casttype) = @@ -45,6 +49,7 @@ message VoteConfirmGatewayTxRequest { message VoteConfirmGatewayTxResponse { string log = 1; } message ConfirmChainRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string name = 2; @@ -54,6 +59,7 @@ message ConfirmChainResponse {} // MsgConfirmDeposit represents an erc20 deposit confirmation message message ConfirmDepositRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -74,6 +80,7 @@ message ConfirmDepositResponse {} // MsgConfirmToken represents a token deploy confirmation message message ConfirmTokenRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -88,6 +95,7 @@ message ConfirmTokenRequest { message ConfirmTokenResponse {} message ConfirmTransferKeyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -109,6 +117,7 @@ message ConfirmTransferKeyResponse {} // MsgLink represents the message that links a cross chain address to a burner // address message LinkRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -122,6 +131,7 @@ message LinkResponse { string deposit_addr = 1; } // CreateBurnTokensRequest represents the message to create commands to burn // tokens with AxelarGateway message CreateBurnTokensRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -132,6 +142,7 @@ message CreateBurnTokensResponse {} // CreateDeployTokenRequest represents the message to create a deploy token // command for AxelarGateway message CreateDeployTokenRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -147,6 +158,7 @@ message CreateDeployTokenResponse {} // CreatePendingTransfersRequest represents a message to trigger the creation of // commands handling all pending transfers message CreatePendingTransfersRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -156,6 +168,7 @@ message CreatePendingTransfersResponse {} // MsgVoteConfirmChain represents a message that votes on a new EVM chain message VoteConfirmChainRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string name = 2; @@ -167,6 +180,7 @@ message VoteConfirmChainResponse { string log = 1; } // MsgVoteConfirmDeposit represents a message that votes on a deposit message VoteConfirmDepositRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -184,6 +198,7 @@ message VoteConfirmDepositRequest { message VoteConfirmDepositResponse { string log = 1; } message VoteConfirmTokenRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -200,6 +215,7 @@ message VoteConfirmTokenRequest { message VoteConfirmTokenResponse { string log = 1; } message VoteConfirmTransferKeyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -209,6 +225,7 @@ message VoteConfirmTransferKeyRequest { message VoteConfirmTransferKeyResponse { string log = 1; } message CreateTransferOwnershipRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -222,6 +239,7 @@ message CreateTransferOwnershipRequest { message CreateTransferOwnershipResponse {} message CreateTransferOperatorshipRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -235,6 +253,7 @@ message CreateTransferOperatorshipRequest { message CreateTransferOperatorshipResponse {} message SignCommandsRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -247,6 +266,7 @@ message SignCommandsResponse { } message AddChainRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; reserved 3; // native_asset was removed in v0.14 bytes sender = 1 [ (gogoproto.casttype) = diff --git a/proto/nexus/v1beta1/tx.proto b/proto/nexus/v1beta1/tx.proto index c4cec8636..4ec307736 100644 --- a/proto/nexus/v1beta1/tx.proto +++ b/proto/nexus/v1beta1/tx.proto @@ -6,10 +6,12 @@ option go_package = "github.com/axelarnetwork/axelar-core/x/nexus/types"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "nexus/exported/v1beta1/types.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message RegisterChainMaintainerRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; repeated string chains = 2; @@ -18,6 +20,7 @@ message RegisterChainMaintainerRequest { message RegisterChainMaintainerResponse {} message DeregisterChainMaintainerRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; repeated string chains = 2; @@ -27,6 +30,7 @@ message DeregisterChainMaintainerResponse {} // ActivateChainRequest represents a message to activate chains message ActivateChainRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; repeated string chains = 2; @@ -36,6 +40,7 @@ message ActivateChainResponse {} // DeactivateChainRequest represents a message to deactivate chains message DeactivateChainRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; repeated string chains = 2; @@ -46,6 +51,7 @@ message DeactivateChainResponse {} // RegisterAssetFeeRequest represents a message to register the transfer fee // info associated to an asset on a chain message RegisterAssetFeeRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; nexus.exported.v1beta1.FeeInfo fee_info = 2 [ (gogoproto.nullable) = false ]; diff --git a/proto/permission/exported/v1beta1/types.proto b/proto/permission/exported/v1beta1/types.proto index 3928c7078..b60458b9e 100644 --- a/proto/permission/exported/v1beta1/types.proto +++ b/proto/permission/exported/v1beta1/types.proto @@ -4,6 +4,7 @@ package permission.exported.v1beta1; option go_package = "github.com/axelarnetwork/axelar-core/x/permission/exported"; import "gogoproto/gogo.proto"; +import "google/protobuf/descriptor.proto"; option (gogoproto.goproto_getters_all) = false; @@ -15,3 +16,8 @@ enum Role { ROLE_ACCESS_CONTROL = 1; ROLE_CHAIN_MANAGEMENT = 2; } + +extend google.protobuf.MessageOptions { + permission.exported.v1beta1.Role permission_role = + 50000; // 50000-99999 reserved for use withing individual organizations +} diff --git a/proto/permission/v1beta1/tx.proto b/proto/permission/v1beta1/tx.proto index 652f6ef8a..5794156c1 100644 --- a/proto/permission/v1beta1/tx.proto +++ b/proto/permission/v1beta1/tx.proto @@ -5,10 +5,12 @@ option go_package = "github.com/axelarnetwork/axelar-core/x/permission/types"; import "gogoproto/gogo.proto"; import "cosmos/crypto/multisig/keys.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message UpdateGovernanceKeyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; cosmos.crypto.multisig.LegacyAminoPubKey governance_key = 2 @@ -19,6 +21,7 @@ message UpdateGovernanceKeyResponse {} // MsgRegisterController represents a message to register a controller account message RegisterControllerRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; bytes controller = 2 [ (gogoproto.casttype) = @@ -29,6 +32,7 @@ message RegisterControllerResponse {} // DeregisterController represents a message to deregister a controller account message DeregisterControllerRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; bytes controller = 2 [ (gogoproto.casttype) = diff --git a/proto/reward/v1beta1/tx.proto b/proto/reward/v1beta1/tx.proto index f4495d048..17a94cb93 100644 --- a/proto/reward/v1beta1/tx.proto +++ b/proto/reward/v1beta1/tx.proto @@ -6,10 +6,12 @@ option go_package = "github.com/axelarnetwork/axelar-core/x/reward/types"; import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message RefundMsgRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; google.protobuf.Any inner_message = 2 diff --git a/proto/snapshot/v1beta1/tx.proto b/proto/snapshot/v1beta1/tx.proto index d3fa7d9da..cf2c4c4aa 100644 --- a/proto/snapshot/v1beta1/tx.proto +++ b/proto/snapshot/v1beta1/tx.proto @@ -5,10 +5,12 @@ option go_package = "github.com/axelarnetwork/axelar-core/x/snapshot/types"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message RegisterProxyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; bytes proxy_addr = 2 [ (gogoproto.casttype) = @@ -18,6 +20,7 @@ message RegisterProxyRequest { message RegisterProxyResponse {} message DeactivateProxyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; } diff --git a/proto/tss/v1beta1/tx.proto b/proto/tss/v1beta1/tx.proto index f25a05774..193712ceb 100644 --- a/proto/tss/v1beta1/tx.proto +++ b/proto/tss/v1beta1/tx.proto @@ -9,11 +9,13 @@ import "tss/v1beta1/types.proto"; import "tss/tofnd/v1beta1/tofnd.proto"; import "vote/exported/v1beta1/types.proto"; import "cosmos/crypto/multisig/keys.proto"; +import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; // StartKeygenRequest indicate the start of keygen message StartKeygenRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; string sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; tss.v1beta1.KeyInfo key_info = 2 [ (gogoproto.nullable) = false ]; @@ -22,6 +24,7 @@ message StartKeygenRequest { message StartKeygenResponse {} message RotateKeyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -37,6 +40,7 @@ message RotateKeyResponse {} // ProcessKeygenTrafficRequest protocol message message ProcessKeygenTrafficRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string session_id = 2 [ (gogoproto.customname) = "SessionID" ]; @@ -47,6 +51,7 @@ message ProcessKeygenTrafficResponse {} // ProcessSignTrafficRequest protocol message message ProcessSignTrafficRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string session_id = 2 [ (gogoproto.customname) = "SessionID" ]; @@ -57,6 +62,7 @@ message ProcessSignTrafficResponse {} // VotePubKeyRequest represents the message to vote on a public key message VotePubKeyRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; vote.exported.v1beta1.PollKey poll_key = 2 [ (gogoproto.nullable) = false ]; @@ -67,6 +73,7 @@ message VotePubKeyResponse { string log = 1; } // VoteSigRequest represents a message to vote for a signature message VoteSigRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; vote.exported.v1beta1.PollKey poll_key = 2 [ (gogoproto.nullable) = false ]; @@ -77,6 +84,7 @@ message VoteSigRequest { message VoteSigResponse { string log = 1; } message HeartBeatRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; @@ -99,6 +107,7 @@ message HeartBeatResponse { } message RegisterExternalKeysRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_CHAIN_MANAGEMENT; message ExternalKey { string id = 1 [ (gogoproto.customname) = "ID", @@ -117,6 +126,7 @@ message RegisterExternalKeysRequest { message RegisterExternalKeysResponse {}; message SubmitMultisigPubKeysRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string key_id = 2 [ @@ -131,6 +141,7 @@ message SubmitMultisigPubKeysRequest { message SubmitMultisigPubKeysResponse {} message SubmitMultisigSignaturesRequest { + option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string sig_id = 2 [ (gogoproto.customname) = "SigID" ]; diff --git a/proto/utils/v1beta1/custom_options.proto b/proto/utils/v1beta1/custom_options.proto deleted file mode 100644 index 5563ac899..000000000 --- a/proto/utils/v1beta1/custom_options.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; -package utils.v1beta1; - -option go_package = "github.com/axelarnetwork/axelar-core/utils"; - -import "google/protobuf/descriptor.proto"; -import "permission/exported/v1beta1/types.proto"; - -extend google.protobuf.MessageOptions { - permission.exported.v1beta1.Role permission_role = - 50000; // 50000-99999 reserved for use withing individual organizations -} diff --git a/utils/custom_options.pb.go b/utils/custom_options.pb.go deleted file mode 100644 index f3836c85c..000000000 --- a/utils/custom_options.pb.go +++ /dev/null @@ -1,60 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: utils/v1beta1/custom_options.proto - -package utils - -import ( - fmt "fmt" - exported "github.com/axelarnetwork/axelar-core/x/permission/exported" - proto "github.com/gogo/protobuf/proto" - descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -var E_PermissionRole = &proto.ExtensionDesc{ - ExtendedType: (*descriptor.MessageOptions)(nil), - ExtensionType: (*exported.Role)(nil), - Field: 50000, - Name: "utils.v1beta1.permission_role", - Tag: "varint,50000,opt,name=permission_role,enum=permission.exported.v1beta1.Role", - Filename: "utils/v1beta1/custom_options.proto", -} - -func init() { - proto.RegisterExtension(E_PermissionRole) -} - -func init() { - proto.RegisterFile("utils/v1beta1/custom_options.proto", fileDescriptor_cb337de90b41f502) -} - -var fileDescriptor_cb337de90b41f502 = []byte{ - // 245 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x90, 0xbf, 0x4a, 0xc4, 0x40, - 0x10, 0xc6, 0x13, 0x04, 0x8b, 0x03, 0x4f, 0xb8, 0x4a, 0xae, 0x58, 0x4f, 0x1b, 0x45, 0x70, 0x96, - 0xd3, 0xce, 0x52, 0x6c, 0x45, 0xb8, 0xd2, 0xe6, 0x48, 0x72, 0x63, 0x5c, 0xdc, 0x64, 0x96, 0xd9, - 0x89, 0xc6, 0x17, 0xb0, 0xf6, 0xb1, 0x2c, 0x53, 0x5a, 0x4a, 0xf2, 0x22, 0xe2, 0x26, 0x31, 0xe5, - 0xc7, 0xfc, 0xbe, 0x3f, 0xcc, 0xec, 0xb4, 0x12, 0x63, 0xbd, 0x7e, 0x5d, 0xa7, 0x28, 0xc9, 0x5a, - 0x67, 0x95, 0x17, 0x2a, 0xb6, 0xe4, 0xc4, 0x50, 0xe9, 0xc1, 0x31, 0x09, 0x2d, 0x0e, 0x02, 0x03, - 0x03, 0xb3, 0x5c, 0xe5, 0x44, 0xb9, 0x45, 0x1d, 0x8e, 0x69, 0xf5, 0xa4, 0x77, 0xe8, 0x33, 0x36, - 0x4e, 0x88, 0x7b, 0xc3, 0xf2, 0xcc, 0x21, 0x17, 0xc6, 0x7b, 0x43, 0xa5, 0xc6, 0xda, 0x11, 0x0b, - 0xee, 0xfe, 0x2b, 0xe4, 0xdd, 0xe1, 0x90, 0x7c, 0x53, 0xcc, 0x0e, 0x27, 0x74, 0xcb, 0x64, 0x71, - 0x71, 0x0c, 0x7d, 0x3c, 0x8c, 0xf1, 0x70, 0x8f, 0xde, 0x27, 0x39, 0x3e, 0xf4, 0x9b, 0x8e, 0x9a, - 0x8f, 0xbd, 0x55, 0x7c, 0x3e, 0xbf, 0x3a, 0x81, 0xc9, 0x0a, 0x63, 0xcb, 0x38, 0x12, 0x36, 0x64, - 0x71, 0x33, 0x9f, 0x88, 0x3f, 0x7d, 0x7b, 0xf7, 0xd5, 0xaa, 0xb8, 0x69, 0x55, 0xfc, 0xd3, 0xaa, - 0xf8, 0xb3, 0x53, 0x51, 0xd3, 0xa9, 0xe8, 0xbb, 0x53, 0xd1, 0xe3, 0x45, 0x6e, 0xe4, 0xb9, 0x4a, - 0x21, 0xa3, 0x42, 0x27, 0x35, 0xda, 0x84, 0x4b, 0x94, 0x37, 0xe2, 0x97, 0x41, 0x5d, 0x66, 0xc4, - 0xa8, 0xc3, 0x1f, 0xd2, 0xfd, 0xb0, 0xec, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xcc, 0x28, - 0x74, 0x3b, 0x01, 0x00, 0x00, -} diff --git a/x/ante/restricted_tx.go b/x/ante/restricted_tx.go index 9fb49f259..f659bc421 100644 --- a/x/ante/restricted_tx.go +++ b/x/ante/restricted_tx.go @@ -5,7 +5,6 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - "github.com/axelarnetwork/axelar-core/utils" "github.com/axelarnetwork/axelar-core/x/ante/types" permission "github.com/axelarnetwork/axelar-core/x/permission/exported" ) @@ -29,7 +28,7 @@ func (d RestrictedTx) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next signer := msg.GetSigners()[0] signerRole := d.permission.GetRole(ctx, signer) - switch utils.GetPermissionRole((msg).(descriptor.Message)) { + switch permission.GetPermissionRole((msg).(descriptor.Message)) { case permission.ROLE_ACCESS_CONTROL: if permission.ROLE_ACCESS_CONTROL != signerRole { return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "%s is not authorized to send transaction %T", signer, msg) diff --git a/x/axelarnet/types/tx.pb.go b/x/axelarnet/types/tx.pb.go index 7a6ed4582..8c312f362 100644 --- a/x/axelarnet/types/tx.pb.go +++ b/x/axelarnet/types/tx.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/axelarnetwork/axelar-core/utils" exported "github.com/axelarnetwork/axelar-core/x/nexus/exported" _ "github.com/axelarnetwork/axelar-core/x/permission/exported" _ "github.com/cosmos/cosmos-sdk/codec/types" @@ -643,114 +642,6 @@ func (m *RegisterFeeCollectorResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RegisterFeeCollectorResponse proto.InternalMessageInfo -type ChainManagementRequest struct { -} - -func (m *ChainManagementRequest) Reset() { *m = ChainManagementRequest{} } -func (m *ChainManagementRequest) String() string { return proto.CompactTextString(m) } -func (*ChainManagementRequest) ProtoMessage() {} -func (*ChainManagementRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a791a0da77994a4e, []int{16} -} -func (m *ChainManagementRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ChainManagementRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ChainManagementRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ChainManagementRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChainManagementRequest.Merge(m, src) -} -func (m *ChainManagementRequest) XXX_Size() int { - return m.Size() -} -func (m *ChainManagementRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ChainManagementRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ChainManagementRequest proto.InternalMessageInfo - -type AccessControlRequest struct { -} - -func (m *AccessControlRequest) Reset() { *m = AccessControlRequest{} } -func (m *AccessControlRequest) String() string { return proto.CompactTextString(m) } -func (*AccessControlRequest) ProtoMessage() {} -func (*AccessControlRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a791a0da77994a4e, []int{17} -} -func (m *AccessControlRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AccessControlRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AccessControlRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *AccessControlRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AccessControlRequest.Merge(m, src) -} -func (m *AccessControlRequest) XXX_Size() int { - return m.Size() -} -func (m *AccessControlRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AccessControlRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_AccessControlRequest proto.InternalMessageInfo - -type UnrestrictedRequest struct { -} - -func (m *UnrestrictedRequest) Reset() { *m = UnrestrictedRequest{} } -func (m *UnrestrictedRequest) String() string { return proto.CompactTextString(m) } -func (*UnrestrictedRequest) ProtoMessage() {} -func (*UnrestrictedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a791a0da77994a4e, []int{18} -} -func (m *UnrestrictedRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UnrestrictedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_UnrestrictedRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *UnrestrictedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UnrestrictedRequest.Merge(m, src) -} -func (m *UnrestrictedRequest) XXX_Size() int { - return m.Size() -} -func (m *UnrestrictedRequest) XXX_DiscardUnknown() { - xxx_messageInfo_UnrestrictedRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_UnrestrictedRequest proto.InternalMessageInfo - func init() { proto.RegisterType((*LinkRequest)(nil), "axelarnet.v1beta1.LinkRequest") proto.RegisterType((*LinkResponse)(nil), "axelarnet.v1beta1.LinkResponse") @@ -768,64 +659,59 @@ func init() { proto.RegisterType((*RouteIBCTransfersResponse)(nil), "axelarnet.v1beta1.RouteIBCTransfersResponse") proto.RegisterType((*RegisterFeeCollectorRequest)(nil), "axelarnet.v1beta1.RegisterFeeCollectorRequest") proto.RegisterType((*RegisterFeeCollectorResponse)(nil), "axelarnet.v1beta1.RegisterFeeCollectorResponse") - proto.RegisterType((*ChainManagementRequest)(nil), "axelarnet.v1beta1.ChainManagementRequest") - proto.RegisterType((*AccessControlRequest)(nil), "axelarnet.v1beta1.AccessControlRequest") - proto.RegisterType((*UnrestrictedRequest)(nil), "axelarnet.v1beta1.UnrestrictedRequest") } func init() { proto.RegisterFile("axelarnet/v1beta1/tx.proto", fileDescriptor_a791a0da77994a4e) } var fileDescriptor_a791a0da77994a4e = []byte{ - // 782 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0x8f, 0x13, 0x67, 0x55, 0x5e, 0xd2, 0xdd, 0x62, 0xb2, 0x5d, 0x27, 0xd9, 0x3a, 0x5d, 0x4b, - 0x68, 0xf7, 0xd2, 0x58, 0x01, 0x09, 0x69, 0xb9, 0x25, 0x01, 0x44, 0x2b, 0x90, 0xaa, 0x68, 0xe1, - 0xb0, 0x97, 0xc8, 0xb1, 0x5f, 0x9c, 0x51, 0x92, 0x19, 0x33, 0x33, 0x5e, 0xb2, 0x37, 0xbe, 0x00, - 0x12, 0x12, 0xdf, 0x04, 0x89, 0x2b, 0xe2, 0xd8, 0xe3, 0x1e, 0x39, 0x55, 0xa5, 0xfd, 0x16, 0x9c, - 0x90, 0xc7, 0xe3, 0xc4, 0x2a, 0xa1, 0x87, 0x8a, 0x70, 0xca, 0xcc, 0xfb, 0x33, 0xbf, 0x3f, 0x79, - 0x33, 0x86, 0x96, 0xbf, 0xc2, 0x85, 0xcf, 0x29, 0x4a, 0xef, 0x4d, 0x6f, 0x82, 0xd2, 0xef, 0x79, - 0x72, 0xd5, 0x8d, 0x39, 0x93, 0xcc, 0x7a, 0x7f, 0x9d, 0xeb, 0xea, 0x5c, 0xab, 0x19, 0x31, 0x16, - 0x2d, 0xd0, 0x53, 0x05, 0x93, 0x64, 0xea, 0xf9, 0xf4, 0x6d, 0x56, 0xdd, 0x6a, 0x44, 0x2c, 0x62, - 0x6a, 0xe9, 0xa5, 0x2b, 0x1d, 0x75, 0x02, 0x26, 0x96, 0x4c, 0x78, 0x13, 0x5f, 0xe0, 0x1a, 0x21, - 0x60, 0x84, 0xea, 0x7c, 0x33, 0xcb, 0x8f, 0xb3, 0xc6, 0x6c, 0xa3, 0x53, 0x2e, 0xc5, 0x55, 0x22, - 0x3c, 0x5c, 0xc5, 0x8c, 0x4b, 0x0c, 0x37, 0xfc, 0xde, 0xc6, 0x98, 0xd7, 0x1c, 0x6d, 0xa1, 0x5f, - 0x48, 0xbb, 0x89, 0x24, 0x0b, 0xb1, 0xc1, 0x4d, 0x84, 0x64, 0xcb, 0x31, 0x8b, 0x25, 0x61, 0x34, - 0xaf, 0x79, 0x1e, 0x23, 0x5f, 0x12, 0x21, 0x08, 0xa3, 0x77, 0x62, 0xb9, 0xbf, 0x19, 0x50, 0xfb, - 0x8a, 0xd0, 0xf9, 0x08, 0xbf, 0x4b, 0x50, 0x48, 0xeb, 0x14, 0x1e, 0x08, 0xa4, 0x21, 0x72, 0xdb, - 0x38, 0x36, 0x5e, 0xd4, 0x07, 0xbd, 0xbf, 0x2e, 0x3b, 0x27, 0x11, 0x91, 0xb3, 0x64, 0xd2, 0x0d, - 0xd8, 0x52, 0x8b, 0xd1, 0x3f, 0x27, 0x22, 0x9c, 0xeb, 0xd3, 0xfa, 0x41, 0xd0, 0x0f, 0x43, 0x8e, - 0x42, 0x8c, 0xf4, 0x01, 0xd6, 0x87, 0xf0, 0x90, 0x63, 0x40, 0x62, 0x82, 0x54, 0x8e, 0xfd, 0x30, - 0xe4, 0x76, 0xf9, 0xd8, 0x78, 0xf1, 0xde, 0x68, 0x7f, 0x1d, 0x4d, 0x3b, 0xac, 0xe7, 0xf0, 0x68, - 0x53, 0x16, 0xcc, 0x7c, 0x42, 0xed, 0x8a, 0xaa, 0xdb, 0x74, 0x0f, 0xd3, 0xa8, 0xd5, 0x80, 0xaa, - 0x2f, 0x04, 0x4a, 0xdb, 0x54, 0xe9, 0x6c, 0xe3, 0xf6, 0xa0, 0x9e, 0xf1, 0x17, 0x31, 0xa3, 0x02, - 0xad, 0x67, 0x50, 0x0f, 0x31, 0x66, 0x82, 0x68, 0x4c, 0x43, 0x15, 0xd7, 0x74, 0x2c, 0x45, 0x74, - 0xaf, 0x0c, 0x78, 0x3c, 0x64, 0x74, 0x4a, 0xf8, 0xf2, 0xb3, 0x2c, 0xbc, 0x03, 0xf5, 0xaf, 0xe1, - 0x51, 0x91, 0x07, 0x0a, 0xa1, 0x78, 0xdf, 0xeb, 0xcc, 0x87, 0x05, 0xf6, 0x28, 0x44, 0xea, 0x44, - 0x88, 0x94, 0x2d, 0xed, 0x6a, 0xe6, 0x84, 0xda, 0x9c, 0x99, 0x7b, 0xe5, 0x83, 0xca, 0x99, 0xb9, - 0x57, 0x39, 0x30, 0x5d, 0x1b, 0x0e, 0x6f, 0x2b, 0xcc, 0xfc, 0x71, 0xe7, 0xe0, 0x7c, 0xbe, 0xc2, - 0x20, 0x91, 0x78, 0x8e, 0x34, 0x24, 0x34, 0x7a, 0xc5, 0x7d, 0x2a, 0xa6, 0xc8, 0xc5, 0x7f, 0x6f, - 0x82, 0xfb, 0x0c, 0x3a, 0xff, 0x0a, 0xa6, 0xf9, 0xfc, 0x68, 0xc0, 0xe1, 0x08, 0x23, 0x22, 0x24, - 0xf2, 0xd3, 0xc1, 0xf0, 0xdc, 0x97, 0xb3, 0x1d, 0xfc, 0x1b, 0x0d, 0xa8, 0x66, 0xa3, 0x95, 0x8d, - 0x60, 0xb6, 0xb1, 0x2c, 0x30, 0x63, 0x5f, 0xce, 0xf4, 0xbc, 0xa9, 0xb5, 0xdb, 0x84, 0x27, 0xff, - 0xa0, 0xa3, 0xa9, 0xfe, 0x5c, 0x86, 0x56, 0x3f, 0x0c, 0x87, 0x0a, 0x6f, 0xe0, 0x0b, 0x0c, 0xd5, - 0x60, 0xee, 0x80, 0xee, 0xcb, 0x22, 0xdd, 0xda, 0x47, 0x47, 0x5d, 0xf5, 0x6a, 0x74, 0xf3, 0x9b, - 0x9c, 0xbf, 0x5c, 0x5d, 0x85, 0x3f, 0x30, 0x2f, 0x2e, 0x3b, 0xa5, 0x5c, 0x53, 0x07, 0x6a, 0xe9, - 0xbc, 0x8d, 0x63, 0x8e, 0x53, 0xb2, 0xd2, 0xd2, 0x20, 0x0d, 0x9d, 0xab, 0x88, 0xf5, 0x25, 0xec, - 0x53, 0x5f, 0x92, 0x37, 0x38, 0x56, 0x17, 0x48, 0xd8, 0xd5, 0xe3, 0xca, 0x5d, 0x18, 0xfd, 0xb4, - 0x4a, 0x63, 0xd4, 0xb3, 0x4e, 0x15, 0x12, 0x67, 0xe6, 0x9e, 0x79, 0x50, 0x75, 0x8f, 0xa0, 0xbd, - 0xd5, 0x14, 0x6d, 0xda, 0x2f, 0x06, 0x34, 0x72, 0x43, 0x55, 0xdf, 0xff, 0xf6, 0xef, 0xbe, 0xcc, - 0xdf, 0x8b, 0xca, 0xdd, 0x26, 0x16, 0x05, 0xea, 0x47, 0xe5, 0x09, 0x3c, 0xbe, 0xc5, 0x59, 0xab, - 0x41, 0xb0, 0x47, 0x2c, 0x91, 0x78, 0x3a, 0x18, 0xee, 0xf2, 0xde, 0xb4, 0xa1, 0xb9, 0x05, 0x46, - 0x73, 0xf8, 0xdd, 0x80, 0x76, 0xce, 0xee, 0x0b, 0xc4, 0x21, 0x5b, 0x2c, 0x30, 0x90, 0x8c, 0xef, - 0xc0, 0xd8, 0x6f, 0x61, 0x7f, 0x8a, 0x38, 0x0e, 0x72, 0x08, 0x65, 0xf0, 0xbd, 0x4e, 0xac, 0x4f, - 0x0b, 0x4c, 0x5d, 0x07, 0x9e, 0x6e, 0x57, 0xa0, 0x25, 0x3a, 0x70, 0xa8, 0xa6, 0xe8, 0x6b, 0x9f, - 0xfa, 0x11, 0x2e, 0x91, 0xe6, 0x53, 0xf3, 0xa9, 0xf9, 0xc3, 0xaf, 0x76, 0xd9, 0x7d, 0x0a, 0x8d, - 0x7e, 0x10, 0xa0, 0x10, 0x43, 0x46, 0x25, 0x67, 0x8b, 0x62, 0xd6, 0x70, 0xdb, 0xf0, 0xc1, 0x37, - 0x94, 0xa3, 0x90, 0x9c, 0x04, 0x12, 0xc3, 0x62, 0xb2, 0x34, 0x78, 0x75, 0xf1, 0xa7, 0x53, 0xba, - 0xb8, 0x76, 0x8c, 0x77, 0xd7, 0x8e, 0x71, 0x75, 0xed, 0x18, 0x3f, 0xdd, 0x38, 0xa5, 0x77, 0x37, - 0x4e, 0xe9, 0x8f, 0x1b, 0xa7, 0xf4, 0xfa, 0x93, 0x82, 0xaa, 0xf5, 0x57, 0xf8, 0x7b, 0xc6, 0xe7, - 0x7a, 0x77, 0x12, 0x30, 0x8e, 0xde, 0x6a, 0x93, 0xcb, 0x94, 0x4e, 0x1e, 0xa8, 0xaf, 0xe9, 0xc7, - 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x58, 0x1a, 0x6c, 0x2f, 0x7a, 0x08, 0x00, 0x00, + // 737 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, + 0x14, 0x8e, 0x13, 0x07, 0x71, 0x27, 0xe1, 0xe7, 0x5a, 0x01, 0x9c, 0x70, 0x71, 0xc0, 0xd2, 0x15, + 0x6c, 0x88, 0x95, 0x7b, 0xa5, 0x4a, 0x74, 0x97, 0xa4, 0xad, 0x0a, 0xea, 0x02, 0x45, 0xa8, 0x0b, + 0x36, 0x91, 0x63, 0x9f, 0x24, 0x56, 0x92, 0x19, 0x33, 0x33, 0xa1, 0x61, 0xd7, 0x47, 0xa8, 0xd4, + 0x55, 0x1f, 0xa4, 0x52, 0x1f, 0xa0, 0xaa, 0x58, 0xb2, 0xec, 0x0a, 0xb5, 0x20, 0xf5, 0x21, 0xba, + 0xaa, 0x3c, 0x33, 0x4e, 0x2c, 0x9a, 0xb2, 0x40, 0x4d, 0x57, 0x9e, 0x39, 0x7f, 0xdf, 0x77, 0xbe, + 0x39, 0x33, 0x46, 0x25, 0x77, 0x0c, 0x03, 0x97, 0x62, 0xe0, 0xce, 0x79, 0xb5, 0x0d, 0xdc, 0xad, + 0x3a, 0x7c, 0x5c, 0x09, 0x29, 0xe1, 0xc4, 0xf8, 0x7b, 0xe2, 0xab, 0x28, 0x5f, 0xa9, 0xd8, 0x25, + 0xa4, 0x3b, 0x00, 0x47, 0x04, 0xb4, 0x47, 0x1d, 0xc7, 0xc5, 0x17, 0x32, 0xba, 0x54, 0xe8, 0x92, + 0x2e, 0x11, 0x4b, 0x27, 0x5a, 0x29, 0xab, 0xe5, 0x11, 0x36, 0x24, 0xcc, 0x69, 0xbb, 0x0c, 0x26, + 0x08, 0x1e, 0x09, 0xb0, 0xf2, 0x17, 0xa5, 0xbf, 0x25, 0x13, 0xe5, 0x46, 0xb9, 0x6c, 0x0c, 0xe3, + 0x11, 0x73, 0x60, 0x1c, 0x12, 0xca, 0xc1, 0x9f, 0xf2, 0xbb, 0x08, 0x21, 0x8e, 0xd9, 0x9a, 0x41, + 0x3f, 0xe1, 0xde, 0x0d, 0x81, 0x0e, 0x03, 0xc6, 0x02, 0x82, 0xef, 0xad, 0x63, 0x7f, 0xd4, 0x50, + 0xee, 0x45, 0x80, 0xfb, 0x4d, 0x38, 0x1b, 0x01, 0xe3, 0xc6, 0x21, 0x5a, 0x60, 0x80, 0x7d, 0xa0, + 0xa6, 0xb6, 0xad, 0xed, 0xe5, 0xeb, 0xd5, 0xef, 0xd7, 0xe5, 0xfd, 0x6e, 0xc0, 0x7b, 0xa3, 0x76, + 0xc5, 0x23, 0x43, 0x45, 0x54, 0x7d, 0xf6, 0x99, 0xdf, 0x57, 0xd5, 0x6a, 0x9e, 0x57, 0xf3, 0x7d, + 0x0a, 0x8c, 0x35, 0x55, 0x01, 0xe3, 0x5f, 0xb4, 0x4c, 0xc1, 0x0b, 0xc2, 0x00, 0x30, 0x6f, 0xb9, + 0xbe, 0x4f, 0xcd, 0xf4, 0xb6, 0xb6, 0xf7, 0x57, 0x73, 0x69, 0x62, 0x8d, 0x32, 0x8c, 0x5d, 0xb4, + 0x32, 0x0d, 0xf3, 0x7a, 0x6e, 0x80, 0xcd, 0x8c, 0x88, 0x9b, 0x66, 0x37, 0x22, 0xab, 0x51, 0x40, + 0x59, 0x97, 0x31, 0xe0, 0xa6, 0x2e, 0xdc, 0x72, 0xf3, 0x58, 0x7f, 0xfd, 0xde, 0x4c, 0xd9, 0x55, + 0x94, 0x97, 0x5d, 0xb0, 0x90, 0x60, 0x06, 0xc6, 0x0e, 0xca, 0xfb, 0x10, 0x12, 0x16, 0x28, 0x64, + 0x4d, 0xa4, 0xe4, 0x94, 0x2d, 0xc2, 0xb5, 0xbf, 0x69, 0x68, 0xad, 0x41, 0x70, 0x27, 0xa0, 0xc3, + 0x27, 0xd2, 0x3c, 0x07, 0x0d, 0x4e, 0xd1, 0x4a, 0x92, 0x07, 0x30, 0x26, 0xd8, 0x3f, 0xa8, 0xe6, + 0x72, 0x82, 0x3d, 0x30, 0x16, 0xe9, 0xe1, 0x03, 0x26, 0x43, 0x33, 0x2b, 0xf5, 0x10, 0x1b, 0xa9, + 0xc7, 0x91, 0xbe, 0x98, 0x5e, 0xcd, 0x1c, 0xe9, 0x8b, 0x99, 0x55, 0xdd, 0x36, 0xd1, 0xfa, 0xdd, + 0x3e, 0xa5, 0x4a, 0xf6, 0x19, 0xb2, 0x9e, 0x8e, 0xc1, 0x1b, 0x71, 0x38, 0x06, 0xec, 0x07, 0xb8, + 0x7b, 0x42, 0x5d, 0xcc, 0x3a, 0x40, 0xd9, 0xef, 0x97, 0x42, 0x1d, 0xd4, 0x0e, 0x2a, 0xff, 0x12, + 0x52, 0xb1, 0x7a, 0xab, 0xa1, 0xf5, 0x26, 0x74, 0x03, 0xc6, 0x81, 0x1e, 0xd6, 0x1b, 0xc7, 0x2e, + 0xef, 0xcd, 0xe1, 0x64, 0x0a, 0x28, 0x2b, 0x87, 0x4d, 0x0e, 0xa5, 0xdc, 0x18, 0x06, 0xd2, 0x43, + 0x97, 0xf7, 0xd4, 0x04, 0x8a, 0xb5, 0x20, 0x9e, 0xb6, 0x8b, 0x68, 0xe3, 0x27, 0x52, 0x8a, 0xf0, + 0xbb, 0x34, 0x2a, 0xd5, 0x7c, 0xbf, 0x21, 0x50, 0xeb, 0x2e, 0x03, 0x5f, 0x0c, 0xec, 0x1c, 0x48, + 0x1f, 0x24, 0x49, 0xe7, 0xfe, 0xdb, 0xaa, 0x88, 0x97, 0xa2, 0x12, 0xdf, 0xf0, 0xf8, 0xb5, 0xaa, + 0x08, 0xfc, 0xba, 0x7e, 0x79, 0x5d, 0x4e, 0xc5, 0x9d, 0x95, 0x51, 0x2e, 0x9a, 0xc0, 0x56, 0x48, + 0xa1, 0x13, 0x8c, 0x55, 0x83, 0x28, 0x32, 0x1d, 0x0b, 0x8b, 0xf1, 0x1c, 0x2d, 0x61, 0x97, 0x07, + 0xe7, 0xd0, 0x12, 0x17, 0x8b, 0x99, 0xd9, 0xed, 0xcc, 0x7d, 0x18, 0xb5, 0x28, 0x4a, 0x61, 0xe4, + 0x65, 0xa6, 0x30, 0x31, 0x29, 0xd8, 0x91, 0xbe, 0xa8, 0xaf, 0x66, 0xed, 0x2d, 0xb4, 0x39, 0x53, + 0x1a, 0x25, 0xdd, 0x07, 0x0d, 0x15, 0x62, 0x59, 0x45, 0xf6, 0x1f, 0x3b, 0xe9, 0x83, 0xf8, 0x35, + 0xc9, 0xdc, 0x2f, 0x65, 0xb2, 0xcd, 0xc4, 0x93, 0x93, 0xb6, 0x37, 0xd0, 0xda, 0x1d, 0xe6, 0xaa, + 0xa7, 0x3e, 0x32, 0x9b, 0x64, 0xc4, 0xe1, 0xb0, 0xde, 0x98, 0xff, 0x7d, 0xda, 0x44, 0xc5, 0x19, + 0x60, 0x8a, 0xc9, 0x27, 0x0d, 0x6d, 0xc6, 0x1c, 0x9f, 0x01, 0x34, 0xc8, 0x60, 0x00, 0x1e, 0x27, + 0x74, 0x0e, 0x22, 0xbf, 0x44, 0x4b, 0x1d, 0x80, 0x96, 0x17, 0x43, 0x08, 0xb1, 0x1f, 0x54, 0x31, + 0xdf, 0x49, 0x30, 0x15, 0x5d, 0x6a, 0xb6, 0x85, 0xfe, 0x99, 0xdd, 0x87, 0x6c, 0xb4, 0x7e, 0x72, + 0xf9, 0xd5, 0x4a, 0x5d, 0xde, 0x58, 0xda, 0xd5, 0x8d, 0xa5, 0x7d, 0xb9, 0xb1, 0xb4, 0x37, 0xb7, + 0x56, 0xea, 0xea, 0xd6, 0x4a, 0x7d, 0xbe, 0xb5, 0x52, 0xa7, 0x8f, 0x12, 0x04, 0x26, 0xbf, 0xcd, + 0x57, 0x84, 0xf6, 0xd5, 0x6e, 0xdf, 0x23, 0x14, 0x9c, 0xf1, 0xd4, 0x27, 0x49, 0xb5, 0x17, 0xc4, + 0x2f, 0xf2, 0xff, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x8d, 0xf3, 0x6a, 0x2b, 0x08, 0x00, + 0x00, } func (m *LinkRequest) Marshal() (dAtA []byte, err error) { @@ -1363,75 +1249,6 @@ func (m *RegisterFeeCollectorResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *ChainManagementRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ChainManagementRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ChainManagementRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *AccessControlRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *AccessControlRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AccessControlRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *UnrestrictedRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UnrestrictedRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UnrestrictedRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - func encodeVarintTx(dAtA []byte, offset int, v uint64) int { offset -= sovTx(v) base := offset @@ -1673,33 +1490,6 @@ func (m *RegisterFeeCollectorResponse) Size() (n int) { return n } -func (m *ChainManagementRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *AccessControlRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *UnrestrictedRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3234,156 +3024,6 @@ func (m *RegisterFeeCollectorResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *ChainManagementRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ChainManagementRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ChainManagementRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *AccessControlRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: AccessControlRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: AccessControlRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *UnrestrictedRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UnrestrictedRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UnrestrictedRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/evm/types/tx.pb.go b/x/evm/types/tx.pb.go index 52637bd1a..7f670126f 100644 --- a/x/evm/types/tx.pb.go +++ b/x/evm/types/tx.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" exported1 "github.com/axelarnetwork/axelar-core/x/tss/exported" github_com_axelarnetwork_axelar_core_x_tss_exported "github.com/axelarnetwork/axelar-core/x/tss/exported" exported "github.com/axelarnetwork/axelar-core/x/vote/exported" @@ -1568,83 +1569,85 @@ func init() { func init() { proto.RegisterFile("evm/v1beta1/tx.proto", fileDescriptor_0b4b69622c19e531) } var fileDescriptor_0b4b69622c19e531 = []byte{ - // 1213 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x41, 0x6f, 0xe3, 0xd4, - 0x13, 0xaf, 0x13, 0x27, 0x6d, 0x26, 0x49, 0xb7, 0xeb, 0xcd, 0x6e, 0xd3, 0x6c, 0x9b, 0xb4, 0xfe, - 0xff, 0x61, 0x8b, 0x44, 0x9d, 0x36, 0x48, 0x68, 0x39, 0xa1, 0xa6, 0x59, 0x4a, 0xb6, 0x08, 0x2a, - 0x6f, 0xe1, 0x80, 0x84, 0x22, 0x27, 0x9e, 0x4d, 0xad, 0x24, 0xb6, 0xf1, 0x7b, 0x4d, 0x13, 0x4e, - 0x88, 0x4f, 0xc0, 0x99, 0x0b, 0x12, 0x82, 0x1b, 0x9f, 0x80, 0x4f, 0x50, 0x6e, 0x8b, 0x84, 0xc4, - 0x8a, 0x43, 0x58, 0xd2, 0x6f, 0xb1, 0x27, 0xf4, 0xec, 0xe7, 0xc6, 0x69, 0x93, 0x6e, 0x05, 0xaa, - 0xa9, 0x38, 0xd5, 0x6f, 0x66, 0xde, 0x9b, 0xf9, 0xfd, 0xde, 0xbc, 0x99, 0x49, 0x21, 0x83, 0xdd, - 0x4e, 0xb1, 0xbb, 0x55, 0x47, 0xaa, 0x6d, 0x15, 0x69, 0x4f, 0xb1, 0x1d, 0x8b, 0x5a, 0x52, 0x12, - 0xbb, 0x1d, 0x85, 0x4b, 0x73, 0x99, 0xa6, 0xd5, 0xb4, 0x5c, 0x79, 0x91, 0x7d, 0x79, 0x26, 0xb9, - 0xb5, 0xae, 0x45, 0xb1, 0x88, 0x3d, 0xdb, 0x72, 0x28, 0xea, 0xa3, 0x23, 0xfa, 0x36, 0x12, 0x6e, - 0xb2, 0x4a, 0x09, 0xb9, 0xdc, 0x62, 0x71, 0xcc, 0xfb, 0x48, 0x21, 0x7f, 0x2b, 0xc0, 0xed, 0x27, - 0x48, 0x77, 0x35, 0x8a, 0xc7, 0x5a, 0x5f, 0xc5, 0xcf, 0x8f, 0x90, 0x50, 0xa9, 0x0a, 0x71, 0x82, - 0xa6, 0x8e, 0x4e, 0x56, 0x58, 0x15, 0xd6, 0x53, 0xe5, 0xad, 0x97, 0x83, 0xc2, 0x46, 0xd3, 0xa0, - 0x87, 0x47, 0x75, 0xa5, 0x61, 0x75, 0x8a, 0x0d, 0x8b, 0x74, 0x2c, 0xc2, 0xff, 0x6c, 0x10, 0xbd, - 0xc5, 0xcf, 0xdc, 0x6e, 0x34, 0xb6, 0x75, 0xdd, 0x41, 0x42, 0x54, 0x7e, 0x80, 0x94, 0x81, 0x58, - 0xe3, 0x50, 0x33, 0xcc, 0x6c, 0x64, 0x55, 0x58, 0x4f, 0xa8, 0xde, 0x42, 0x7a, 0x03, 0x66, 0x35, - 0xcf, 0x30, 0x1b, 0x75, 0x3d, 0xdc, 0x3a, 0x19, 0x14, 0x66, 0x7e, 0x1f, 0x14, 0x66, 0xfd, 0xfd, - 0xbe, 0x5e, 0xce, 0x80, 0x14, 0x0c, 0x90, 0xd8, 0x96, 0x49, 0x50, 0xfe, 0x41, 0x80, 0xc5, 0x1d, - 0xcb, 0x7c, 0x6a, 0x38, 0x1d, 0xae, 0x3a, 0xe8, 0x85, 0x18, 0x7d, 0x8c, 0xf6, 0x6a, 0x86, 0xce, - 0x63, 0xcf, 0xf0, 0xd8, 0xc5, 0xf7, 0x35, 0x72, 0x38, 0x1c, 0x14, 0xc4, 0x83, 0x5e, 0xb5, 0xa2, - 0x8a, 0xb4, 0x57, 0xd5, 0xe5, 0x1c, 0x64, 0x2f, 0x86, 0xc9, 0x31, 0xfc, 0x18, 0x81, 0xfb, 0x9f, - 0x58, 0x14, 0x43, 0xc0, 0xf1, 0x2e, 0xcc, 0xd9, 0x56, 0xbb, 0x5d, 0x6b, 0x61, 0xdf, 0x85, 0x92, - 0x2c, 0xe5, 0x15, 0x96, 0x57, 0x8a, 0x9f, 0x35, 0x7e, 0x12, 0x2a, 0xfb, 0x56, 0xbb, 0xbd, 0x87, - 0xfd, 0xb2, 0xc8, 0x40, 0xa9, 0xb3, 0xb6, 0xb7, 0x94, 0x76, 0x41, 0x64, 0xf6, 0x2e, 0xe2, 0x64, - 0x69, 0x43, 0x09, 0xe4, 0xad, 0x72, 0x09, 0x06, 0x57, 0xc7, 0xcf, 0x72, 0x0f, 0xc8, 0x3d, 0x04, - 0x91, 0xc9, 0xa4, 0x4d, 0x88, 0x63, 0x17, 0x4d, 0x4a, 0xb2, 0xc2, 0x6a, 0x74, 0x3d, 0x59, 0x92, - 0xc6, 0x8e, 0x7c, 0xc4, 0x54, 0x7c, 0x1f, 0xb7, 0x93, 0x37, 0x61, 0x79, 0xb2, 0x27, 0x8f, 0x4e, - 0x69, 0x01, 0xa2, 0x6d, 0xab, 0xe9, 0x72, 0x95, 0x50, 0xd9, 0xa7, 0x4c, 0xe1, 0x0e, 0xb7, 0xde, - 0x61, 0xf7, 0x76, 0x0d, 0xbc, 0x4a, 0x20, 0x9a, 0x5a, 0x07, 0x79, 0x7a, 0xb8, 0xdf, 0xf2, 0x3d, - 0xc8, 0x8c, 0x7b, 0xe5, 0xd7, 0xfd, 0x7d, 0x04, 0xee, 0x72, 0x45, 0x05, 0x6d, 0x8b, 0x18, 0xf4, - 0x06, 0x26, 0xac, 0xb4, 0x0b, 0x71, 0xad, 0x63, 0x1d, 0x99, 0x34, 0x2b, 0xba, 0xb6, 0x45, 0x6e, - 0xfb, 0xe0, 0x0a, 0xf1, 0x7c, 0x6c, 0x98, 0x54, 0xe5, 0xdb, 0xa5, 0xb7, 0x61, 0xbe, 0x7e, 0xe4, - 0x98, 0xe8, 0xd4, 0xfc, 0x97, 0x1e, 0x9b, 0xfc, 0xd2, 0xd3, 0x9e, 0x19, 0x5f, 0xca, 0x59, 0xb8, - 0x77, 0x9e, 0x25, 0x4e, 0xe0, 0x2f, 0xc2, 0xd9, 0x7d, 0x1e, 0x58, 0x2d, 0x34, 0x6f, 0x22, 0x7d, - 0x0a, 0xc4, 0x34, 0x42, 0xd0, 0x63, 0xef, 0x7c, 0x56, 0x6f, 0x33, 0x0d, 0xcf, 0x6a, 0xcf, 0x2c, - 0x90, 0x2c, 0x1c, 0x12, 0xc7, 0xfa, 0x73, 0x04, 0x96, 0x7c, 0x85, 0xa3, 0x99, 0xe4, 0x29, 0x3a, - 0x7b, 0xd8, 0xbf, 0x89, 0x88, 0xb7, 0x21, 0x4d, 0x79, 0x84, 0x35, 0xe6, 0xc5, 0x45, 0x3e, 0x5f, - 0x5a, 0x1e, 0x43, 0x1e, 0xc0, 0x70, 0xd0, 0xb7, 0x51, 0x4d, 0xf9, 0x5b, 0xd8, 0x4a, 0xfa, 0x0c, - 0xe2, 0x2d, 0xec, 0x33, 0x77, 0x2c, 0x45, 0x12, 0xe5, 0xf7, 0x86, 0x83, 0x42, 0x6c, 0x0f, 0xfb, - 0xd5, 0xca, 0xcb, 0x41, 0xe1, 0x9d, 0x00, 0x2e, 0xad, 0x87, 0x6d, 0xcd, 0x31, 0x91, 0x1e, 0x5b, - 0x4e, 0x8b, 0xaf, 0x36, 0x1a, 0x96, 0x83, 0xc5, 0x5e, 0x31, 0xd8, 0x03, 0x15, 0x77, 0xb3, 0x1a, - 0x6b, 0x61, 0xbf, 0xaa, 0xcb, 0xcb, 0x90, 0x9b, 0x44, 0x25, 0x67, 0xfa, 0x57, 0x01, 0x92, 0x1f, - 0x18, 0x66, 0x2b, 0x34, 0x6e, 0x5f, 0x83, 0x79, 0x07, 0x1b, 0x86, 0x6d, 0xa0, 0x49, 0xdd, 0xb7, - 0xe1, 0x92, 0x9c, 0x50, 0xd3, 0x67, 0x52, 0x76, 0x0e, 0xdb, 0x3c, 0xca, 0xa4, 0x04, 0xcf, 0x17, - 0xe9, 0x01, 0xdc, 0x1a, 0x6d, 0xf6, 0x0e, 0x77, 0x39, 0x53, 0x47, 0x67, 0xba, 0x55, 0x47, 0xde, - 0x82, 0x94, 0x87, 0x8a, 0x57, 0xc7, 0x35, 0x48, 0xe9, 0xde, 0x7b, 0xf2, 0x7c, 0x7a, 0x65, 0x32, - 0xc9, 0x65, 0xcc, 0xa3, 0xfc, 0x05, 0x2c, 0xee, 0x38, 0xa8, 0x51, 0x2c, 0x1f, 0x39, 0xa6, 0x9b, - 0x8e, 0x24, 0x2c, 0x52, 0xdc, 0x3e, 0x79, 0xc1, 0x37, 0xbf, 0xa1, 0xef, 0x22, 0xbe, 0xb2, 0x82, - 0x76, 0xdb, 0xea, 0x87, 0xfb, 0xf8, 0xcf, 0x5e, 0x74, 0xf4, 0x4a, 0x2f, 0x5a, 0xaa, 0x40, 0x9a, - 0xb2, 0x00, 0x6b, 0x3a, 0x52, 0xcd, 0x68, 0x13, 0x5e, 0x09, 0x96, 0xc6, 0xdf, 0x03, 0xb3, 0xa8, - 0x78, 0x06, 0x7c, 0x7b, 0x8a, 0x06, 0x64, 0xc1, 0x01, 0x29, 0x7e, 0xf9, 0x80, 0xf4, 0x58, 0x9c, - 0x8b, 0x2d, 0xc4, 0xe5, 0xfb, 0xb0, 0x34, 0x81, 0x23, 0xce, 0xe0, 0x97, 0x02, 0xac, 0x78, 0xda, - 0x7d, 0x34, 0x75, 0xc3, 0x6c, 0xfa, 0x0f, 0x21, 0xbc, 0x0b, 0x5e, 0x85, 0xfc, 0xb4, 0x08, 0x78, - 0x90, 0xbf, 0x09, 0xb0, 0x18, 0x68, 0xf0, 0x21, 0xb6, 0xec, 0xb1, 0xf1, 0x28, 0xfa, 0x77, 0xc6, - 0xa3, 0x65, 0x48, 0x34, 0xbc, 0xb0, 0x51, 0x77, 0x2f, 0x7c, 0x4e, 0x1d, 0x09, 0xe4, 0x37, 0x21, - 0x7b, 0x11, 0xd8, 0xd4, 0xa9, 0xe5, 0xa7, 0x08, 0x2c, 0x05, 0xcc, 0xc3, 0x9e, 0x15, 0xfe, 0x31, - 0x17, 0x67, 0xbd, 0x43, 0x7c, 0x65, 0xef, 0x28, 0x41, 0x8a, 0x35, 0xff, 0x57, 0x4d, 0x08, 0x49, - 0x66, 0xc4, 0x17, 0xe3, 0x54, 0xc7, 0xcf, 0x53, 0xad, 0x40, 0x6e, 0x12, 0x77, 0x53, 0xc9, 0xfe, - 0x26, 0x32, 0x96, 0x74, 0xe1, 0x96, 0x96, 0x30, 0xa9, 0x3e, 0x6b, 0x27, 0xb1, 0x60, 0x3b, 0xb9, - 0x9c, 0xcc, 0xf1, 0xbc, 0x1d, 0x2b, 0x29, 0x13, 0xa8, 0xfc, 0x43, 0x80, 0x95, 0xa0, 0xf9, 0xbf, - 0x30, 0xb6, 0x5c, 0xf3, 0x3b, 0x2e, 0x41, 0x7e, 0x1a, 0xc0, 0xa9, 0xac, 0xbc, 0x10, 0xfc, 0xc2, - 0xe7, 0xdb, 0x7f, 0x74, 0x6c, 0xa2, 0x43, 0x0e, 0x0d, 0x3b, 0x34, 0x5a, 0x46, 0xf3, 0x55, 0xf4, - 0x3a, 0xe6, 0xab, 0x35, 0x28, 0x4c, 0x45, 0xc8, 0x6b, 0xfb, 0xa9, 0x00, 0x6b, 0xe7, 0x6c, 0x6c, - 0x74, 0x34, 0x6a, 0xfd, 0xa7, 0x88, 0xf8, 0x3f, 0xc8, 0x97, 0x81, 0xe4, 0x5c, 0x74, 0xe1, 0xce, - 0x13, 0xa3, 0x69, 0xee, 0x58, 0x9d, 0x8e, 0x66, 0xea, 0xe1, 0x75, 0xe0, 0xaf, 0x04, 0xc8, 0x8c, - 0x3b, 0xe6, 0x49, 0xfb, 0x08, 0xee, 0xd4, 0x35, 0xda, 0x38, 0x44, 0xbd, 0xd6, 0xe0, 0x3a, 0x46, - 0x91, 0x17, 0xc6, 0xdd, 0xe1, 0xa0, 0x70, 0xbb, 0xec, 0xa9, 0xfd, 0x9d, 0xd5, 0x8a, 0x7a, 0xbb, - 0x7e, 0x4e, 0xa4, 0x4b, 0xff, 0x83, 0x34, 0xdf, 0x5e, 0x6b, 0xb8, 0x3f, 0x20, 0x99, 0xf7, 0xb4, - 0x9a, 0xe2, 0xc2, 0x1d, 0x26, 0x93, 0x9f, 0x0b, 0x70, 0x6b, 0x5b, 0xd7, 0xc3, 0x6c, 0xee, 0x0f, - 0x61, 0x8e, 0x5d, 0x7a, 0xe0, 0xb7, 0xc9, 0x8a, 0x42, 0x09, 0xb9, 0x58, 0x13, 0xfc, 0x1f, 0x27, - 0xb3, 0x2d, 0xef, 0x43, 0x7a, 0x1d, 0xe2, 0xb6, 0xe6, 0x68, 0x1d, 0xbf, 0x31, 0xcd, 0xf3, 0xfa, - 0x1a, 0xdf, 0x77, 0xa5, 0x2a, 0xd7, 0x3e, 0x16, 0xe7, 0xa2, 0x0b, 0xa2, 0x2c, 0xc1, 0xc2, 0x08, - 0x99, 0x47, 0x6d, 0xf9, 0xc3, 0x93, 0x3f, 0xf3, 0x33, 0x27, 0xc3, 0xbc, 0xf0, 0x6c, 0x98, 0x17, - 0x5e, 0x0c, 0xf3, 0xc2, 0xd7, 0xa7, 0xf9, 0x99, 0x67, 0xa7, 0xf9, 0x99, 0xe7, 0xa7, 0xf9, 0x99, - 0x4f, 0x37, 0xaf, 0x98, 0x71, 0xd8, 0xed, 0x78, 0x90, 0xeb, 0x71, 0xf7, 0xbf, 0x76, 0x6f, 0xfd, - 0x15, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x59, 0x19, 0xd9, 0x4e, 0x14, 0x00, 0x00, + // 1247 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x41, 0x6f, 0xe3, 0xc4, + 0x17, 0x8f, 0x13, 0x27, 0x6d, 0x5e, 0x92, 0x6e, 0xd7, 0x9b, 0xdd, 0x4d, 0xb3, 0xdd, 0xa4, 0xf5, + 0xff, 0x0f, 0x2d, 0x12, 0x75, 0xda, 0x20, 0xa1, 0x85, 0x0b, 0x4a, 0x9a, 0xa5, 0x94, 0x22, 0xa8, + 0xbc, 0x85, 0x03, 0x12, 0x8a, 0x9c, 0x78, 0x36, 0xb5, 0x12, 0x7b, 0x8c, 0x67, 0x9a, 0x26, 0x88, + 0xc3, 0x8a, 0x03, 0x67, 0x3e, 0x02, 0x17, 0x24, 0x04, 0x37, 0x24, 0xee, 0x1c, 0x7b, 0x63, 0x6f, + 0xa0, 0x95, 0x88, 0x20, 0x15, 0x48, 0x7c, 0x85, 0x3d, 0xa1, 0xb1, 0xc7, 0x89, 0xd3, 0x26, 0xdd, + 0x0a, 0xb4, 0xa6, 0xe2, 0x54, 0xcf, 0x7b, 0x6f, 0xde, 0xbc, 0xdf, 0x6f, 0xde, 0xbc, 0xf7, 0x52, + 0xc8, 0xa2, 0xae, 0x59, 0xea, 0x6e, 0x35, 0x10, 0xd5, 0xb6, 0x4a, 0xb4, 0xa7, 0xd8, 0x0e, 0xa6, + 0x58, 0x4a, 0xa1, 0xae, 0xa9, 0x70, 0x69, 0x3e, 0xdb, 0xc2, 0x2d, 0xec, 0xca, 0x4b, 0xec, 0xcb, + 0x33, 0xc9, 0xaf, 0x76, 0x31, 0x45, 0x25, 0xd4, 0xb3, 0xb1, 0x43, 0x91, 0x3e, 0x76, 0xd1, 0xb7, + 0x11, 0xe1, 0x26, 0x2b, 0x94, 0x90, 0x8b, 0x2d, 0x6e, 0x4f, 0x9c, 0x1e, 0x50, 0xac, 0xd9, 0xc8, + 0x31, 0x0d, 0x42, 0x0c, 0x6c, 0x5d, 0xe8, 0x41, 0xfe, 0x4a, 0x80, 0xeb, 0x0f, 0x10, 0xdd, 0xd1, + 0x28, 0x3a, 0xd6, 0xfa, 0x2a, 0xfa, 0xf8, 0x08, 0x11, 0x2a, 0xed, 0x42, 0x82, 0x20, 0x4b, 0x47, + 0x4e, 0x4e, 0x58, 0x11, 0xd6, 0xd3, 0xd5, 0xad, 0xa7, 0x83, 0xe2, 0x46, 0xcb, 0xa0, 0x87, 0x47, + 0x0d, 0xa5, 0x89, 0xcd, 0x52, 0x13, 0x13, 0x13, 0x13, 0xfe, 0x67, 0x83, 0xe8, 0x6d, 0xee, 0xb3, + 0xd2, 0x6c, 0x56, 0x74, 0xdd, 0x41, 0x84, 0xa8, 0xdc, 0x81, 0x94, 0x85, 0x78, 0xf3, 0x50, 0x33, + 0xac, 0x5c, 0x74, 0x45, 0x58, 0x4f, 0xaa, 0xde, 0x42, 0x7a, 0x09, 0xe6, 0x34, 0xcf, 0x30, 0x17, + 0x73, 0x4f, 0xb8, 0x76, 0x32, 0x28, 0x46, 0x9e, 0x0c, 0x8a, 0x73, 0xfe, 0x7e, 0x5f, 0xff, 0xba, + 0xf8, 0xe8, 0xfb, 0x9c, 0x20, 0x67, 0x41, 0x0a, 0x86, 0x49, 0x6c, 0x6c, 0x11, 0x24, 0x7f, 0x2b, + 0xc0, 0xed, 0x6d, 0x6c, 0x3d, 0x34, 0x1c, 0x93, 0xab, 0x0e, 0x7a, 0x21, 0x62, 0x88, 0xd3, 0x5e, + 0xdd, 0xd0, 0x39, 0x82, 0x2c, 0x47, 0x20, 0xbe, 0xa5, 0x91, 0xc3, 0xe1, 0xa0, 0x28, 0x1e, 0xf4, + 0x76, 0x6b, 0xaa, 0x48, 0x7b, 0xbb, 0xba, 0x8b, 0x21, 0x22, 0xe7, 0x21, 0x77, 0x3e, 0x58, 0x8e, + 0xe4, 0xbb, 0x28, 0xdc, 0xf9, 0x00, 0x53, 0x14, 0x02, 0x9a, 0x37, 0x60, 0xde, 0xc6, 0x9d, 0x4e, + 0xbd, 0x8d, 0xfa, 0x2e, 0xa0, 0x54, 0xb9, 0xa0, 0xb0, 0x64, 0x54, 0xfc, 0x44, 0xf1, 0x33, 0x57, + 0xd9, 0xc7, 0x9d, 0xce, 0x1e, 0xea, 0x57, 0x45, 0x06, 0x4d, 0x9d, 0xb3, 0xbd, 0xa5, 0xb4, 0x03, + 0x22, 0xb3, 0x77, 0x71, 0xa7, 0xca, 0x1b, 0x4a, 0x20, 0xd9, 0x95, 0x0b, 0x30, 0xb8, 0x3a, 0xee, + 0xcb, 0x75, 0x90, 0xbf, 0x07, 0x22, 0x93, 0x49, 0x9b, 0x90, 0x40, 0x5d, 0x64, 0x51, 0x92, 0x13, + 0x56, 0x62, 0xeb, 0xa9, 0xb2, 0x34, 0xe1, 0xf2, 0x3e, 0x53, 0xf1, 0x7d, 0xdc, 0x8e, 0x13, 0xba, + 0x09, 0xcb, 0xd3, 0xcf, 0xf3, 0x48, 0x95, 0x16, 0x21, 0xd6, 0xc1, 0x2d, 0x97, 0xb1, 0xa4, 0xca, + 0x3e, 0xe5, 0x4f, 0xe0, 0x06, 0xb7, 0xde, 0x66, 0x77, 0xf8, 0x1c, 0xd8, 0x95, 0x40, 0xb4, 0x34, + 0x13, 0xf1, 0x54, 0x71, 0xbf, 0x79, 0xb4, 0xb7, 0x20, 0x3b, 0x79, 0x36, 0xbf, 0xfa, 0x6f, 0xa2, + 0x70, 0x93, 0x2b, 0x6a, 0xc8, 0xc6, 0xc4, 0xa0, 0x57, 0x30, 0x85, 0xa5, 0x1d, 0x48, 0x68, 0x26, + 0x3e, 0xb2, 0x68, 0x4e, 0x74, 0x6d, 0x4b, 0xdc, 0x76, 0xed, 0x12, 0xf1, 0xbc, 0x6f, 0x58, 0x54, + 0xe5, 0xdb, 0xa5, 0x57, 0x61, 0xa1, 0x71, 0xe4, 0x58, 0xc8, 0xa9, 0xfb, 0x15, 0x20, 0x3e, 0xbd, + 0x02, 0x64, 0x3c, 0xb3, 0x4a, 0xa0, 0x0e, 0x44, 0xe4, 0x1c, 0xdc, 0x3a, 0xcb, 0x15, 0xa7, 0xf1, + 0x27, 0x61, 0x74, 0xb7, 0x07, 0xb8, 0x8d, 0xac, 0xab, 0x48, 0xa2, 0x02, 0x71, 0x8d, 0x10, 0xe4, + 0x71, 0x78, 0x36, 0xcf, 0x2b, 0x4c, 0xc3, 0xf3, 0xdc, 0x33, 0x3b, 0x97, 0x38, 0x1c, 0x18, 0x47, + 0xfc, 0x63, 0x14, 0x96, 0x7c, 0x85, 0xa3, 0x59, 0xe4, 0x21, 0x72, 0xf6, 0x50, 0xff, 0x2a, 0xe2, + 0xae, 0x40, 0x86, 0xf2, 0x08, 0xeb, 0xec, 0x14, 0x17, 0xff, 0x42, 0x79, 0x79, 0x02, 0x7f, 0x00, + 0xc3, 0x41, 0xdf, 0x46, 0x6a, 0xda, 0xdf, 0xc2, 0x56, 0xd2, 0x47, 0x90, 0x68, 0xa3, 0x3e, 0x3b, + 0x8e, 0xa5, 0x4b, 0xb2, 0xfa, 0xe6, 0x70, 0x50, 0x8c, 0xef, 0xa1, 0xfe, 0x6e, 0xed, 0xe9, 0xa0, + 0xf8, 0x5a, 0x00, 0x97, 0xd6, 0x43, 0x1d, 0xcd, 0xb1, 0x10, 0x3d, 0xc6, 0x4e, 0x9b, 0xaf, 0x36, + 0x9a, 0xd8, 0x41, 0xa5, 0x5e, 0x29, 0xd8, 0x50, 0x15, 0x77, 0xb3, 0x1a, 0x6f, 0xa3, 0xfe, 0xa8, + 0x42, 0x2f, 0x43, 0x7e, 0x1a, 0xa1, 0x9c, 0xef, 0x27, 0x02, 0xa4, 0xde, 0x31, 0xac, 0x76, 0x68, + 0x0c, 0xbf, 0x00, 0x0b, 0x0e, 0x6a, 0x1a, 0xb6, 0x81, 0x2c, 0xea, 0xbe, 0x16, 0x97, 0xea, 0xa4, + 0x9a, 0x19, 0x49, 0x99, 0x1f, 0xb6, 0x79, 0x9c, 0x55, 0x49, 0x9e, 0x3b, 0xd2, 0x1a, 0x5c, 0x1b, + 0x6f, 0xf6, 0x9c, 0xbb, 0xcc, 0xa9, 0x63, 0x9f, 0x6e, 0x1d, 0xe2, 0xd0, 0xb7, 0x20, 0xed, 0x61, + 0xe3, 0xb5, 0x73, 0x15, 0xd2, 0xba, 0xf7, 0xc2, 0xbc, 0x93, 0xbd, 0x22, 0x9a, 0xe2, 0x32, 0x76, + 0xae, 0xfc, 0x88, 0x75, 0x5f, 0x07, 0x69, 0x14, 0x55, 0x8f, 0x1c, 0xcb, 0xcd, 0x4d, 0x12, 0x16, + 0x37, 0x81, 0x96, 0x7a, 0x2e, 0x02, 0x7e, 0x5d, 0x5f, 0x47, 0x7d, 0x65, 0x0d, 0xd9, 0x1d, 0xdc, + 0x0f, 0xb7, 0x2a, 0x8c, 0x9e, 0x7a, 0xec, 0x52, 0x4f, 0x5d, 0xaa, 0x41, 0x86, 0xb2, 0x00, 0xeb, + 0x3a, 0xa2, 0x9a, 0xd1, 0x21, 0xbc, 0x44, 0x2c, 0x4d, 0x3e, 0x11, 0x66, 0x51, 0xf3, 0x0c, 0xf8, + 0xf6, 0x34, 0x0d, 0xc8, 0x82, 0x73, 0x55, 0xe2, 0x12, 0x73, 0x55, 0xf4, 0x6d, 0x71, 0x3e, 0xbe, + 0x98, 0x90, 0xef, 0xc0, 0xd2, 0x14, 0xa6, 0x38, 0x8f, 0x9f, 0x0b, 0x70, 0xd7, 0xd3, 0xee, 0x23, + 0x4b, 0x37, 0xac, 0x96, 0xff, 0x36, 0xc2, 0xbe, 0xec, 0x15, 0x28, 0xcc, 0x8a, 0x83, 0x87, 0xfa, + 0x8b, 0x00, 0xb7, 0x03, 0x13, 0x41, 0x88, 0x3d, 0x7e, 0x62, 0xaa, 0x8a, 0xfd, 0x9d, 0xa9, 0x6a, + 0x19, 0x92, 0x4d, 0x2f, 0x6c, 0xa4, 0xbb, 0x97, 0x3f, 0xaf, 0x8e, 0x05, 0x9c, 0x81, 0x97, 0x21, + 0x77, 0x1e, 0xde, 0xcc, 0x61, 0xe7, 0x87, 0x28, 0x2c, 0x05, 0xcc, 0xc3, 0x1e, 0x2e, 0xfe, 0x31, + 0x23, 0xa3, 0x06, 0x23, 0x3e, 0xb3, 0xc1, 0x94, 0x21, 0xcd, 0xa6, 0x85, 0x67, 0x8d, 0x14, 0x29, + 0x66, 0xc4, 0x17, 0x93, 0x84, 0x27, 0xa6, 0x13, 0xae, 0x40, 0x7e, 0x1a, 0x83, 0x33, 0x29, 0xff, + 0x32, 0x3a, 0x91, 0x80, 0xe1, 0x96, 0x9c, 0x30, 0x09, 0x1f, 0xf5, 0x9c, 0x78, 0xb0, 0xe7, 0x5c, + 0x86, 0xd2, 0xc9, 0x1c, 0x9e, 0x28, 0x35, 0x53, 0x08, 0xfd, 0x5d, 0x80, 0xbb, 0x41, 0xf3, 0x7f, + 0x61, 0xce, 0x09, 0xe5, 0x65, 0x97, 0xa1, 0x30, 0x0b, 0xe6, 0x4c, 0x6e, 0xfe, 0x10, 0xfc, 0x82, + 0xe8, 0xdb, 0xbf, 0x77, 0x6c, 0x21, 0x87, 0x1c, 0x1a, 0x76, 0x68, 0xe4, 0x8c, 0xc7, 0xb2, 0xd8, + 0xf3, 0x1a, 0xcb, 0xa2, 0xf2, 0x2a, 0x14, 0x67, 0xe2, 0xe4, 0x95, 0xff, 0x4f, 0x01, 0x56, 0xcf, + 0xd8, 0xd8, 0xc8, 0xd1, 0x28, 0xfe, 0x0f, 0xd2, 0xf1, 0x7f, 0x90, 0x2f, 0x82, 0xca, 0x19, 0xf9, + 0x14, 0x6e, 0x3c, 0x30, 0x5a, 0xd6, 0x36, 0x36, 0x4d, 0xcd, 0xd2, 0xc3, 0xee, 0xd5, 0x9f, 0x09, + 0x90, 0x9d, 0x3c, 0x9e, 0xa7, 0xf1, 0x7d, 0xb8, 0xd1, 0xd0, 0x68, 0xf3, 0x10, 0xe9, 0xf5, 0x26, + 0xd7, 0x31, 0xba, 0xbc, 0x60, 0x6e, 0x0e, 0x07, 0xc5, 0xeb, 0x55, 0x4f, 0xed, 0xef, 0xdc, 0xad, + 0xa9, 0xd7, 0x1b, 0x67, 0x44, 0xba, 0xf4, 0x3f, 0xc8, 0xf0, 0xed, 0xf5, 0xa6, 0xfb, 0xab, 0x94, + 0xc5, 0x90, 0x51, 0xd3, 0x5c, 0xb8, 0xcd, 0x64, 0xf2, 0x40, 0x80, 0x6b, 0x15, 0x5d, 0x0f, 0x73, + 0x0c, 0xb8, 0x07, 0xf3, 0x2c, 0x01, 0x02, 0x3f, 0x72, 0xee, 0x2a, 0x94, 0x90, 0xf3, 0xb5, 0xc2, + 0xff, 0x95, 0x33, 0xd7, 0xf6, 0x3e, 0xa4, 0x17, 0x21, 0x61, 0x6b, 0x8e, 0x66, 0xfa, 0xcd, 0x6b, + 0x81, 0x57, 0xdf, 0xc4, 0xbe, 0x2b, 0x55, 0xb9, 0x76, 0x34, 0xb7, 0xc5, 0x16, 0x45, 0x59, 0x82, + 0xc5, 0x31, 0x3e, 0x8f, 0xe0, 0xea, 0xbb, 0x27, 0xbf, 0x15, 0x22, 0x27, 0xc3, 0x82, 0xf0, 0x78, + 0x58, 0x10, 0x7e, 0x1d, 0x16, 0x84, 0x2f, 0x4e, 0x0b, 0x91, 0xc7, 0xa7, 0x85, 0xc8, 0xcf, 0xa7, + 0x85, 0xc8, 0x87, 0x9b, 0x97, 0xcc, 0x41, 0xd4, 0x35, 0x3d, 0xe0, 0x8d, 0x84, 0xfb, 0x8f, 0xc2, + 0x57, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x80, 0xdb, 0x3a, 0xea, 0x14, 0x00, 0x00, } func (m *SetGatewayRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/nexus/types/tx.pb.go b/x/nexus/types/tx.pb.go index b767cbe23..bf9da5a69 100644 --- a/x/nexus/types/tx.pb.go +++ b/x/nexus/types/tx.pb.go @@ -6,6 +6,7 @@ package types import ( fmt "fmt" exported "github.com/axelarnetwork/axelar-core/x/nexus/exported" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -416,33 +417,35 @@ func init() { func init() { proto.RegisterFile("nexus/v1beta1/tx.proto", fileDescriptor_7af3d47209cda0b3) } var fileDescriptor_7af3d47209cda0b3 = []byte{ - // 415 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x93, 0xb1, 0x8e, 0xd3, 0x40, - 0x10, 0x86, 0xbd, 0x07, 0x0a, 0xb0, 0x40, 0x13, 0x1d, 0x89, 0x89, 0xd0, 0xda, 0x67, 0x9a, 0x34, - 0xf1, 0x2a, 0xc7, 0x0b, 0xe0, 0x70, 0x3a, 0xe9, 0x0a, 0x24, 0xe4, 0x92, 0x06, 0x6d, 0xec, 0xb1, - 0x6f, 0x75, 0x77, 0x3b, 0x66, 0x77, 0x73, 0xf8, 0x44, 0x89, 0xe8, 0x79, 0x0a, 0x9e, 0x25, 0x65, - 0x4a, 0xaa, 0x08, 0x92, 0xb7, 0xa0, 0x42, 0xb1, 0x37, 0x02, 0x11, 0x41, 0x07, 0xa9, 0xec, 0x99, - 0xf9, 0x35, 0xff, 0x37, 0x5a, 0xfd, 0xb4, 0xa7, 0xa0, 0x9e, 0x19, 0x7e, 0x3d, 0x9e, 0x82, 0x15, - 0x63, 0x6e, 0xeb, 0xb8, 0xd2, 0x68, 0xb1, 0xfb, 0xb0, 0xe9, 0xc7, 0xae, 0x3f, 0x38, 0x2c, 0xb1, - 0xc4, 0x66, 0xc2, 0x37, 0x7f, 0xad, 0x68, 0xf0, 0xa4, 0x44, 0x2c, 0x2f, 0x81, 0x8b, 0x4a, 0x72, - 0xa1, 0x14, 0x5a, 0x61, 0x25, 0x2a, 0xe3, 0xa6, 0x51, 0xbb, 0x1a, 0xea, 0x0a, 0xb5, 0x85, 0xfc, - 0xa7, 0xc7, 0x4d, 0x05, 0x4e, 0x13, 0x7d, 0x20, 0x94, 0xa5, 0x50, 0x4a, 0x63, 0x41, 0xbf, 0x38, - 0x17, 0x52, 0xbd, 0x14, 0x52, 0x59, 0x21, 0x15, 0xe8, 0x14, 0xde, 0xce, 0xc0, 0xd8, 0xee, 0x19, - 0xed, 0x18, 0x50, 0x39, 0x68, 0x9f, 0x84, 0x64, 0xf8, 0x60, 0x32, 0xfe, 0xbe, 0x0c, 0x46, 0xa5, - 0xb4, 0xe7, 0xb3, 0x69, 0x9c, 0xe1, 0x15, 0xcf, 0xd0, 0x5c, 0xa1, 0x71, 0x9f, 0x91, 0xc9, 0x2f, - 0x9c, 0x41, 0x92, 0x65, 0x49, 0x9e, 0x6b, 0x30, 0x26, 0x75, 0x0b, 0xba, 0x3d, 0xda, 0xc9, 0x36, - 0x26, 0xc6, 0x3f, 0x08, 0x6f, 0x0d, 0xef, 0xa5, 0xae, 0x8a, 0x8e, 0x68, 0xf0, 0x47, 0x08, 0x53, - 0xa1, 0x32, 0x10, 0x7d, 0x24, 0x34, 0x3c, 0x01, 0xbd, 0x77, 0xd4, 0xa7, 0xf4, 0xe8, 0x2f, 0x18, - 0x0e, 0xf6, 0x86, 0x1e, 0x26, 0x99, 0x95, 0xd7, 0xc2, 0x42, 0x23, 0xf9, 0x8f, 0x7c, 0x7d, 0xfa, - 0xe8, 0x37, 0x6b, 0xc7, 0xf4, 0x9e, 0xf6, 0x4e, 0x40, 0xec, 0x89, 0xea, 0x31, 0xed, 0xef, 0x98, - 0x3b, 0xae, 0xcf, 0x84, 0xf6, 0xb7, 0x8f, 0x9f, 0x18, 0x03, 0xf6, 0x14, 0xe0, 0x1f, 0x90, 0x3d, - 0xa7, 0x77, 0x0b, 0x80, 0x37, 0x52, 0x15, 0xe8, 0x1f, 0x84, 0x64, 0x78, 0xff, 0x38, 0x88, 0xdb, - 0x88, 0x6d, 0xf3, 0xb1, 0xcd, 0x5a, 0x7c, 0x0a, 0x70, 0xa6, 0x0a, 0x9c, 0xdc, 0x9e, 0x2f, 0x03, - 0x2f, 0xbd, 0x53, 0xb4, 0x65, 0x34, 0xa0, 0xfe, 0x2e, 0x67, 0x7b, 0xc4, 0xe4, 0xd5, 0xfc, 0x1b, - 0xf3, 0xe6, 0x2b, 0x46, 0x16, 0x2b, 0x46, 0xbe, 0xae, 0x18, 0xf9, 0xb4, 0x66, 0xde, 0x62, 0xcd, - 0xbc, 0x2f, 0x6b, 0xe6, 0xbd, 0x3e, 0xfe, 0x05, 0x59, 0xd4, 0x70, 0x29, 0xb4, 0x02, 0xfb, 0x0e, - 0xf5, 0x85, 0xab, 0x46, 0x19, 0x6a, 0xe0, 0x35, 0x6f, 0xf3, 0xda, 0x9c, 0x30, 0xed, 0x34, 0xf9, - 0x7c, 0xf6, 0x23, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xbf, 0xea, 0x0d, 0x20, 0x04, 0x00, 0x00, + // 440 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0xbf, 0x6e, 0x13, 0x41, + 0x10, 0xc6, 0x6f, 0x4d, 0x64, 0x60, 0x81, 0xc6, 0x0a, 0xf6, 0x61, 0xa1, 0xb5, 0x73, 0x14, 0xb8, + 0xf1, 0xad, 0x1c, 0x3a, 0x2a, 0x6c, 0xa2, 0x48, 0x29, 0x90, 0xd0, 0x95, 0x34, 0x68, 0x7d, 0x37, + 0xbe, 0xac, 0x12, 0xef, 0x1c, 0x3b, 0xeb, 0x70, 0x54, 0x40, 0x89, 0x68, 0x78, 0x10, 0x5a, 0xde, + 0xc1, 0x65, 0x4a, 0xaa, 0x08, 0xec, 0xb7, 0xa0, 0x42, 0xb9, 0x5b, 0x0b, 0x44, 0x44, 0x3a, 0xfe, + 0x54, 0x77, 0x33, 0xf3, 0x69, 0xe6, 0xf7, 0x49, 0xfb, 0xf1, 0xb6, 0x81, 0x72, 0x41, 0xf2, 0x64, + 0x34, 0x05, 0xa7, 0x46, 0xd2, 0x95, 0x71, 0x61, 0xd1, 0x61, 0xeb, 0x56, 0xd5, 0x8f, 0x7d, 0xbf, + 0xbb, 0x9d, 0x63, 0x8e, 0xd5, 0x44, 0x9e, 0xff, 0xd5, 0xa2, 0xee, 0xdd, 0x1c, 0x31, 0x3f, 0x06, + 0xa9, 0x0a, 0x2d, 0x95, 0x31, 0xe8, 0x94, 0xd3, 0x68, 0xc8, 0x4f, 0xa3, 0x7a, 0x35, 0x94, 0x05, + 0x5a, 0x07, 0xd9, 0x8f, 0x1b, 0xaf, 0x0a, 0xd8, 0x68, 0xee, 0x17, 0x60, 0xe7, 0x9a, 0x48, 0xa3, + 0xb9, 0x54, 0x18, 0xbd, 0x63, 0x5c, 0x24, 0x90, 0x6b, 0x72, 0x60, 0x1f, 0x1f, 0x2a, 0x6d, 0x9e, + 0x28, 0x6d, 0x9c, 0xd2, 0x06, 0x6c, 0x02, 0x2f, 0x16, 0x40, 0xae, 0x75, 0xc0, 0x9b, 0x04, 0x26, + 0x03, 0x1b, 0xb2, 0x3e, 0x1b, 0xdc, 0x9c, 0x8c, 0xbe, 0x9d, 0xf5, 0x86, 0xb9, 0x76, 0x87, 0x8b, + 0x69, 0x9c, 0xe2, 0x5c, 0xa6, 0x48, 0x73, 0x24, 0xff, 0x19, 0x52, 0x76, 0xe4, 0x0f, 0x8c, 0xd3, + 0x74, 0x9c, 0x65, 0x16, 0x88, 0x12, 0xbf, 0xa0, 0xd5, 0xe6, 0xcd, 0xf4, 0xfc, 0x08, 0x85, 0x8d, + 0xfe, 0x95, 0xc1, 0xf5, 0xc4, 0x57, 0x0f, 0xb7, 0xde, 0x7c, 0x0a, 0x83, 0x68, 0x87, 0xf7, 0x7e, + 0x8b, 0x42, 0x05, 0x1a, 0x82, 0xe8, 0x3d, 0xe3, 0xfd, 0x3d, 0xb0, 0xff, 0x09, 0xf0, 0x3d, 0xbe, + 0x73, 0x09, 0x8c, 0x47, 0x7e, 0xcd, 0xb7, 0xc7, 0xa9, 0xd3, 0x27, 0xca, 0x41, 0x25, 0xf9, 0xcb, + 0x94, 0x2c, 0xea, 0xf0, 0xdb, 0xbf, 0x00, 0x78, 0xb2, 0xb7, 0x8c, 0xb7, 0xf7, 0x40, 0xfd, 0x53, + 0xb8, 0x3b, 0xbc, 0x73, 0x01, 0xc1, 0xe3, 0x7d, 0x64, 0xbc, 0xb3, 0x79, 0x0f, 0x63, 0x22, 0x70, + 0xfb, 0x00, 0x7f, 0x80, 0xef, 0x11, 0xbf, 0x36, 0x03, 0x78, 0xae, 0xcd, 0x0c, 0xc3, 0x46, 0x9f, + 0x0d, 0x6e, 0xec, 0xf6, 0xe2, 0x3a, 0xa4, 0x9b, 0xe0, 0x6c, 0xd2, 0x1a, 0xef, 0x03, 0x1c, 0x98, + 0x19, 0x4e, 0xb6, 0x96, 0x67, 0xbd, 0x20, 0xb9, 0x3a, 0xab, 0xcb, 0xca, 0x49, 0x23, 0xea, 0xf2, + 0xf0, 0x22, 0x6d, 0x6d, 0x65, 0xf2, 0x74, 0xf9, 0x55, 0x04, 0xcb, 0x95, 0x60, 0xa7, 0x2b, 0xc1, + 0xbe, 0xac, 0x04, 0xfb, 0xb0, 0x16, 0xc1, 0xe9, 0x5a, 0x04, 0x9f, 0xd7, 0x22, 0x78, 0xb6, 0xfb, + 0x13, 0xb8, 0x2a, 0xe1, 0x58, 0x59, 0x03, 0xee, 0x25, 0xda, 0x23, 0x5f, 0x0d, 0x53, 0xb4, 0x20, + 0x4b, 0x59, 0xe7, 0xbe, 0x32, 0x32, 0x6d, 0x56, 0xf1, 0x7d, 0xf0, 0x3d, 0x00, 0x00, 0xff, 0xff, + 0xb6, 0xe1, 0x46, 0x27, 0x68, 0x04, 0x00, 0x00, } func (m *RegisterChainMaintainerRequest) Marshal() (dAtA []byte, err error) { diff --git a/utils/proto.go b/x/permission/exported/proto.go similarity index 62% rename from utils/proto.go rename to x/permission/exported/proto.go index 7480e367b..b48f8fff7 100644 --- a/utils/proto.go +++ b/x/permission/exported/proto.go @@ -1,18 +1,16 @@ -package utils +package exported import ( "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - - "github.com/axelarnetwork/axelar-core/x/permission/exported" ) // GetPermissionRole returns the role that is defined for the given message. Returns ROLE_CHAIN_MANAGEMENT if none is set. -func GetPermissionRole(message descriptor.Message) exported.Role { +func GetPermissionRole(message descriptor.Message) Role { _, d := descriptor.ForMessage(message) v, err := proto.GetExtension(d.GetOptions(), E_PermissionRole) if err != nil { - return exported.ROLE_CHAIN_MANAGEMENT + return ROLE_CHAIN_MANAGEMENT } - return *v.(*exported.Role) + return *v.(*Role) } diff --git a/x/permission/exported/types.pb.go b/x/permission/exported/types.pb.go index 6e8050b97..f7ad3f470 100644 --- a/x/permission/exported/types.pb.go +++ b/x/permission/exported/types.pb.go @@ -7,6 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" math "math" ) @@ -49,8 +50,18 @@ func (Role) EnumDescriptor() ([]byte, []int) { return fileDescriptor_122b0697c9fb828e, []int{0} } +var E_PermissionRole = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.MessageOptions)(nil), + ExtensionType: (*Role)(nil), + Field: 50000, + Name: "permission.exported.v1beta1.permission_role", + Tag: "varint,50000,opt,name=permission_role,enum=permission.exported.v1beta1.Role", + Filename: "permission/exported/v1beta1/types.proto", +} + func init() { proto.RegisterEnum("permission.exported.v1beta1.Role", Role_name, Role_value) + proto.RegisterExtension(E_PermissionRole) } func init() { @@ -58,22 +69,27 @@ func init() { } var fileDescriptor_122b0697c9fb828e = []byte{ - // 267 bytes of a gzipped FileDescriptorProto + // 350 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x48, 0x2d, 0xca, 0xcd, 0x2c, 0x2e, 0xce, 0xcc, 0xcf, 0xd3, 0x4f, 0xad, 0x28, 0xc8, 0x2f, 0x2a, 0x49, 0x4d, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x46, 0x28, 0xd4, 0x83, 0x29, 0xd4, 0x83, 0x2a, 0x94, 0x12, 0x49, - 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd3, 0x07, 0xb1, 0x20, 0x5a, 0xb4, 0x0a, 0xb9, 0x58, 0x82, 0xf2, - 0x73, 0x52, 0x85, 0xb4, 0xb9, 0x04, 0x82, 0xfc, 0x7d, 0x5c, 0xe3, 0x43, 0xfd, 0x82, 0x03, 0x5c, - 0x9d, 0x3d, 0xdd, 0x3c, 0x5d, 0x5d, 0x04, 0x18, 0xa4, 0x44, 0xbb, 0xe6, 0x2a, 0x08, 0x42, 0xc5, - 0x83, 0x5c, 0x83, 0x43, 0x82, 0x3c, 0x9d, 0x43, 0x5c, 0x5d, 0x84, 0xc4, 0xb9, 0x84, 0xc1, 0x82, - 0x8e, 0xce, 0xce, 0xae, 0xc1, 0xc1, 0xf1, 0xce, 0xfe, 0x7e, 0x21, 0x41, 0xfe, 0x3e, 0x02, 0x8c, - 0x42, 0x92, 0x5c, 0xa2, 0x60, 0x09, 0x67, 0x0f, 0x47, 0x4f, 0xbf, 0x78, 0x5f, 0x47, 0x3f, 0x47, - 0x77, 0x57, 0x5f, 0x57, 0xbf, 0x10, 0x01, 0x26, 0x29, 0x8e, 0x8e, 0xc5, 0x72, 0x0c, 0x2b, 0x96, - 0xc8, 0x31, 0x3a, 0x45, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, - 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, - 0x72, 0x0c, 0x51, 0x56, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x89, - 0x15, 0xa9, 0x39, 0x89, 0x45, 0x79, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x50, 0x9e, 0x6e, 0x72, - 0x7e, 0x51, 0xaa, 0x7e, 0x85, 0x3e, 0x96, 0x30, 0x49, 0x62, 0x03, 0xfb, 0xc9, 0x18, 0x10, 0x00, - 0x00, 0xff, 0xff, 0x90, 0xeb, 0x78, 0xbe, 0x31, 0x01, 0x00, 0x00, + 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd3, 0x07, 0xb1, 0x20, 0x5a, 0xa4, 0x14, 0xd2, 0xf3, 0xf3, 0xd3, + 0x73, 0x52, 0xf5, 0xc1, 0xbc, 0xa4, 0xd2, 0x34, 0xfd, 0x94, 0xd4, 0xe2, 0xe4, 0xa2, 0xcc, 0x82, + 0x92, 0xfc, 0x22, 0x88, 0x0a, 0xad, 0x42, 0x2e, 0x96, 0xa0, 0xfc, 0x9c, 0x54, 0x21, 0x6d, 0x2e, + 0x81, 0x20, 0x7f, 0x1f, 0xd7, 0xf8, 0x50, 0xbf, 0xe0, 0x00, 0x57, 0x67, 0x4f, 0x37, 0x4f, 0x57, + 0x17, 0x01, 0x06, 0x29, 0xd1, 0xae, 0xb9, 0x0a, 0x82, 0x50, 0xf1, 0x20, 0xd7, 0xe0, 0x90, 0x20, + 0x4f, 0xe7, 0x10, 0x57, 0x17, 0x21, 0x71, 0x2e, 0x61, 0xb0, 0xa0, 0xa3, 0xb3, 0xb3, 0x6b, 0x70, + 0x70, 0xbc, 0xb3, 0xbf, 0x5f, 0x48, 0x90, 0xbf, 0x8f, 0x00, 0xa3, 0x90, 0x24, 0x97, 0x28, 0x58, + 0xc2, 0xd9, 0xc3, 0xd1, 0xd3, 0x2f, 0xde, 0xd7, 0xd1, 0xcf, 0xd1, 0xdd, 0xd5, 0xd7, 0xd5, 0x2f, + 0x44, 0x80, 0x49, 0x8a, 0xa3, 0x63, 0xb1, 0x1c, 0xc3, 0x8a, 0x25, 0x72, 0x8c, 0x56, 0xb9, 0x5c, + 0xfc, 0x08, 0x9f, 0xc4, 0x17, 0x81, 0x6c, 0x97, 0xd7, 0x83, 0x38, 0x54, 0x0f, 0xe6, 0x50, 0x3d, + 0xdf, 0xd4, 0xe2, 0xe2, 0xc4, 0xf4, 0x54, 0xff, 0x82, 0x92, 0xcc, 0xfc, 0xbc, 0x62, 0x89, 0x0b, + 0x6d, 0xcc, 0x0a, 0x8c, 0x1a, 0x7c, 0x46, 0x8a, 0x7a, 0x78, 0x02, 0x41, 0x0f, 0xe4, 0x93, 0x20, + 0x3e, 0x84, 0x0a, 0x10, 0xdf, 0x29, 0xe2, 0xc4, 0x43, 0x39, 0x86, 0x13, 0x8f, 0xe4, 0x18, 0x2f, + 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, + 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0xd5, 0x4f, 0xac, 0x48, 0xcd, 0x49, 0x2c, 0xca, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0x86, 0xf2, + 0x74, 0x93, 0xf3, 0x8b, 0x52, 0xf5, 0x2b, 0xf4, 0xb1, 0x44, 0x52, 0x12, 0x1b, 0xd8, 0xb5, 0xc6, + 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x46, 0xd0, 0x50, 0xc2, 0x01, 0x00, 0x00, } diff --git a/x/permission/exported/types_test.go b/x/permission/exported/types_test.go index 4d170c509..a4f2baf9c 100644 --- a/x/permission/exported/types_test.go +++ b/x/permission/exported/types_test.go @@ -11,7 +11,7 @@ import ( "golang.org/x/exp/slices" "github.com/axelarnetwork/axelar-core/app" - "github.com/axelarnetwork/axelar-core/utils" + "github.com/axelarnetwork/axelar-core/x/permission/exported" ) func TestMsgRoles(t *testing.T) { @@ -34,7 +34,7 @@ func TestMsgRoles(t *testing.T) { missingRoles = append(missingRoles, implementation) continue } - _, err = proto.GetExtension(options, utils.E_PermissionRole) + _, err = proto.GetExtension(options, exported.E_PermissionRole) if err != nil { missingRoles = append(missingRoles, implementation) continue diff --git a/x/permission/types/tx.pb.go b/x/permission/types/tx.pb.go index ee7fb46a4..d694403be 100644 --- a/x/permission/types/tx.pb.go +++ b/x/permission/types/tx.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" multisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" @@ -261,32 +262,33 @@ func init() { func init() { proto.RegisterFile("permission/v1beta1/tx.proto", fileDescriptor_1d3d2ab82ee63830) } var fileDescriptor_1d3d2ab82ee63830 = []byte{ - // 387 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0xbf, 0x8f, 0xd3, 0x30, - 0x14, 0xc7, 0x63, 0x84, 0x6e, 0x30, 0x3f, 0x86, 0x88, 0xe1, 0x48, 0x0f, 0xdf, 0x91, 0xe9, 0x18, - 0x6a, 0xab, 0x30, 0x30, 0xb7, 0x20, 0x21, 0x74, 0x0c, 0x10, 0xa9, 0x0c, 0x2c, 0x28, 0x71, 0x9e, - 0x4c, 0x94, 0xc4, 0x2f, 0xd8, 0x4e, 0x69, 0xfe, 0x0b, 0xfe, 0x1d, 0xc4, 0xc0, 0xda, 0xb1, 0x23, - 0x53, 0x05, 0xed, 0x7f, 0xc1, 0x84, 0x48, 0xd2, 0x92, 0xa1, 0x13, 0x12, 0xc3, 0x4d, 0xb6, 0xf5, - 0x9e, 0xbf, 0xef, 0xf3, 0x91, 0x6c, 0x3a, 0xaa, 0xc0, 0x94, 0x99, 0xb5, 0x19, 0x6a, 0xb1, 0x98, - 0x24, 0xe0, 0xe2, 0x89, 0x70, 0x4b, 0x5e, 0x19, 0x74, 0xe8, 0xfb, 0x7f, 0x8b, 0xbc, 0x2f, 0x06, - 0xf7, 0x14, 0x2a, 0x6c, 0xcb, 0xe2, 0xcf, 0xae, 0xeb, 0x0c, 0x1e, 0x4a, 0xb4, 0x25, 0x5a, 0x21, - 0x4d, 0x53, 0x39, 0x14, 0x65, 0x5d, 0xb8, 0xcc, 0x66, 0x4a, 0xe4, 0xd0, 0xd8, 0xae, 0x25, 0xfc, - 0x46, 0x68, 0x30, 0xaf, 0xd2, 0xd8, 0xc1, 0x0b, 0x5c, 0x80, 0xd1, 0xb1, 0x96, 0x70, 0x05, 0x4d, - 0x04, 0x1f, 0x6b, 0xb0, 0xce, 0x7f, 0x49, 0x4f, 0x2c, 0xe8, 0x14, 0xcc, 0x29, 0xb9, 0x20, 0x97, - 0xb7, 0x67, 0x93, 0x5f, 0x9b, 0xf3, 0xb1, 0xca, 0xdc, 0x87, 0x3a, 0xe1, 0x12, 0x4b, 0xb1, 0x1f, - 0xd0, 0x2e, 0x63, 0x9b, 0xe6, 0xc2, 0x35, 0x15, 0x58, 0x3e, 0x95, 0x72, 0x9a, 0xa6, 0x06, 0xac, - 0x8d, 0xfa, 0x00, 0xff, 0x2d, 0xbd, 0xab, 0x0e, 0x23, 0xde, 0xe7, 0xd0, 0x9c, 0xde, 0xb8, 0x20, - 0x97, 0xb7, 0x1e, 0x3f, 0xe2, 0xdd, 0x6d, 0xde, 0x51, 0xf2, 0x3d, 0x25, 0x7f, 0x05, 0x2a, 0x96, - 0xcd, 0xb4, 0xcc, 0x34, 0xbe, 0xae, 0x93, 0x2b, 0x68, 0x66, 0x37, 0x57, 0x9b, 0x73, 0x2f, 0xba, - 0xa3, 0x86, 0xa4, 0xe1, 0x03, 0x3a, 0x3a, 0x2a, 0x60, 0x2b, 0xd4, 0x16, 0xc2, 0x2f, 0x84, 0xde, - 0x8f, 0x40, 0x65, 0xd6, 0x81, 0x79, 0x86, 0xda, 0x19, 0x2c, 0x0a, 0x30, 0xff, 0xc1, 0xef, 0x0d, - 0xa5, 0xf2, 0x90, 0xdf, 0xba, 0xfd, 0x53, 0xdc, 0x20, 0x24, 0x3c, 0xa3, 0xc1, 0x31, 0xf4, 0xde, - 0xec, 0x2b, 0xa1, 0xa3, 0xe7, 0x60, 0xae, 0xa9, 0x1b, 0xa3, 0x67, 0xc7, 0xe1, 0x3b, 0xbb, 0xd9, - 0x7c, 0xf5, 0x93, 0x79, 0xab, 0x2d, 0x23, 0xeb, 0x2d, 0x23, 0x3f, 0xb6, 0x8c, 0x7c, 0xde, 0x31, - 0x6f, 0xbd, 0x63, 0xde, 0xf7, 0x1d, 0xf3, 0xde, 0x3d, 0x1d, 0x0c, 0x8e, 0x97, 0x50, 0xc4, 0x46, - 0x83, 0xfb, 0x84, 0x26, 0xef, 0x4f, 0x63, 0x89, 0x06, 0xc4, 0x52, 0x0c, 0xfe, 0x51, 0x4b, 0x93, - 0x9c, 0xb4, 0xcf, 0xfe, 0xc9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xc9, 0xdc, 0x59, 0x62, - 0x03, 0x00, 0x00, + // 408 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0x3f, 0x6f, 0xd4, 0x30, + 0x18, 0xc6, 0x63, 0x54, 0x75, 0x30, 0x7f, 0x86, 0x88, 0xe1, 0xc8, 0x15, 0xb7, 0xdc, 0x42, 0x19, + 0x2e, 0xd6, 0xc1, 0x80, 0xc4, 0x76, 0x07, 0x12, 0x42, 0x65, 0x80, 0x48, 0x65, 0x60, 0x41, 0x89, + 0xf3, 0xca, 0x44, 0x49, 0xfc, 0x06, 0xdb, 0x29, 0xc9, 0xc6, 0x47, 0xe0, 0xcb, 0x30, 0x23, 0x06, + 0xa4, 0x1b, 0x3b, 0x32, 0x55, 0x70, 0xf7, 0x2d, 0x98, 0x10, 0x89, 0x7b, 0x97, 0xe1, 0x26, 0x24, + 0x86, 0x4e, 0xb6, 0xf5, 0x3e, 0x7e, 0x9e, 0xe7, 0x37, 0xbc, 0x74, 0x5c, 0x81, 0x2e, 0x33, 0x63, + 0x32, 0x54, 0xfc, 0x6c, 0x96, 0x80, 0x8d, 0x67, 0xdc, 0x36, 0x61, 0xa5, 0xd1, 0xa2, 0xef, 0x6f, + 0x87, 0xa1, 0x1b, 0x06, 0xb7, 0x25, 0x4a, 0xec, 0xc6, 0xfc, 0xef, 0xad, 0x57, 0x06, 0xf7, 0x04, + 0x9a, 0x12, 0x0d, 0x17, 0xba, 0xad, 0x2c, 0xf2, 0xb2, 0x2e, 0x6c, 0x66, 0x32, 0xc9, 0x73, 0x68, + 0x8d, 0x93, 0xdc, 0x1f, 0x24, 0x41, 0x53, 0xa1, 0xb6, 0x90, 0x6e, 0x23, 0xdb, 0x0a, 0x9c, 0x70, + 0xf2, 0x9d, 0xd0, 0xe0, 0xb4, 0x4a, 0x63, 0x0b, 0xcf, 0xf1, 0x0c, 0xb4, 0x8a, 0x95, 0x80, 0x13, + 0x68, 0x23, 0xf8, 0x50, 0x83, 0xb1, 0xfe, 0x0b, 0xba, 0x6f, 0x40, 0xa5, 0xa0, 0x47, 0xe4, 0x88, + 0x1c, 0xdf, 0x58, 0xcc, 0x7e, 0x5f, 0x1c, 0x4e, 0x65, 0x66, 0xdf, 0xd7, 0x49, 0x28, 0xb0, 0xe4, + 0x97, 0x4d, 0xba, 0x63, 0x6a, 0xd2, 0xdc, 0x99, 0xcf, 0x85, 0x98, 0xa7, 0xa9, 0x06, 0x63, 0x22, + 0x67, 0xe0, 0xbf, 0xa1, 0xb7, 0xe4, 0x26, 0xe2, 0x5d, 0x0e, 0xed, 0xe8, 0xda, 0x11, 0x39, 0xbe, + 0xfe, 0xf0, 0x41, 0xd8, 0xff, 0x0e, 0x7b, 0x9c, 0xf0, 0x12, 0x27, 0x7c, 0x09, 0x32, 0x16, 0xed, + 0xbc, 0xcc, 0x14, 0xbe, 0xaa, 0x93, 0x13, 0x68, 0x17, 0x7b, 0xcb, 0x8b, 0x43, 0x2f, 0xba, 0x29, + 0x87, 0x4d, 0x9f, 0xec, 0x7d, 0xfa, 0x32, 0x22, 0x93, 0xbb, 0x74, 0xbc, 0x13, 0xc3, 0x54, 0xa8, + 0x0c, 0x4c, 0xbe, 0x12, 0x7a, 0x27, 0x02, 0x99, 0x19, 0x0b, 0xfa, 0x29, 0x2a, 0xab, 0xb1, 0x28, + 0x40, 0xff, 0x07, 0xca, 0xd7, 0x94, 0x8a, 0x8d, 0x7f, 0x47, 0xf8, 0x4f, 0x76, 0x03, 0x13, 0x07, + 0x78, 0x40, 0x83, 0x5d, 0x00, 0x8e, 0xef, 0x1b, 0xa1, 0xe3, 0x67, 0xa0, 0xaf, 0x34, 0x21, 0xa3, + 0x07, 0xbb, 0x11, 0x7a, 0xc6, 0xc5, 0xe9, 0xf2, 0x17, 0xf3, 0x96, 0x2b, 0x46, 0xce, 0x57, 0x8c, + 0xfc, 0x5c, 0x31, 0xf2, 0x79, 0xcd, 0xbc, 0xf3, 0x35, 0xf3, 0x7e, 0xac, 0x99, 0xf7, 0xf6, 0xf1, + 0x20, 0x3e, 0x6e, 0xa0, 0x88, 0xb5, 0x02, 0xfb, 0x11, 0x75, 0xee, 0x5e, 0x53, 0x81, 0x1a, 0x78, + 0xc3, 0x07, 0x8b, 0xd1, 0x75, 0x4a, 0xf6, 0xbb, 0x45, 0x78, 0xf4, 0x27, 0x00, 0x00, 0xff, 0xff, + 0x8d, 0xfd, 0x81, 0x0b, 0x9d, 0x03, 0x00, 0x00, } func (m *UpdateGovernanceKeyRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/reward/types/tx.pb.go b/x/reward/types/tx.pb.go index 41ae92d73..babd575c2 100644 --- a/x/reward/types/tx.pb.go +++ b/x/reward/types/tx.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" types "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" @@ -110,28 +111,30 @@ func init() { func init() { proto.RegisterFile("reward/v1beta1/tx.proto", fileDescriptor_3a40a70d6e1fd0ef) } var fileDescriptor_3a40a70d6e1fd0ef = []byte{ - // 334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x31, 0x6e, 0x22, 0x31, - 0x14, 0x86, 0x67, 0x76, 0x57, 0x48, 0xeb, 0x65, 0x11, 0x19, 0x21, 0x05, 0x28, 0x26, 0x88, 0x8a, - 0x66, 0x6c, 0x11, 0xaa, 0x94, 0xd0, 0x51, 0x50, 0x64, 0xca, 0x34, 0xc8, 0x33, 0x7e, 0x38, 0x88, - 0xc1, 0x26, 0xb6, 0x27, 0xc0, 0x2d, 0x72, 0x8c, 0x1c, 0x20, 0x87, 0x40, 0xa9, 0x28, 0x53, 0x45, - 0x09, 0xdc, 0x22, 0x55, 0x84, 0xed, 0x48, 0x54, 0xfe, 0x9f, 0x3f, 0xbf, 0xe7, 0xff, 0xd7, 0x43, - 0x97, 0x0a, 0xd6, 0x54, 0x31, 0xf2, 0xd8, 0xcf, 0xc0, 0xd0, 0x3e, 0x31, 0x1b, 0xbc, 0x52, 0xd2, - 0xc8, 0xa8, 0xe6, 0x00, 0xf6, 0xa0, 0xdd, 0xe2, 0x52, 0xf2, 0x02, 0x88, 0xa5, 0x59, 0x39, 0x23, - 0x54, 0x6c, 0xdd, 0xd3, 0x76, 0x83, 0x4b, 0x2e, 0xad, 0x24, 0x27, 0xe5, 0x6f, 0x5b, 0xb9, 0xd4, - 0x4b, 0xa9, 0xa7, 0x0e, 0xb8, 0xc2, 0xa1, 0xee, 0x73, 0x88, 0xea, 0x29, 0xcc, 0x4a, 0xc1, 0x26, - 0x9a, 0xa7, 0xf0, 0x50, 0x82, 0x36, 0xd1, 0x18, 0x55, 0x34, 0x08, 0x06, 0xaa, 0x19, 0x76, 0xc2, - 0x5e, 0x75, 0xd4, 0xff, 0x7a, 0xbf, 0x4a, 0xf8, 0xdc, 0xdc, 0x97, 0x19, 0xce, 0xe5, 0xd2, 0x4f, - 0xf0, 0x47, 0xa2, 0xd9, 0x82, 0x98, 0xed, 0x0a, 0x34, 0x1e, 0xe6, 0xf9, 0x90, 0x31, 0x05, 0x5a, - 0xa7, 0x7e, 0x40, 0x34, 0x46, 0xff, 0xe7, 0x42, 0x80, 0x9a, 0x2e, 0x41, 0x6b, 0xca, 0xa1, 0xf9, - 0xab, 0x13, 0xf6, 0xfe, 0x5d, 0x37, 0xb0, 0xcb, 0x80, 0x7f, 0x32, 0xe0, 0xa1, 0xd8, 0x8e, 0x6a, - 0xaf, 0x2f, 0x09, 0x72, 0x6e, 0x68, 0x56, 0x40, 0x5a, 0xb5, 0xad, 0x13, 0xd7, 0xd9, 0xbd, 0x41, - 0x17, 0x67, 0x4e, 0xf5, 0x4a, 0x0a, 0x0d, 0x51, 0x84, 0xfe, 0x30, 0x6a, 0xa8, 0x33, 0x9a, 0x5a, - 0x1d, 0xd5, 0xd1, 0xef, 0x42, 0x72, 0xfb, 0xd3, 0xdf, 0xf4, 0x24, 0x47, 0xb7, 0xbb, 0xcf, 0x38, - 0xd8, 0x1d, 0xe2, 0x70, 0x7f, 0x88, 0xc3, 0x8f, 0x43, 0x1c, 0x3e, 0x1d, 0xe3, 0x60, 0x7f, 0x8c, - 0x83, 0xb7, 0x63, 0x1c, 0xdc, 0x0d, 0xce, 0xa2, 0xd1, 0x0d, 0x14, 0x54, 0x09, 0x30, 0x6b, 0xa9, - 0x16, 0xbe, 0x4a, 0x72, 0xa9, 0x80, 0x6c, 0x88, 0xdf, 0x8f, 0xcd, 0x9a, 0x55, 0xac, 0xf3, 0xc1, - 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0x3e, 0xd0, 0x99, 0xb6, 0x01, 0x00, 0x00, + // 358 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x3f, 0x6f, 0xe2, 0x30, + 0x18, 0xc6, 0x93, 0x3b, 0x84, 0x74, 0x3e, 0x0e, 0x71, 0x11, 0xd2, 0x01, 0x43, 0x0e, 0xb1, 0x94, + 0x25, 0xb1, 0x28, 0x53, 0xbb, 0xc1, 0xc6, 0xc0, 0xd0, 0x8c, 0x5d, 0x90, 0x93, 0xbc, 0xb8, 0x11, + 0x89, 0x9d, 0xda, 0x4e, 0x09, 0x5b, 0x3f, 0x42, 0x3f, 0x49, 0xa7, 0xf6, 0x3b, 0xa0, 0x4e, 0x8c, + 0x9d, 0xaa, 0x16, 0xbe, 0x45, 0xa7, 0x8a, 0xd8, 0x95, 0x98, 0xf2, 0xbc, 0x79, 0xde, 0x3f, 0xbf, + 0x47, 0x46, 0xff, 0x04, 0xac, 0x89, 0x88, 0xf1, 0xdd, 0x28, 0x04, 0x45, 0x46, 0x58, 0x95, 0x7e, + 0x2e, 0xb8, 0xe2, 0x4e, 0x53, 0x1b, 0xbe, 0x31, 0x7a, 0x5d, 0xca, 0x39, 0x4d, 0x01, 0x57, 0x6e, + 0x58, 0x2c, 0x31, 0x61, 0x1b, 0xdd, 0xda, 0x6b, 0x53, 0x4e, 0x79, 0x25, 0xf1, 0x51, 0x99, 0xbf, + 0xdd, 0x88, 0xcb, 0x8c, 0xcb, 0x85, 0x36, 0x74, 0x61, 0xac, 0xb3, 0x1c, 0x44, 0x96, 0x48, 0x99, + 0x70, 0x86, 0xa1, 0xcc, 0xb9, 0x50, 0x70, 0x42, 0xb0, 0xc9, 0xc1, 0x34, 0x0e, 0x1e, 0x6d, 0xd4, + 0x0a, 0x60, 0x59, 0xb0, 0x78, 0x2e, 0x69, 0x00, 0xb7, 0x05, 0x48, 0xe5, 0xcc, 0x50, 0x5d, 0x02, + 0x8b, 0x41, 0x74, 0xec, 0xbe, 0x3d, 0x6c, 0x4c, 0x47, 0x9f, 0x6f, 0xff, 0x3d, 0x9a, 0xa8, 0x9b, + 0x22, 0xf4, 0x23, 0x9e, 0x99, 0x53, 0xe6, 0xe3, 0xc9, 0x78, 0x65, 0x56, 0x4e, 0xa2, 0x68, 0x12, + 0xc7, 0x02, 0xa4, 0x0c, 0xcc, 0x02, 0x67, 0x86, 0xfe, 0x24, 0x8c, 0x81, 0x58, 0x64, 0x20, 0x25, + 0xa1, 0xd0, 0xf9, 0xd1, 0xb7, 0x87, 0xbf, 0xcf, 0xdb, 0xbe, 0x0e, 0xeb, 0x7f, 0x87, 0xf5, 0x27, + 0x6c, 0x33, 0x6d, 0xbe, 0x3c, 0x79, 0x48, 0xd3, 0x90, 0x30, 0x85, 0xa0, 0x51, 0x8d, 0xce, 0xf5, + 0xe4, 0x65, 0xed, 0xfe, 0xb9, 0x63, 0x0d, 0x2e, 0xd0, 0xdf, 0x13, 0x5e, 0x99, 0x73, 0x26, 0xc1, + 0x71, 0x50, 0x2d, 0x26, 0x8a, 0x68, 0xdc, 0xa0, 0xd2, 0x4e, 0x0b, 0xfd, 0x4c, 0x39, 0xad, 0xee, + 0xfd, 0x0a, 0x8e, 0x72, 0x7a, 0xb5, 0xfd, 0x70, 0xad, 0xed, 0xde, 0xb5, 0x77, 0x7b, 0xd7, 0x7e, + 0xdf, 0xbb, 0xf6, 0xc3, 0xc1, 0xb5, 0x76, 0x07, 0xd7, 0x7a, 0x3d, 0xb8, 0xd6, 0xf5, 0xf8, 0x24, + 0x20, 0x29, 0x21, 0x25, 0x82, 0x81, 0x5a, 0x73, 0xb1, 0x32, 0x95, 0x17, 0x71, 0x01, 0xb8, 0xc4, + 0xe6, 0x39, 0xab, 0xc4, 0x61, 0xbd, 0xe2, 0x1f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xd6, + 0xbd, 0x65, 0xe5, 0x01, 0x00, 0x00, } func (m *RefundMsgRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/snapshot/types/tx.pb.go b/x/snapshot/types/tx.pb.go index 00c467afa..e5de7b693 100644 --- a/x/snapshot/types/tx.pb.go +++ b/x/snapshot/types/tx.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -182,27 +183,29 @@ func init() { func init() { proto.RegisterFile("snapshot/v1beta1/tx.proto", fileDescriptor_a4923e082b209674) } var fileDescriptor_a4923e082b209674 = []byte{ - // 311 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x91, 0xbf, 0x4a, 0x03, 0x41, - 0x10, 0xc6, 0xef, 0x2c, 0x02, 0x2e, 0x16, 0x12, 0xa2, 0xf9, 0x83, 0xac, 0x72, 0x95, 0x4d, 0x6e, - 0x09, 0xe2, 0x03, 0x24, 0xd8, 0xd8, 0x85, 0x08, 0x16, 0x36, 0xb2, 0xd9, 0x1b, 0x2e, 0x47, 0x92, - 0x9d, 0x73, 0x67, 0x12, 0x2f, 0x6f, 0xe1, 0xbb, 0xf8, 0x12, 0x29, 0x53, 0x5a, 0x89, 0x26, 0x6f, - 0x61, 0x25, 0xb9, 0xbb, 0x88, 0x68, 0x65, 0x61, 0xb5, 0x3b, 0xfc, 0x96, 0xdf, 0x37, 0xcb, 0x27, - 0x9a, 0x64, 0x75, 0x4a, 0x23, 0x64, 0x35, 0xef, 0x0c, 0x81, 0x75, 0x47, 0x71, 0x16, 0xa6, 0x0e, - 0x19, 0xab, 0x87, 0x3b, 0x14, 0x96, 0xa8, 0x55, 0x8b, 0x31, 0xc6, 0x1c, 0xaa, 0xed, 0xad, 0x78, - 0xd7, 0x3a, 0x89, 0x11, 0xe3, 0x09, 0x28, 0x9d, 0x26, 0x4a, 0x5b, 0x8b, 0xac, 0x39, 0x41, 0x4b, - 0x05, 0x0d, 0x9e, 0x7d, 0x51, 0x1b, 0x40, 0x9c, 0x10, 0x83, 0xeb, 0x3b, 0xcc, 0x16, 0x03, 0x78, - 0x98, 0x01, 0x71, 0xf5, 0x5a, 0x54, 0x08, 0x6c, 0x04, 0xae, 0xe1, 0x9f, 0xf9, 0xe7, 0x07, 0xbd, - 0xce, 0xc7, 0xeb, 0x69, 0x3b, 0x4e, 0x78, 0x34, 0x1b, 0x86, 0x06, 0xa7, 0xca, 0x20, 0x4d, 0x91, - 0xca, 0xa3, 0x4d, 0xd1, 0x58, 0xf1, 0x22, 0x05, 0x0a, 0x6f, 0xf5, 0xa4, 0x1b, 0x45, 0x0e, 0x88, - 0x06, 0xa5, 0xa0, 0xda, 0x17, 0x22, 0xdd, 0xaa, 0xef, 0x75, 0x14, 0xb9, 0xc6, 0xde, 0x9f, 0x74, - 0x5d, 0x63, 0x76, 0xba, 0xfd, 0x5c, 0xb2, 0x9d, 0x82, 0xba, 0x38, 0xfa, 0xb1, 0x34, 0xa5, 0x68, - 0x09, 0x02, 0x23, 0x8e, 0xaf, 0x40, 0x1b, 0x4e, 0xe6, 0x9a, 0xe1, 0x9f, 0xfe, 0x13, 0x34, 0x45, - 0xfd, 0x57, 0x48, 0x91, 0xdf, 0xbb, 0x59, 0xbe, 0x4b, 0x6f, 0xb9, 0x96, 0xfe, 0x6a, 0x2d, 0xfd, - 0xb7, 0xb5, 0xf4, 0x9f, 0x36, 0xd2, 0x5b, 0x6d, 0xa4, 0xf7, 0xb2, 0x91, 0xde, 0xdd, 0xe5, 0xb7, - 0x3c, 0x9d, 0xc1, 0x44, 0x3b, 0x0b, 0xfc, 0x88, 0x6e, 0x5c, 0x4e, 0x6d, 0x83, 0x0e, 0x54, 0xa6, - 0xbe, 0x4a, 0xcf, 0x57, 0x18, 0x56, 0xf2, 0xaa, 0x2e, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x16, - 0x7b, 0x3c, 0x5e, 0x0d, 0x02, 0x00, 0x00, + // 337 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x92, 0xbf, 0x4e, 0x42, 0x31, + 0x14, 0xc6, 0xef, 0x35, 0x86, 0xc4, 0xc6, 0xc1, 0x10, 0x94, 0x3f, 0x31, 0x57, 0xc3, 0xa2, 0x0b, + 0x34, 0xc4, 0xb8, 0xb8, 0x41, 0x5c, 0xdc, 0x08, 0x26, 0x0e, 0x2e, 0xa6, 0xdc, 0x9e, 0x5c, 0x1a, + 0xa0, 0xa7, 0xf6, 0x14, 0xbc, 0x6c, 0x3e, 0x82, 0x2f, 0xe3, 0xe0, 0x1b, 0x30, 0x32, 0x3a, 0x19, + 0x85, 0xb7, 0x70, 0x32, 0x5c, 0x8a, 0x1a, 0x9d, 0x1c, 0x9c, 0xda, 0x93, 0xef, 0xcb, 0xef, 0xfb, + 0x9a, 0x1e, 0x56, 0x26, 0x2d, 0x0c, 0xf5, 0xd0, 0xf1, 0x71, 0xa3, 0x0b, 0x4e, 0x34, 0xb8, 0x4b, + 0xeb, 0xc6, 0xa2, 0xc3, 0xfc, 0xce, 0x5a, 0xaa, 0x7b, 0xa9, 0x52, 0x48, 0x30, 0xc1, 0x4c, 0xe4, + 0xcb, 0xdb, 0xca, 0x57, 0xd9, 0x4f, 0x10, 0x93, 0x01, 0x70, 0x61, 0x14, 0x17, 0x5a, 0xa3, 0x13, + 0x4e, 0xa1, 0x26, 0xaf, 0x1e, 0x19, 0xb0, 0x43, 0x45, 0xa4, 0x50, 0x73, 0x48, 0x0d, 0x5a, 0x07, + 0xf2, 0x2b, 0x6b, 0x62, 0xc0, 0x1b, 0xab, 0x4f, 0x21, 0x2b, 0x74, 0x20, 0x51, 0xe4, 0xc0, 0xb6, + 0x2d, 0xa6, 0x93, 0x0e, 0xdc, 0x8e, 0x80, 0x5c, 0xfe, 0x82, 0xe5, 0x08, 0xb4, 0x04, 0x5b, 0x0a, + 0x0f, 0xc3, 0xe3, 0xed, 0x56, 0xe3, 0xfd, 0xe5, 0xa0, 0x96, 0x28, 0xd7, 0x1b, 0x75, 0xeb, 0x31, + 0x0e, 0x79, 0x8c, 0x34, 0x44, 0xf2, 0x47, 0x8d, 0x64, 0xdf, 0x63, 0xaf, 0xc4, 0xa0, 0x29, 0xa5, + 0x05, 0xa2, 0x8e, 0x07, 0xe4, 0xdb, 0x8c, 0x99, 0x25, 0xfa, 0x46, 0x48, 0x69, 0x4b, 0x1b, 0x7f, + 0xc2, 0x35, 0xe3, 0x78, 0x8d, 0xdb, 0xca, 0x20, 0xcb, 0xe9, 0x6c, 0xf3, 0xfe, 0xb1, 0x14, 0x54, + 0x8b, 0x6c, 0xf7, 0x47, 0x75, 0x32, 0xa8, 0x09, 0xaa, 0x8a, 0xed, 0x9d, 0x83, 0x88, 0x9d, 0x1a, + 0x0b, 0x07, 0xff, 0xf4, 0x2a, 0xdf, 0xa1, 0xcc, 0x8a, 0xbf, 0xa2, 0x56, 0x2d, 0x5a, 0x97, 0xd3, + 0xb7, 0x28, 0x98, 0xce, 0xa3, 0x70, 0x36, 0x8f, 0xc2, 0xd7, 0x79, 0x14, 0x3e, 0x2c, 0xa2, 0x60, + 0xb6, 0x88, 0x82, 0xe7, 0x45, 0x14, 0x5c, 0x9f, 0x7e, 0x4b, 0x15, 0x29, 0x0c, 0x84, 0xd5, 0xe0, + 0xee, 0xd0, 0xf6, 0xfd, 0x54, 0x8b, 0xd1, 0x02, 0x4f, 0xf9, 0xe7, 0xa6, 0x64, 0x45, 0xba, 0xb9, + 0xec, 0xdb, 0x4e, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xed, 0x90, 0x0b, 0x07, 0x42, 0x02, 0x00, + 0x00, } func (m *RegisterProxyRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/tss/types/tx.pb.go b/x/tss/types/tx.pb.go index 6f206804a..bce2d4378 100644 --- a/x/tss/types/tx.pb.go +++ b/x/tss/types/tx.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/axelarnetwork/axelar-core/x/permission/exported" github_com_axelarnetwork_axelar_core_x_snapshot_exported "github.com/axelarnetwork/axelar-core/x/snapshot/exported" exported "github.com/axelarnetwork/axelar-core/x/tss/exported" github_com_axelarnetwork_axelar_core_x_tss_exported "github.com/axelarnetwork/axelar-core/x/tss/exported" @@ -855,70 +856,72 @@ func init() { func init() { proto.RegisterFile("tss/v1beta1/tx.proto", fileDescriptor_58d13e1023e3ffaf) } var fileDescriptor_58d13e1023e3ffaf = []byte{ - // 1002 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x96, 0xc1, 0x6f, 0xe3, 0xc4, - 0x17, 0xc7, 0x6b, 0x77, 0x9b, 0x6e, 0x5e, 0xda, 0xfd, 0xb5, 0x6e, 0x7f, 0xda, 0xd0, 0x6d, 0xed, - 0xac, 0x91, 0x50, 0x84, 0x68, 0x42, 0x0b, 0x48, 0x70, 0x40, 0x68, 0x43, 0x59, 0x36, 0x54, 0xbb, - 0x5b, 0x39, 0x68, 0x0f, 0x48, 0x28, 0x38, 0xf1, 0x8b, 0x3b, 0x8a, 0xeb, 0x31, 0x33, 0xe3, 0x25, - 0x16, 0x47, 0xc4, 0x8d, 0x03, 0x07, 0xc4, 0x9d, 0x7f, 0x80, 0x7f, 0x81, 0x6b, 0x8f, 0x2b, 0x21, - 0x24, 0x0e, 0x28, 0x82, 0x94, 0x0b, 0xff, 0x42, 0x4f, 0x68, 0xec, 0x49, 0xea, 0x40, 0x5a, 0x81, - 0xaa, 0x20, 0xc4, 0xc9, 0x9e, 0x37, 0x6f, 0x66, 0xde, 0xf7, 0x33, 0x6f, 0xde, 0x0c, 0x6c, 0x0a, - 0xce, 0xeb, 0x4f, 0xf7, 0x3a, 0x28, 0xdc, 0xbd, 0xba, 0x18, 0xd4, 0x22, 0x46, 0x05, 0x35, 0x4a, - 0x82, 0xf3, 0x9a, 0xb2, 0x6e, 0x6d, 0xfa, 0xd4, 0xa7, 0xa9, 0xbd, 0x2e, 0xff, 0x32, 0x97, 0xad, - 0x8a, 0x1c, 0x88, 0x83, 0x88, 0x32, 0x81, 0xde, 0xc5, 0x0c, 0x49, 0x84, 0x5c, 0x79, 0xdc, 0x9e, - 0x9a, 0x3a, 0xd7, 0xb1, 0x23, 0x3b, 0x04, 0xed, 0x85, 0xb9, 0x71, 0xb2, 0xa5, 0xba, 0xef, 0x3e, - 0xa5, 0x02, 0xaf, 0x9e, 0xfa, 0x6e, 0x97, 0xf2, 0x13, 0xca, 0xeb, 0x5d, 0x96, 0x44, 0x82, 0xd6, - 0x4f, 0xe2, 0x40, 0x10, 0x4e, 0xfc, 0x7a, 0x1f, 0x13, 0xe5, 0x62, 0x7f, 0xad, 0x81, 0xd1, 0x12, - 0x2e, 0x13, 0x87, 0x98, 0xf8, 0x18, 0x3a, 0xf8, 0x71, 0x8c, 0x5c, 0x18, 0x4d, 0x28, 0x70, 0x0c, - 0x3d, 0x64, 0x65, 0xad, 0xa2, 0x55, 0x8b, 0x8d, 0xbd, 0xf3, 0xa1, 0xb5, 0xeb, 0x13, 0x71, 0x1c, - 0x77, 0x6a, 0x5d, 0x7a, 0x52, 0x1f, 0x4f, 0x9c, 0x7e, 0x76, 0xb9, 0xd7, 0x57, 0xeb, 0xde, 0xeb, - 0x76, 0xef, 0x79, 0x1e, 0x43, 0xce, 0x1d, 0x35, 0x81, 0xf1, 0x1a, 0xdc, 0xec, 0x63, 0xd2, 0x26, - 0x61, 0x8f, 0x96, 0xf5, 0x8a, 0x56, 0x2d, 0xed, 0x6f, 0xd6, 0x72, 0xdc, 0x6a, 0x87, 0x98, 0x34, - 0xc3, 0x1e, 0x6d, 0xdc, 0x38, 0x1d, 0x5a, 0x0b, 0xce, 0x72, 0x3f, 0x6b, 0xda, 0xff, 0x87, 0x8d, - 0xa9, 0xb8, 0x78, 0x44, 0x43, 0x8e, 0xf6, 0x17, 0x3a, 0xac, 0x39, 0x54, 0xb8, 0x02, 0x0f, 0x31, - 0x99, 0x1d, 0xed, 0xca, 0x75, 0xa2, 0xdd, 0x84, 0xa5, 0xee, 0xb1, 0x4b, 0xc2, 0x34, 0xd4, 0xa2, - 0x93, 0x35, 0x8c, 0xd7, 0x33, 0x0d, 0x8c, 0x06, 0x58, 0x5e, 0xac, 0x68, 0xd5, 0x5b, 0xfb, 0x3b, - 0xa9, 0x86, 0x31, 0xfd, 0xbc, 0x18, 0x87, 0x06, 0x98, 0xca, 0x90, 0x3f, 0xc6, 0x87, 0x50, 0x48, - 0xd5, 0x7b, 0xe5, 0x1b, 0x29, 0xc8, 0xfb, 0xa3, 0xa1, 0xb5, 0x24, 0x25, 0x1f, 0x9c, 0x0f, 0xad, - 0x37, 0x72, 0x31, 0xba, 0x03, 0x0c, 0x5c, 0x16, 0xa2, 0xf8, 0x84, 0xb2, 0xbe, 0x6a, 0xed, 0x76, - 0x29, 0xc3, 0xfa, 0xa0, 0x9e, 0xcf, 0xa1, 0x94, 0xd7, 0x81, 0xb3, 0x24, 0x39, 0x79, 0xf6, 0x06, - 0xac, 0xe7, 0x68, 0x28, 0x46, 0x3f, 0x68, 0x70, 0xe7, 0x88, 0xd1, 0x2e, 0x72, 0x9e, 0xd1, 0x7b, - 0x9f, 0xb9, 0xbd, 0x1e, 0xe9, 0xce, 0x01, 0xd7, 0x4b, 0x00, 0x1c, 0x39, 0x27, 0x34, 0x94, 0x12, - 0x53, 0x66, 0x8d, 0xd5, 0xd1, 0xd0, 0x2a, 0xb6, 0x32, 0x6b, 0xf3, 0xc0, 0x29, 0x2a, 0x87, 0xa6, - 0x67, 0xbc, 0x09, 0xcb, 0x91, 0x9b, 0x04, 0xd4, 0xf5, 0x52, 0x8a, 0x25, 0x45, 0x31, 0xcb, 0xea, - 0x31, 0x42, 0x15, 0xec, 0xe3, 0x58, 0x8c, 0x53, 0x42, 0x8d, 0xb1, 0x4d, 0xd8, 0x9e, 0x2d, 0x4b, - 0xe9, 0xfe, 0x5e, 0x83, 0xe7, 0x94, 0x43, 0x8b, 0xf8, 0xff, 0x15, 0xd5, 0xdb, 0xb0, 0x35, 0x4b, - 0x94, 0xd2, 0xfc, 0x9b, 0x06, 0xeb, 0x4f, 0xa8, 0xc0, 0xa3, 0xb8, 0x33, 0x9f, 0x03, 0xf1, 0x16, - 0xdc, 0x8c, 0x68, 0x10, 0xb4, 0xfb, 0x98, 0xa8, 0xe3, 0x6b, 0xd6, 0x64, 0xe5, 0xf9, 0x73, 0xee, - 0x1f, 0xd1, 0x20, 0x38, 0xc4, 0x64, 0x12, 0x7f, 0xd6, 0x34, 0x1e, 0x40, 0x81, 0x21, 0x8f, 0x03, - 0xa1, 0xd4, 0xbf, 0x38, 0x43, 0xfd, 0x43, 0xe4, 0xdc, 0xf5, 0xf1, 0x71, 0x2c, 0x6a, 0x93, 0xf3, - 0x1e, 0x07, 0x63, 0x14, 0x6a, 0xbc, 0xfd, 0x02, 0x18, 0x79, 0xa9, 0x19, 0x01, 0x63, 0x0d, 0x16, - 0x03, 0xea, 0x67, 0x75, 0xca, 0x91, 0xbf, 0xf6, 0xaf, 0x1a, 0xdc, 0x92, 0x8e, 0x2d, 0xe2, 0xff, - 0x1b, 0x81, 0xdc, 0xff, 0x03, 0x90, 0xea, 0xd5, 0x40, 0xe4, 0xae, 0xcf, 0xc4, 0xf1, 0x3c, 0xfc, - 0x6f, 0xa2, 0xf2, 0x52, 0x16, 0xdf, 0x69, 0xb0, 0xf6, 0x00, 0x5d, 0x26, 0x1a, 0xe8, 0x8a, 0x39, - 0xd0, 0xf8, 0x08, 0x96, 0xb3, 0xfa, 0xc6, 0xcb, 0x7a, 0x65, 0xb1, 0x5a, 0x6c, 0xbc, 0x3b, 0x1a, - 0x5a, 0x85, 0xb4, 0x46, 0xf1, 0xeb, 0x55, 0xb8, 0x42, 0x5a, 0xe1, 0xb8, 0xfd, 0x8d, 0x0e, 0xeb, - 0x39, 0x05, 0x4a, 0xe9, 0x67, 0x1a, 0x6c, 0xf4, 0xd3, 0x54, 0x69, 0x93, 0x20, 0x40, 0x9f, 0x74, - 0x48, 0x40, 0x44, 0x92, 0x0a, 0x5a, 0x6a, 0x38, 0xe7, 0x43, 0xeb, 0xd1, 0x5f, 0x5c, 0x9a, 0x87, - 0x6e, 0xc4, 0x8f, 0xa9, 0xb8, 0x58, 0xff, 0x89, 0x1b, 0x10, 0xcf, 0x15, 0x94, 0x35, 0x73, 0x33, - 0x3b, 0x46, 0xb6, 0x5c, 0xde, 0x66, 0x7c, 0xae, 0xc1, 0x26, 0x27, 0x7e, 0x48, 0x42, 0x7f, 0x3a, - 0x0c, 0x7d, 0x6e, 0x61, 0x6c, 0xa8, 0xf5, 0xf2, 0x46, 0xfb, 0x27, 0x1d, 0xee, 0x38, 0xe8, 0x13, - 0x2e, 0x90, 0xbd, 0x33, 0x10, 0xc8, 0x42, 0x57, 0xa6, 0x1a, 0xff, 0xc7, 0x2e, 0xc8, 0x36, 0xac, - 0xa2, 0x5a, 0x57, 0x1e, 0x0c, 0x5e, 0x5e, 0xac, 0x2c, 0x56, 0x4b, 0xfb, 0xaf, 0x4e, 0xdd, 0xf4, - 0x57, 0x44, 0x58, 0xcb, 0xd9, 0x54, 0x9a, 0xaf, 0x60, 0xce, 0x6d, 0xeb, 0x53, 0x28, 0xe5, 0x5c, - 0x8c, 0x16, 0xe8, 0xc4, 0x53, 0x6f, 0x93, 0xb7, 0x47, 0x43, 0x4b, 0xbf, 0xee, 0x7d, 0xaa, 0x13, - 0xcf, 0xb8, 0x0d, 0xcb, 0x51, 0xdc, 0x99, 0x1c, 0xec, 0x15, 0xa7, 0x10, 0xa5, 0xa5, 0x46, 0x5e, - 0x3c, 0xb3, 0x63, 0x57, 0x45, 0xf8, 0x2b, 0x1d, 0xb6, 0x5b, 0x71, 0xe7, 0x84, 0x88, 0x87, 0xea, - 0x89, 0x95, 0xd5, 0xa8, 0x79, 0xf0, 0xbf, 0x78, 0x50, 0xe8, 0x73, 0x78, 0x50, 0x18, 0xef, 0xc1, - 0x2a, 0x27, 0xbe, 0x64, 0xd0, 0x8e, 0x5c, 0xc2, 0xc6, 0x1b, 0x59, 0x99, 0xfd, 0xdc, 0x69, 0x11, - 0xff, 0x10, 0x93, 0x23, 0x97, 0x30, 0xb5, 0x69, 0x25, 0x3e, 0xb1, 0x70, 0xdb, 0x82, 0x9d, 0x4b, - 0xa8, 0x28, 0x6e, 0xdf, 0x6a, 0x60, 0x4d, 0x7b, 0xc8, 0x62, 0xe7, 0x8a, 0x98, 0xe1, 0x3c, 0xd0, - 0x55, 0xa0, 0x20, 0xb5, 0x4d, 0xd0, 0x15, 0x25, 0xba, 0x16, 0xf1, 0xa5, 0x7a, 0x4e, 0xfc, 0xa6, - 0x67, 0x98, 0x00, 0x7c, 0x12, 0x41, 0x2a, 0x7d, 0xc5, 0xc9, 0x59, 0x6c, 0x1b, 0x2a, 0x97, 0xc7, - 0x9b, 0x89, 0x6a, 0x3c, 0x3a, 0xfd, 0xc5, 0x5c, 0x38, 0x1d, 0x99, 0xda, 0xb3, 0x91, 0xa9, 0xfd, - 0x3c, 0x32, 0xb5, 0x2f, 0xcf, 0xcc, 0x85, 0x67, 0x67, 0xe6, 0xc2, 0x8f, 0x67, 0xe6, 0xc2, 0x07, - 0x2f, 0xff, 0x8d, 0x1d, 0x4a, 0x85, 0x74, 0x0a, 0xe9, 0x43, 0xfd, 0x95, 0xdf, 0x03, 0x00, 0x00, - 0xff, 0xff, 0xe6, 0x7a, 0x3f, 0x29, 0x83, 0x0c, 0x00, 0x00, + // 1026 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x96, 0x41, 0x6f, 0xe3, 0x44, + 0x14, 0xc7, 0x63, 0x77, 0x9b, 0x6e, 0x5e, 0xda, 0xa5, 0x75, 0x8b, 0x36, 0x74, 0x5b, 0x3b, 0x1b, + 0x24, 0x88, 0x10, 0x4d, 0x68, 0x01, 0x09, 0x90, 0x10, 0xda, 0x50, 0x96, 0x0d, 0xd5, 0xee, 0x56, + 0x0e, 0xda, 0x03, 0x12, 0x2a, 0x4e, 0xfc, 0xea, 0x8e, 0xe2, 0x78, 0xcc, 0xcc, 0x78, 0x89, 0xc5, + 0x05, 0x09, 0x71, 0x47, 0x1c, 0x11, 0x17, 0xbe, 0x03, 0x7c, 0x04, 0xa4, 0x1e, 0xf7, 0x08, 0x42, + 0x8a, 0x20, 0xbd, 0x71, 0xe1, 0xde, 0x13, 0xf2, 0x78, 0x92, 0x3a, 0x90, 0x46, 0xa0, 0x2a, 0x08, + 0x71, 0x4a, 0xe6, 0xf9, 0xcd, 0xf8, 0xff, 0xff, 0xcd, 0xcc, 0xf3, 0x83, 0x0d, 0xc1, 0x79, 0xfd, + 0xf1, 0x6e, 0x1b, 0x85, 0xb3, 0x5b, 0x17, 0xfd, 0x5a, 0xc8, 0xa8, 0xa0, 0x46, 0x51, 0x70, 0x5e, + 0x53, 0xd1, 0xcd, 0x0d, 0x8f, 0x7a, 0x54, 0xc6, 0xeb, 0xc9, 0xbf, 0x34, 0x65, 0xb3, 0x9c, 0x4c, + 0xc4, 0x7e, 0x48, 0x99, 0x40, 0xf7, 0x62, 0x85, 0x38, 0x44, 0xae, 0x32, 0x6e, 0x4e, 0x2c, 0x9d, + 0x79, 0xb0, 0x9d, 0x3c, 0x10, 0xf4, 0x38, 0xc8, 0xcc, 0x4b, 0x46, 0xea, 0xf1, 0xed, 0xc7, 0x54, + 0xe0, 0xec, 0xa5, 0x6f, 0x77, 0x28, 0xef, 0x51, 0x5e, 0xef, 0xb0, 0x38, 0x14, 0xb4, 0xde, 0x8b, + 0x7c, 0x41, 0x38, 0xf1, 0xea, 0x5d, 0x8c, 0x47, 0x29, 0xcf, 0x87, 0xc8, 0x7a, 0x84, 0x73, 0x42, + 0x83, 0x99, 0x6b, 0x55, 0xbe, 0xd1, 0xc0, 0x68, 0x09, 0x87, 0x89, 0x03, 0x8c, 0x3d, 0x0c, 0x6c, + 0xfc, 0x38, 0x42, 0x2e, 0x8c, 0x26, 0xe4, 0x39, 0x06, 0x2e, 0xb2, 0x92, 0x56, 0xd6, 0xaa, 0x85, + 0xc6, 0xee, 0xf9, 0xc0, 0xda, 0xf1, 0x88, 0x38, 0x89, 0xda, 0xb5, 0x0e, 0xed, 0xd5, 0x47, 0x0a, + 0xe4, 0xcf, 0x0e, 0x77, 0xbb, 0x6a, 0xd1, 0x3b, 0x9d, 0xce, 0x1d, 0xd7, 0x65, 0xc8, 0xb9, 0xad, + 0x16, 0x30, 0x5e, 0x85, 0xeb, 0x5d, 0x8c, 0x8f, 0x48, 0x70, 0x4c, 0x4b, 0x7a, 0x59, 0xab, 0x16, + 0xf7, 0x36, 0x6a, 0x19, 0xc0, 0xb5, 0x03, 0x8c, 0x9b, 0xc1, 0x31, 0x6d, 0x5c, 0x3b, 0x1d, 0x58, + 0x39, 0x7b, 0xa9, 0x9b, 0x0e, 0xdf, 0xb8, 0xf6, 0xd9, 0xf7, 0x25, 0xbd, 0xf2, 0x34, 0xac, 0x4f, + 0xa8, 0xe3, 0x21, 0x0d, 0x38, 0x56, 0xbe, 0xd2, 0x61, 0xd5, 0xa6, 0xc2, 0x11, 0x78, 0x80, 0xf1, + 0x74, 0xcd, 0xcb, 0x57, 0xd1, 0xbc, 0x01, 0x8b, 0x9d, 0x13, 0x87, 0x04, 0x52, 0x70, 0xc1, 0x4e, + 0x07, 0xc6, 0x6b, 0xa9, 0x13, 0x46, 0x7d, 0x2c, 0x2d, 0x94, 0xb5, 0xea, 0x8d, 0xbd, 0x6d, 0xe9, + 0x64, 0x04, 0x38, 0x6b, 0xc9, 0xa6, 0x3e, 0x4a, 0x33, 0xc9, 0x1f, 0xe3, 0x43, 0xc8, 0x4b, 0x06, + 0x6e, 0xe9, 0x9a, 0xc4, 0x79, 0x77, 0x38, 0xb0, 0x16, 0x13, 0xe3, 0xfb, 0xe7, 0x03, 0xeb, 0xf5, + 0x8c, 0x46, 0xa7, 0x8f, 0xbe, 0xc3, 0x02, 0x14, 0x9f, 0x50, 0xd6, 0x55, 0xa3, 0x9d, 0x0e, 0x65, + 0x58, 0xef, 0xd7, 0xb3, 0x47, 0x4e, 0x52, 0xdb, 0xb7, 0x17, 0x13, 0x5a, 0xae, 0x62, 0xb5, 0x0e, + 0x6b, 0x19, 0x26, 0x8a, 0xd4, 0xcf, 0x1a, 0xdc, 0x3a, 0x64, 0xb4, 0x83, 0x9c, 0xa7, 0x0c, 0xdf, + 0x67, 0xce, 0xf1, 0x31, 0xe9, 0xcc, 0x01, 0xda, 0x8b, 0x00, 0x1c, 0xe5, 0x91, 0x4b, 0x8c, 0x4a, + 0x72, 0x8d, 0x95, 0xe1, 0xc0, 0x2a, 0xb4, 0xd2, 0x68, 0x73, 0xdf, 0x2e, 0xa8, 0x84, 0xa6, 0x6b, + 0xbc, 0x09, 0x4b, 0xa1, 0x13, 0xfb, 0xd4, 0x71, 0x25, 0xcb, 0xa2, 0x62, 0x99, 0x5e, 0x85, 0x11, + 0x48, 0x25, 0xf6, 0x61, 0x24, 0x46, 0xc7, 0x43, 0xcd, 0x91, 0x96, 0x73, 0x15, 0x13, 0xb6, 0xa6, + 0x9b, 0x53, 0xee, 0x7f, 0xd2, 0xe0, 0x19, 0x95, 0xd0, 0x22, 0xde, 0xff, 0xcb, 0xfb, 0x16, 0x6c, + 0x4e, 0xb3, 0xa6, 0x9c, 0xff, 0xae, 0xc1, 0xda, 0x23, 0x2a, 0xf0, 0x30, 0x6a, 0xcf, 0xe7, 0x8a, + 0xbc, 0x05, 0xd7, 0x43, 0xea, 0xfb, 0x47, 0x5d, 0x8c, 0xd5, 0xb5, 0x36, 0x6b, 0x49, 0xe9, 0xfa, + 0xeb, 0x6d, 0x38, 0xa4, 0xbe, 0x7f, 0x80, 0xf1, 0xd8, 0x45, 0x3a, 0x34, 0xee, 0x41, 0x9e, 0x21, + 0x8f, 0x7c, 0xa1, 0x18, 0xbc, 0x30, 0x85, 0xc1, 0x7d, 0xe4, 0xdc, 0xf1, 0xf0, 0x61, 0x24, 0x6a, + 0xe3, 0x0a, 0x10, 0xf9, 0x23, 0x20, 0x6a, 0xbe, 0xe2, 0xf1, 0x1c, 0x18, 0x59, 0xc3, 0x29, 0x07, + 0x63, 0x15, 0x16, 0x7c, 0xea, 0xa5, 0x55, 0xcc, 0x4e, 0xfe, 0x56, 0x7e, 0xd3, 0xe0, 0x46, 0x92, + 0xd8, 0x22, 0xde, 0x7f, 0x11, 0xcb, 0xdd, 0x3f, 0x61, 0xa9, 0xce, 0xc6, 0x92, 0xec, 0xfd, 0x0c, + 0x28, 0xcf, 0xc2, 0x53, 0x63, 0xaf, 0x97, 0x12, 0xf9, 0x41, 0x83, 0xd5, 0x7b, 0xe8, 0x30, 0xd1, + 0x40, 0x47, 0xcc, 0x81, 0xc9, 0x47, 0xb0, 0x94, 0x56, 0x3f, 0x5e, 0xd2, 0xcb, 0x0b, 0xd5, 0x42, + 0xe3, 0xdd, 0xe1, 0xc0, 0xca, 0xcb, 0x0a, 0xc6, 0xaf, 0x56, 0xff, 0xf2, 0xb2, 0xfe, 0x71, 0x65, + 0xf6, 0x5b, 0x1d, 0xd6, 0x32, 0x3e, 0x94, 0xdf, 0xcf, 0x35, 0x58, 0xef, 0xca, 0xc3, 0x73, 0x44, + 0x7c, 0x1f, 0x3d, 0xd2, 0x26, 0x3e, 0x11, 0xb1, 0xb4, 0xb5, 0xd8, 0xb0, 0xcf, 0x07, 0xd6, 0x83, + 0xbf, 0x29, 0x80, 0x07, 0x4e, 0xc8, 0x4f, 0xa8, 0xb8, 0x50, 0xf1, 0xc8, 0xf1, 0x89, 0xeb, 0x08, + 0xca, 0x9a, 0x99, 0x95, 0x6d, 0x23, 0x7d, 0x5d, 0x36, 0x66, 0x7c, 0xa1, 0xc1, 0x06, 0x27, 0x5e, + 0x40, 0x02, 0x6f, 0x52, 0x86, 0x3e, 0x37, 0x19, 0xeb, 0xea, 0x7d, 0xd9, 0x60, 0x65, 0xa8, 0xc3, + 0x2d, 0x1b, 0x3d, 0xc2, 0x05, 0xb2, 0x77, 0xfa, 0x02, 0x59, 0xe0, 0x24, 0xc7, 0x8e, 0xff, 0x6b, + 0x1f, 0xd1, 0x23, 0x58, 0x41, 0xf5, 0xde, 0xe4, 0x92, 0xf0, 0xd2, 0x42, 0x79, 0xa1, 0x5a, 0xdc, + 0x7b, 0x65, 0xa2, 0x27, 0x98, 0xa1, 0xb0, 0x96, 0x89, 0xa9, 0x23, 0xbf, 0x8c, 0x99, 0xb4, 0xcd, + 0x4f, 0xa1, 0x98, 0x49, 0x31, 0x5a, 0xa0, 0x13, 0x57, 0x75, 0x31, 0x6f, 0x0f, 0x07, 0x96, 0x7e, + 0xd5, 0x6f, 0xae, 0x4e, 0x5c, 0xe3, 0x26, 0x2c, 0x85, 0x51, 0x7b, 0x7c, 0xc9, 0x97, 0xed, 0x7c, + 0x28, 0xcb, 0x8e, 0xfa, 0x12, 0x9b, 0xb0, 0x35, 0xdd, 0x81, 0x2a, 0xce, 0x5f, 0xeb, 0xb0, 0xd5, + 0x8a, 0xda, 0x3d, 0x22, 0xee, 0xab, 0xde, 0x2d, 0xad, 0x5a, 0xf3, 0xd8, 0x85, 0x8b, 0xd6, 0x43, + 0x9f, 0x43, 0xeb, 0x61, 0xbc, 0x07, 0x2b, 0x9c, 0x78, 0x09, 0x89, 0xa3, 0xd0, 0x21, 0x6c, 0xb4, + 0x9d, 0xe5, 0xe9, 0x8d, 0x51, 0x8b, 0x78, 0x07, 0x18, 0x1f, 0x3a, 0x84, 0xa9, 0xad, 0x2b, 0xf2, + 0x71, 0x64, 0x74, 0x8b, 0x2d, 0xd8, 0xbe, 0x84, 0x8d, 0xa2, 0xf7, 0x9d, 0x06, 0xd6, 0x64, 0x46, + 0x52, 0x04, 0x1d, 0x11, 0x31, 0x9c, 0x07, 0xc0, 0x32, 0xe4, 0x13, 0x87, 0x63, 0x80, 0x85, 0x04, + 0x60, 0x8b, 0x78, 0x09, 0x03, 0x4e, 0xbc, 0xa6, 0x6b, 0x98, 0x00, 0x7c, 0xac, 0x40, 0x02, 0x58, + 0xb6, 0x33, 0x11, 0xe5, 0xab, 0x02, 0xe5, 0xcb, 0x55, 0xa7, 0xd6, 0x1a, 0x0f, 0x4e, 0x7f, 0x35, + 0x73, 0xa7, 0x43, 0x53, 0x7b, 0x32, 0x34, 0xb5, 0x5f, 0x86, 0xa6, 0xf6, 0xe5, 0x99, 0x99, 0x7b, + 0x72, 0x66, 0xe6, 0x7e, 0x3c, 0x33, 0x73, 0x1f, 0xbc, 0xf4, 0x0f, 0x76, 0x4b, 0xda, 0x69, 0xe7, + 0x65, 0x93, 0xff, 0xf2, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x57, 0x27, 0x07, 0x99, 0xe8, 0x0c, + 0x00, 0x00, } func (m *StartKeygenRequest) Marshal() (dAtA []byte, err error) { From 94394156b2f0297572b4e849a56d8526237a9762 Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Fri, 1 Apr 2022 19:11:51 -0400 Subject: [PATCH 5/8] formatting --- proto/permission/exported/v1beta1/types.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proto/permission/exported/v1beta1/types.proto b/proto/permission/exported/v1beta1/types.proto index b60458b9e..b8d283573 100644 --- a/proto/permission/exported/v1beta1/types.proto +++ b/proto/permission/exported/v1beta1/types.proto @@ -12,7 +12,8 @@ enum Role { option (gogoproto.goproto_enum_prefix) = false; option (gogoproto.goproto_enum_stringer) = true; - ROLE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname)="ROLE_UNRESTRICTED"]; + ROLE_UNSPECIFIED = 0 + [ (gogoproto.enumvalue_customname) = "ROLE_UNRESTRICTED" ]; ROLE_ACCESS_CONTROL = 1; ROLE_CHAIN_MANAGEMENT = 2; } From 7b80091aad9ae1a1f81e1c368bd12e3fd97175bc Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Tue, 5 Apr 2022 22:42:06 -0400 Subject: [PATCH 6/8] fixing critical bug --- docs/proto/proto-docs.md | 3 +- go.mod | 4 +- go.sum | 4 +- proto/axelarnet/v1beta1/tx.proto | 8 +- proto/evm/v1beta1/tx.proto | 28 +- proto/nexus/v1beta1/tx.proto | 4 +- proto/permission/exported/v1beta1/types.proto | 6 +- proto/reward/v1beta1/tx.proto | 2 +- proto/snapshot/v1beta1/tx.proto | 4 +- proto/tss/v1beta1/tx.proto | 14 +- .../proto/google/protobuf/descriptor.proto | 12 +- x/ante/restricted_tx_test.go | 97 +++++ x/ante/types/expected_keepers.go | 2 + x/ante/types/mock/alias.go | 14 + x/ante/types/mock/alias_mock.go | 341 ++++++++++++++++++ x/ante/types/mock/expected_keepers.go | 82 +++++ x/axelarnet/types/tx.pb.go | 48 +-- x/evm/types/tx.pb.go | 154 ++++---- x/nexus/types/tx.pb.go | 56 +-- x/permission/exported/proto.go | 2 +- x/permission/exported/types.go | 2 +- x/permission/exported/types.pb.go | 41 ++- x/permission/exported/types_test.go | 12 +- x/permission/keeper/migrate.go | 35 ++ x/permission/module.go | 7 +- x/permission/types/tx.pb.go | 54 +-- x/reward/types/tx.pb.go | 48 +-- x/snapshot/types/tx.pb.go | 4 +- x/tss/types/tx.pb.go | 118 +++--- 29 files changed, 890 insertions(+), 316 deletions(-) create mode 100644 x/ante/restricted_tx_test.go create mode 100644 x/ante/types/mock/alias.go create mode 100644 x/ante/types/mock/alias_mock.go create mode 100644 x/ante/types/mock/expected_keepers.go create mode 100644 x/permission/keeper/migrate.go diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index c696cda1b..cb65b9ac1 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -1430,8 +1430,9 @@ transfers for the specified chain | Name | Number | Description | | ---- | ------ | ----------- | | ROLE_UNSPECIFIED | 0 | | -| ROLE_ACCESS_CONTROL | 1 | | +| ROLE_UNRESTRICTED | 1 | | | ROLE_CHAIN_MANAGEMENT | 2 | | +| ROLE_ACCESS_CONTROL | 3 | | diff --git a/go.mod b/go.mod index 0d6f6c715..b71907c46 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/armon/go-metrics v0.3.10 github.com/axelarnetwork/tm-events v0.0.0-20220329200027-3f6720431fcf - github.com/axelarnetwork/utils v0.0.0-20220404190329-a441c50ebb3a + github.com/axelarnetwork/utils v0.0.0-20220405200343-8b1f98ba3b21 github.com/btcsuite/btcd v0.22.0-beta github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/cosmos/cosmos-sdk v0.45.1 @@ -29,6 +29,7 @@ require ( github.com/tendermint/tendermint v0.34.16 github.com/tendermint/tm-db v0.6.7 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 + golang.org/x/exp v0.0.0-20220328175248-053ad81199eb golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 golang.org/x/text v0.3.7 golang.org/x/tools v0.1.10 @@ -138,7 +139,6 @@ require ( github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/zondax/hid v0.9.0 // indirect go.etcd.io/bbolt v1.3.6 // indirect - golang.org/x/exp v0.0.0-20220328175248-053ad81199eb // indirect golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/sys v0.0.0-20220329152356-43be30ef3008 // indirect diff --git a/go.sum b/go.sum index a29cd5cff..fbb03b31e 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/axelarnetwork/tm-events v0.0.0-20220329200027-3f6720431fcf h1:nacjHL5tF1PsK1bR0xcwm7XnC7D8TfvnF6YJF4RP0KM= github.com/axelarnetwork/tm-events v0.0.0-20220329200027-3f6720431fcf/go.mod h1:DMlrWfQ/Au/v5miwry3c67fM8q5mcxEMzuVzOT8qHbE= -github.com/axelarnetwork/utils v0.0.0-20220404190329-a441c50ebb3a h1:tncX7WvtlSqX5UgLNfqFWWMQy+sHGxzn6TJn25rIe6k= -github.com/axelarnetwork/utils v0.0.0-20220404190329-a441c50ebb3a/go.mod h1:B6mKp8Eti8x4vgwBRXgGeo4myArtk77xuLSRPzce3I0= +github.com/axelarnetwork/utils v0.0.0-20220405200343-8b1f98ba3b21 h1:QZ79biVIBKUNZjP9hsSbZVht56941m62G7n5uDwTfjY= +github.com/axelarnetwork/utils v0.0.0-20220405200343-8b1f98ba3b21/go.mod h1:B6mKp8Eti8x4vgwBRXgGeo4myArtk77xuLSRPzce3I0= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/proto/axelarnet/v1beta1/tx.proto b/proto/axelarnet/v1beta1/tx.proto index eeb77450e..89350eead 100644 --- a/proto/axelarnet/v1beta1/tx.proto +++ b/proto/axelarnet/v1beta1/tx.proto @@ -16,7 +16,7 @@ option (gogoproto.goproto_getters_all) = false; // MsgLink represents a message to link a cross-chain address to an Axelar // address message LinkRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string recipient_addr = 2; @@ -28,7 +28,7 @@ message LinkResponse { string deposit_addr = 1; }; // MsgConfirmDeposit represents a deposit confirmation message message ConfirmDepositRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; @@ -48,7 +48,7 @@ message ConfirmDepositResponse {} // MsgExecutePendingTransfers represents a message to trigger transfer all // pending transfers message ExecutePendingTransfersRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; } @@ -97,7 +97,7 @@ message RegisterAssetResponse {} // RouteIBCTransfersRequest represents a message to route pending transfers to // cosmos based chains message RouteIBCTransfersRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; } diff --git a/proto/evm/v1beta1/tx.proto b/proto/evm/v1beta1/tx.proto index 280cfd1fa..da99b7e30 100644 --- a/proto/evm/v1beta1/tx.proto +++ b/proto/evm/v1beta1/tx.proto @@ -23,7 +23,7 @@ message SetGatewayRequest { message SetGatewayResponse {} message ConfirmGatewayTxRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -37,7 +37,7 @@ message ConfirmGatewayTxRequest { message ConfirmGatewayTxResponse {} message VoteConfirmGatewayTxRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; message Vote { repeated Event events = 1 [ (gogoproto.nullable) = false ]; } bytes sender = 1 [ (gogoproto.casttype) = @@ -49,7 +49,7 @@ message VoteConfirmGatewayTxRequest { message VoteConfirmGatewayTxResponse { string log = 1; } message ConfirmChainRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string name = 2; @@ -59,7 +59,7 @@ message ConfirmChainResponse {} // MsgConfirmDeposit represents an erc20 deposit confirmation message message ConfirmDepositRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -80,7 +80,7 @@ message ConfirmDepositResponse {} // MsgConfirmToken represents a token deploy confirmation message message ConfirmTokenRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -95,7 +95,7 @@ message ConfirmTokenRequest { message ConfirmTokenResponse {} message ConfirmTransferKeyRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -117,7 +117,7 @@ message ConfirmTransferKeyResponse {} // MsgLink represents the message that links a cross chain address to a burner // address message LinkRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -131,7 +131,7 @@ message LinkResponse { string deposit_addr = 1; } // CreateBurnTokensRequest represents the message to create commands to burn // tokens with AxelarGateway message CreateBurnTokensRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -158,7 +158,7 @@ message CreateDeployTokenResponse {} // CreatePendingTransfersRequest represents a message to trigger the creation of // commands handling all pending transfers message CreatePendingTransfersRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -168,7 +168,7 @@ message CreatePendingTransfersResponse {} // MsgVoteConfirmChain represents a message that votes on a new EVM chain message VoteConfirmChainRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string name = 2; @@ -180,7 +180,7 @@ message VoteConfirmChainResponse { string log = 1; } // MsgVoteConfirmDeposit represents a message that votes on a deposit message VoteConfirmDepositRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -198,7 +198,7 @@ message VoteConfirmDepositRequest { message VoteConfirmDepositResponse { string log = 1; } message VoteConfirmTokenRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -215,7 +215,7 @@ message VoteConfirmTokenRequest { message VoteConfirmTokenResponse { string log = 1; } message VoteConfirmTransferKeyRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; @@ -253,7 +253,7 @@ message CreateTransferOperatorshipRequest { message CreateTransferOperatorshipResponse {} message SignCommandsRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string chain = 2; diff --git a/proto/nexus/v1beta1/tx.proto b/proto/nexus/v1beta1/tx.proto index 4ec307736..adb22c51b 100644 --- a/proto/nexus/v1beta1/tx.proto +++ b/proto/nexus/v1beta1/tx.proto @@ -11,7 +11,7 @@ import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message RegisterChainMaintainerRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; repeated string chains = 2; @@ -20,7 +20,7 @@ message RegisterChainMaintainerRequest { message RegisterChainMaintainerResponse {} message DeregisterChainMaintainerRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; repeated string chains = 2; diff --git a/proto/permission/exported/v1beta1/types.proto b/proto/permission/exported/v1beta1/types.proto index b8d283573..cc6bfcd73 100644 --- a/proto/permission/exported/v1beta1/types.proto +++ b/proto/permission/exported/v1beta1/types.proto @@ -12,10 +12,10 @@ enum Role { option (gogoproto.goproto_enum_prefix) = false; option (gogoproto.goproto_enum_stringer) = true; - ROLE_UNSPECIFIED = 0 - [ (gogoproto.enumvalue_customname) = "ROLE_UNRESTRICTED" ]; - ROLE_ACCESS_CONTROL = 1; + ROLE_UNSPECIFIED = 0; + ROLE_UNRESTRICTED = 1; ROLE_CHAIN_MANAGEMENT = 2; + ROLE_ACCESS_CONTROL = 3; } extend google.protobuf.MessageOptions { diff --git a/proto/reward/v1beta1/tx.proto b/proto/reward/v1beta1/tx.proto index 17a94cb93..a8b6bf1ca 100644 --- a/proto/reward/v1beta1/tx.proto +++ b/proto/reward/v1beta1/tx.proto @@ -11,7 +11,7 @@ import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message RefundMsgRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; google.protobuf.Any inner_message = 2 diff --git a/proto/snapshot/v1beta1/tx.proto b/proto/snapshot/v1beta1/tx.proto index cf2c4c4aa..7a39d9e3d 100644 --- a/proto/snapshot/v1beta1/tx.proto +++ b/proto/snapshot/v1beta1/tx.proto @@ -10,7 +10,7 @@ import "permission/exported/v1beta1/types.proto"; option (gogoproto.goproto_getters_all) = false; message RegisterProxyRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; bytes proxy_addr = 2 [ (gogoproto.casttype) = @@ -20,7 +20,7 @@ message RegisterProxyRequest { message RegisterProxyResponse {} message DeactivateProxyRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; } diff --git a/proto/tss/v1beta1/tx.proto b/proto/tss/v1beta1/tx.proto index 193712ceb..21d834a14 100644 --- a/proto/tss/v1beta1/tx.proto +++ b/proto/tss/v1beta1/tx.proto @@ -40,7 +40,7 @@ message RotateKeyResponse {} // ProcessKeygenTrafficRequest protocol message message ProcessKeygenTrafficRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string session_id = 2 [ (gogoproto.customname) = "SessionID" ]; @@ -51,7 +51,7 @@ message ProcessKeygenTrafficResponse {} // ProcessSignTrafficRequest protocol message message ProcessSignTrafficRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string session_id = 2 [ (gogoproto.customname) = "SessionID" ]; @@ -62,7 +62,7 @@ message ProcessSignTrafficResponse {} // VotePubKeyRequest represents the message to vote on a public key message VotePubKeyRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; vote.exported.v1beta1.PollKey poll_key = 2 [ (gogoproto.nullable) = false ]; @@ -73,7 +73,7 @@ message VotePubKeyResponse { string log = 1; } // VoteSigRequest represents a message to vote for a signature message VoteSigRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; vote.exported.v1beta1.PollKey poll_key = 2 [ (gogoproto.nullable) = false ]; @@ -84,7 +84,7 @@ message VoteSigRequest { message VoteSigResponse { string log = 1; } message HeartBeatRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; @@ -126,7 +126,7 @@ message RegisterExternalKeysRequest { message RegisterExternalKeysResponse {}; message SubmitMultisigPubKeysRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string key_id = 2 [ @@ -141,7 +141,7 @@ message SubmitMultisigPubKeysRequest { message SubmitMultisigPubKeysResponse {} message SubmitMultisigSignaturesRequest { - option (permission.exported.v1beta1.permission_role) = ROLE_UNSPECIFIED; + option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; bytes sender = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress" ]; string sig_id = 2 [ (gogoproto.customname) = "SigID" ]; diff --git a/third_party/proto/google/protobuf/descriptor.proto b/third_party/proto/google/protobuf/descriptor.proto index 49ec6534b..f8eb216cd 100644 --- a/third_party/proto/google/protobuf/descriptor.proto +++ b/third_party/proto/google/protobuf/descriptor.proto @@ -740,8 +740,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; required bool is_extension = 2; @@ -868,13 +868,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. diff --git a/x/ante/restricted_tx_test.go b/x/ante/restricted_tx_test.go new file mode 100644 index 000000000..78721222d --- /dev/null +++ b/x/ante/restricted_tx_test.go @@ -0,0 +1,97 @@ +package ante_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + "github.com/stretchr/testify/assert" + "golang.org/x/exp/maps" + + "github.com/axelarnetwork/axelar-core/testutils/rand" + "github.com/axelarnetwork/axelar-core/x/ante" + "github.com/axelarnetwork/axelar-core/x/ante/types/mock" + axelarnet "github.com/axelarnetwork/axelar-core/x/axelarnet/types" + evm "github.com/axelarnetwork/axelar-core/x/evm/types" + "github.com/axelarnetwork/axelar-core/x/permission/exported" + tss "github.com/axelarnetwork/axelar-core/x/tss/types" + "github.com/axelarnetwork/utils/slices" + . "github.com/axelarnetwork/utils/test" +) + +func TestRestrictedTx(t *testing.T) { + var ( + handler ante.RestrictedTx + permission *mock.PermissionMock + tx *mock.TxMock + ) + + signerAnyRole := func(t *testing.T) { + permission.GetRoleFunc = func(sdk.Context, sdk.AccAddress) exported.Role { + return exported.Role(rand.Of[int32](maps.Keys(exported.Role_name)...)) + } + } + + signerIsNot := func(role exported.Role) func(t *testing.T) { + return func(t *testing.T) { + permission.GetRoleFunc = func(sdk.Context, sdk.AccAddress) exported.Role { + filtered := slices.Filter(maps.Keys(exported.Role_name), func(k int32) bool { return k != int32(role) }) + return exported.Role(rand.Of[int32](filtered...)) + } + } + } + + letTxThrough := func(t *testing.T) { + _, err := handler.AnteHandle(sdk.Context{}, tx, false, + func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) { return sdk.Context{}, nil }) + assert.NoError(t, err) + } + + stopTx := func(t *testing.T) { + _, err := handler.AnteHandle(sdk.Context{}, tx, false, + func(sdk.Context, sdk.Tx, bool) (sdk.Context, error) { return sdk.Context{}, nil }) + assert.Error(t, err) + } + + txWithMsg := func(msg descriptor.Message) *mock.TxMock { + return &mock.TxMock{ + GetMsgsFunc: func() []sdk.Msg { + return slices.Expand(func(_ int) sdk.Msg { + return &mock.MsgMock{ + GetSignersFunc: func() []sdk.AccAddress { + return slices.Expand(func(_ int) sdk.AccAddress { return rand.AccAddr() }, int(rand.I64Between(1, 5))) + }, + DescriptorFunc: msg.Descriptor, + } + }, int(rand.I64Between(1, 20))) + }, + } + } + + msgRoleIsUnrestricted := func(t *testing.T) { tx = txWithMsg(&evm.LinkRequest{}) } + msgRoleIsUnspecified := func(t *testing.T) { tx = txWithMsg(&banktypes.MsgSend{}) } + msgRoleIsChainManagement := func(t *testing.T) { tx = txWithMsg(&tss.RotateKeyRequest{}) } + msgRoleIsAccessControl := func(t *testing.T) { tx = txWithMsg(&axelarnet.RegisterFeeCollectorRequest{}) } + + Given("a restricted tx ante handler", func(t *testing.T) { + permission = &mock.PermissionMock{} + handler = ante.NewRestrictedTx(permission) + }).Branch( + When("msg role is unrestricted", msgRoleIsUnrestricted). + And().When("signer has any role", signerAnyRole). + Then("let the msg through", letTxThrough), + + When("msg role is unspecified", msgRoleIsUnspecified). + And().When("signer has any role", signerAnyRole). + Then("let the msg through", letTxThrough), + + When("msg role is chain management", msgRoleIsChainManagement). + And().When("signer is not chain management", signerIsNot(exported.ROLE_CHAIN_MANAGEMENT)). + Then("stop tx", stopTx), + + When("msg role is access control", msgRoleIsAccessControl). + And().When("signer is not access control", signerIsNot(exported.ROLE_ACCESS_CONTROL)). + Then("stop tx", stopTx), + ).Run(t, 20) +} diff --git a/x/ante/types/expected_keepers.go b/x/ante/types/expected_keepers.go index 73775c95a..16e941596 100644 --- a/x/ante/types/expected_keepers.go +++ b/x/ante/types/expected_keepers.go @@ -12,6 +12,8 @@ import ( tss "github.com/axelarnetwork/axelar-core/x/tss/exported" ) +//go:generate moq -pkg mock -out ./mock/expected_keepers.go . Permission + // Tss provides access to the tss functionality type Tss interface { GetCurrentKeyID(ctx sdk.Context, chain nexus.Chain, keyRole tss.KeyRole) (tss.KeyID, bool) diff --git a/x/ante/types/mock/alias.go b/x/ante/types/mock/alias.go new file mode 100644 index 000000000..15e5dc0ad --- /dev/null +++ b/x/ante/types/mock/alias.go @@ -0,0 +1,14 @@ +package mock + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" +) + +//go:generate moq -pkg mock -out ./alias_mock.go . Tx Msg + +type Tx sdk.Tx +type Msg interface { + sdk.Msg + descriptor.Message +} diff --git a/x/ante/types/mock/alias_mock.go b/x/ante/types/mock/alias_mock.go new file mode 100644 index 000000000..f8afe9d17 --- /dev/null +++ b/x/ante/types/mock/alias_mock.go @@ -0,0 +1,341 @@ +// Code generated by moq; DO NOT EDIT. +// github.com/matryer/moq + +package mock + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "sync" +) + +// Ensure, that TxMock does implement Tx. +// If this is not the case, regenerate this file with moq. +var _ Tx = &TxMock{} + +// TxMock is a mock implementation of Tx. +// +// func TestSomethingThatUsesTx(t *testing.T) { +// +// // make and configure a mocked Tx +// mockedTx := &TxMock{ +// GetMsgsFunc: func() []sdk.Msg { +// panic("mock out the GetMsgs method") +// }, +// ValidateBasicFunc: func() error { +// panic("mock out the ValidateBasic method") +// }, +// } +// +// // use mockedTx in code that requires Tx +// // and then make assertions. +// +// } +type TxMock struct { + // GetMsgsFunc mocks the GetMsgs method. + GetMsgsFunc func() []sdk.Msg + + // ValidateBasicFunc mocks the ValidateBasic method. + ValidateBasicFunc func() error + + // calls tracks calls to the methods. + calls struct { + // GetMsgs holds details about calls to the GetMsgs method. + GetMsgs []struct { + } + // ValidateBasic holds details about calls to the ValidateBasic method. + ValidateBasic []struct { + } + } + lockGetMsgs sync.RWMutex + lockValidateBasic sync.RWMutex +} + +// GetMsgs calls GetMsgsFunc. +func (mock *TxMock) GetMsgs() []sdk.Msg { + if mock.GetMsgsFunc == nil { + panic("TxMock.GetMsgsFunc: method is nil but Tx.GetMsgs was just called") + } + callInfo := struct { + }{} + mock.lockGetMsgs.Lock() + mock.calls.GetMsgs = append(mock.calls.GetMsgs, callInfo) + mock.lockGetMsgs.Unlock() + return mock.GetMsgsFunc() +} + +// GetMsgsCalls gets all the calls that were made to GetMsgs. +// Check the length with: +// len(mockedTx.GetMsgsCalls()) +func (mock *TxMock) GetMsgsCalls() []struct { +} { + var calls []struct { + } + mock.lockGetMsgs.RLock() + calls = mock.calls.GetMsgs + mock.lockGetMsgs.RUnlock() + return calls +} + +// ValidateBasic calls ValidateBasicFunc. +func (mock *TxMock) ValidateBasic() error { + if mock.ValidateBasicFunc == nil { + panic("TxMock.ValidateBasicFunc: method is nil but Tx.ValidateBasic was just called") + } + callInfo := struct { + }{} + mock.lockValidateBasic.Lock() + mock.calls.ValidateBasic = append(mock.calls.ValidateBasic, callInfo) + mock.lockValidateBasic.Unlock() + return mock.ValidateBasicFunc() +} + +// ValidateBasicCalls gets all the calls that were made to ValidateBasic. +// Check the length with: +// len(mockedTx.ValidateBasicCalls()) +func (mock *TxMock) ValidateBasicCalls() []struct { +} { + var calls []struct { + } + mock.lockValidateBasic.RLock() + calls = mock.calls.ValidateBasic + mock.lockValidateBasic.RUnlock() + return calls +} + +// Ensure, that MsgMock does implement Msg. +// If this is not the case, regenerate this file with moq. +var _ Msg = &MsgMock{} + +// MsgMock is a mock implementation of Msg. +// +// func TestSomethingThatUsesMsg(t *testing.T) { +// +// // make and configure a mocked Msg +// mockedMsg := &MsgMock{ +// DescriptorFunc: func() ([]byte, []int) { +// panic("mock out the Descriptor method") +// }, +// GetSignersFunc: func() []sdk.AccAddress { +// panic("mock out the GetSigners method") +// }, +// ProtoMessageFunc: func() { +// panic("mock out the ProtoMessage method") +// }, +// ResetFunc: func() { +// panic("mock out the Reset method") +// }, +// StringFunc: func() string { +// panic("mock out the String method") +// }, +// ValidateBasicFunc: func() error { +// panic("mock out the ValidateBasic method") +// }, +// } +// +// // use mockedMsg in code that requires Msg +// // and then make assertions. +// +// } +type MsgMock struct { + // DescriptorFunc mocks the Descriptor method. + DescriptorFunc func() ([]byte, []int) + + // GetSignersFunc mocks the GetSigners method. + GetSignersFunc func() []sdk.AccAddress + + // ProtoMessageFunc mocks the ProtoMessage method. + ProtoMessageFunc func() + + // ResetFunc mocks the Reset method. + ResetFunc func() + + // StringFunc mocks the String method. + StringFunc func() string + + // ValidateBasicFunc mocks the ValidateBasic method. + ValidateBasicFunc func() error + + // calls tracks calls to the methods. + calls struct { + // Descriptor holds details about calls to the Descriptor method. + Descriptor []struct { + } + // GetSigners holds details about calls to the GetSigners method. + GetSigners []struct { + } + // ProtoMessage holds details about calls to the ProtoMessage method. + ProtoMessage []struct { + } + // Reset holds details about calls to the Reset method. + Reset []struct { + } + // String holds details about calls to the String method. + String []struct { + } + // ValidateBasic holds details about calls to the ValidateBasic method. + ValidateBasic []struct { + } + } + lockDescriptor sync.RWMutex + lockGetSigners sync.RWMutex + lockProtoMessage sync.RWMutex + lockReset sync.RWMutex + lockString sync.RWMutex + lockValidateBasic sync.RWMutex +} + +// Descriptor calls DescriptorFunc. +func (mock *MsgMock) Descriptor() ([]byte, []int) { + if mock.DescriptorFunc == nil { + panic("MsgMock.DescriptorFunc: method is nil but Msg.Descriptor was just called") + } + callInfo := struct { + }{} + mock.lockDescriptor.Lock() + mock.calls.Descriptor = append(mock.calls.Descriptor, callInfo) + mock.lockDescriptor.Unlock() + return mock.DescriptorFunc() +} + +// DescriptorCalls gets all the calls that were made to Descriptor. +// Check the length with: +// len(mockedMsg.DescriptorCalls()) +func (mock *MsgMock) DescriptorCalls() []struct { +} { + var calls []struct { + } + mock.lockDescriptor.RLock() + calls = mock.calls.Descriptor + mock.lockDescriptor.RUnlock() + return calls +} + +// GetSigners calls GetSignersFunc. +func (mock *MsgMock) GetSigners() []sdk.AccAddress { + if mock.GetSignersFunc == nil { + panic("MsgMock.GetSignersFunc: method is nil but Msg.GetSigners was just called") + } + callInfo := struct { + }{} + mock.lockGetSigners.Lock() + mock.calls.GetSigners = append(mock.calls.GetSigners, callInfo) + mock.lockGetSigners.Unlock() + return mock.GetSignersFunc() +} + +// GetSignersCalls gets all the calls that were made to GetSigners. +// Check the length with: +// len(mockedMsg.GetSignersCalls()) +func (mock *MsgMock) GetSignersCalls() []struct { +} { + var calls []struct { + } + mock.lockGetSigners.RLock() + calls = mock.calls.GetSigners + mock.lockGetSigners.RUnlock() + return calls +} + +// ProtoMessage calls ProtoMessageFunc. +func (mock *MsgMock) ProtoMessage() { + if mock.ProtoMessageFunc == nil { + panic("MsgMock.ProtoMessageFunc: method is nil but Msg.ProtoMessage was just called") + } + callInfo := struct { + }{} + mock.lockProtoMessage.Lock() + mock.calls.ProtoMessage = append(mock.calls.ProtoMessage, callInfo) + mock.lockProtoMessage.Unlock() + mock.ProtoMessageFunc() +} + +// ProtoMessageCalls gets all the calls that were made to ProtoMessage. +// Check the length with: +// len(mockedMsg.ProtoMessageCalls()) +func (mock *MsgMock) ProtoMessageCalls() []struct { +} { + var calls []struct { + } + mock.lockProtoMessage.RLock() + calls = mock.calls.ProtoMessage + mock.lockProtoMessage.RUnlock() + return calls +} + +// Reset calls ResetFunc. +func (mock *MsgMock) Reset() { + if mock.ResetFunc == nil { + panic("MsgMock.ResetFunc: method is nil but Msg.Reset was just called") + } + callInfo := struct { + }{} + mock.lockReset.Lock() + mock.calls.Reset = append(mock.calls.Reset, callInfo) + mock.lockReset.Unlock() + mock.ResetFunc() +} + +// ResetCalls gets all the calls that were made to Reset. +// Check the length with: +// len(mockedMsg.ResetCalls()) +func (mock *MsgMock) ResetCalls() []struct { +} { + var calls []struct { + } + mock.lockReset.RLock() + calls = mock.calls.Reset + mock.lockReset.RUnlock() + return calls +} + +// String calls StringFunc. +func (mock *MsgMock) String() string { + if mock.StringFunc == nil { + panic("MsgMock.StringFunc: method is nil but Msg.String was just called") + } + callInfo := struct { + }{} + mock.lockString.Lock() + mock.calls.String = append(mock.calls.String, callInfo) + mock.lockString.Unlock() + return mock.StringFunc() +} + +// StringCalls gets all the calls that were made to String. +// Check the length with: +// len(mockedMsg.StringCalls()) +func (mock *MsgMock) StringCalls() []struct { +} { + var calls []struct { + } + mock.lockString.RLock() + calls = mock.calls.String + mock.lockString.RUnlock() + return calls +} + +// ValidateBasic calls ValidateBasicFunc. +func (mock *MsgMock) ValidateBasic() error { + if mock.ValidateBasicFunc == nil { + panic("MsgMock.ValidateBasicFunc: method is nil but Msg.ValidateBasic was just called") + } + callInfo := struct { + }{} + mock.lockValidateBasic.Lock() + mock.calls.ValidateBasic = append(mock.calls.ValidateBasic, callInfo) + mock.lockValidateBasic.Unlock() + return mock.ValidateBasicFunc() +} + +// ValidateBasicCalls gets all the calls that were made to ValidateBasic. +// Check the length with: +// len(mockedMsg.ValidateBasicCalls()) +func (mock *MsgMock) ValidateBasicCalls() []struct { +} { + var calls []struct { + } + mock.lockValidateBasic.RLock() + calls = mock.calls.ValidateBasic + mock.lockValidateBasic.RUnlock() + return calls +} diff --git a/x/ante/types/mock/expected_keepers.go b/x/ante/types/mock/expected_keepers.go new file mode 100644 index 000000000..980e214ed --- /dev/null +++ b/x/ante/types/mock/expected_keepers.go @@ -0,0 +1,82 @@ +// Code generated by moq; DO NOT EDIT. +// github.com/matryer/moq + +package mock + +import ( + "github.com/axelarnetwork/axelar-core/x/ante/types" + permission "github.com/axelarnetwork/axelar-core/x/permission/exported" + sdk "github.com/cosmos/cosmos-sdk/types" + "sync" +) + +// Ensure, that PermissionMock does implement types.Permission. +// If this is not the case, regenerate this file with moq. +var _ types.Permission = &PermissionMock{} + +// PermissionMock is a mock implementation of types.Permission. +// +// func TestSomethingThatUsesPermission(t *testing.T) { +// +// // make and configure a mocked types.Permission +// mockedPermission := &PermissionMock{ +// GetRoleFunc: func(ctx sdk.Context, address sdk.AccAddress) permission.Role { +// panic("mock out the GetRole method") +// }, +// } +// +// // use mockedPermission in code that requires types.Permission +// // and then make assertions. +// +// } +type PermissionMock struct { + // GetRoleFunc mocks the GetRole method. + GetRoleFunc func(ctx sdk.Context, address sdk.AccAddress) permission.Role + + // calls tracks calls to the methods. + calls struct { + // GetRole holds details about calls to the GetRole method. + GetRole []struct { + // Ctx is the ctx argument value. + Ctx sdk.Context + // Address is the address argument value. + Address sdk.AccAddress + } + } + lockGetRole sync.RWMutex +} + +// GetRole calls GetRoleFunc. +func (mock *PermissionMock) GetRole(ctx sdk.Context, address sdk.AccAddress) permission.Role { + if mock.GetRoleFunc == nil { + panic("PermissionMock.GetRoleFunc: method is nil but Permission.GetRole was just called") + } + callInfo := struct { + Ctx sdk.Context + Address sdk.AccAddress + }{ + Ctx: ctx, + Address: address, + } + mock.lockGetRole.Lock() + mock.calls.GetRole = append(mock.calls.GetRole, callInfo) + mock.lockGetRole.Unlock() + return mock.GetRoleFunc(ctx, address) +} + +// GetRoleCalls gets all the calls that were made to GetRole. +// Check the length with: +// len(mockedPermission.GetRoleCalls()) +func (mock *PermissionMock) GetRoleCalls() []struct { + Ctx sdk.Context + Address sdk.AccAddress +} { + var calls []struct { + Ctx sdk.Context + Address sdk.AccAddress + } + mock.lockGetRole.RLock() + calls = mock.calls.GetRole + mock.lockGetRole.RUnlock() + return calls +} diff --git a/x/axelarnet/types/tx.pb.go b/x/axelarnet/types/tx.pb.go index 8c312f362..a70db76af 100644 --- a/x/axelarnet/types/tx.pb.go +++ b/x/axelarnet/types/tx.pb.go @@ -684,33 +684,33 @@ var fileDescriptor_a791a0da77994a4e = []byte{ 0x0a, 0x8c, 0x35, 0x55, 0x01, 0xe3, 0x5f, 0xb4, 0x4c, 0xc1, 0x0b, 0xc2, 0x00, 0x30, 0x6f, 0xb9, 0xbe, 0x4f, 0xcd, 0xf4, 0xb6, 0xb6, 0xf7, 0x57, 0x73, 0x69, 0x62, 0x8d, 0x32, 0x8c, 0x5d, 0xb4, 0x32, 0x0d, 0xf3, 0x7a, 0x6e, 0x80, 0xcd, 0x8c, 0x88, 0x9b, 0x66, 0x37, 0x22, 0xab, 0x51, 0x40, - 0x59, 0x97, 0x31, 0xe0, 0xa6, 0x2e, 0xdc, 0x72, 0xf3, 0x58, 0x7f, 0xfd, 0xde, 0x4c, 0xd9, 0x55, - 0x94, 0x97, 0x5d, 0xb0, 0x90, 0x60, 0x06, 0xc6, 0x0e, 0xca, 0xfb, 0x10, 0x12, 0x16, 0x28, 0x64, - 0x4d, 0xa4, 0xe4, 0x94, 0x2d, 0xc2, 0xb5, 0xbf, 0x69, 0x68, 0xad, 0x41, 0x70, 0x27, 0xa0, 0xc3, - 0x27, 0xd2, 0x3c, 0x07, 0x0d, 0x4e, 0xd1, 0x4a, 0x92, 0x07, 0x30, 0x26, 0xd8, 0x3f, 0xa8, 0xe6, - 0x72, 0x82, 0x3d, 0x30, 0x16, 0xe9, 0xe1, 0x03, 0x26, 0x43, 0x33, 0x2b, 0xf5, 0x10, 0x1b, 0xa9, - 0xc7, 0x91, 0xbe, 0x98, 0x5e, 0xcd, 0x1c, 0xe9, 0x8b, 0x99, 0x55, 0xdd, 0x36, 0xd1, 0xfa, 0xdd, - 0x3e, 0xa5, 0x4a, 0xf6, 0x19, 0xb2, 0x9e, 0x8e, 0xc1, 0x1b, 0x71, 0x38, 0x06, 0xec, 0x07, 0xb8, - 0x7b, 0x42, 0x5d, 0xcc, 0x3a, 0x40, 0xd9, 0xef, 0x97, 0x42, 0x1d, 0xd4, 0x0e, 0x2a, 0xff, 0x12, - 0x52, 0xb1, 0x7a, 0xab, 0xa1, 0xf5, 0x26, 0x74, 0x03, 0xc6, 0x81, 0x1e, 0xd6, 0x1b, 0xc7, 0x2e, - 0xef, 0xcd, 0xe1, 0x64, 0x0a, 0x28, 0x2b, 0x87, 0x4d, 0x0e, 0xa5, 0xdc, 0x18, 0x06, 0xd2, 0x43, - 0x97, 0xf7, 0xd4, 0x04, 0x8a, 0xb5, 0x20, 0x9e, 0xb6, 0x8b, 0x68, 0xe3, 0x27, 0x52, 0x8a, 0xf0, - 0xbb, 0x34, 0x2a, 0xd5, 0x7c, 0xbf, 0x21, 0x50, 0xeb, 0x2e, 0x03, 0x5f, 0x0c, 0xec, 0x1c, 0x48, - 0x1f, 0x24, 0x49, 0xe7, 0xfe, 0xdb, 0xaa, 0x88, 0x97, 0xa2, 0x12, 0xdf, 0xf0, 0xf8, 0xb5, 0xaa, - 0x08, 0xfc, 0xba, 0x7e, 0x79, 0x5d, 0x4e, 0xc5, 0x9d, 0x95, 0x51, 0x2e, 0x9a, 0xc0, 0x56, 0x48, - 0xa1, 0x13, 0x8c, 0x55, 0x83, 0x28, 0x32, 0x1d, 0x0b, 0x8b, 0xf1, 0x1c, 0x2d, 0x61, 0x97, 0x07, - 0xe7, 0xd0, 0x12, 0x17, 0x8b, 0x99, 0xd9, 0xed, 0xcc, 0x7d, 0x18, 0xb5, 0x28, 0x4a, 0x61, 0xe4, - 0x65, 0xa6, 0x30, 0x31, 0x29, 0xd8, 0x91, 0xbe, 0xa8, 0xaf, 0x66, 0xed, 0x2d, 0xb4, 0x39, 0x53, - 0x1a, 0x25, 0xdd, 0x07, 0x0d, 0x15, 0x62, 0x59, 0x45, 0xf6, 0x1f, 0x3b, 0xe9, 0x83, 0xf8, 0x35, - 0xc9, 0xdc, 0x2f, 0x65, 0xb2, 0xcd, 0xc4, 0x93, 0x93, 0xb6, 0x37, 0xd0, 0xda, 0x1d, 0xe6, 0xaa, - 0xa7, 0x3e, 0x32, 0x9b, 0x64, 0xc4, 0xe1, 0xb0, 0xde, 0x98, 0xff, 0x7d, 0xda, 0x44, 0xc5, 0x19, - 0x60, 0x8a, 0xc9, 0x27, 0x0d, 0x6d, 0xc6, 0x1c, 0x9f, 0x01, 0x34, 0xc8, 0x60, 0x00, 0x1e, 0x27, - 0x74, 0x0e, 0x22, 0xbf, 0x44, 0x4b, 0x1d, 0x80, 0x96, 0x17, 0x43, 0x08, 0xb1, 0x1f, 0x54, 0x31, - 0xdf, 0x49, 0x30, 0x15, 0x5d, 0x6a, 0xb6, 0x85, 0xfe, 0x99, 0xdd, 0x87, 0x6c, 0xb4, 0x7e, 0x72, + 0x59, 0x97, 0x31, 0xe0, 0xa6, 0x2e, 0xdc, 0x72, 0xf3, 0x58, 0x7f, 0xfd, 0xde, 0xd4, 0xec, 0x2a, + 0xca, 0xcb, 0x2e, 0x58, 0x48, 0x30, 0x03, 0x63, 0x07, 0xe5, 0x7d, 0x08, 0x09, 0x0b, 0x14, 0xb2, + 0x26, 0x52, 0x72, 0xca, 0x16, 0xe1, 0xda, 0xdf, 0x34, 0xb4, 0xd6, 0x20, 0xb8, 0x13, 0xd0, 0xe1, + 0x13, 0x69, 0x9e, 0x83, 0x06, 0xa7, 0x68, 0x25, 0xc9, 0x03, 0x18, 0x13, 0xec, 0x1f, 0x54, 0x73, + 0x39, 0xc1, 0x1e, 0x18, 0x8b, 0xf4, 0xf0, 0x01, 0x93, 0xa1, 0x99, 0x95, 0x7a, 0x88, 0x8d, 0xd4, + 0xe3, 0x48, 0x5f, 0x4c, 0xaf, 0x66, 0x8e, 0xf4, 0xc5, 0xcc, 0xaa, 0x6e, 0x9b, 0x68, 0xfd, 0x6e, + 0x9f, 0x52, 0x25, 0xfb, 0x0c, 0x59, 0x4f, 0xc7, 0xe0, 0x8d, 0x38, 0x1c, 0x03, 0xf6, 0x03, 0xdc, + 0x3d, 0xa1, 0x2e, 0x66, 0x1d, 0xa0, 0xec, 0xf7, 0x4b, 0xa1, 0x0e, 0x6a, 0x07, 0x95, 0x7f, 0x09, + 0xa9, 0x58, 0xbd, 0xd5, 0xd0, 0x7a, 0x13, 0xba, 0x01, 0xe3, 0x40, 0x0f, 0xeb, 0x8d, 0x63, 0x97, + 0xf7, 0xe6, 0x70, 0x32, 0x05, 0x94, 0x95, 0xc3, 0x26, 0x87, 0x52, 0x6e, 0x0c, 0x03, 0xe9, 0xa1, + 0xcb, 0x7b, 0x6a, 0x02, 0xc5, 0x5a, 0x10, 0x4f, 0xdb, 0x45, 0xb4, 0xf1, 0x13, 0x29, 0x45, 0xf8, + 0x5d, 0x1a, 0x95, 0x6a, 0xbe, 0xdf, 0x10, 0xa8, 0x75, 0x97, 0x81, 0x2f, 0x06, 0x76, 0x0e, 0xa4, + 0x0f, 0x92, 0xa4, 0x73, 0xff, 0x6d, 0x55, 0xc4, 0x4b, 0x51, 0x89, 0x6f, 0x78, 0xfc, 0x5a, 0x55, + 0x04, 0x7e, 0x5d, 0xbf, 0xbc, 0x2e, 0xa7, 0xe2, 0xce, 0xca, 0x28, 0x17, 0x4d, 0x60, 0x2b, 0xa4, + 0xd0, 0x09, 0xc6, 0xaa, 0x41, 0x14, 0x99, 0x8e, 0x85, 0xc5, 0x78, 0x8e, 0x96, 0xb0, 0xcb, 0x83, + 0x73, 0x68, 0x89, 0x8b, 0xc5, 0xcc, 0xec, 0x76, 0xe6, 0x3e, 0x8c, 0x5a, 0x14, 0xa5, 0x30, 0xf2, + 0x32, 0x53, 0x98, 0x98, 0x14, 0xec, 0x48, 0x5f, 0xd4, 0x57, 0xb3, 0xf6, 0x16, 0xda, 0x9c, 0x29, + 0x8d, 0x92, 0xee, 0x83, 0x86, 0x0a, 0xb1, 0xac, 0x22, 0xfb, 0x8f, 0x9d, 0xf4, 0x41, 0xfc, 0x9a, + 0x64, 0xee, 0x97, 0x32, 0xd9, 0x66, 0xe2, 0xc9, 0x49, 0xdb, 0x1b, 0x68, 0xed, 0x0e, 0x73, 0xd5, + 0x53, 0x1f, 0x99, 0x4d, 0x32, 0xe2, 0x70, 0x58, 0x6f, 0xcc, 0xff, 0x3e, 0x6d, 0xa2, 0xe2, 0x0c, + 0x30, 0xc5, 0xe4, 0x93, 0x86, 0x36, 0x63, 0x8e, 0xcf, 0x00, 0x1a, 0x64, 0x30, 0x00, 0x8f, 0x13, + 0x3a, 0x07, 0x91, 0x5f, 0xa2, 0xa5, 0x0e, 0x40, 0xcb, 0x8b, 0x21, 0x84, 0xd8, 0x0f, 0xaa, 0x98, + 0xef, 0x24, 0x98, 0x8a, 0x2e, 0x33, 0xb6, 0x85, 0xfe, 0x99, 0xdd, 0x87, 0x6c, 0xb4, 0x7e, 0x72, 0xf9, 0xd5, 0x4a, 0x5d, 0xde, 0x58, 0xda, 0xd5, 0x8d, 0xa5, 0x7d, 0xb9, 0xb1, 0xb4, 0x37, 0xb7, 0x56, 0xea, 0xea, 0xd6, 0x4a, 0x7d, 0xbe, 0xb5, 0x52, 0xa7, 0x8f, 0x12, 0x04, 0x26, 0xbf, 0xcd, 0x57, 0x84, 0xf6, 0xd5, 0x6e, 0xdf, 0x23, 0x14, 0x9c, 0xf1, 0xd4, 0x27, 0x49, 0xb5, 0x17, 0xc4, - 0x2f, 0xf2, 0xff, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x8d, 0xf3, 0x6a, 0x2b, 0x08, 0x00, + 0x2f, 0xf2, 0xff, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xf2, 0x17, 0x8a, 0x2b, 0x08, 0x00, 0x00, } diff --git a/x/evm/types/tx.pb.go b/x/evm/types/tx.pb.go index 7f670126f..684d3d5be 100644 --- a/x/evm/types/tx.pb.go +++ b/x/evm/types/tx.pb.go @@ -1571,83 +1571,83 @@ func init() { proto.RegisterFile("evm/v1beta1/tx.proto", fileDescriptor_0b4b6962 var fileDescriptor_0b4b69622c19e531 = []byte{ // 1247 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x41, 0x6f, 0xe3, 0xc4, - 0x17, 0x8f, 0x13, 0x27, 0x6d, 0x5e, 0x92, 0x6e, 0xd7, 0x9b, 0xdd, 0x4d, 0xb3, 0xdd, 0xa4, 0xf5, - 0xff, 0x0f, 0x2d, 0x12, 0x75, 0xda, 0x20, 0xa1, 0x85, 0x0b, 0x4a, 0x9a, 0xa5, 0x94, 0x22, 0xa8, - 0xbc, 0x85, 0x03, 0x12, 0x8a, 0x9c, 0x78, 0x36, 0xb5, 0x12, 0x7b, 0x8c, 0x67, 0x9a, 0x26, 0x88, - 0xc3, 0x8a, 0x03, 0x67, 0x3e, 0x02, 0x17, 0x24, 0x04, 0x37, 0x24, 0xee, 0x1c, 0x7b, 0x63, 0x6f, - 0xa0, 0x95, 0x88, 0x20, 0x15, 0x48, 0x7c, 0x85, 0x3d, 0xa1, 0xb1, 0xc7, 0x89, 0xd3, 0x26, 0xdd, - 0x0a, 0xb4, 0xa6, 0xe2, 0x54, 0xcf, 0x7b, 0x6f, 0xde, 0xbc, 0xdf, 0x6f, 0xde, 0xbc, 0xf7, 0x52, - 0xc8, 0xa2, 0xae, 0x59, 0xea, 0x6e, 0x35, 0x10, 0xd5, 0xb6, 0x4a, 0xb4, 0xa7, 0xd8, 0x0e, 0xa6, - 0x58, 0x4a, 0xa1, 0xae, 0xa9, 0x70, 0x69, 0x3e, 0xdb, 0xc2, 0x2d, 0xec, 0xca, 0x4b, 0xec, 0xcb, - 0x33, 0xc9, 0xaf, 0x76, 0x31, 0x45, 0x25, 0xd4, 0xb3, 0xb1, 0x43, 0x91, 0x3e, 0x76, 0xd1, 0xb7, - 0x11, 0xe1, 0x26, 0x2b, 0x94, 0x90, 0x8b, 0x2d, 0x6e, 0x4f, 0x9c, 0x1e, 0x50, 0xac, 0xd9, 0xc8, - 0x31, 0x0d, 0x42, 0x0c, 0x6c, 0x5d, 0xe8, 0x41, 0xfe, 0x4a, 0x80, 0xeb, 0x0f, 0x10, 0xdd, 0xd1, - 0x28, 0x3a, 0xd6, 0xfa, 0x2a, 0xfa, 0xf8, 0x08, 0x11, 0x2a, 0xed, 0x42, 0x82, 0x20, 0x4b, 0x47, - 0x4e, 0x4e, 0x58, 0x11, 0xd6, 0xd3, 0xd5, 0xad, 0xa7, 0x83, 0xe2, 0x46, 0xcb, 0xa0, 0x87, 0x47, - 0x0d, 0xa5, 0x89, 0xcd, 0x52, 0x13, 0x13, 0x13, 0x13, 0xfe, 0x67, 0x83, 0xe8, 0x6d, 0xee, 0xb3, - 0xd2, 0x6c, 0x56, 0x74, 0xdd, 0x41, 0x84, 0xa8, 0xdc, 0x81, 0x94, 0x85, 0x78, 0xf3, 0x50, 0x33, - 0xac, 0x5c, 0x74, 0x45, 0x58, 0x4f, 0xaa, 0xde, 0x42, 0x7a, 0x09, 0xe6, 0x34, 0xcf, 0x30, 0x17, - 0x73, 0x4f, 0xb8, 0x76, 0x32, 0x28, 0x46, 0x9e, 0x0c, 0x8a, 0x73, 0xfe, 0x7e, 0x5f, 0xff, 0xba, - 0xf8, 0xe8, 0xfb, 0x9c, 0x20, 0x67, 0x41, 0x0a, 0x86, 0x49, 0x6c, 0x6c, 0x11, 0x24, 0x7f, 0x2b, - 0xc0, 0xed, 0x6d, 0x6c, 0x3d, 0x34, 0x1c, 0x93, 0xab, 0x0e, 0x7a, 0x21, 0x62, 0x88, 0xd3, 0x5e, - 0xdd, 0xd0, 0x39, 0x82, 0x2c, 0x47, 0x20, 0xbe, 0xa5, 0x91, 0xc3, 0xe1, 0xa0, 0x28, 0x1e, 0xf4, - 0x76, 0x6b, 0xaa, 0x48, 0x7b, 0xbb, 0xba, 0x8b, 0x21, 0x22, 0xe7, 0x21, 0x77, 0x3e, 0x58, 0x8e, - 0xe4, 0xbb, 0x28, 0xdc, 0xf9, 0x00, 0x53, 0x14, 0x02, 0x9a, 0x37, 0x60, 0xde, 0xc6, 0x9d, 0x4e, - 0xbd, 0x8d, 0xfa, 0x2e, 0xa0, 0x54, 0xb9, 0xa0, 0xb0, 0x64, 0x54, 0xfc, 0x44, 0xf1, 0x33, 0x57, - 0xd9, 0xc7, 0x9d, 0xce, 0x1e, 0xea, 0x57, 0x45, 0x06, 0x4d, 0x9d, 0xb3, 0xbd, 0xa5, 0xb4, 0x03, - 0x22, 0xb3, 0x77, 0x71, 0xa7, 0xca, 0x1b, 0x4a, 0x20, 0xd9, 0x95, 0x0b, 0x30, 0xb8, 0x3a, 0xee, - 0xcb, 0x75, 0x90, 0xbf, 0x07, 0x22, 0x93, 0x49, 0x9b, 0x90, 0x40, 0x5d, 0x64, 0x51, 0x92, 0x13, - 0x56, 0x62, 0xeb, 0xa9, 0xb2, 0x34, 0xe1, 0xf2, 0x3e, 0x53, 0xf1, 0x7d, 0xdc, 0x8e, 0x13, 0xba, - 0x09, 0xcb, 0xd3, 0xcf, 0xf3, 0x48, 0x95, 0x16, 0x21, 0xd6, 0xc1, 0x2d, 0x97, 0xb1, 0xa4, 0xca, - 0x3e, 0xe5, 0x4f, 0xe0, 0x06, 0xb7, 0xde, 0x66, 0x77, 0xf8, 0x1c, 0xd8, 0x95, 0x40, 0xb4, 0x34, - 0x13, 0xf1, 0x54, 0x71, 0xbf, 0x79, 0xb4, 0xb7, 0x20, 0x3b, 0x79, 0x36, 0xbf, 0xfa, 0x6f, 0xa2, - 0x70, 0x93, 0x2b, 0x6a, 0xc8, 0xc6, 0xc4, 0xa0, 0x57, 0x30, 0x85, 0xa5, 0x1d, 0x48, 0x68, 0x26, - 0x3e, 0xb2, 0x68, 0x4e, 0x74, 0x6d, 0x4b, 0xdc, 0x76, 0xed, 0x12, 0xf1, 0xbc, 0x6f, 0x58, 0x54, - 0xe5, 0xdb, 0xa5, 0x57, 0x61, 0xa1, 0x71, 0xe4, 0x58, 0xc8, 0xa9, 0xfb, 0x15, 0x20, 0x3e, 0xbd, - 0x02, 0x64, 0x3c, 0xb3, 0x4a, 0xa0, 0x0e, 0x44, 0xe4, 0x1c, 0xdc, 0x3a, 0xcb, 0x15, 0xa7, 0xf1, - 0x27, 0x61, 0x74, 0xb7, 0x07, 0xb8, 0x8d, 0xac, 0xab, 0x48, 0xa2, 0x02, 0x71, 0x8d, 0x10, 0xe4, - 0x71, 0x78, 0x36, 0xcf, 0x2b, 0x4c, 0xc3, 0xf3, 0xdc, 0x33, 0x3b, 0x97, 0x38, 0x1c, 0x18, 0x47, - 0xfc, 0x63, 0x14, 0x96, 0x7c, 0x85, 0xa3, 0x59, 0xe4, 0x21, 0x72, 0xf6, 0x50, 0xff, 0x2a, 0xe2, - 0xae, 0x40, 0x86, 0xf2, 0x08, 0xeb, 0xec, 0x14, 0x17, 0xff, 0x42, 0x79, 0x79, 0x02, 0x7f, 0x00, - 0xc3, 0x41, 0xdf, 0x46, 0x6a, 0xda, 0xdf, 0xc2, 0x56, 0xd2, 0x47, 0x90, 0x68, 0xa3, 0x3e, 0x3b, - 0x8e, 0xa5, 0x4b, 0xb2, 0xfa, 0xe6, 0x70, 0x50, 0x8c, 0xef, 0xa1, 0xfe, 0x6e, 0xed, 0xe9, 0xa0, - 0xf8, 0x5a, 0x00, 0x97, 0xd6, 0x43, 0x1d, 0xcd, 0xb1, 0x10, 0x3d, 0xc6, 0x4e, 0x9b, 0xaf, 0x36, - 0x9a, 0xd8, 0x41, 0xa5, 0x5e, 0x29, 0xd8, 0x50, 0x15, 0x77, 0xb3, 0x1a, 0x6f, 0xa3, 0xfe, 0xa8, - 0x42, 0x2f, 0x43, 0x7e, 0x1a, 0xa1, 0x9c, 0xef, 0x27, 0x02, 0xa4, 0xde, 0x31, 0xac, 0x76, 0x68, - 0x0c, 0xbf, 0x00, 0x0b, 0x0e, 0x6a, 0x1a, 0xb6, 0x81, 0x2c, 0xea, 0xbe, 0x16, 0x97, 0xea, 0xa4, - 0x9a, 0x19, 0x49, 0x99, 0x1f, 0xb6, 0x79, 0x9c, 0x55, 0x49, 0x9e, 0x3b, 0xd2, 0x1a, 0x5c, 0x1b, - 0x6f, 0xf6, 0x9c, 0xbb, 0xcc, 0xa9, 0x63, 0x9f, 0x6e, 0x1d, 0xe2, 0xd0, 0xb7, 0x20, 0xed, 0x61, - 0xe3, 0xb5, 0x73, 0x15, 0xd2, 0xba, 0xf7, 0xc2, 0xbc, 0x93, 0xbd, 0x22, 0x9a, 0xe2, 0x32, 0x76, - 0xae, 0xfc, 0x88, 0x75, 0x5f, 0x07, 0x69, 0x14, 0x55, 0x8f, 0x1c, 0xcb, 0xcd, 0x4d, 0x12, 0x16, - 0x37, 0x81, 0x96, 0x7a, 0x2e, 0x02, 0x7e, 0x5d, 0x5f, 0x47, 0x7d, 0x65, 0x0d, 0xd9, 0x1d, 0xdc, - 0x0f, 0xb7, 0x2a, 0x8c, 0x9e, 0x7a, 0xec, 0x52, 0x4f, 0x5d, 0xaa, 0x41, 0x86, 0xb2, 0x00, 0xeb, - 0x3a, 0xa2, 0x9a, 0xd1, 0x21, 0xbc, 0x44, 0x2c, 0x4d, 0x3e, 0x11, 0x66, 0x51, 0xf3, 0x0c, 0xf8, - 0xf6, 0x34, 0x0d, 0xc8, 0x82, 0x73, 0x55, 0xe2, 0x12, 0x73, 0x55, 0xf4, 0x6d, 0x71, 0x3e, 0xbe, - 0x98, 0x90, 0xef, 0xc0, 0xd2, 0x14, 0xa6, 0x38, 0x8f, 0x9f, 0x0b, 0x70, 0xd7, 0xd3, 0xee, 0x23, - 0x4b, 0x37, 0xac, 0x96, 0xff, 0x36, 0xc2, 0xbe, 0xec, 0x15, 0x28, 0xcc, 0x8a, 0x83, 0x87, 0xfa, - 0x8b, 0x00, 0xb7, 0x03, 0x13, 0x41, 0x88, 0x3d, 0x7e, 0x62, 0xaa, 0x8a, 0xfd, 0x9d, 0xa9, 0x6a, - 0x19, 0x92, 0x4d, 0x2f, 0x6c, 0xa4, 0xbb, 0x97, 0x3f, 0xaf, 0x8e, 0x05, 0x9c, 0x81, 0x97, 0x21, - 0x77, 0x1e, 0xde, 0xcc, 0x61, 0xe7, 0x87, 0x28, 0x2c, 0x05, 0xcc, 0xc3, 0x1e, 0x2e, 0xfe, 0x31, - 0x23, 0xa3, 0x06, 0x23, 0x3e, 0xb3, 0xc1, 0x94, 0x21, 0xcd, 0xa6, 0x85, 0x67, 0x8d, 0x14, 0x29, - 0x66, 0xc4, 0x17, 0x93, 0x84, 0x27, 0xa6, 0x13, 0xae, 0x40, 0x7e, 0x1a, 0x83, 0x33, 0x29, 0xff, - 0x32, 0x3a, 0x91, 0x80, 0xe1, 0x96, 0x9c, 0x30, 0x09, 0x1f, 0xf5, 0x9c, 0x78, 0xb0, 0xe7, 0x5c, - 0x86, 0xd2, 0xc9, 0x1c, 0x9e, 0x28, 0x35, 0x53, 0x08, 0xfd, 0x5d, 0x80, 0xbb, 0x41, 0xf3, 0x7f, - 0x61, 0xce, 0x09, 0xe5, 0x65, 0x97, 0xa1, 0x30, 0x0b, 0xe6, 0x4c, 0x6e, 0xfe, 0x10, 0xfc, 0x82, - 0xe8, 0xdb, 0xbf, 0x77, 0x6c, 0x21, 0x87, 0x1c, 0x1a, 0x76, 0x68, 0xe4, 0x8c, 0xc7, 0xb2, 0xd8, - 0xf3, 0x1a, 0xcb, 0xa2, 0xf2, 0x2a, 0x14, 0x67, 0xe2, 0xe4, 0x95, 0xff, 0x4f, 0x01, 0x56, 0xcf, - 0xd8, 0xd8, 0xc8, 0xd1, 0x28, 0xfe, 0x0f, 0xd2, 0xf1, 0x7f, 0x90, 0x2f, 0x82, 0xca, 0x19, 0xf9, - 0x14, 0x6e, 0x3c, 0x30, 0x5a, 0xd6, 0x36, 0x36, 0x4d, 0xcd, 0xd2, 0xc3, 0xee, 0xd5, 0x9f, 0x09, - 0x90, 0x9d, 0x3c, 0x9e, 0xa7, 0xf1, 0x7d, 0xb8, 0xd1, 0xd0, 0x68, 0xf3, 0x10, 0xe9, 0xf5, 0x26, - 0xd7, 0x31, 0xba, 0xbc, 0x60, 0x6e, 0x0e, 0x07, 0xc5, 0xeb, 0x55, 0x4f, 0xed, 0xef, 0xdc, 0xad, - 0xa9, 0xd7, 0x1b, 0x67, 0x44, 0xba, 0xf4, 0x3f, 0xc8, 0xf0, 0xed, 0xf5, 0xa6, 0xfb, 0xab, 0x94, - 0xc5, 0x90, 0x51, 0xd3, 0x5c, 0xb8, 0xcd, 0x64, 0xf2, 0x40, 0x80, 0x6b, 0x15, 0x5d, 0x0f, 0x73, - 0x0c, 0xb8, 0x07, 0xf3, 0x2c, 0x01, 0x02, 0x3f, 0x72, 0xee, 0x2a, 0x94, 0x90, 0xf3, 0xb5, 0xc2, - 0xff, 0x95, 0x33, 0xd7, 0xf6, 0x3e, 0xa4, 0x17, 0x21, 0x61, 0x6b, 0x8e, 0x66, 0xfa, 0xcd, 0x6b, - 0x81, 0x57, 0xdf, 0xc4, 0xbe, 0x2b, 0x55, 0xb9, 0x76, 0x34, 0xb7, 0xc5, 0x16, 0x45, 0x59, 0x82, - 0xc5, 0x31, 0x3e, 0x8f, 0xe0, 0xea, 0xbb, 0x27, 0xbf, 0x15, 0x22, 0x27, 0xc3, 0x82, 0xf0, 0x78, - 0x58, 0x10, 0x7e, 0x1d, 0x16, 0x84, 0x2f, 0x4e, 0x0b, 0x91, 0xc7, 0xa7, 0x85, 0xc8, 0xcf, 0xa7, - 0x85, 0xc8, 0x87, 0x9b, 0x97, 0xcc, 0x41, 0xd4, 0x35, 0x3d, 0xe0, 0x8d, 0x84, 0xfb, 0x8f, 0xc2, - 0x57, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x80, 0xdb, 0x3a, 0xea, 0x14, 0x00, 0x00, + 0x17, 0xaf, 0x13, 0x27, 0x6d, 0x5e, 0x92, 0x6e, 0xd7, 0x9b, 0xdd, 0xa6, 0xd9, 0x36, 0x69, 0xfd, + 0xff, 0x43, 0x8b, 0x44, 0x9d, 0x36, 0x48, 0x68, 0xe1, 0x82, 0x92, 0x66, 0x29, 0xa5, 0x08, 0x2a, + 0x6f, 0xe1, 0x80, 0x84, 0x22, 0x27, 0x9e, 0x4d, 0xad, 0xc4, 0x1e, 0xe3, 0x99, 0xa6, 0x09, 0xe2, + 0xb0, 0xe2, 0xc0, 0x99, 0x8f, 0xc0, 0x05, 0x09, 0xc1, 0x0d, 0x89, 0x3b, 0xc7, 0xde, 0xd8, 0x1b, + 0x68, 0x25, 0x22, 0x48, 0x05, 0x12, 0x5f, 0x61, 0x4f, 0x68, 0xec, 0x71, 0xe2, 0xb4, 0x49, 0xb7, + 0x02, 0xad, 0xa9, 0x38, 0xd5, 0xf3, 0xde, 0x9b, 0x37, 0xef, 0xf7, 0x9b, 0x37, 0xef, 0xbd, 0x14, + 0x32, 0xa8, 0x63, 0x16, 0x3b, 0xdb, 0x75, 0x44, 0xb5, 0xed, 0x22, 0xed, 0x2a, 0xb6, 0x83, 0x29, + 0x96, 0x92, 0xa8, 0x63, 0x2a, 0x5c, 0x9a, 0xcb, 0x34, 0x71, 0x13, 0xbb, 0xf2, 0x22, 0xfb, 0xf2, + 0x4c, 0x72, 0x6b, 0x1d, 0x4c, 0x51, 0x11, 0x75, 0x6d, 0xec, 0x50, 0xa4, 0x8f, 0x5c, 0xf4, 0x6c, + 0x44, 0xb8, 0xc9, 0x2a, 0x25, 0xe4, 0x72, 0x8b, 0xc5, 0xb1, 0xd3, 0x03, 0x8a, 0x75, 0x1b, 0x39, + 0xa6, 0x41, 0x88, 0x81, 0xad, 0x4b, 0x3d, 0xc8, 0x5f, 0x09, 0x70, 0xf3, 0x01, 0xa2, 0xbb, 0x1a, + 0x45, 0x27, 0x5a, 0x4f, 0x45, 0x1f, 0x1f, 0x23, 0x42, 0xa5, 0x3d, 0x88, 0x13, 0x64, 0xe9, 0xc8, + 0xc9, 0x0a, 0xab, 0xc2, 0x46, 0xaa, 0xb2, 0xfd, 0xb4, 0x5f, 0xd8, 0x6c, 0x1a, 0xf4, 0xe8, 0xb8, + 0xae, 0x34, 0xb0, 0x59, 0x6c, 0x60, 0x62, 0x62, 0xc2, 0xff, 0x6c, 0x12, 0xbd, 0xc5, 0x7d, 0x96, + 0x1b, 0x8d, 0xb2, 0xae, 0x3b, 0x88, 0x10, 0x95, 0x3b, 0x90, 0x32, 0x10, 0x6b, 0x1c, 0x69, 0x86, + 0x95, 0x8d, 0xac, 0x0a, 0x1b, 0x09, 0xd5, 0x5b, 0x48, 0x2f, 0xc1, 0xac, 0xe6, 0x19, 0x66, 0xa3, + 0xee, 0x09, 0x37, 0x4e, 0xfb, 0x85, 0x99, 0x27, 0xfd, 0xc2, 0xac, 0xbf, 0xdf, 0xd7, 0xbf, 0x2e, + 0x3e, 0xfa, 0x3e, 0x1b, 0x95, 0x33, 0x20, 0x05, 0xc3, 0x24, 0x36, 0xb6, 0x08, 0x92, 0xbf, 0x15, + 0x60, 0x71, 0x07, 0x5b, 0x0f, 0x0d, 0xc7, 0xe4, 0xaa, 0xc3, 0x6e, 0x88, 0x18, 0x62, 0xb4, 0x5b, + 0x33, 0x74, 0x8e, 0x20, 0xc3, 0x11, 0x88, 0x6f, 0x69, 0xe4, 0x68, 0xd0, 0x2f, 0x88, 0x87, 0xdd, + 0xbd, 0xaa, 0x2a, 0xd2, 0xee, 0x9e, 0xee, 0x62, 0x10, 0xe4, 0x1c, 0x64, 0x2f, 0x06, 0xcb, 0x91, + 0x7c, 0x17, 0x81, 0xbb, 0x1f, 0x60, 0x8a, 0x42, 0x40, 0xf3, 0x06, 0xcc, 0xd9, 0xb8, 0xdd, 0xae, + 0xb5, 0x50, 0xcf, 0x05, 0x94, 0x2c, 0xe5, 0x15, 0x96, 0x8c, 0x8a, 0x9f, 0x28, 0x7e, 0xe6, 0x2a, + 0x07, 0xb8, 0xdd, 0xde, 0x47, 0xbd, 0x8a, 0xc8, 0xa0, 0xa9, 0xb3, 0xb6, 0xb7, 0x94, 0x76, 0x41, + 0x64, 0xf6, 0x2e, 0xee, 0x64, 0x69, 0x53, 0x09, 0x24, 0xbb, 0x72, 0x09, 0x06, 0x57, 0xc7, 0x7d, + 0xb9, 0x0e, 0x72, 0xf7, 0x40, 0x64, 0x32, 0x69, 0x0b, 0xe2, 0xa8, 0x83, 0x2c, 0x4a, 0xb2, 0xc2, + 0x6a, 0x74, 0x23, 0x59, 0x92, 0xc6, 0x5c, 0xde, 0x67, 0x2a, 0xbe, 0x8f, 0xdb, 0x71, 0x42, 0xb7, + 0x60, 0x79, 0xf2, 0x79, 0x1e, 0xa9, 0xd2, 0x02, 0x44, 0xdb, 0xb8, 0xe9, 0x32, 0x96, 0x50, 0xd9, + 0xa7, 0xfc, 0x09, 0xdc, 0xe2, 0xd6, 0x3b, 0xec, 0x0e, 0x9f, 0x03, 0xbb, 0x12, 0x88, 0x96, 0x66, + 0x22, 0x9e, 0x2a, 0xee, 0x37, 0x8f, 0xf6, 0x0e, 0x64, 0xc6, 0xcf, 0xe6, 0x57, 0xff, 0x4d, 0x04, + 0x6e, 0x73, 0x45, 0x15, 0xd9, 0x98, 0x18, 0xf4, 0x1a, 0xa6, 0xb0, 0xb4, 0x0b, 0x71, 0xcd, 0xc4, + 0xc7, 0x16, 0xcd, 0x8a, 0xae, 0x6d, 0x91, 0xdb, 0xae, 0x5f, 0x21, 0x9e, 0xf7, 0x0d, 0x8b, 0xaa, + 0x7c, 0xbb, 0xf4, 0x2a, 0xcc, 0xd7, 0x8f, 0x1d, 0x0b, 0x39, 0x35, 0xbf, 0x02, 0xc4, 0x26, 0x57, + 0x80, 0xb4, 0x67, 0x56, 0x0e, 0xd4, 0x01, 0x41, 0xce, 0xc2, 0x9d, 0xf3, 0x5c, 0x71, 0x1a, 0x7f, + 0x12, 0x86, 0x77, 0x7b, 0x88, 0x5b, 0xc8, 0xba, 0x8e, 0x24, 0x2a, 0x10, 0xd3, 0x08, 0x41, 0x1e, + 0x87, 0xe7, 0xf3, 0xbc, 0xcc, 0x34, 0x3c, 0xcf, 0x3d, 0xb3, 0x0b, 0x89, 0xc3, 0x81, 0x71, 0xc4, + 0x3f, 0x46, 0x60, 0xc9, 0x57, 0x38, 0x9a, 0x45, 0x1e, 0x22, 0x67, 0x1f, 0xf5, 0xae, 0x23, 0xee, + 0x32, 0xa4, 0x29, 0x8f, 0xb0, 0xc6, 0x4e, 0x71, 0xf1, 0xcf, 0x97, 0x96, 0xc7, 0xf0, 0x07, 0x30, + 0x1c, 0xf6, 0x6c, 0xa4, 0xa6, 0xfc, 0x2d, 0x6c, 0x25, 0x7d, 0x04, 0xf1, 0x16, 0xea, 0xb1, 0xe3, + 0x58, 0xba, 0x24, 0x2a, 0x6f, 0x0e, 0xfa, 0x85, 0xd8, 0x3e, 0xea, 0xed, 0x55, 0x9f, 0xf6, 0x0b, + 0xaf, 0x05, 0x70, 0x69, 0x5d, 0xd4, 0xd6, 0x1c, 0x0b, 0xd1, 0x13, 0xec, 0xb4, 0xf8, 0x6a, 0xb3, + 0x81, 0x1d, 0x54, 0xec, 0x16, 0x83, 0x0d, 0x55, 0x71, 0x37, 0xab, 0xb1, 0x16, 0xea, 0x0d, 0x2b, + 0xf4, 0x32, 0xe4, 0x26, 0x11, 0xca, 0xf9, 0x7e, 0x22, 0x40, 0xf2, 0x1d, 0xc3, 0x6a, 0x85, 0xc6, + 0xf0, 0x0b, 0x30, 0xef, 0xa0, 0x86, 0x61, 0x1b, 0xc8, 0xa2, 0xee, 0x6b, 0x71, 0xa9, 0x4e, 0xa8, + 0xe9, 0xa1, 0x94, 0xf9, 0x61, 0x9b, 0x47, 0x59, 0x95, 0xe0, 0xb9, 0x23, 0xad, 0xc3, 0x8d, 0xd1, + 0x66, 0xcf, 0xb9, 0xcb, 0x9c, 0x3a, 0xf2, 0xe9, 0xd6, 0x21, 0x0e, 0x7d, 0x1b, 0x52, 0x1e, 0x36, + 0x5e, 0x3b, 0xd7, 0x20, 0xa5, 0x7b, 0x2f, 0xcc, 0x3b, 0xd9, 0x2b, 0xa2, 0x49, 0x2e, 0x63, 0xe7, + 0xca, 0x8f, 0x58, 0xf7, 0x75, 0x90, 0x46, 0x51, 0xe5, 0xd8, 0xb1, 0xdc, 0xdc, 0x24, 0x61, 0x71, + 0x13, 0x68, 0xa9, 0x17, 0x22, 0xe0, 0xd7, 0xf5, 0x75, 0xc4, 0x57, 0x56, 0x91, 0xdd, 0xc6, 0xbd, + 0x70, 0xab, 0xc2, 0xf0, 0xa9, 0x47, 0xaf, 0xf4, 0xd4, 0xa5, 0x2a, 0xa4, 0x29, 0x0b, 0xb0, 0xa6, + 0x23, 0xaa, 0x19, 0x6d, 0xc2, 0x4b, 0xc4, 0xd2, 0xf8, 0x13, 0x61, 0x16, 0x55, 0xcf, 0x80, 0x6f, + 0x4f, 0xd1, 0x80, 0x2c, 0x38, 0x57, 0xc5, 0xaf, 0x30, 0x57, 0x45, 0xde, 0x16, 0xe7, 0x62, 0x0b, + 0x71, 0xf9, 0x2e, 0x2c, 0x4d, 0x60, 0x8a, 0xf3, 0xf8, 0xb9, 0x00, 0x2b, 0x9e, 0xf6, 0x00, 0x59, + 0xba, 0x61, 0x35, 0xfd, 0xb7, 0x11, 0xf6, 0x65, 0xaf, 0x42, 0x7e, 0x5a, 0x1c, 0x3c, 0xd4, 0x5f, + 0x04, 0x58, 0x0c, 0x4c, 0x04, 0x21, 0xf6, 0xf8, 0xb1, 0xa9, 0x2a, 0xfa, 0x77, 0xa6, 0xaa, 0x65, + 0x48, 0x34, 0xbc, 0xb0, 0x91, 0xee, 0x5e, 0xfe, 0x9c, 0x3a, 0x12, 0x70, 0x06, 0x5e, 0x86, 0xec, + 0x45, 0x78, 0x53, 0x87, 0x9d, 0x1f, 0x22, 0xb0, 0x14, 0x30, 0x0f, 0x7b, 0xb8, 0xf8, 0xc7, 0x8c, + 0x0c, 0x1b, 0x8c, 0xf8, 0xcc, 0x06, 0x53, 0x82, 0x14, 0x9b, 0x16, 0x9e, 0x35, 0x52, 0x24, 0x99, + 0x11, 0x5f, 0x8c, 0x13, 0x1e, 0x9f, 0x4c, 0xb8, 0x02, 0xb9, 0x49, 0x0c, 0x4e, 0xa5, 0xfc, 0xcb, + 0xc8, 0x58, 0x02, 0x86, 0x5b, 0x72, 0xc2, 0x24, 0x7c, 0xd8, 0x73, 0x62, 0xc1, 0x9e, 0x73, 0x15, + 0x4a, 0xc7, 0x73, 0x78, 0xac, 0xd4, 0x4c, 0x20, 0xf4, 0x77, 0x01, 0x56, 0x82, 0xe6, 0xff, 0xc2, + 0x9c, 0x13, 0xca, 0xcb, 0x2e, 0x41, 0x7e, 0x1a, 0xcc, 0xa9, 0xdc, 0xfc, 0x21, 0xf8, 0x05, 0xd1, + 0xb7, 0x7f, 0xef, 0xc4, 0x42, 0x0e, 0x39, 0x32, 0xec, 0xd0, 0xc8, 0x19, 0x8d, 0x65, 0xd1, 0xe7, + 0x35, 0x96, 0x45, 0xe4, 0x35, 0x28, 0x4c, 0xc5, 0xc9, 0x2b, 0xff, 0x9f, 0x02, 0xac, 0x9d, 0xb3, + 0xb1, 0x91, 0xa3, 0x51, 0xfc, 0x1f, 0xa4, 0xe3, 0xff, 0x20, 0x5f, 0x06, 0x95, 0x33, 0xf2, 0x29, + 0xdc, 0x7a, 0x60, 0x34, 0xad, 0x1d, 0x6c, 0x9a, 0x9a, 0xa5, 0x87, 0xdd, 0xab, 0x3f, 0x13, 0x20, + 0x33, 0x7e, 0x3c, 0x4f, 0xe3, 0xfb, 0x70, 0xab, 0xae, 0xd1, 0xc6, 0x11, 0xd2, 0x6b, 0x0d, 0xae, + 0x63, 0x74, 0x79, 0xc1, 0xdc, 0x1e, 0xf4, 0x0b, 0x37, 0x2b, 0x9e, 0xda, 0xdf, 0xb9, 0x57, 0x55, + 0x6f, 0xd6, 0xcf, 0x89, 0x74, 0xe9, 0x7f, 0x90, 0xe6, 0xdb, 0x6b, 0x0d, 0xf7, 0x57, 0x29, 0x8b, + 0x21, 0xad, 0xa6, 0xb8, 0x70, 0x87, 0xc9, 0xe4, 0xbe, 0x00, 0x37, 0xca, 0xba, 0x1e, 0xe6, 0x18, + 0x70, 0x0f, 0xe6, 0x58, 0x02, 0x04, 0x7e, 0xe4, 0xac, 0x28, 0x94, 0x90, 0x8b, 0xb5, 0xc2, 0xff, + 0x95, 0x33, 0xdb, 0xf2, 0x3e, 0xa4, 0x17, 0x21, 0x6e, 0x6b, 0x8e, 0x66, 0xfa, 0xcd, 0x6b, 0x9e, + 0x57, 0xdf, 0xf8, 0x81, 0x2b, 0x55, 0xb9, 0x76, 0x38, 0xb7, 0x45, 0x17, 0x44, 0x59, 0x82, 0x85, + 0x11, 0x3e, 0x8f, 0xe0, 0xca, 0xbb, 0xa7, 0xbf, 0xe5, 0x67, 0x4e, 0x07, 0x79, 0xe1, 0xf1, 0x20, + 0x2f, 0xfc, 0x3a, 0xc8, 0x0b, 0x5f, 0x9c, 0xe5, 0x67, 0x1e, 0x9f, 0xe5, 0x67, 0x7e, 0x3e, 0xcb, + 0xcf, 0x7c, 0xb8, 0x75, 0xc5, 0x1c, 0x44, 0x1d, 0xd3, 0x03, 0x5e, 0x8f, 0xbb, 0xff, 0x28, 0x7c, + 0xe5, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0x7d, 0x1e, 0x99, 0xea, 0x14, 0x00, 0x00, } func (m *SetGatewayRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/nexus/types/tx.pb.go b/x/nexus/types/tx.pb.go index bf9da5a69..fb2ff2073 100644 --- a/x/nexus/types/tx.pb.go +++ b/x/nexus/types/tx.pb.go @@ -418,34 +418,34 @@ func init() { proto.RegisterFile("nexus/v1beta1/tx.proto", fileDescriptor_7af3d4 var fileDescriptor_7af3d47209cda0b3 = []byte{ // 440 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0xbf, 0x6e, 0x13, 0x41, - 0x10, 0xc6, 0x6f, 0x4d, 0x64, 0x60, 0x81, 0xc6, 0x0a, 0xf6, 0x61, 0xa1, 0xb5, 0x73, 0x14, 0xb8, - 0xf1, 0xad, 0x1c, 0x3a, 0x2a, 0x6c, 0xa2, 0x48, 0x29, 0x90, 0xd0, 0x95, 0x34, 0x68, 0x7d, 0x37, - 0xbe, 0xac, 0x12, 0xef, 0x1c, 0x3b, 0xeb, 0x70, 0x54, 0x40, 0x89, 0x68, 0x78, 0x10, 0x5a, 0xde, - 0xc1, 0x65, 0x4a, 0xaa, 0x08, 0xec, 0xb7, 0xa0, 0x42, 0xb9, 0x5b, 0x0b, 0x44, 0x44, 0x3a, 0xfe, - 0x54, 0x77, 0x33, 0xf3, 0x69, 0xe6, 0xf7, 0x49, 0xfb, 0xf1, 0xb6, 0x81, 0x72, 0x41, 0xf2, 0x64, - 0x34, 0x05, 0xa7, 0x46, 0xd2, 0x95, 0x71, 0x61, 0xd1, 0x61, 0xeb, 0x56, 0xd5, 0x8f, 0x7d, 0xbf, - 0xbb, 0x9d, 0x63, 0x8e, 0xd5, 0x44, 0x9e, 0xff, 0xd5, 0xa2, 0xee, 0xdd, 0x1c, 0x31, 0x3f, 0x06, - 0xa9, 0x0a, 0x2d, 0x95, 0x31, 0xe8, 0x94, 0xd3, 0x68, 0xc8, 0x4f, 0xa3, 0x7a, 0x35, 0x94, 0x05, - 0x5a, 0x07, 0xd9, 0x8f, 0x1b, 0xaf, 0x0a, 0xd8, 0x68, 0xee, 0x17, 0x60, 0xe7, 0x9a, 0x48, 0xa3, - 0xb9, 0x54, 0x18, 0xbd, 0x63, 0x5c, 0x24, 0x90, 0x6b, 0x72, 0x60, 0x1f, 0x1f, 0x2a, 0x6d, 0x9e, - 0x28, 0x6d, 0x9c, 0xd2, 0x06, 0x6c, 0x02, 0x2f, 0x16, 0x40, 0xae, 0x75, 0xc0, 0x9b, 0x04, 0x26, - 0x03, 0x1b, 0xb2, 0x3e, 0x1b, 0xdc, 0x9c, 0x8c, 0xbe, 0x9d, 0xf5, 0x86, 0xb9, 0x76, 0x87, 0x8b, - 0x69, 0x9c, 0xe2, 0x5c, 0xa6, 0x48, 0x73, 0x24, 0xff, 0x19, 0x52, 0x76, 0xe4, 0x0f, 0x8c, 0xd3, - 0x74, 0x9c, 0x65, 0x16, 0x88, 0x12, 0xbf, 0xa0, 0xd5, 0xe6, 0xcd, 0xf4, 0xfc, 0x08, 0x85, 0x8d, - 0xfe, 0x95, 0xc1, 0xf5, 0xc4, 0x57, 0x0f, 0xb7, 0xde, 0x7c, 0x0a, 0x83, 0x68, 0x87, 0xf7, 0x7e, - 0x8b, 0x42, 0x05, 0x1a, 0x82, 0xe8, 0x3d, 0xe3, 0xfd, 0x3d, 0xb0, 0xff, 0x09, 0xf0, 0x3d, 0xbe, - 0x73, 0x09, 0x8c, 0x47, 0x7e, 0xcd, 0xb7, 0xc7, 0xa9, 0xd3, 0x27, 0xca, 0x41, 0x25, 0xf9, 0xcb, - 0x94, 0x2c, 0xea, 0xf0, 0xdb, 0xbf, 0x00, 0x78, 0xb2, 0xb7, 0x8c, 0xb7, 0xf7, 0x40, 0xfd, 0x53, - 0xb8, 0x3b, 0xbc, 0x73, 0x01, 0xc1, 0xe3, 0x7d, 0x64, 0xbc, 0xb3, 0x79, 0x0f, 0x63, 0x22, 0x70, - 0xfb, 0x00, 0x7f, 0x80, 0xef, 0x11, 0xbf, 0x36, 0x03, 0x78, 0xae, 0xcd, 0x0c, 0xc3, 0x46, 0x9f, - 0x0d, 0x6e, 0xec, 0xf6, 0xe2, 0x3a, 0xa4, 0x9b, 0xe0, 0x6c, 0xd2, 0x1a, 0xef, 0x03, 0x1c, 0x98, - 0x19, 0x4e, 0xb6, 0x96, 0x67, 0xbd, 0x20, 0xb9, 0x3a, 0xab, 0xcb, 0xca, 0x49, 0x23, 0xea, 0xf2, - 0xf0, 0x22, 0x6d, 0x6d, 0x65, 0xf2, 0x74, 0xf9, 0x55, 0x04, 0xcb, 0x95, 0x60, 0xa7, 0x2b, 0xc1, - 0xbe, 0xac, 0x04, 0xfb, 0xb0, 0x16, 0xc1, 0xe9, 0x5a, 0x04, 0x9f, 0xd7, 0x22, 0x78, 0xb6, 0xfb, - 0x13, 0xb8, 0x2a, 0xe1, 0x58, 0x59, 0x03, 0xee, 0x25, 0xda, 0x23, 0x5f, 0x0d, 0x53, 0xb4, 0x20, - 0x4b, 0x59, 0xe7, 0xbe, 0x32, 0x32, 0x6d, 0x56, 0xf1, 0x7d, 0xf0, 0x3d, 0x00, 0x00, 0xff, 0xff, - 0xb6, 0xe1, 0x46, 0x27, 0x68, 0x04, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0x7d, 0x69, 0x15, 0xe0, 0x80, 0x25, 0x2a, 0x89, 0x89, 0x90, 0x93, 0x9a, 0x81, 0x2c, + 0xf1, 0x29, 0x65, 0x63, 0x22, 0xa1, 0xaa, 0xd4, 0x01, 0x09, 0x79, 0x64, 0x41, 0x17, 0xfb, 0xc5, + 0x3d, 0xb5, 0xb9, 0x67, 0xee, 0x5d, 0x8a, 0x99, 0x80, 0x11, 0xb1, 0xf0, 0x41, 0x58, 0xf9, 0x0e, + 0x19, 0x3b, 0x32, 0x55, 0x90, 0x7c, 0x0b, 0x26, 0x54, 0xfb, 0x2c, 0x10, 0x15, 0xd9, 0x80, 0x4e, + 0xf6, 0x7b, 0xef, 0xaf, 0xf7, 0x7e, 0x7f, 0xe9, 0xfe, 0xbc, 0xad, 0xa1, 0x58, 0x90, 0x38, 0x1d, + 0x4d, 0xc1, 0xca, 0x91, 0xb0, 0x45, 0x94, 0x1b, 0xb4, 0xd8, 0xba, 0x5d, 0xf6, 0x23, 0xd7, 0xef, + 0xee, 0x64, 0x98, 0x61, 0x39, 0x11, 0x17, 0x7f, 0x95, 0xa8, 0x7b, 0x2f, 0x43, 0xcc, 0x4e, 0x40, + 0xc8, 0x5c, 0x09, 0xa9, 0x35, 0x5a, 0x69, 0x15, 0x6a, 0x72, 0xd3, 0xb0, 0x5a, 0x0d, 0x45, 0x8e, + 0xc6, 0x42, 0xfa, 0xf3, 0xc6, 0xeb, 0x1c, 0x6a, 0xcd, 0x83, 0x1c, 0xcc, 0x5c, 0x11, 0x29, 0xd4, + 0x1b, 0x85, 0xe1, 0x7b, 0xc6, 0x83, 0x18, 0x32, 0x45, 0x16, 0xcc, 0x93, 0x23, 0xa9, 0xf4, 0x53, + 0xa9, 0xb4, 0x95, 0x4a, 0x83, 0x89, 0xe1, 0xe5, 0x02, 0xc8, 0xb6, 0x0e, 0x79, 0x93, 0x40, 0xa7, + 0x60, 0x7c, 0xd6, 0x67, 0x83, 0x5b, 0x93, 0xd1, 0xf7, 0xf3, 0xde, 0x30, 0x53, 0xf6, 0x68, 0x31, + 0x8d, 0x12, 0x9c, 0x8b, 0x04, 0x69, 0x8e, 0xe4, 0x3e, 0x43, 0x4a, 0x8f, 0xdd, 0x81, 0x71, 0x92, + 0x8c, 0xd3, 0xd4, 0x00, 0x51, 0xec, 0x16, 0xb4, 0xda, 0xbc, 0x99, 0x5c, 0x1c, 0x21, 0xbf, 0xd1, + 0xdf, 0x1a, 0xdc, 0x88, 0x5d, 0xf5, 0x68, 0xfb, 0xed, 0x67, 0x9f, 0x85, 0xbb, 0xbc, 0xf7, 0x47, + 0x14, 0xca, 0x51, 0x13, 0x84, 0x1f, 0x18, 0xef, 0xef, 0x83, 0xb9, 0x22, 0xc0, 0xf7, 0xf9, 0xee, + 0x06, 0x18, 0x87, 0xfc, 0x86, 0xef, 0x8c, 0x13, 0xab, 0x4e, 0xa5, 0x85, 0x52, 0xf2, 0x8f, 0x29, + 0xb7, 0xc2, 0x0e, 0xbf, 0xf3, 0x1b, 0x80, 0x23, 0x7b, 0xc7, 0x78, 0x7b, 0x1f, 0xe4, 0x7f, 0x85, + 0xbb, 0xcb, 0x3b, 0x97, 0x10, 0x1c, 0xde, 0x27, 0xc6, 0x3b, 0xf5, 0x7b, 0x18, 0x13, 0x81, 0x3d, + 0x00, 0xf8, 0x0b, 0x7c, 0x8f, 0xf9, 0xf5, 0x19, 0xc0, 0x0b, 0xa5, 0x67, 0xe8, 0x37, 0xfa, 0x6c, + 0x70, 0x73, 0xaf, 0x17, 0x55, 0x21, 0xad, 0x83, 0x53, 0xa7, 0x35, 0x3a, 0x00, 0x38, 0xd4, 0x33, + 0x9c, 0x6c, 0x2f, 0xcf, 0x7b, 0x5e, 0x7c, 0x6d, 0x56, 0x95, 0xa5, 0x93, 0x46, 0xd8, 0xe5, 0xfe, + 0x65, 0xda, 0xca, 0xca, 0xe4, 0xd9, 0xf2, 0x5b, 0xe0, 0x2d, 0x57, 0x01, 0x3b, 0x5b, 0x05, 0xec, + 0xeb, 0x2a, 0x60, 0x1f, 0xd7, 0x81, 0x77, 0xb6, 0x0e, 0xbc, 0x2f, 0xeb, 0xc0, 0x7b, 0xbe, 0xf7, + 0x0b, 0xb8, 0x2c, 0xe0, 0x44, 0x1a, 0x0d, 0xf6, 0x15, 0x9a, 0x63, 0x57, 0x0d, 0x13, 0x34, 0x20, + 0x0a, 0x51, 0xe5, 0xbe, 0x34, 0x32, 0x6d, 0x96, 0xf1, 0x7d, 0xf8, 0x23, 0x00, 0x00, 0xff, 0xff, + 0x79, 0x5d, 0xc4, 0x05, 0x68, 0x04, 0x00, 0x00, } func (m *RegisterChainMaintainerRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/permission/exported/proto.go b/x/permission/exported/proto.go index b48f8fff7..54bc69285 100644 --- a/x/permission/exported/proto.go +++ b/x/permission/exported/proto.go @@ -10,7 +10,7 @@ func GetPermissionRole(message descriptor.Message) Role { _, d := descriptor.ForMessage(message) v, err := proto.GetExtension(d.GetOptions(), E_PermissionRole) if err != nil { - return ROLE_CHAIN_MANAGEMENT + return ROLE_UNSPECIFIED } return *v.(*Role) } diff --git a/x/permission/exported/types.go b/x/permission/exported/types.go index f9e042bc8..11fa122d5 100644 --- a/x/permission/exported/types.go +++ b/x/permission/exported/types.go @@ -11,7 +11,7 @@ func (x Role) Validate() error { return fmt.Errorf("unknown gov role") } - if x == ROLE_UNRESTRICTED { + if x == ROLE_UNSPECIFIED || x == ROLE_UNRESTRICTED { return fmt.Errorf("unspecified gov role") } diff --git a/x/permission/exported/types.pb.go b/x/permission/exported/types.pb.go index f7ad3f470..73d20f0af 100644 --- a/x/permission/exported/types.pb.go +++ b/x/permission/exported/types.pb.go @@ -25,21 +25,24 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Role int32 const ( - ROLE_UNRESTRICTED Role = 0 - ROLE_ACCESS_CONTROL Role = 1 + ROLE_UNSPECIFIED Role = 0 + ROLE_UNRESTRICTED Role = 1 ROLE_CHAIN_MANAGEMENT Role = 2 + ROLE_ACCESS_CONTROL Role = 3 ) var Role_name = map[int32]string{ 0: "ROLE_UNSPECIFIED", - 1: "ROLE_ACCESS_CONTROL", + 1: "ROLE_UNRESTRICTED", 2: "ROLE_CHAIN_MANAGEMENT", + 3: "ROLE_ACCESS_CONTROL", } var Role_value = map[string]int32{ "ROLE_UNSPECIFIED": 0, - "ROLE_ACCESS_CONTROL": 1, + "ROLE_UNRESTRICTED": 1, "ROLE_CHAIN_MANAGEMENT": 2, + "ROLE_ACCESS_CONTROL": 3, } func (x Role) String() string { @@ -76,20 +79,20 @@ var fileDescriptor_122b0697c9fb828e = []byte{ 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x46, 0x28, 0xd4, 0x83, 0x29, 0xd4, 0x83, 0x2a, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd3, 0x07, 0xb1, 0x20, 0x5a, 0xa4, 0x14, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0xc1, 0xbc, 0xa4, 0xd2, 0x34, 0xfd, 0x94, 0xd4, 0xe2, 0xe4, 0xa2, 0xcc, 0x82, - 0x92, 0xfc, 0x22, 0x88, 0x0a, 0xad, 0x42, 0x2e, 0x96, 0xa0, 0xfc, 0x9c, 0x54, 0x21, 0x6d, 0x2e, + 0x92, 0xfc, 0x22, 0x88, 0x0a, 0xad, 0x42, 0x2e, 0x96, 0xa0, 0xfc, 0x9c, 0x54, 0x21, 0x11, 0x2e, 0x81, 0x20, 0x7f, 0x1f, 0xd7, 0xf8, 0x50, 0xbf, 0xe0, 0x00, 0x57, 0x67, 0x4f, 0x37, 0x4f, 0x57, - 0x17, 0x01, 0x06, 0x29, 0xd1, 0xae, 0xb9, 0x0a, 0x82, 0x50, 0xf1, 0x20, 0xd7, 0xe0, 0x90, 0x20, - 0x4f, 0xe7, 0x10, 0x57, 0x17, 0x21, 0x71, 0x2e, 0x61, 0xb0, 0xa0, 0xa3, 0xb3, 0xb3, 0x6b, 0x70, - 0x70, 0xbc, 0xb3, 0xbf, 0x5f, 0x48, 0x90, 0xbf, 0x8f, 0x00, 0xa3, 0x90, 0x24, 0x97, 0x28, 0x58, - 0xc2, 0xd9, 0xc3, 0xd1, 0xd3, 0x2f, 0xde, 0xd7, 0xd1, 0xcf, 0xd1, 0xdd, 0xd5, 0xd7, 0xd5, 0x2f, - 0x44, 0x80, 0x49, 0x8a, 0xa3, 0x63, 0xb1, 0x1c, 0xc3, 0x8a, 0x25, 0x72, 0x8c, 0x56, 0xb9, 0x5c, - 0xfc, 0x08, 0x9f, 0xc4, 0x17, 0x81, 0x6c, 0x97, 0xd7, 0x83, 0x38, 0x54, 0x0f, 0xe6, 0x50, 0x3d, - 0xdf, 0xd4, 0xe2, 0xe2, 0xc4, 0xf4, 0x54, 0xff, 0x82, 0x92, 0xcc, 0xfc, 0xbc, 0x62, 0x89, 0x0b, - 0x6d, 0xcc, 0x0a, 0x8c, 0x1a, 0x7c, 0x46, 0x8a, 0x7a, 0x78, 0x02, 0x41, 0x0f, 0xe4, 0x93, 0x20, - 0x3e, 0x84, 0x0a, 0x10, 0xdf, 0x29, 0xe2, 0xc4, 0x43, 0x39, 0x86, 0x13, 0x8f, 0xe4, 0x18, 0x2f, - 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, - 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x4f, 0xac, 0x48, 0xcd, 0x49, 0x2c, 0xca, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0x86, 0xf2, - 0x74, 0x93, 0xf3, 0x8b, 0x52, 0xf5, 0x2b, 0xf4, 0xb1, 0x44, 0x52, 0x12, 0x1b, 0xd8, 0xb5, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x46, 0xd0, 0x50, 0xc2, 0x01, 0x00, 0x00, + 0x17, 0x01, 0x06, 0x21, 0x51, 0x2e, 0x41, 0xa8, 0x68, 0x90, 0x6b, 0x70, 0x48, 0x90, 0xa7, 0x73, + 0x88, 0xab, 0x8b, 0x00, 0xa3, 0x90, 0x24, 0x97, 0x28, 0x58, 0xd8, 0xd9, 0xc3, 0xd1, 0xd3, 0x2f, + 0xde, 0xd7, 0xd1, 0xcf, 0xd1, 0xdd, 0xd5, 0xd7, 0xd5, 0x2f, 0x44, 0x80, 0x49, 0x48, 0x9c, 0x4b, + 0x18, 0x2c, 0xe5, 0xe8, 0xec, 0xec, 0x1a, 0x1c, 0x1c, 0xef, 0xec, 0xef, 0x17, 0x12, 0xe4, 0xef, + 0x23, 0xc0, 0x2c, 0xc5, 0xd1, 0xb1, 0x58, 0x8e, 0x61, 0xc5, 0x12, 0x39, 0x46, 0xab, 0x5c, 0x2e, + 0x7e, 0x84, 0x4f, 0xe2, 0x8b, 0x40, 0xb6, 0xcb, 0xeb, 0x41, 0x1c, 0xaa, 0x07, 0x73, 0xa8, 0x9e, + 0x6f, 0x6a, 0x71, 0x71, 0x62, 0x7a, 0xaa, 0x7f, 0x41, 0x49, 0x66, 0x7e, 0x5e, 0xb1, 0xc4, 0x85, + 0x36, 0x66, 0x05, 0x46, 0x0d, 0x3e, 0x23, 0x45, 0x3d, 0x3c, 0x81, 0xa0, 0x07, 0xf2, 0x49, 0x10, + 0x1f, 0x42, 0x05, 0x88, 0xef, 0x14, 0x71, 0xe2, 0xa1, 0x1c, 0xc3, 0x89, 0x47, 0x72, 0x8c, 0x17, + 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, + 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, + 0xea, 0x27, 0x56, 0xa4, 0xe6, 0x24, 0x16, 0xe5, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0x43, 0x79, + 0xba, 0xc9, 0xf9, 0x45, 0xa9, 0xfa, 0x15, 0xfa, 0x58, 0x22, 0x29, 0x89, 0x0d, 0xec, 0x5a, 0x63, + 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x69, 0x60, 0x1c, 0xc2, 0x01, 0x00, 0x00, } diff --git a/x/permission/exported/types_test.go b/x/permission/exported/types_test.go index a4f2baf9c..dadfc0901 100644 --- a/x/permission/exported/types_test.go +++ b/x/permission/exported/types_test.go @@ -5,7 +5,6 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" "github.com/stretchr/testify/assert" "golang.org/x/exp/slices" @@ -28,14 +27,9 @@ func TestMsgRoles(t *testing.T) { msg, err := registry.Resolve(implementation) assert.NoError(t, err) - _, d := descriptor.ForMessage(msg.(descriptor.Message)) - options := d.GetOptions() - if options == nil { - missingRoles = append(missingRoles, implementation) - continue - } - _, err = proto.GetExtension(options, exported.E_PermissionRole) - if err != nil { + + role := exported.GetPermissionRole(msg.(descriptor.Message)) + if role == exported.ROLE_UNSPECIFIED { missingRoles = append(missingRoles, implementation) continue } diff --git a/x/permission/keeper/migrate.go b/x/permission/keeper/migrate.go new file mode 100644 index 000000000..2c7ea226c --- /dev/null +++ b/x/permission/keeper/migrate.go @@ -0,0 +1,35 @@ +package keeper + +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/axelarnetwork/axelar-core/x/permission/exported" +) + +// GetMigrationHandler returns a migration handler from v1 to v2 +// The order of role enums has changed, so we have to migrate all government accounts. +// Enums are int32 underneath, so without this migration, the meaning of the value would change and open up the system to attacks +func GetMigrationHandler(k Keeper) func(sdk.Context) error { + roleMapping := map[exported.Role]exported.Role{ + 0: exported.ROLE_UNRESTRICTED, + 1: exported.ROLE_ACCESS_CONTROL, + 2: exported.ROLE_CHAIN_MANAGEMENT, + } + + return func(ctx sdk.Context) error { + accs := k.getGovAccounts(ctx) + + for _, acc := range accs { + newRole, ok := roleMapping[acc.Role] + if !ok { + return fmt.Errorf("unrecognized role %d", acc.Role) + } + acc.Role = newRole + k.setGovAccount(ctx, acc) + } + + return nil + } +} diff --git a/x/permission/module.go b/x/permission/module.go index d5338be56..d8a0d5d55 100644 --- a/x/permission/module.go +++ b/x/permission/module.go @@ -133,6 +133,11 @@ func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + + err := cfg.RegisterMigration(types.ModuleName, 1, keeper.GetMigrationHandler(am.keeper)) + if err != nil { + panic(err) + } } // BeginBlock executes all state transitions this module requires at the beginning of each new block @@ -146,4 +151,4 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V } // ConsensusVersion implements AppModule/ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { return 2 } diff --git a/x/permission/types/tx.pb.go b/x/permission/types/tx.pb.go index d694403be..eac6c7c21 100644 --- a/x/permission/types/tx.pb.go +++ b/x/permission/types/tx.pb.go @@ -262,33 +262,33 @@ func init() { func init() { proto.RegisterFile("permission/v1beta1/tx.proto", fileDescriptor_1d3d2ab82ee63830) } var fileDescriptor_1d3d2ab82ee63830 = []byte{ - // 408 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0x3f, 0x6f, 0xd4, 0x30, - 0x18, 0xc6, 0x63, 0x54, 0x75, 0x30, 0x7f, 0x86, 0x88, 0xe1, 0xc8, 0x15, 0xb7, 0xdc, 0x42, 0x19, - 0x2e, 0xd6, 0xc1, 0x80, 0xc4, 0x76, 0x07, 0x12, 0x42, 0x65, 0x80, 0x48, 0x65, 0x60, 0x41, 0x89, - 0xf3, 0xca, 0x44, 0x49, 0xfc, 0x06, 0xdb, 0x29, 0xc9, 0xc6, 0x47, 0xe0, 0xcb, 0x30, 0x23, 0x06, - 0xa4, 0x1b, 0x3b, 0x32, 0x55, 0x70, 0xf7, 0x2d, 0x98, 0x10, 0x89, 0x7b, 0x97, 0xe1, 0x26, 0x24, - 0x86, 0x4e, 0xb6, 0xf5, 0x3e, 0x7e, 0x9e, 0xe7, 0x37, 0xbc, 0x74, 0x5c, 0x81, 0x2e, 0x33, 0x63, - 0x32, 0x54, 0xfc, 0x6c, 0x96, 0x80, 0x8d, 0x67, 0xdc, 0x36, 0x61, 0xa5, 0xd1, 0xa2, 0xef, 0x6f, - 0x87, 0xa1, 0x1b, 0x06, 0xb7, 0x25, 0x4a, 0xec, 0xc6, 0xfc, 0xef, 0xad, 0x57, 0x06, 0xf7, 0x04, - 0x9a, 0x12, 0x0d, 0x17, 0xba, 0xad, 0x2c, 0xf2, 0xb2, 0x2e, 0x6c, 0x66, 0x32, 0xc9, 0x73, 0x68, - 0x8d, 0x93, 0xdc, 0x1f, 0x24, 0x41, 0x53, 0xa1, 0xb6, 0x90, 0x6e, 0x23, 0xdb, 0x0a, 0x9c, 0x70, - 0xf2, 0x9d, 0xd0, 0xe0, 0xb4, 0x4a, 0x63, 0x0b, 0xcf, 0xf1, 0x0c, 0xb4, 0x8a, 0x95, 0x80, 0x13, - 0x68, 0x23, 0xf8, 0x50, 0x83, 0xb1, 0xfe, 0x0b, 0xba, 0x6f, 0x40, 0xa5, 0xa0, 0x47, 0xe4, 0x88, - 0x1c, 0xdf, 0x58, 0xcc, 0x7e, 0x5f, 0x1c, 0x4e, 0x65, 0x66, 0xdf, 0xd7, 0x49, 0x28, 0xb0, 0xe4, - 0x97, 0x4d, 0xba, 0x63, 0x6a, 0xd2, 0xdc, 0x99, 0xcf, 0x85, 0x98, 0xa7, 0xa9, 0x06, 0x63, 0x22, - 0x67, 0xe0, 0xbf, 0xa1, 0xb7, 0xe4, 0x26, 0xe2, 0x5d, 0x0e, 0xed, 0xe8, 0xda, 0x11, 0x39, 0xbe, - 0xfe, 0xf0, 0x41, 0xd8, 0xff, 0x0e, 0x7b, 0x9c, 0xf0, 0x12, 0x27, 0x7c, 0x09, 0x32, 0x16, 0xed, - 0xbc, 0xcc, 0x14, 0xbe, 0xaa, 0x93, 0x13, 0x68, 0x17, 0x7b, 0xcb, 0x8b, 0x43, 0x2f, 0xba, 0x29, - 0x87, 0x4d, 0x9f, 0xec, 0x7d, 0xfa, 0x32, 0x22, 0x93, 0xbb, 0x74, 0xbc, 0x13, 0xc3, 0x54, 0xa8, - 0x0c, 0x4c, 0xbe, 0x12, 0x7a, 0x27, 0x02, 0x99, 0x19, 0x0b, 0xfa, 0x29, 0x2a, 0xab, 0xb1, 0x28, - 0x40, 0xff, 0x07, 0xca, 0xd7, 0x94, 0x8a, 0x8d, 0x7f, 0x47, 0xf8, 0x4f, 0x76, 0x03, 0x13, 0x07, - 0x78, 0x40, 0x83, 0x5d, 0x00, 0x8e, 0xef, 0x1b, 0xa1, 0xe3, 0x67, 0xa0, 0xaf, 0x34, 0x21, 0xa3, - 0x07, 0xbb, 0x11, 0x7a, 0xc6, 0xc5, 0xe9, 0xf2, 0x17, 0xf3, 0x96, 0x2b, 0x46, 0xce, 0x57, 0x8c, - 0xfc, 0x5c, 0x31, 0xf2, 0x79, 0xcd, 0xbc, 0xf3, 0x35, 0xf3, 0x7e, 0xac, 0x99, 0xf7, 0xf6, 0xf1, - 0x20, 0x3e, 0x6e, 0xa0, 0x88, 0xb5, 0x02, 0xfb, 0x11, 0x75, 0xee, 0x5e, 0x53, 0x81, 0x1a, 0x78, - 0xc3, 0x07, 0x8b, 0xd1, 0x75, 0x4a, 0xf6, 0xbb, 0x45, 0x78, 0xf4, 0x27, 0x00, 0x00, 0xff, 0xff, - 0x8d, 0xfd, 0x81, 0x0b, 0x9d, 0x03, 0x00, 0x00, + // 409 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0x3f, 0x8f, 0xd3, 0x30, + 0x18, 0xc6, 0x63, 0x38, 0xdd, 0x60, 0xfe, 0x0c, 0x11, 0x43, 0x49, 0x0f, 0xdf, 0xd1, 0x85, 0x63, + 0x68, 0xac, 0xc2, 0x80, 0xc4, 0xd6, 0x82, 0x84, 0xd0, 0x31, 0x40, 0xa4, 0x63, 0x60, 0x41, 0x89, + 0xf3, 0xca, 0x44, 0x49, 0xfc, 0x06, 0xdb, 0x39, 0x92, 0x8d, 0x8f, 0xc0, 0x97, 0x61, 0x46, 0x0c, + 0x48, 0x1d, 0x6f, 0x64, 0x3a, 0x41, 0xfb, 0x2d, 0x98, 0x10, 0x89, 0xaf, 0xcd, 0xd0, 0x09, 0x89, + 0x81, 0xc9, 0xb6, 0xde, 0xc7, 0xcf, 0xf3, 0xfc, 0x86, 0x97, 0x8e, 0x2b, 0xd0, 0x65, 0x66, 0x4c, + 0x86, 0x8a, 0x9f, 0xcd, 0x12, 0xb0, 0xf1, 0x8c, 0xdb, 0x26, 0xac, 0x34, 0x5a, 0xf4, 0xfd, 0xed, + 0x30, 0x74, 0xc3, 0xe0, 0x96, 0x44, 0x89, 0xdd, 0x98, 0xff, 0xb9, 0xf5, 0xca, 0xe0, 0xae, 0x40, + 0x53, 0xa2, 0xe1, 0x42, 0xb7, 0x95, 0x45, 0x5e, 0xd6, 0x85, 0xcd, 0x4c, 0x26, 0x79, 0x0e, 0xad, + 0x71, 0x92, 0x7b, 0x83, 0x24, 0x68, 0x2a, 0xd4, 0x16, 0xd2, 0x6d, 0x64, 0x5b, 0x81, 0x13, 0x4e, + 0xbe, 0x11, 0x1a, 0x9c, 0x56, 0x69, 0x6c, 0xe1, 0x19, 0x9e, 0x81, 0x56, 0xb1, 0x12, 0x70, 0x02, + 0x6d, 0x04, 0xef, 0x6b, 0x30, 0xd6, 0x7f, 0x4e, 0xf7, 0x0d, 0xa8, 0x14, 0xf4, 0x88, 0x1c, 0x91, + 0xe3, 0xeb, 0x8b, 0xd9, 0xaf, 0x8b, 0xc3, 0xa9, 0xcc, 0xec, 0xbb, 0x3a, 0x09, 0x05, 0x96, 0xfc, + 0xb2, 0x49, 0x77, 0x4c, 0x4d, 0x9a, 0x3b, 0xf3, 0xb9, 0x10, 0xf3, 0x34, 0xd5, 0x60, 0x4c, 0xe4, + 0x0c, 0xfc, 0xd7, 0xf4, 0xa6, 0xdc, 0x44, 0xbc, 0xcd, 0xa1, 0x1d, 0x5d, 0x39, 0x22, 0xc7, 0xd7, + 0x1e, 0xdc, 0x0f, 0xfb, 0xdf, 0x61, 0x8f, 0x13, 0x5e, 0xe2, 0x84, 0x2f, 0x40, 0xc6, 0xa2, 0x9d, + 0x97, 0x99, 0xc2, 0x97, 0x75, 0x72, 0x02, 0xed, 0x62, 0x6f, 0x79, 0x71, 0xe8, 0x45, 0x37, 0xe4, + 0xb0, 0xe9, 0xe3, 0xbd, 0x8f, 0x9f, 0x47, 0x57, 0x27, 0x77, 0xe8, 0x78, 0x27, 0x86, 0xa9, 0x50, + 0x19, 0x98, 0x7c, 0x21, 0xf4, 0x76, 0x04, 0x32, 0x33, 0x16, 0xf4, 0x13, 0x54, 0x56, 0x63, 0x51, + 0x80, 0xfe, 0x07, 0x94, 0xaf, 0x28, 0x15, 0x1b, 0xff, 0x8e, 0xf0, 0xaf, 0xec, 0x06, 0x26, 0x0e, + 0xf0, 0x80, 0x06, 0xbb, 0x00, 0x1c, 0xdf, 0x57, 0x42, 0xc7, 0x4f, 0x41, 0xff, 0xd7, 0x84, 0x8c, + 0x1e, 0xec, 0x46, 0xe8, 0x19, 0x17, 0xa7, 0xcb, 0x9f, 0xcc, 0x5b, 0xae, 0x18, 0x39, 0x5f, 0x31, + 0xf2, 0x63, 0xc5, 0xc8, 0xa7, 0x35, 0xf3, 0xce, 0xd7, 0xcc, 0xfb, 0xbe, 0x66, 0xde, 0x9b, 0x47, + 0x83, 0xf8, 0xb8, 0x81, 0x22, 0xd6, 0x0a, 0xec, 0x07, 0xd4, 0xb9, 0x7b, 0x4d, 0x05, 0x6a, 0xe0, + 0x0d, 0x1f, 0x2c, 0x46, 0xd7, 0x29, 0xd9, 0xef, 0x16, 0xe1, 0xe1, 0xef, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x2c, 0xf0, 0x21, 0xb4, 0x9d, 0x03, 0x00, 0x00, } func (m *UpdateGovernanceKeyRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/reward/types/tx.pb.go b/x/reward/types/tx.pb.go index babd575c2..9ccb46bee 100644 --- a/x/reward/types/tx.pb.go +++ b/x/reward/types/tx.pb.go @@ -111,30 +111,30 @@ func init() { func init() { proto.RegisterFile("reward/v1beta1/tx.proto", fileDescriptor_3a40a70d6e1fd0ef) } var fileDescriptor_3a40a70d6e1fd0ef = []byte{ - // 358 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x3f, 0x6f, 0xe2, 0x30, - 0x18, 0xc6, 0x93, 0x3b, 0x84, 0x74, 0x3e, 0x0e, 0x71, 0x11, 0xd2, 0x01, 0x43, 0x0e, 0xb1, 0x94, - 0x25, 0xb1, 0x28, 0x53, 0xbb, 0xc1, 0xc6, 0xc0, 0xd0, 0x8c, 0x5d, 0x90, 0x93, 0xbc, 0xb8, 0x11, - 0x89, 0x9d, 0xda, 0x4e, 0x09, 0x5b, 0x3f, 0x42, 0x3f, 0x49, 0xa7, 0xf6, 0x3b, 0xa0, 0x4e, 0x8c, - 0x9d, 0xaa, 0x16, 0xbe, 0x45, 0xa7, 0x8a, 0xd8, 0x95, 0x98, 0xf2, 0xbc, 0x79, 0xde, 0x3f, 0xbf, - 0x47, 0x46, 0xff, 0x04, 0xac, 0x89, 0x88, 0xf1, 0xdd, 0x28, 0x04, 0x45, 0x46, 0x58, 0x95, 0x7e, - 0x2e, 0xb8, 0xe2, 0x4e, 0x53, 0x1b, 0xbe, 0x31, 0x7a, 0x5d, 0xca, 0x39, 0x4d, 0x01, 0x57, 0x6e, - 0x58, 0x2c, 0x31, 0x61, 0x1b, 0xdd, 0xda, 0x6b, 0x53, 0x4e, 0x79, 0x25, 0xf1, 0x51, 0x99, 0xbf, - 0xdd, 0x88, 0xcb, 0x8c, 0xcb, 0x85, 0x36, 0x74, 0x61, 0xac, 0xb3, 0x1c, 0x44, 0x96, 0x48, 0x99, - 0x70, 0x86, 0xa1, 0xcc, 0xb9, 0x50, 0x70, 0x42, 0xb0, 0xc9, 0xc1, 0x34, 0x0e, 0x1e, 0x6d, 0xd4, - 0x0a, 0x60, 0x59, 0xb0, 0x78, 0x2e, 0x69, 0x00, 0xb7, 0x05, 0x48, 0xe5, 0xcc, 0x50, 0x5d, 0x02, - 0x8b, 0x41, 0x74, 0xec, 0xbe, 0x3d, 0x6c, 0x4c, 0x47, 0x9f, 0x6f, 0xff, 0x3d, 0x9a, 0xa8, 0x9b, - 0x22, 0xf4, 0x23, 0x9e, 0x99, 0x53, 0xe6, 0xe3, 0xc9, 0x78, 0x65, 0x56, 0x4e, 0xa2, 0x68, 0x12, - 0xc7, 0x02, 0xa4, 0x0c, 0xcc, 0x02, 0x67, 0x86, 0xfe, 0x24, 0x8c, 0x81, 0x58, 0x64, 0x20, 0x25, - 0xa1, 0xd0, 0xf9, 0xd1, 0xb7, 0x87, 0xbf, 0xcf, 0xdb, 0xbe, 0x0e, 0xeb, 0x7f, 0x87, 0xf5, 0x27, - 0x6c, 0x33, 0x6d, 0xbe, 0x3c, 0x79, 0x48, 0xd3, 0x90, 0x30, 0x85, 0xa0, 0x51, 0x8d, 0xce, 0xf5, - 0xe4, 0x65, 0xed, 0xfe, 0xb9, 0x63, 0x0d, 0x2e, 0xd0, 0xdf, 0x13, 0x5e, 0x99, 0x73, 0x26, 0xc1, - 0x71, 0x50, 0x2d, 0x26, 0x8a, 0x68, 0xdc, 0xa0, 0xd2, 0x4e, 0x0b, 0xfd, 0x4c, 0x39, 0xad, 0xee, - 0xfd, 0x0a, 0x8e, 0x72, 0x7a, 0xb5, 0xfd, 0x70, 0xad, 0xed, 0xde, 0xb5, 0x77, 0x7b, 0xd7, 0x7e, - 0xdf, 0xbb, 0xf6, 0xc3, 0xc1, 0xb5, 0x76, 0x07, 0xd7, 0x7a, 0x3d, 0xb8, 0xd6, 0xf5, 0xf8, 0x24, - 0x20, 0x29, 0x21, 0x25, 0x82, 0x81, 0x5a, 0x73, 0xb1, 0x32, 0x95, 0x17, 0x71, 0x01, 0xb8, 0xc4, - 0xe6, 0x39, 0xab, 0xc4, 0x61, 0xbd, 0xe2, 0x1f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xd6, - 0xbd, 0x65, 0xe5, 0x01, 0x00, 0x00, + // 359 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x3f, 0x6f, 0xda, 0x40, + 0x18, 0xc6, 0x7d, 0x2d, 0x42, 0xea, 0x95, 0x22, 0x6a, 0x21, 0x15, 0x18, 0x5c, 0xc4, 0x52, 0x16, + 0xfb, 0x44, 0x99, 0xda, 0x0d, 0x36, 0x06, 0x86, 0x7a, 0xec, 0x82, 0xce, 0xf6, 0xcb, 0xd5, 0xc2, + 0xbe, 0x73, 0xef, 0xce, 0xc1, 0x6c, 0xf9, 0x08, 0xf9, 0x24, 0x99, 0x92, 0xef, 0x80, 0x32, 0x31, + 0x66, 0x8a, 0x12, 0xf8, 0x16, 0x99, 0x22, 0x7c, 0x17, 0x89, 0xc9, 0xcf, 0xeb, 0xe7, 0xfd, 0xf3, + 0x7b, 0x74, 0xf8, 0x9b, 0x84, 0x2d, 0x95, 0x09, 0xb9, 0x9a, 0x44, 0xa0, 0xe9, 0x84, 0xe8, 0x2a, + 0x28, 0xa4, 0xd0, 0xc2, 0x6d, 0x1b, 0x23, 0xb0, 0xc6, 0xa0, 0xcf, 0x84, 0x60, 0x19, 0x90, 0xda, + 0x8d, 0xca, 0x35, 0xa1, 0x7c, 0x67, 0x5a, 0x07, 0x5d, 0x26, 0x98, 0xa8, 0x25, 0x39, 0x2b, 0xfb, + 0xb7, 0x1f, 0x0b, 0x95, 0x0b, 0xb5, 0x32, 0x86, 0x29, 0xac, 0xf5, 0xa3, 0x00, 0x99, 0xa7, 0x4a, + 0xa5, 0x82, 0x13, 0xa8, 0x0a, 0x21, 0x35, 0x5c, 0x10, 0xec, 0x0a, 0xb0, 0x8d, 0xa3, 0x5b, 0x84, + 0x3b, 0x21, 0xac, 0x4b, 0x9e, 0x2c, 0x15, 0x0b, 0xe1, 0x7f, 0x09, 0x4a, 0xbb, 0x0b, 0xdc, 0x54, + 0xc0, 0x13, 0x90, 0x3d, 0x34, 0x44, 0xe3, 0xd6, 0x7c, 0xf2, 0xfa, 0xf4, 0xdd, 0x67, 0xa9, 0xfe, + 0x57, 0x46, 0x41, 0x2c, 0x72, 0x7b, 0xca, 0x7e, 0x7c, 0x95, 0x6c, 0xec, 0xca, 0x59, 0x1c, 0xcf, + 0x92, 0x44, 0x82, 0x52, 0xa1, 0x5d, 0xe0, 0x2e, 0xf0, 0x97, 0x94, 0x73, 0x90, 0xab, 0x1c, 0x94, + 0xa2, 0x0c, 0x7a, 0x1f, 0x86, 0x68, 0xfc, 0xf9, 0x67, 0x37, 0x30, 0x61, 0x83, 0xf7, 0xb0, 0xc1, + 0x8c, 0xef, 0xe6, 0xed, 0x87, 0x3b, 0x1f, 0x1b, 0x1a, 0x1a, 0x65, 0x10, 0xb6, 0xea, 0xd1, 0xa5, + 0x99, 0xfc, 0xdd, 0xb8, 0xbe, 0xef, 0xa1, 0xd1, 0x2f, 0xfc, 0xf5, 0x82, 0x57, 0x15, 0x82, 0x2b, + 0x70, 0x5d, 0xdc, 0x48, 0xa8, 0xa6, 0x06, 0x37, 0xac, 0xb5, 0xdb, 0xc1, 0x1f, 0x33, 0xc1, 0xea, + 0x7b, 0x9f, 0xc2, 0xb3, 0x9c, 0xff, 0xd9, 0xbf, 0x78, 0xce, 0xfe, 0xe8, 0xa1, 0xc3, 0xd1, 0x43, + 0xcf, 0x47, 0x0f, 0xdd, 0x9c, 0x3c, 0xe7, 0x70, 0xf2, 0x9c, 0xc7, 0x93, 0xe7, 0xfc, 0x9d, 0x5e, + 0x04, 0xa4, 0x15, 0x64, 0x54, 0x72, 0xd0, 0x5b, 0x21, 0x37, 0xb6, 0xf2, 0x63, 0x21, 0x81, 0x54, + 0xc4, 0x3e, 0x67, 0x9d, 0x38, 0x6a, 0xd6, 0xfc, 0xd3, 0xb7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, + 0xf6, 0x75, 0xfc, 0xe5, 0x01, 0x00, 0x00, } func (m *RefundMsgRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/snapshot/types/tx.pb.go b/x/snapshot/types/tx.pb.go index e5de7b693..5323dc40d 100644 --- a/x/snapshot/types/tx.pb.go +++ b/x/snapshot/types/tx.pb.go @@ -198,13 +198,13 @@ var fileDescriptor_a4923e082b209674 = []byte{ 0x0f, 0xc3, 0xe3, 0xed, 0x56, 0xe3, 0xfd, 0xe5, 0xa0, 0x96, 0x28, 0xd7, 0x1b, 0x75, 0xeb, 0x31, 0x0e, 0x79, 0x8c, 0x34, 0x44, 0xf2, 0x47, 0x8d, 0x64, 0xdf, 0x63, 0xaf, 0xc4, 0xa0, 0x29, 0xa5, 0x05, 0xa2, 0x8e, 0x07, 0xe4, 0xdb, 0x8c, 0x99, 0x25, 0xfa, 0x46, 0x48, 0x69, 0x4b, 0x1b, 0x7f, - 0xc2, 0x35, 0xe3, 0x78, 0x8d, 0xdb, 0xca, 0x20, 0xcb, 0xe9, 0x6c, 0xf3, 0xfe, 0xb1, 0x14, 0x54, + 0xc2, 0x35, 0xe3, 0x78, 0x8d, 0xdb, 0xca, 0x20, 0xcb, 0xe9, 0x6c, 0xf3, 0xfe, 0xb1, 0x14, 0x56, 0x8b, 0x6c, 0xf7, 0x47, 0x75, 0x32, 0xa8, 0x09, 0xaa, 0x8a, 0xed, 0x9d, 0x83, 0x88, 0x9d, 0x1a, 0x0b, 0x07, 0xff, 0xf4, 0x2a, 0xdf, 0xa1, 0xcc, 0x8a, 0xbf, 0xa2, 0x56, 0x2d, 0x5a, 0x97, 0xd3, 0xb7, 0x28, 0x98, 0xce, 0xa3, 0x70, 0x36, 0x8f, 0xc2, 0xd7, 0x79, 0x14, 0x3e, 0x2c, 0xa2, 0x60, 0xb6, 0x88, 0x82, 0xe7, 0x45, 0x14, 0x5c, 0x9f, 0x7e, 0x4b, 0x15, 0x29, 0x0c, 0x84, 0xd5, 0xe0, 0xee, 0xd0, 0xf6, 0xfd, 0x54, 0x8b, 0xd1, 0x02, 0x4f, 0xf9, 0xe7, 0xa6, 0x64, 0x45, 0xba, 0xb9, - 0xec, 0xdb, 0x4e, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xed, 0x90, 0x0b, 0x07, 0x42, 0x02, 0x00, + 0xec, 0xdb, 0x4e, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xa5, 0x41, 0x3f, 0x42, 0x02, 0x00, 0x00, } diff --git a/x/tss/types/tx.pb.go b/x/tss/types/tx.pb.go index bce2d4378..9c5cb9666 100644 --- a/x/tss/types/tx.pb.go +++ b/x/tss/types/tx.pb.go @@ -858,69 +858,69 @@ func init() { proto.RegisterFile("tss/v1beta1/tx.proto", fileDescriptor_58d13e10 var fileDescriptor_58d13e1023e3ffaf = []byte{ // 1026 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x96, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0x63, 0x77, 0x9b, 0x6e, 0x5e, 0xda, 0xa5, 0x75, 0x8b, 0x36, 0x74, 0x5b, 0x3b, 0x1b, + 0x14, 0xc7, 0x6b, 0x77, 0x9b, 0x6e, 0x5e, 0xda, 0xa5, 0x75, 0x8b, 0x36, 0x74, 0x5b, 0x3b, 0x1b, 0x24, 0x88, 0x10, 0x4d, 0x68, 0x01, 0x09, 0x90, 0x10, 0xda, 0x50, 0x96, 0x0d, 0xd5, 0xee, 0x56, - 0x0e, 0xda, 0x03, 0x12, 0x2a, 0x4e, 0xfc, 0xea, 0x8e, 0xe2, 0x78, 0xcc, 0xcc, 0x78, 0x89, 0xc5, + 0x0e, 0xda, 0x03, 0x12, 0x2a, 0x4e, 0xfc, 0xe2, 0x8e, 0xe2, 0x78, 0xcc, 0xcc, 0x78, 0x89, 0xc5, 0x05, 0x09, 0x71, 0x47, 0x1c, 0x11, 0x17, 0xbe, 0x03, 0x7c, 0x04, 0xa4, 0x1e, 0xf7, 0x08, 0x42, 0x8a, 0x20, 0xbd, 0x71, 0xe1, 0xde, 0x13, 0xf2, 0x78, 0x92, 0x3a, 0x90, 0x46, 0xa0, 0x2a, 0x08, - 0x71, 0x4a, 0xe6, 0xf9, 0xcd, 0xf8, 0xff, 0xff, 0xcd, 0xcc, 0xf3, 0x83, 0x0d, 0xc1, 0x79, 0xfd, - 0xf1, 0x6e, 0x1b, 0x85, 0xb3, 0x5b, 0x17, 0xfd, 0x5a, 0xc8, 0xa8, 0xa0, 0x46, 0x51, 0x70, 0x5e, - 0x53, 0xd1, 0xcd, 0x0d, 0x8f, 0x7a, 0x54, 0xc6, 0xeb, 0xc9, 0xbf, 0x34, 0x65, 0xb3, 0x9c, 0x4c, + 0x71, 0x4a, 0xe6, 0xf9, 0xcd, 0xf8, 0xff, 0xff, 0xcd, 0xcc, 0xf3, 0x83, 0x4d, 0xc1, 0x79, 0xed, + 0xf1, 0x5e, 0x0b, 0x85, 0xb3, 0x57, 0x13, 0xfd, 0x6a, 0xc8, 0xa8, 0xa0, 0x46, 0x41, 0x70, 0x5e, + 0x55, 0xd1, 0xad, 0x4d, 0x8f, 0x7a, 0x54, 0xc6, 0x6b, 0xc9, 0xbf, 0x34, 0x65, 0xab, 0x94, 0x4c, 0xc4, 0x7e, 0x48, 0x99, 0x40, 0xf7, 0x62, 0x85, 0x38, 0x44, 0xae, 0x32, 0x6e, 0x4e, 0x2c, 0x9d, - 0x79, 0xb0, 0x9d, 0x3c, 0x10, 0xf4, 0x38, 0xc8, 0xcc, 0x4b, 0x46, 0xea, 0xf1, 0xed, 0xc7, 0x54, - 0xe0, 0xec, 0xa5, 0x6f, 0x77, 0x28, 0xef, 0x51, 0x5e, 0xef, 0xb0, 0x38, 0x14, 0xb4, 0xde, 0x8b, - 0x7c, 0x41, 0x38, 0xf1, 0xea, 0x5d, 0x8c, 0x47, 0x29, 0xcf, 0x87, 0xc8, 0x7a, 0x84, 0x73, 0x42, - 0x83, 0x99, 0x6b, 0x55, 0xbe, 0xd1, 0xc0, 0x68, 0x09, 0x87, 0x89, 0x03, 0x8c, 0x3d, 0x0c, 0x6c, - 0xfc, 0x38, 0x42, 0x2e, 0x8c, 0x26, 0xe4, 0x39, 0x06, 0x2e, 0xb2, 0x92, 0x56, 0xd6, 0xaa, 0x85, - 0xc6, 0xee, 0xf9, 0xc0, 0xda, 0xf1, 0x88, 0x38, 0x89, 0xda, 0xb5, 0x0e, 0xed, 0xd5, 0x47, 0x0a, - 0xe4, 0xcf, 0x0e, 0x77, 0xbb, 0x6a, 0xd1, 0x3b, 0x9d, 0xce, 0x1d, 0xd7, 0x65, 0xc8, 0xb9, 0xad, - 0x16, 0x30, 0x5e, 0x85, 0xeb, 0x5d, 0x8c, 0x8f, 0x48, 0x70, 0x4c, 0x4b, 0x7a, 0x59, 0xab, 0x16, - 0xf7, 0x36, 0x6a, 0x19, 0xc0, 0xb5, 0x03, 0x8c, 0x9b, 0xc1, 0x31, 0x6d, 0x5c, 0x3b, 0x1d, 0x58, - 0x39, 0x7b, 0xa9, 0x9b, 0x0e, 0xdf, 0xb8, 0xf6, 0xd9, 0xf7, 0x25, 0xbd, 0xf2, 0x34, 0xac, 0x4f, - 0xa8, 0xe3, 0x21, 0x0d, 0x38, 0x56, 0xbe, 0xd2, 0x61, 0xd5, 0xa6, 0xc2, 0x11, 0x78, 0x80, 0xf1, - 0x74, 0xcd, 0xcb, 0x57, 0xd1, 0xbc, 0x01, 0x8b, 0x9d, 0x13, 0x87, 0x04, 0x52, 0x70, 0xc1, 0x4e, - 0x07, 0xc6, 0x6b, 0xa9, 0x13, 0x46, 0x7d, 0x2c, 0x2d, 0x94, 0xb5, 0xea, 0x8d, 0xbd, 0x6d, 0xe9, - 0x64, 0x04, 0x38, 0x6b, 0xc9, 0xa6, 0x3e, 0x4a, 0x33, 0xc9, 0x1f, 0xe3, 0x43, 0xc8, 0x4b, 0x06, - 0x6e, 0xe9, 0x9a, 0xc4, 0x79, 0x77, 0x38, 0xb0, 0x16, 0x13, 0xe3, 0xfb, 0xe7, 0x03, 0xeb, 0xf5, - 0x8c, 0x46, 0xa7, 0x8f, 0xbe, 0xc3, 0x02, 0x14, 0x9f, 0x50, 0xd6, 0x55, 0xa3, 0x9d, 0x0e, 0x65, - 0x58, 0xef, 0xd7, 0xb3, 0x47, 0x4e, 0x52, 0xdb, 0xb7, 0x17, 0x13, 0x5a, 0xae, 0x62, 0xb5, 0x0e, - 0x6b, 0x19, 0x26, 0x8a, 0xd4, 0xcf, 0x1a, 0xdc, 0x3a, 0x64, 0xb4, 0x83, 0x9c, 0xa7, 0x0c, 0xdf, - 0x67, 0xce, 0xf1, 0x31, 0xe9, 0xcc, 0x01, 0xda, 0x8b, 0x00, 0x1c, 0xe5, 0x91, 0x4b, 0x8c, 0x4a, - 0x72, 0x8d, 0x95, 0xe1, 0xc0, 0x2a, 0xb4, 0xd2, 0x68, 0x73, 0xdf, 0x2e, 0xa8, 0x84, 0xa6, 0x6b, - 0xbc, 0x09, 0x4b, 0xa1, 0x13, 0xfb, 0xd4, 0x71, 0x25, 0xcb, 0xa2, 0x62, 0x99, 0x5e, 0x85, 0x11, - 0x48, 0x25, 0xf6, 0x61, 0x24, 0x46, 0xc7, 0x43, 0xcd, 0x91, 0x96, 0x73, 0x15, 0x13, 0xb6, 0xa6, - 0x9b, 0x53, 0xee, 0x7f, 0xd2, 0xe0, 0x19, 0x95, 0xd0, 0x22, 0xde, 0xff, 0xcb, 0xfb, 0x16, 0x6c, - 0x4e, 0xb3, 0xa6, 0x9c, 0xff, 0xae, 0xc1, 0xda, 0x23, 0x2a, 0xf0, 0x30, 0x6a, 0xcf, 0xe7, 0x8a, - 0xbc, 0x05, 0xd7, 0x43, 0xea, 0xfb, 0x47, 0x5d, 0x8c, 0xd5, 0xb5, 0x36, 0x6b, 0x49, 0xe9, 0xfa, - 0xeb, 0x6d, 0x38, 0xa4, 0xbe, 0x7f, 0x80, 0xf1, 0xd8, 0x45, 0x3a, 0x34, 0xee, 0x41, 0x9e, 0x21, - 0x8f, 0x7c, 0xa1, 0x18, 0xbc, 0x30, 0x85, 0xc1, 0x7d, 0xe4, 0xdc, 0xf1, 0xf0, 0x61, 0x24, 0x6a, - 0xe3, 0x0a, 0x10, 0xf9, 0x23, 0x20, 0x6a, 0xbe, 0xe2, 0xf1, 0x1c, 0x18, 0x59, 0xc3, 0x29, 0x07, - 0x63, 0x15, 0x16, 0x7c, 0xea, 0xa5, 0x55, 0xcc, 0x4e, 0xfe, 0x56, 0x7e, 0xd3, 0xe0, 0x46, 0x92, - 0xd8, 0x22, 0xde, 0x7f, 0x11, 0xcb, 0xdd, 0x3f, 0x61, 0xa9, 0xce, 0xc6, 0x92, 0xec, 0xfd, 0x0c, - 0x28, 0xcf, 0xc2, 0x53, 0x63, 0xaf, 0x97, 0x12, 0xf9, 0x41, 0x83, 0xd5, 0x7b, 0xe8, 0x30, 0xd1, - 0x40, 0x47, 0xcc, 0x81, 0xc9, 0x47, 0xb0, 0x94, 0x56, 0x3f, 0x5e, 0xd2, 0xcb, 0x0b, 0xd5, 0x42, - 0xe3, 0xdd, 0xe1, 0xc0, 0xca, 0xcb, 0x0a, 0xc6, 0xaf, 0x56, 0xff, 0xf2, 0xb2, 0xfe, 0x71, 0x65, - 0xf6, 0x5b, 0x1d, 0xd6, 0x32, 0x3e, 0x94, 0xdf, 0xcf, 0x35, 0x58, 0xef, 0xca, 0xc3, 0x73, 0x44, - 0x7c, 0x1f, 0x3d, 0xd2, 0x26, 0x3e, 0x11, 0xb1, 0xb4, 0xb5, 0xd8, 0xb0, 0xcf, 0x07, 0xd6, 0x83, - 0xbf, 0x29, 0x80, 0x07, 0x4e, 0xc8, 0x4f, 0xa8, 0xb8, 0x50, 0xf1, 0xc8, 0xf1, 0x89, 0xeb, 0x08, - 0xca, 0x9a, 0x99, 0x95, 0x6d, 0x23, 0x7d, 0x5d, 0x36, 0x66, 0x7c, 0xa1, 0xc1, 0x06, 0x27, 0x5e, - 0x40, 0x02, 0x6f, 0x52, 0x86, 0x3e, 0x37, 0x19, 0xeb, 0xea, 0x7d, 0xd9, 0x60, 0x65, 0xa8, 0xc3, - 0x2d, 0x1b, 0x3d, 0xc2, 0x05, 0xb2, 0x77, 0xfa, 0x02, 0x59, 0xe0, 0x24, 0xc7, 0x8e, 0xff, 0x6b, - 0x1f, 0xd1, 0x23, 0x58, 0x41, 0xf5, 0xde, 0xe4, 0x92, 0xf0, 0xd2, 0x42, 0x79, 0xa1, 0x5a, 0xdc, - 0x7b, 0x65, 0xa2, 0x27, 0x98, 0xa1, 0xb0, 0x96, 0x89, 0xa9, 0x23, 0xbf, 0x8c, 0x99, 0xb4, 0xcd, - 0x4f, 0xa1, 0x98, 0x49, 0x31, 0x5a, 0xa0, 0x13, 0x57, 0x75, 0x31, 0x6f, 0x0f, 0x07, 0x96, 0x7e, - 0xd5, 0x6f, 0xae, 0x4e, 0x5c, 0xe3, 0x26, 0x2c, 0x85, 0x51, 0x7b, 0x7c, 0xc9, 0x97, 0xed, 0x7c, - 0x28, 0xcb, 0x8e, 0xfa, 0x12, 0x9b, 0xb0, 0x35, 0xdd, 0x81, 0x2a, 0xce, 0x5f, 0xeb, 0xb0, 0xd5, - 0x8a, 0xda, 0x3d, 0x22, 0xee, 0xab, 0xde, 0x2d, 0xad, 0x5a, 0xf3, 0xd8, 0x85, 0x8b, 0xd6, 0x43, - 0x9f, 0x43, 0xeb, 0x61, 0xbc, 0x07, 0x2b, 0x9c, 0x78, 0x09, 0x89, 0xa3, 0xd0, 0x21, 0x6c, 0xb4, - 0x9d, 0xe5, 0xe9, 0x8d, 0x51, 0x8b, 0x78, 0x07, 0x18, 0x1f, 0x3a, 0x84, 0xa9, 0xad, 0x2b, 0xf2, - 0x71, 0x64, 0x74, 0x8b, 0x2d, 0xd8, 0xbe, 0x84, 0x8d, 0xa2, 0xf7, 0x9d, 0x06, 0xd6, 0x64, 0x46, - 0x52, 0x04, 0x1d, 0x11, 0x31, 0x9c, 0x07, 0xc0, 0x32, 0xe4, 0x13, 0x87, 0x63, 0x80, 0x85, 0x04, - 0x60, 0x8b, 0x78, 0x09, 0x03, 0x4e, 0xbc, 0xa6, 0x6b, 0x98, 0x00, 0x7c, 0xac, 0x40, 0x02, 0x58, - 0xb6, 0x33, 0x11, 0xe5, 0xab, 0x02, 0xe5, 0xcb, 0x55, 0xa7, 0xd6, 0x1a, 0x0f, 0x4e, 0x7f, 0x35, - 0x73, 0xa7, 0x43, 0x53, 0x7b, 0x32, 0x34, 0xb5, 0x5f, 0x86, 0xa6, 0xf6, 0xe5, 0x99, 0x99, 0x7b, - 0x72, 0x66, 0xe6, 0x7e, 0x3c, 0x33, 0x73, 0x1f, 0xbc, 0xf4, 0x0f, 0x76, 0x4b, 0xda, 0x69, 0xe7, - 0x65, 0x93, 0xff, 0xf2, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x57, 0x27, 0x07, 0x99, 0xe8, 0x0c, + 0x79, 0xb0, 0x93, 0x3c, 0x10, 0xb4, 0x13, 0x64, 0xe6, 0x25, 0x23, 0xf5, 0xf8, 0xf6, 0x63, 0x2a, + 0x70, 0xf6, 0xd2, 0xb7, 0xdb, 0x94, 0xf7, 0x28, 0xaf, 0xb5, 0x59, 0x1c, 0x0a, 0x5a, 0xeb, 0x45, + 0xbe, 0x20, 0x9c, 0x78, 0xb5, 0x2e, 0xc6, 0xa3, 0x94, 0xe7, 0x43, 0x64, 0x3d, 0xc2, 0x39, 0xa1, + 0xc1, 0xcc, 0xb5, 0xca, 0xdf, 0x68, 0x60, 0x34, 0x85, 0xc3, 0xc4, 0x21, 0xc6, 0x1e, 0x06, 0x36, + 0x7e, 0x1c, 0x21, 0x17, 0x46, 0x03, 0x72, 0x1c, 0x03, 0x17, 0x59, 0x51, 0x2b, 0x69, 0x95, 0x7c, + 0x7d, 0xef, 0x7c, 0x60, 0xed, 0x7a, 0x44, 0x9c, 0x44, 0xad, 0x6a, 0x9b, 0xf6, 0x6a, 0x23, 0x05, + 0xf2, 0x67, 0x97, 0xbb, 0x5d, 0xb5, 0xe8, 0x9d, 0x76, 0xfb, 0x8e, 0xeb, 0x32, 0xe4, 0xdc, 0x56, + 0x0b, 0x18, 0xaf, 0xc2, 0xf5, 0x2e, 0xc6, 0xc7, 0x24, 0xe8, 0xd0, 0xa2, 0x5e, 0xd2, 0x2a, 0x85, + 0xfd, 0xcd, 0x6a, 0x06, 0x70, 0xf5, 0x10, 0xe3, 0x46, 0xd0, 0xa1, 0xf5, 0x6b, 0xa7, 0x03, 0x6b, + 0xc1, 0x5e, 0xee, 0xa6, 0xc3, 0x37, 0xae, 0x7d, 0xf6, 0x7d, 0x51, 0x2f, 0x3f, 0x0d, 0x1b, 0x13, + 0xea, 0x78, 0x48, 0x03, 0x8e, 0xe5, 0xaf, 0x74, 0x58, 0xb3, 0xa9, 0x70, 0x04, 0x1e, 0x62, 0x3c, + 0x5d, 0xf3, 0xca, 0x55, 0x34, 0x6f, 0xc2, 0x52, 0xfb, 0xc4, 0x21, 0x81, 0x14, 0x9c, 0xb7, 0xd3, + 0x81, 0xf1, 0x5a, 0xea, 0x84, 0x51, 0x1f, 0x8b, 0x8b, 0x25, 0xad, 0x72, 0x63, 0x7f, 0x47, 0x3a, + 0x19, 0x01, 0xce, 0x5a, 0xb2, 0xa9, 0x8f, 0xd2, 0x4c, 0xf2, 0xc7, 0xf8, 0x10, 0x72, 0x92, 0x81, + 0x5b, 0xbc, 0x26, 0x71, 0xde, 0x1d, 0x0e, 0xac, 0xa5, 0xc4, 0xf8, 0xc1, 0xf9, 0xc0, 0x7a, 0x3d, + 0xa3, 0xd1, 0xe9, 0xa3, 0xef, 0xb0, 0x00, 0xc5, 0x27, 0x94, 0x75, 0xd5, 0x68, 0xb7, 0x4d, 0x19, + 0xd6, 0xfa, 0xb5, 0xec, 0x91, 0x93, 0xd4, 0x0e, 0xec, 0xa5, 0x84, 0x96, 0xab, 0x58, 0x6d, 0xc0, + 0x7a, 0x86, 0x89, 0x22, 0xf5, 0xb3, 0x06, 0xb7, 0x8e, 0x18, 0x6d, 0x23, 0xe7, 0x29, 0xc3, 0xf7, + 0x99, 0xd3, 0xe9, 0x90, 0xf6, 0x1c, 0xa0, 0xbd, 0x08, 0xc0, 0x51, 0x1e, 0xb9, 0xc4, 0xa8, 0x24, + 0x57, 0x5f, 0x1d, 0x0e, 0xac, 0x7c, 0x33, 0x8d, 0x36, 0x0e, 0xec, 0xbc, 0x4a, 0x68, 0xb8, 0xc6, + 0x9b, 0xb0, 0x1c, 0x3a, 0xb1, 0x4f, 0x1d, 0x57, 0xb2, 0x2c, 0x28, 0x96, 0xe9, 0x55, 0x18, 0x81, + 0x54, 0x62, 0x1f, 0x46, 0x62, 0x74, 0x3c, 0xd4, 0x1c, 0x69, 0x59, 0x2b, 0x9b, 0xb0, 0x3d, 0xdd, + 0x9c, 0x72, 0xff, 0x93, 0x06, 0xcf, 0xa8, 0x84, 0x26, 0xf1, 0xfe, 0x5f, 0xde, 0xb7, 0x61, 0x6b, + 0x9a, 0x35, 0xe5, 0xfc, 0x77, 0x0d, 0xd6, 0x1f, 0x51, 0x81, 0x47, 0x51, 0x6b, 0x3e, 0x57, 0xe4, + 0x2d, 0xb8, 0x1e, 0x52, 0xdf, 0x3f, 0xee, 0x62, 0xac, 0xae, 0xb5, 0x59, 0x4d, 0x4a, 0xd7, 0x5f, + 0x6f, 0xc3, 0x11, 0xf5, 0xfd, 0x43, 0x8c, 0xc7, 0x2e, 0xd2, 0xa1, 0x71, 0x0f, 0x72, 0x0c, 0x79, + 0xe4, 0x0b, 0xc5, 0xe0, 0x85, 0x29, 0x0c, 0xee, 0x23, 0xe7, 0x8e, 0x87, 0x0f, 0x23, 0x51, 0x1d, + 0x57, 0x80, 0xc8, 0x1f, 0x01, 0x51, 0xf3, 0x15, 0x8f, 0xe7, 0xc0, 0xc8, 0x1a, 0x4e, 0x39, 0x18, + 0x6b, 0xb0, 0xe8, 0x53, 0x2f, 0xad, 0x62, 0x76, 0xf2, 0xb7, 0xfc, 0x9b, 0x06, 0x37, 0x92, 0xc4, + 0x26, 0xf1, 0xfe, 0x8b, 0x58, 0xee, 0xfe, 0x09, 0x4b, 0x65, 0x36, 0x96, 0x64, 0xef, 0x67, 0x40, + 0x79, 0x16, 0x9e, 0x1a, 0x7b, 0xbd, 0x94, 0xc8, 0x0f, 0x1a, 0xac, 0xdd, 0x43, 0x87, 0x89, 0x3a, + 0x3a, 0x62, 0x0e, 0x4c, 0x3e, 0x82, 0xe5, 0xb4, 0xfa, 0xf1, 0xa2, 0x5e, 0x5a, 0xac, 0xe4, 0xeb, + 0xef, 0x0e, 0x07, 0x56, 0x4e, 0x56, 0x30, 0x7e, 0xb5, 0xfa, 0x97, 0x93, 0xf5, 0x8f, 0x2b, 0xb3, + 0xdf, 0xea, 0xb0, 0x9e, 0xf1, 0xa1, 0xfc, 0x7e, 0xae, 0xc1, 0x46, 0x57, 0x1e, 0x9e, 0x63, 0xe2, + 0xfb, 0xe8, 0x91, 0x16, 0xf1, 0x89, 0x88, 0xa5, 0xad, 0xa5, 0xba, 0x7d, 0x3e, 0xb0, 0x1e, 0xfc, + 0x4d, 0x01, 0x3c, 0x70, 0x42, 0x7e, 0x42, 0xc5, 0x85, 0x8a, 0x47, 0x8e, 0x4f, 0x5c, 0x47, 0x50, + 0xd6, 0xc8, 0xac, 0x6c, 0x1b, 0xe9, 0xeb, 0xb2, 0x31, 0xe3, 0x0b, 0x0d, 0x36, 0x39, 0xf1, 0x02, + 0x12, 0x78, 0x93, 0x32, 0xf4, 0xb9, 0xc9, 0xd8, 0x50, 0xef, 0xcb, 0x06, 0xcb, 0x43, 0x1d, 0x6e, + 0xd9, 0xe8, 0x11, 0x2e, 0x90, 0xbd, 0xd3, 0x17, 0xc8, 0x02, 0x27, 0x39, 0x76, 0xfc, 0x5f, 0xfb, + 0x88, 0x1e, 0xc3, 0x2a, 0xaa, 0xf7, 0x26, 0x97, 0x84, 0x17, 0x17, 0x4b, 0x8b, 0x95, 0xc2, 0xfe, + 0x2b, 0x13, 0x3d, 0xc1, 0x0c, 0x85, 0xd5, 0x4c, 0x4c, 0x1d, 0xf9, 0x15, 0xcc, 0xa4, 0x6d, 0x7d, + 0x0a, 0x85, 0x4c, 0x8a, 0xd1, 0x04, 0x9d, 0xb8, 0xaa, 0x8b, 0x79, 0x7b, 0x38, 0xb0, 0xf4, 0xab, + 0x7e, 0x73, 0x75, 0xe2, 0x1a, 0x37, 0x61, 0x39, 0x8c, 0x5a, 0xe3, 0x4b, 0xbe, 0x62, 0xe7, 0x42, + 0x59, 0x76, 0xd4, 0x97, 0xd8, 0x84, 0xed, 0xe9, 0x0e, 0x54, 0x71, 0xfe, 0x5a, 0x87, 0xed, 0x66, + 0xd4, 0xea, 0x11, 0x71, 0x5f, 0xf5, 0x6e, 0x69, 0xd5, 0x9a, 0xc7, 0x2e, 0x5c, 0xb4, 0x1e, 0xfa, + 0x1c, 0x5a, 0x0f, 0xe3, 0x3d, 0x58, 0xe5, 0xc4, 0x4b, 0x48, 0x1c, 0x87, 0x0e, 0x61, 0xa3, 0xed, + 0x2c, 0x4d, 0x6f, 0x8c, 0x9a, 0xc4, 0x3b, 0xc4, 0xf8, 0xc8, 0x21, 0x4c, 0x6d, 0x5d, 0x81, 0x8f, + 0x23, 0xa3, 0x5b, 0x6c, 0xc1, 0xce, 0x25, 0x6c, 0x14, 0xbd, 0xef, 0x34, 0xb0, 0x26, 0x33, 0x92, + 0x22, 0xe8, 0x88, 0x88, 0xe1, 0x3c, 0x00, 0x96, 0x20, 0x97, 0x38, 0x1c, 0x03, 0xcc, 0x27, 0x00, + 0x9b, 0xc4, 0x4b, 0x18, 0x70, 0xe2, 0x35, 0x5c, 0xc3, 0x04, 0xe0, 0x63, 0x05, 0x12, 0xc0, 0x8a, + 0x9d, 0x89, 0x28, 0x5f, 0x65, 0x28, 0x5d, 0xae, 0x3a, 0xb5, 0x56, 0x7f, 0x70, 0xfa, 0xab, 0xb9, + 0x70, 0x3a, 0x34, 0xb5, 0x27, 0x43, 0x53, 0xfb, 0x65, 0x68, 0x6a, 0x5f, 0x9e, 0x99, 0x0b, 0x4f, + 0xce, 0xcc, 0x85, 0x1f, 0xcf, 0xcc, 0x85, 0x0f, 0x5e, 0xfa, 0x07, 0xbb, 0x25, 0xed, 0xb4, 0x72, + 0xb2, 0xc9, 0x7f, 0xf9, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x08, 0xb0, 0x40, 0x1a, 0xe8, 0x0c, 0x00, 0x00, } From ffec9a8defa61090b4c97431ba88b3c1624611e9 Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Tue, 5 Apr 2022 22:44:33 -0400 Subject: [PATCH 7/8] fix comment --- x/permission/exported/proto.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/permission/exported/proto.go b/x/permission/exported/proto.go index 54bc69285..ccbcc1e39 100644 --- a/x/permission/exported/proto.go +++ b/x/permission/exported/proto.go @@ -5,7 +5,7 @@ import ( "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" ) -// GetPermissionRole returns the role that is defined for the given message. Returns ROLE_CHAIN_MANAGEMENT if none is set. +// GetPermissionRole returns the role that is defined for the given message. Returns ROLE_UNSPECIFIED if none is set. func GetPermissionRole(message descriptor.Message) Role { _, d := descriptor.ForMessage(message) v, err := proto.GetExtension(d.GetOptions(), E_PermissionRole) From 05065046e3c405a4795615e374ad441ef42fe27f Mon Sep 17 00:00:00 2001 From: Christian Gorenflo Date: Wed, 6 Apr 2022 18:06:00 -0400 Subject: [PATCH 8/8] lint --- x/ante/types/mock/alias.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x/ante/types/mock/alias.go b/x/ante/types/mock/alias.go index 15e5dc0ad..0c008c829 100644 --- a/x/ante/types/mock/alias.go +++ b/x/ante/types/mock/alias.go @@ -7,7 +7,10 @@ import ( //go:generate moq -pkg mock -out ./alias_mock.go . Tx Msg +// Tx alias for mocking type Tx sdk.Tx + +// Msg alias for mocking type Msg interface { sdk.Msg descriptor.Message