diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 26057e216e..0b2a44eb15 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -8,6 +8,7 @@ - [AbsoluteTxPosition](#cosmwasm.wasm.v1.AbsoluteTxPosition) - [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) - [AccessTypeParam](#cosmwasm.wasm.v1.AccessTypeParam) + - [AllowedContract](#cosmwasm.wasm.v1.AllowedContract) - [CodeInfo](#cosmwasm.wasm.v1.CodeInfo) - [ContractCodeHistoryEntry](#cosmwasm.wasm.v1.ContractCodeHistoryEntry) - [ContractInfo](#cosmwasm.wasm.v1.ContractInfo) @@ -138,6 +139,25 @@ AccessTypeParam + + +### AllowedContract + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `contract_address` | [string](#string) | | required | +| `allowed_messages` | [string](#string) | repeated | optional | +| `once` | [bool](#bool) | | optional + +if true, the contract is only allowed to be called once | + + + + + + ### CodeInfo @@ -203,8 +223,7 @@ the provided method on behalf of the granter's account. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `target_contracts` | [string](#string) | repeated | Msg, identified by it's type URL, to grant unrestricted permissions to execute | -| `allowed_functions` | [string](#string) | repeated | | +| `allowed_contracts` | [AllowedContract](#cosmwasm.wasm.v1.AllowedContract) | repeated | | diff --git a/proto/cosmwasm/wasm/v1/types.proto b/proto/cosmwasm/wasm/v1/types.proto index 84cc385574..5cf6b6bdd4 100644 --- a/proto/cosmwasm/wasm/v1/types.proto +++ b/proto/cosmwasm/wasm/v1/types.proto @@ -14,11 +14,19 @@ option (gogoproto.equal_all) = true; message ExecuteContractAuthorization { option (cosmos_proto.implements_interface) = "Authorization"; - // Msg, identified by it's type URL, to grant unrestricted permissions to execute - repeated string target_contracts = 1; - repeated string allowed_functions = 2; + repeated AllowedContract allowed_contracts = 1; } +message AllowedContract { + // required + string contract_address = 1; + + // optional + repeated string allowed_messages = 2; + + // optional + bool once = 3; // if true, the contract is only allowed to be called once +} // AccessType permission types enum AccessType { diff --git a/x/wasm/types/types.go b/x/wasm/types/types.go index b1d616353e..28163137ef 100644 --- a/x/wasm/types/types.go +++ b/x/wasm/types/types.go @@ -1,6 +1,8 @@ package types import ( + "encoding/base64" + "encoding/json" "fmt" "reflect" @@ -27,9 +29,18 @@ var ( _ authztypes.Authorization = &ExecuteContractAuthorization{} ) +func NewAllowedContract(contractAddr sdk.AccAddress, allowedMessages []string) *AllowedContract { + return &AllowedContract{ + ContractAddress: contractAddr.String(), + AllowedMessages: allowedMessages, + } +} + // NewExecuteContractAuthorization creates a new ExecuteContractAuthorization object. -func NewExecuteContractAuthorization(targetContracts, AllowedFunctions []string) *ExecuteContractAuthorization { - return &ExecuteContractAuthorization{} +func NewExecuteContractAuthorization(allowedContracts []*AllowedContract) *ExecuteContractAuthorization { + return &ExecuteContractAuthorization{ + AllowedContracts: allowedContracts, + } } // MsgTypeURL implements Authorization.MsgTypeURL. @@ -39,11 +50,81 @@ func (a ExecuteContractAuthorization) MsgTypeURL() string { // Accept implements Authorization.Accept. func (a ExecuteContractAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authztypes.AcceptResponse, error) { - return authztypes.AcceptResponse{Accept: true}, nil + exec, ok := msg.(*MsgExecuteContract) + if !ok { + return authztypes.AcceptResponse{}, sdkerrors.ErrInvalidType.Wrap("type mismatch") + } + + update := []*AllowedContract{} + for _, allowedContract := range a.AllowedContracts { + if allowedContract.ContractAddress == exec.Contract { + // if the allowed contract contains the contract address and there aren't allowed messages, + // then we accept the message. + if len(allowedContract.AllowedMessages) == 0 && !allowedContract.Once { + // if the permission is for multiple executions, we accept the message and keep + // it in the update array + update = append(update, allowedContract) + continue + } else if len(allowedContract.AllowedMessages) > 0 { + // otherwise we exclude it from the update array + continue + } + + // NOTE: exec.Msg is base64 encoded, so we need to decode it first + // If there are allowedMessages then decode the call and check if the message is allowed + callBz := []byte{} + if _, err := base64.RawStdEncoding.Decode(exec.Msg.Bytes(), callBz); err != nil { + return authztypes.AcceptResponse{}, sdkerrors.Wrap(err, "failed to decode base64") + } + + messageName := map[string]interface{}{} + if err := json.Unmarshal(callBz, &messageName); err != nil { + return authztypes.AcceptResponse{}, sdkerrors.Wrap(err, "failed to unmarshal json") + } + + for _, allowedFunction := range allowedContract.AllowedMessages { + if len(messageName) != 1 { + return authztypes.AcceptResponse{}, sdkerrors.ErrInvalidRequest.Wrap("too many message calls in the same transaction") + } + for k := range messageName { + if allowedFunction == k { + if allowedContract.Once { + continue + } else { + update = append(update, allowedContract) + continue + } + } + } + } + } else { + // if the allowed contract doesn't contain the contract address, we add it to the update array + update = append(update, allowedContract) + } + } + if len(update) == 0 { + return authztypes.AcceptResponse{Accept: true, Delete: true}, nil + } + return authztypes.AcceptResponse{Accept: true, Updated: NewExecuteContractAuthorization(update)}, nil } // ValidateBasic implements Authorization.ValidateBasic. func (a ExecuteContractAuthorization) ValidateBasic() error { + for _, allowedContract := range a.AllowedContracts { + if err := allowedContract.ValidateBasic(); err != nil { + return sdkerrors.Wrap(err, "allowed contract") + } + } + return nil +} + +func (a AllowedContract) ValidateBasic() error { + if len(a.ContractAddress) == 0 { + return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "contract address cannot be empty") + } + if _, err := sdk.AccAddressFromBech32(a.ContractAddress); err != nil { + return sdkerrors.Wrap(err, "contract address") + } return nil } diff --git a/x/wasm/types/types.pb.go b/x/wasm/types/types.pb.go index eed6df1f1c..3d68f2ec16 100644 --- a/x/wasm/types/types.pb.go +++ b/x/wasm/types/types.pb.go @@ -98,9 +98,7 @@ func (ContractCodeHistoryOperationType) EnumDescriptor() ([]byte, []int) { // ExecuteContractAuthorization gives the grantee unrestricted permissions to execute // the provided method on behalf of the granter's account. type ExecuteContractAuthorization struct { - // Msg, identified by it's type URL, to grant unrestricted permissions to execute - TargetContracts []string `protobuf:"bytes,1,rep,name=target_contracts,json=targetContracts,proto3" json:"target_contracts,omitempty"` - AllowedFunctions []string `protobuf:"bytes,2,rep,name=allowed_functions,json=allowedFunctions,proto3" json:"allowed_functions,omitempty"` + AllowedContracts []*AllowedContract `protobuf:"bytes,1,rep,name=allowed_contracts,json=allowedContracts,proto3" json:"allowed_contracts,omitempty"` } func (m *ExecuteContractAuthorization) Reset() { *m = ExecuteContractAuthorization{} } @@ -136,6 +134,48 @@ func (m *ExecuteContractAuthorization) XXX_DiscardUnknown() { var xxx_messageInfo_ExecuteContractAuthorization proto.InternalMessageInfo +type AllowedContract struct { + // required + ContractAddress string `protobuf:"bytes,1,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty"` + // optional + AllowedMessages []string `protobuf:"bytes,2,rep,name=allowed_messages,json=allowedMessages,proto3" json:"allowed_messages,omitempty"` + // optional + Once bool `protobuf:"varint,3,opt,name=once,proto3" json:"once,omitempty"` +} + +func (m *AllowedContract) Reset() { *m = AllowedContract{} } +func (m *AllowedContract) String() string { return proto.CompactTextString(m) } +func (*AllowedContract) ProtoMessage() {} +func (*AllowedContract) Descriptor() ([]byte, []int) { + return fileDescriptor_e6155d98fa173e02, []int{1} +} +func (m *AllowedContract) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AllowedContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AllowedContract.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 *AllowedContract) XXX_Merge(src proto.Message) { + xxx_messageInfo_AllowedContract.Merge(m, src) +} +func (m *AllowedContract) XXX_Size() int { + return m.Size() +} +func (m *AllowedContract) XXX_DiscardUnknown() { + xxx_messageInfo_AllowedContract.DiscardUnknown(m) +} + +var xxx_messageInfo_AllowedContract proto.InternalMessageInfo + // AccessTypeParam type AccessTypeParam struct { Value AccessType `protobuf:"varint,1,opt,name=value,proto3,enum=cosmwasm.wasm.v1.AccessType" json:"value,omitempty" yaml:"value"` @@ -145,7 +185,7 @@ func (m *AccessTypeParam) Reset() { *m = AccessTypeParam{} } func (m *AccessTypeParam) String() string { return proto.CompactTextString(m) } func (*AccessTypeParam) ProtoMessage() {} func (*AccessTypeParam) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{1} + return fileDescriptor_e6155d98fa173e02, []int{2} } func (m *AccessTypeParam) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -184,7 +224,7 @@ func (m *AccessConfig) Reset() { *m = AccessConfig{} } func (m *AccessConfig) String() string { return proto.CompactTextString(m) } func (*AccessConfig) ProtoMessage() {} func (*AccessConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{2} + return fileDescriptor_e6155d98fa173e02, []int{3} } func (m *AccessConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -223,7 +263,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{3} + return fileDescriptor_e6155d98fa173e02, []int{4} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -266,7 +306,7 @@ func (m *CodeInfo) Reset() { *m = CodeInfo{} } func (m *CodeInfo) String() string { return proto.CompactTextString(m) } func (*CodeInfo) ProtoMessage() {} func (*CodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{4} + return fileDescriptor_e6155d98fa173e02, []int{5} } func (m *CodeInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -319,7 +359,7 @@ func (m *ContractInfo) Reset() { *m = ContractInfo{} } func (m *ContractInfo) String() string { return proto.CompactTextString(m) } func (*ContractInfo) ProtoMessage() {} func (*ContractInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{5} + return fileDescriptor_e6155d98fa173e02, []int{6} } func (m *ContractInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -362,7 +402,7 @@ func (m *ContractCodeHistoryEntry) Reset() { *m = ContractCodeHistoryEnt func (m *ContractCodeHistoryEntry) String() string { return proto.CompactTextString(m) } func (*ContractCodeHistoryEntry) ProtoMessage() {} func (*ContractCodeHistoryEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{6} + return fileDescriptor_e6155d98fa173e02, []int{7} } func (m *ContractCodeHistoryEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -405,7 +445,7 @@ func (m *AbsoluteTxPosition) Reset() { *m = AbsoluteTxPosition{} } func (m *AbsoluteTxPosition) String() string { return proto.CompactTextString(m) } func (*AbsoluteTxPosition) ProtoMessage() {} func (*AbsoluteTxPosition) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{7} + return fileDescriptor_e6155d98fa173e02, []int{8} } func (m *AbsoluteTxPosition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -446,7 +486,7 @@ func (m *Model) Reset() { *m = Model{} } func (m *Model) String() string { return proto.CompactTextString(m) } func (*Model) ProtoMessage() {} func (*Model) Descriptor() ([]byte, []int) { - return fileDescriptor_e6155d98fa173e02, []int{8} + return fileDescriptor_e6155d98fa173e02, []int{9} } func (m *Model) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -479,6 +519,7 @@ func init() { proto.RegisterEnum("cosmwasm.wasm.v1.AccessType", AccessType_name, AccessType_value) proto.RegisterEnum("cosmwasm.wasm.v1.ContractCodeHistoryOperationType", ContractCodeHistoryOperationType_name, ContractCodeHistoryOperationType_value) proto.RegisterType((*ExecuteContractAuthorization)(nil), "cosmwasm.wasm.v1.ExecuteContractAuthorization") + proto.RegisterType((*AllowedContract)(nil), "cosmwasm.wasm.v1.AllowedContract") proto.RegisterType((*AccessTypeParam)(nil), "cosmwasm.wasm.v1.AccessTypeParam") proto.RegisterType((*AccessConfig)(nil), "cosmwasm.wasm.v1.AccessConfig") proto.RegisterType((*Params)(nil), "cosmwasm.wasm.v1.Params") @@ -492,85 +533,87 @@ func init() { func init() { proto.RegisterFile("cosmwasm/wasm/v1/types.proto", fileDescriptor_e6155d98fa173e02) } var fileDescriptor_e6155d98fa173e02 = []byte{ - // 1243 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xf7, 0xda, 0xce, 0x0f, 0x4f, 0xd3, 0x76, 0x33, 0xdf, 0xe4, 0x5b, 0xc7, 0x04, 0xdb, 0x5d, - 0x0a, 0xa4, 0xbf, 0x6c, 0x1a, 0x10, 0xa0, 0x1c, 0x2a, 0xf9, 0xc7, 0xb6, 0xd9, 0x88, 0xd8, 0xd6, - 0xd8, 0xa5, 0x0a, 0x52, 0xb5, 0x1a, 0xef, 0x4e, 0x9c, 0x55, 0xd7, 0x3b, 0xd6, 0xce, 0x38, 0xb5, - 0xfb, 0x17, 0x40, 0x24, 0x24, 0x6e, 0x70, 0x89, 0x84, 0x00, 0xa1, 0xfe, 0x01, 0xbd, 0x72, 0xaf, - 0x38, 0x55, 0x9c, 0x90, 0x90, 0x2c, 0x48, 0x2f, 0x70, 0xcd, 0xb1, 0x5c, 0xd0, 0xce, 0x78, 0xe5, - 0xa5, 0x69, 0x1b, 0x73, 0x59, 0xcd, 0xbc, 0xf7, 0x3e, 0x9f, 0xf7, 0x6b, 0xde, 0xd3, 0x82, 0x55, - 0x8b, 0xb2, 0xee, 0x03, 0xcc, 0xba, 0x45, 0xf1, 0xd9, 0xbf, 0x51, 0xe4, 0xc3, 0x1e, 0x61, 0x85, - 0x9e, 0x4f, 0x39, 0x85, 0x6a, 0xa8, 0x2d, 0x88, 0xcf, 0xfe, 0x8d, 0xcc, 0x4a, 0x20, 0xa1, 0xcc, - 0x14, 0xfa, 0xa2, 0xbc, 0x48, 0xe3, 0xcc, 0x52, 0x87, 0x76, 0xa8, 0x94, 0x07, 0xa7, 0xb1, 0x74, - 0xa5, 0x43, 0x69, 0xc7, 0x25, 0x45, 0x71, 0x6b, 0xf7, 0x77, 0x8b, 0xd8, 0x1b, 0x4a, 0x95, 0xf6, - 0x85, 0x02, 0x56, 0xf5, 0x01, 0xb1, 0xfa, 0x9c, 0x54, 0xa8, 0xc7, 0x7d, 0x6c, 0xf1, 0x52, 0x9f, - 0xef, 0x51, 0xdf, 0x79, 0x88, 0xb9, 0x43, 0x3d, 0x78, 0x19, 0xa8, 0x1c, 0xfb, 0x1d, 0xc2, 0x4d, - 0x6b, 0xac, 0x67, 0x69, 0x25, 0x9f, 0x58, 0x4b, 0xa1, 0xf3, 0x52, 0x1e, 0xc2, 0x18, 0xbc, 0x0a, - 0x16, 0xb1, 0xeb, 0xd2, 0x07, 0xc4, 0x36, 0x77, 0xfb, 0x9e, 0x15, 0xc0, 0x59, 0x3a, 0x2e, 0x6c, - 0xd5, 0xb1, 0xe2, 0x56, 0x28, 0xdf, 0x58, 0xfc, 0xe5, 0xf1, 0xf5, 0xb3, 0xff, 0x72, 0xa5, 0xdd, - 0x03, 0xe7, 0x4b, 0x96, 0x45, 0x18, 0x6b, 0x0d, 0x7b, 0xa4, 0x81, 0x7d, 0xdc, 0x85, 0x55, 0x30, - 0xb3, 0x8f, 0xdd, 0x3e, 0x49, 0x2b, 0x79, 0x65, 0xed, 0xdc, 0xfa, 0x6a, 0xe1, 0xc5, 0x62, 0x14, - 0x26, 0x88, 0xb2, 0x7a, 0x3c, 0xca, 0x2d, 0x0c, 0x71, 0xd7, 0xdd, 0xd0, 0x04, 0x48, 0x43, 0x12, - 0xbc, 0x91, 0xfc, 0xe6, 0xdb, 0x9c, 0xa2, 0x7d, 0xad, 0x80, 0x05, 0x69, 0x5d, 0xa1, 0xde, 0xae, - 0xd3, 0x81, 0x4d, 0x00, 0x7a, 0xc4, 0xef, 0x3a, 0x8c, 0x39, 0xd4, 0x9b, 0xca, 0xc3, 0xf2, 0xf1, - 0x28, 0xb7, 0x28, 0x3d, 0x4c, 0x90, 0x1a, 0x8a, 0xd0, 0xc0, 0x6b, 0x60, 0x0e, 0xdb, 0xb6, 0x4f, - 0x58, 0x90, 0xba, 0xb2, 0x96, 0x2a, 0xc3, 0xe3, 0x51, 0xee, 0x9c, 0xc4, 0x8c, 0x15, 0x1a, 0x0a, - 0x4d, 0xc6, 0x91, 0xfd, 0x16, 0x07, 0xb3, 0x22, 0x5f, 0x06, 0x29, 0x80, 0x16, 0xb5, 0x89, 0xd9, - 0xef, 0xb9, 0x14, 0xdb, 0x26, 0x16, 0xbe, 0x45, 0x6c, 0x67, 0xd6, 0xb3, 0xaf, 0x8a, 0x4d, 0xe6, - 0x53, 0xbe, 0xf8, 0x64, 0x94, 0x8b, 0x1d, 0x8f, 0x72, 0x2b, 0xd2, 0xdb, 0x49, 0x1e, 0x0d, 0xa9, - 0x81, 0xf0, 0x8e, 0x90, 0x49, 0x28, 0xfc, 0x52, 0x01, 0x59, 0xc7, 0x63, 0x1c, 0x7b, 0xdc, 0xc1, - 0x9c, 0x98, 0x36, 0xd9, 0xc5, 0x7d, 0x97, 0x9b, 0x91, 0xca, 0xc4, 0xa7, 0xa8, 0xcc, 0xe5, 0xe3, - 0x51, 0xee, 0x6d, 0xe9, 0xf7, 0xf5, 0x6c, 0x1a, 0x5a, 0x8d, 0x18, 0x54, 0xa5, 0xbe, 0x31, 0xa9, - 0xdf, 0x16, 0x80, 0x5d, 0x3c, 0x30, 0x03, 0x17, 0xa6, 0xc8, 0x80, 0x39, 0x0f, 0x49, 0x3a, 0x91, - 0x57, 0xd6, 0x92, 0xe5, 0x37, 0x27, 0xc9, 0x9d, 0xb4, 0xd1, 0xd0, 0xf9, 0x2e, 0x1e, 0xdc, 0xc5, - 0xac, 0x5b, 0xa1, 0x36, 0x69, 0x3a, 0x0f, 0x65, 0xdf, 0x63, 0xda, 0x77, 0x0a, 0x98, 0x0f, 0x44, - 0x86, 0xb7, 0x4b, 0xe1, 0x1b, 0x20, 0x25, 0x10, 0x7b, 0x98, 0xed, 0x89, 0xb2, 0x2e, 0xa0, 0xf9, - 0x40, 0xb0, 0x89, 0xd9, 0x1e, 0x4c, 0x83, 0x39, 0xcb, 0x27, 0x98, 0x53, 0x5f, 0xf6, 0x0e, 0x85, - 0x57, 0xd8, 0x04, 0x30, 0x9a, 0x96, 0x25, 0x0a, 0x9e, 0x9e, 0x99, 0xaa, 0x2d, 0xc9, 0xa0, 0x2d, - 0x68, 0x31, 0x82, 0x97, 0x8a, 0xad, 0xe4, 0x7c, 0x42, 0x4d, 0x6e, 0x25, 0xe7, 0x93, 0xea, 0x8c, - 0xf6, 0x53, 0x1c, 0x2c, 0x84, 0x93, 0x24, 0x02, 0x7d, 0x0b, 0xcc, 0x89, 0x40, 0x1d, 0x5b, 0x84, - 0x99, 0x2c, 0x83, 0xa3, 0x51, 0x6e, 0x56, 0xe4, 0x51, 0x45, 0xb3, 0x81, 0xca, 0xb0, 0x5f, 0x13, - 0xf0, 0x12, 0x98, 0xc1, 0x76, 0xd7, 0xf1, 0x44, 0xe5, 0x52, 0x48, 0x5e, 0x02, 0xa9, 0x8b, 0xdb, - 0xc4, 0x4d, 0x27, 0xa5, 0x54, 0x5c, 0xe0, 0xcd, 0x31, 0x0b, 0xb1, 0xc7, 0x19, 0x5d, 0x7a, 0x49, - 0x46, 0x6d, 0x46, 0xdd, 0x3e, 0x27, 0xad, 0x41, 0x83, 0x32, 0x27, 0x18, 0x57, 0x14, 0x82, 0xe0, - 0x75, 0x70, 0xc6, 0x69, 0x5b, 0x66, 0x8f, 0xfa, 0x3c, 0x08, 0x77, 0x56, 0x3c, 0xfb, 0xb3, 0x47, - 0xa3, 0x5c, 0xca, 0x28, 0x57, 0x1a, 0xd4, 0xe7, 0x46, 0x15, 0xa5, 0x9c, 0xb6, 0x25, 0x8e, 0x36, - 0xdc, 0x06, 0x29, 0x32, 0xe0, 0xc4, 0x13, 0x6f, 0x6b, 0x4e, 0x38, 0x5c, 0x2a, 0xc8, 0x0d, 0x55, - 0x08, 0x37, 0x54, 0xa1, 0xe4, 0x0d, 0xcb, 0x2b, 0x3f, 0x3f, 0xbe, 0xbe, 0x1c, 0x2d, 0x8a, 0x1e, - 0xc2, 0xd0, 0x84, 0x61, 0x23, 0xf9, 0x67, 0x30, 0x42, 0x7f, 0x2b, 0x20, 0x1d, 0x9a, 0x06, 0x45, - 0xda, 0x74, 0x18, 0xa7, 0xfe, 0x50, 0xf7, 0xb8, 0x3f, 0x84, 0x0d, 0x90, 0xa2, 0x3d, 0xe2, 0x8b, - 0x2d, 0x33, 0x9e, 0xf3, 0xf5, 0x93, 0x29, 0xbe, 0x04, 0x5e, 0x0f, 0x51, 0xc1, 0x1b, 0x47, 0x13, - 0x92, 0x68, 0x77, 0xe2, 0xaf, 0xec, 0xce, 0x4d, 0x30, 0xd7, 0xef, 0xd9, 0xa2, 0xae, 0x89, 0xff, - 0x52, 0xd7, 0x31, 0x08, 0xae, 0x81, 0x44, 0x97, 0x75, 0x44, 0xaf, 0x16, 0xca, 0xff, 0x7f, 0x3e, - 0xca, 0x41, 0x84, 0x1f, 0x84, 0x51, 0x6e, 0x13, 0xc6, 0x70, 0x87, 0xa0, 0xc0, 0x44, 0x43, 0x00, - 0x9e, 0x24, 0x82, 0x17, 0xc1, 0x42, 0xdb, 0xa5, 0xd6, 0x7d, 0x73, 0x8f, 0x38, 0x9d, 0x3d, 0x2e, - 0xdf, 0x11, 0x3a, 0x23, 0x64, 0x9b, 0x42, 0x04, 0x57, 0xc0, 0x3c, 0x1f, 0x98, 0x8e, 0x67, 0x93, - 0x81, 0x4c, 0x04, 0xcd, 0xf1, 0x81, 0x11, 0x5c, 0x35, 0x07, 0xcc, 0x6c, 0x53, 0x9b, 0xb8, 0x70, - 0x0b, 0x24, 0xee, 0x93, 0xa1, 0x1c, 0x96, 0xf2, 0xc7, 0xcf, 0x47, 0xb9, 0x0f, 0x3a, 0x0e, 0xdf, - 0xeb, 0xb7, 0x0b, 0x16, 0xed, 0x16, 0x39, 0xf1, 0xec, 0x60, 0x78, 0x3d, 0x1e, 0x3d, 0xba, 0x4e, - 0x9b, 0x15, 0xdb, 0x43, 0x4e, 0x58, 0x61, 0x93, 0x0c, 0xca, 0xc1, 0x01, 0x05, 0x24, 0xc1, 0x03, - 0x94, 0xfb, 0x3c, 0x2e, 0x46, 0x4f, 0x5e, 0xae, 0xfc, 0xa5, 0x00, 0x30, 0xd9, 0x25, 0xf0, 0x43, - 0x70, 0xa1, 0x54, 0xa9, 0xe8, 0xcd, 0xa6, 0xd9, 0xda, 0x69, 0xe8, 0xe6, 0x9d, 0x5a, 0xb3, 0xa1, - 0x57, 0x8c, 0x5b, 0x86, 0x5e, 0x55, 0x63, 0x99, 0x95, 0x83, 0xc3, 0xfc, 0xf2, 0xc4, 0xf8, 0x8e, - 0xc7, 0x7a, 0xc4, 0x72, 0x76, 0x1d, 0x62, 0xc3, 0x6b, 0x00, 0x46, 0x71, 0xb5, 0x7a, 0xb9, 0x5e, - 0xdd, 0x51, 0x95, 0xcc, 0xd2, 0xc1, 0x61, 0x5e, 0x9d, 0x40, 0x6a, 0xb4, 0x4d, 0xed, 0x21, 0xfc, - 0x08, 0xa4, 0xa3, 0xd6, 0xf5, 0xda, 0x27, 0x3b, 0x66, 0xa9, 0x5a, 0x45, 0x7a, 0xb3, 0xa9, 0xc6, - 0x5f, 0x74, 0x53, 0xf7, 0xdc, 0x61, 0x49, 0xee, 0x6c, 0xb8, 0x0e, 0x96, 0xa3, 0x40, 0xfd, 0x53, - 0x1d, 0xed, 0x08, 0x4f, 0x89, 0xcc, 0x85, 0x83, 0xc3, 0xfc, 0xff, 0x26, 0x28, 0x7d, 0x9f, 0xf8, - 0xc3, 0xc0, 0x59, 0x66, 0xfe, 0xf3, 0xef, 0xb3, 0xb1, 0x47, 0x3f, 0x64, 0x63, 0x57, 0x7e, 0x4c, - 0x80, 0xfc, 0x69, 0x2f, 0x0d, 0x12, 0xf0, 0x5e, 0xa5, 0x5e, 0x6b, 0xa1, 0x52, 0xa5, 0x65, 0x56, - 0xea, 0x55, 0xdd, 0xdc, 0x34, 0x9a, 0xad, 0x3a, 0xda, 0x31, 0xeb, 0x0d, 0x1d, 0x95, 0x5a, 0x46, - 0xbd, 0xf6, 0xb2, 0xd2, 0x14, 0x0f, 0x0e, 0xf3, 0x57, 0x4f, 0xe3, 0x8e, 0x16, 0xec, 0x2e, 0xb8, - 0x3c, 0x95, 0x1b, 0xa3, 0x66, 0xb4, 0x54, 0x25, 0xb3, 0x76, 0x70, 0x98, 0xbf, 0x74, 0x1a, 0xbf, - 0xe1, 0x39, 0x1c, 0xde, 0x03, 0xd7, 0xa6, 0x22, 0xde, 0x36, 0x6e, 0xa3, 0x52, 0x4b, 0x57, 0xe3, - 0x99, 0xab, 0x07, 0x87, 0xf9, 0x77, 0x4f, 0xe3, 0xde, 0x76, 0x3a, 0x3e, 0xe6, 0x64, 0x6a, 0xfa, - 0xdb, 0x7a, 0x4d, 0x6f, 0x1a, 0x4d, 0x35, 0x31, 0x1d, 0xfd, 0x6d, 0xe2, 0x11, 0xe6, 0xb0, 0x4c, - 0x32, 0x68, 0x56, 0x79, 0xf3, 0xc9, 0x1f, 0xd9, 0xd8, 0xa3, 0xa3, 0xac, 0xf2, 0xe4, 0x28, 0xab, - 0x3c, 0x3d, 0xca, 0x2a, 0xbf, 0x1f, 0x65, 0x95, 0xaf, 0x9e, 0x65, 0x63, 0x4f, 0x9f, 0x65, 0x63, - 0xbf, 0x3e, 0xcb, 0xc6, 0x3e, 0x7b, 0x27, 0x32, 0x07, 0x15, 0xca, 0xba, 0x77, 0xc3, 0x5f, 0x38, - 0xbb, 0x38, 0x90, 0xbf, 0x72, 0xe2, 0x3f, 0xae, 0x3d, 0x2b, 0xb6, 0xda, 0xfb, 0xff, 0x04, 0x00, - 0x00, 0xff, 0xff, 0xaf, 0xe3, 0x58, 0xed, 0xe8, 0x09, 0x00, 0x00, + // 1275 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x6f, 0x1b, 0xc5, + 0x1b, 0xf6, 0xda, 0xce, 0xd7, 0x24, 0x6d, 0x36, 0xf3, 0x4b, 0x7e, 0x75, 0x4c, 0xb0, 0xdd, 0xa5, + 0x40, 0xfa, 0x65, 0xd3, 0x80, 0x00, 0xe5, 0x50, 0xc9, 0x1f, 0x4b, 0xb3, 0x11, 0xb1, 0xad, 0xb1, + 0x4b, 0x15, 0xa4, 0x6a, 0x35, 0xde, 0x9d, 0xd8, 0xab, 0xae, 0x77, 0xac, 0x9d, 0x71, 0x6a, 0x97, + 0x13, 0x37, 0x14, 0x09, 0x89, 0x1b, 0x5c, 0x22, 0x21, 0x40, 0xa8, 0x7f, 0x40, 0xaf, 0xdc, 0x2b, + 0x4e, 0x15, 0x27, 0x24, 0x24, 0x0b, 0xd2, 0x0b, 0x5c, 0x73, 0x2c, 0x17, 0xb4, 0x33, 0x5e, 0xec, + 0x36, 0x69, 0x63, 0x2e, 0xd6, 0xcc, 0x33, 0xef, 0xf3, 0x3e, 0xef, 0xc7, 0xcc, 0xeb, 0x05, 0x6b, + 0x16, 0x65, 0xed, 0xfb, 0x98, 0xb5, 0x73, 0xe2, 0x67, 0xff, 0x46, 0x8e, 0xf7, 0x3b, 0x84, 0x65, + 0x3b, 0x3e, 0xe5, 0x14, 0xaa, 0xe1, 0x69, 0x56, 0xfc, 0xec, 0xdf, 0x48, 0xae, 0x06, 0x08, 0x65, + 0xa6, 0x38, 0xcf, 0xc9, 0x8d, 0x34, 0x4e, 0x2e, 0x37, 0x69, 0x93, 0x4a, 0x3c, 0x58, 0x0d, 0xd1, + 0xd5, 0x26, 0xa5, 0x4d, 0x97, 0xe4, 0xc4, 0xae, 0xd1, 0xdd, 0xcb, 0x61, 0xaf, 0x2f, 0x8f, 0xb4, + 0xcf, 0x15, 0xb0, 0xa6, 0xf7, 0x88, 0xd5, 0xe5, 0xa4, 0x48, 0x3d, 0xee, 0x63, 0x8b, 0xe7, 0xbb, + 0xbc, 0x45, 0x7d, 0xe7, 0x01, 0xe6, 0x0e, 0xf5, 0x60, 0x19, 0x2c, 0x61, 0xd7, 0xa5, 0xf7, 0x89, + 0x6d, 0x5a, 0x43, 0x03, 0x96, 0x50, 0x32, 0xb1, 0xf5, 0xf9, 0x8d, 0x8b, 0xd9, 0x17, 0x43, 0xcb, + 0xe6, 0xa5, 0x69, 0xe8, 0x0a, 0xa9, 0xf8, 0x79, 0x80, 0x6d, 0x2e, 0xfd, 0xf2, 0xe8, 0xfa, 0xb9, + 0xe7, 0x24, 0xb4, 0xcf, 0xc0, 0xe2, 0x0b, 0x3c, 0x78, 0x19, 0xa8, 0xa1, 0x9a, 0x89, 0x6d, 0xdb, + 0x27, 0x2c, 0x10, 0x55, 0xd6, 0xe7, 0xd0, 0x62, 0x88, 0xe7, 0x25, 0x1c, 0x98, 0x86, 0x01, 0xb6, + 0x09, 0x63, 0xb8, 0x49, 0x58, 0x22, 0x9a, 0x89, 0x05, 0xa6, 0x43, 0x7c, 0x67, 0x08, 0x43, 0x08, + 0xe2, 0xd4, 0xb3, 0x48, 0x22, 0x96, 0x51, 0xd6, 0x67, 0x91, 0x58, 0x6b, 0x77, 0xc1, 0x62, 0xde, + 0xb2, 0x08, 0x63, 0xf5, 0x7e, 0x87, 0x54, 0xb1, 0x8f, 0xdb, 0xb0, 0x04, 0xa6, 0xf6, 0xb1, 0xdb, + 0x25, 0x42, 0xf1, 0xfc, 0xc6, 0xda, 0x29, 0x69, 0xfe, 0xcb, 0x28, 0xa8, 0xc7, 0x83, 0xf4, 0x42, + 0x1f, 0xb7, 0xdd, 0x4d, 0x4d, 0x90, 0x34, 0x24, 0xc9, 0x9b, 0xf1, 0x6f, 0xbe, 0x4d, 0x2b, 0xda, + 0xd7, 0x0a, 0x58, 0x90, 0xd6, 0x45, 0xea, 0xed, 0x39, 0x4d, 0x58, 0x03, 0xa0, 0x43, 0xfc, 0xb6, + 0xc3, 0x98, 0x43, 0xbd, 0x89, 0x14, 0x56, 0x8e, 0x07, 0xe9, 0x25, 0xa9, 0x30, 0x62, 0x6a, 0x68, + 0xcc, 0x0d, 0xbc, 0x06, 0x66, 0xc2, 0x2a, 0x45, 0x83, 0x2a, 0x15, 0xe0, 0xf1, 0x20, 0x7d, 0x5e, + 0x72, 0x86, 0x07, 0x1a, 0x0a, 0x4d, 0x86, 0x91, 0xfd, 0x16, 0x05, 0xd3, 0x22, 0x5f, 0x06, 0x29, + 0x80, 0x16, 0xb5, 0x89, 0xd9, 0xed, 0xb8, 0x14, 0xdb, 0x26, 0x16, 0xda, 0x22, 0xb6, 0xf9, 0x8d, + 0xd4, 0xcb, 0x62, 0x93, 0xf9, 0x14, 0x2e, 0x3e, 0x1e, 0xa4, 0x23, 0xc7, 0x83, 0xf4, 0xaa, 0x54, + 0x3b, 0xe9, 0x47, 0x43, 0x6a, 0x00, 0xde, 0x16, 0x98, 0xa4, 0xc2, 0x2f, 0x15, 0x90, 0x72, 0x3c, + 0xc6, 0xb1, 0xc7, 0x1d, 0xcc, 0x89, 0x69, 0x93, 0x3d, 0xdc, 0x75, 0xb9, 0x39, 0x56, 0x99, 0xe8, + 0x04, 0x95, 0xb9, 0x7c, 0x3c, 0x48, 0xbf, 0x29, 0x75, 0x5f, 0xed, 0x4d, 0x43, 0x6b, 0x63, 0x06, + 0x25, 0x79, 0x5e, 0x1d, 0xd5, 0x6f, 0x1b, 0xc0, 0x36, 0xee, 0x99, 0x81, 0x84, 0x29, 0x32, 0x60, + 0xce, 0x03, 0x79, 0x4d, 0xe2, 0x85, 0xd7, 0x47, 0xc9, 0x9d, 0xb4, 0xd1, 0xd0, 0x62, 0x1b, 0xf7, + 0xee, 0x60, 0xd6, 0x2e, 0x52, 0x9b, 0xd4, 0x9c, 0x07, 0xb2, 0xef, 0x11, 0xed, 0x3b, 0x05, 0xcc, + 0x06, 0x90, 0xe1, 0xed, 0x51, 0xf8, 0x1a, 0x98, 0x13, 0x8c, 0x16, 0x66, 0x2d, 0x51, 0xd6, 0x05, + 0x34, 0x1b, 0x00, 0x5b, 0x98, 0xb5, 0x60, 0x02, 0xcc, 0x58, 0x3e, 0xc1, 0x9c, 0xfa, 0xb2, 0x77, + 0x28, 0xdc, 0xc2, 0x1a, 0x80, 0xe3, 0x69, 0x59, 0xa2, 0xe0, 0x89, 0xa9, 0x89, 0xda, 0x12, 0x0f, + 0xda, 0x82, 0x96, 0xc6, 0xf8, 0xf2, 0x60, 0x3b, 0x3e, 0x1b, 0x53, 0xe3, 0xdb, 0xf1, 0xd9, 0xb8, + 0x3a, 0xa5, 0xfd, 0x14, 0x05, 0x0b, 0xe1, 0x93, 0x13, 0x81, 0xbe, 0x01, 0x66, 0x44, 0xa0, 0x8e, + 0x2d, 0xc2, 0x8c, 0x17, 0xc0, 0xd1, 0x20, 0x3d, 0x2d, 0xf2, 0x28, 0xa1, 0xe9, 0xe0, 0xc8, 0xb0, + 0x5f, 0x11, 0xf0, 0x32, 0x98, 0xc2, 0x76, 0xdb, 0xf1, 0x44, 0xe5, 0xe6, 0x90, 0xdc, 0x04, 0xa8, + 0x8b, 0x1b, 0xc4, 0x4d, 0xc4, 0x25, 0x2a, 0x36, 0xf0, 0xe6, 0xd0, 0x0b, 0xb1, 0x87, 0x19, 0x5d, + 0x3a, 0x25, 0xa3, 0x06, 0xa3, 0x6e, 0x97, 0x93, 0x7a, 0xaf, 0x4a, 0x99, 0x13, 0xcc, 0x0a, 0x14, + 0x92, 0xe0, 0x75, 0x30, 0xef, 0x34, 0x2c, 0xb3, 0x43, 0x7d, 0x1e, 0x84, 0x3b, 0x2d, 0xae, 0xfd, + 0xb9, 0xa3, 0x41, 0x7a, 0xce, 0x28, 0x14, 0xab, 0xd4, 0xe7, 0x46, 0x09, 0xcd, 0x39, 0x0d, 0x4b, + 0x2c, 0x6d, 0xb8, 0x03, 0xe6, 0x48, 0x8f, 0x13, 0x4f, 0xdc, 0xad, 0x19, 0x21, 0xb8, 0x9c, 0x95, + 0x63, 0x31, 0x1b, 0x8e, 0xc5, 0x6c, 0xde, 0xeb, 0x17, 0x56, 0x7f, 0x7e, 0x74, 0x7d, 0x65, 0xbc, + 0x28, 0x7a, 0x48, 0x43, 0x23, 0x0f, 0x9b, 0xf1, 0x3f, 0x83, 0x27, 0xf4, 0xb7, 0x02, 0x12, 0xa1, + 0x69, 0x50, 0xa4, 0x2d, 0x87, 0x71, 0xea, 0xf7, 0x75, 0x8f, 0xfb, 0x7d, 0x58, 0x05, 0x73, 0xb4, + 0x43, 0x7c, 0x31, 0xe2, 0x86, 0xef, 0x7c, 0xe3, 0x64, 0x8a, 0xa7, 0xd0, 0x2b, 0x21, 0x2b, 0xb8, + 0xe3, 0x68, 0xe4, 0x64, 0xbc, 0x3b, 0xd1, 0x97, 0x76, 0xe7, 0x26, 0x98, 0xe9, 0x76, 0x6c, 0x51, + 0xd7, 0xd8, 0x7f, 0xa9, 0xeb, 0x90, 0x04, 0xd7, 0x41, 0xac, 0xcd, 0x9a, 0xa2, 0x57, 0x0b, 0x85, + 0xff, 0x3f, 0x1b, 0xa4, 0x21, 0xc2, 0xf7, 0xc3, 0x28, 0x87, 0x93, 0x14, 0x05, 0x26, 0x1a, 0x02, + 0xf0, 0xa4, 0x23, 0x78, 0x11, 0x2c, 0x34, 0x5c, 0x6a, 0xdd, 0x33, 0x5b, 0xc4, 0x69, 0xb6, 0xb8, + 0xbc, 0x47, 0x68, 0x5e, 0x60, 0x5b, 0x02, 0x82, 0xab, 0x60, 0x96, 0xf7, 0x4c, 0xc7, 0xb3, 0x49, + 0x4f, 0x26, 0x82, 0x66, 0x78, 0xcf, 0x08, 0xb6, 0x9a, 0x03, 0xa6, 0x76, 0xa8, 0x4d, 0x5c, 0xb8, + 0x0d, 0x62, 0xf7, 0x48, 0x5f, 0x3e, 0x96, 0xc2, 0x87, 0xcf, 0x06, 0xe9, 0xf7, 0x9a, 0x0e, 0x6f, + 0x75, 0x1b, 0x59, 0x8b, 0xb6, 0x73, 0x9c, 0x78, 0x76, 0xf0, 0x78, 0x3d, 0x3e, 0xbe, 0x74, 0x9d, + 0x06, 0xcb, 0x35, 0xfa, 0x9c, 0xb0, 0xec, 0x16, 0xe9, 0x15, 0x82, 0x05, 0x0a, 0x9c, 0x04, 0x17, + 0x50, 0xce, 0xf3, 0xa8, 0x78, 0x7a, 0x72, 0x73, 0xe5, 0x2f, 0x05, 0x80, 0xd1, 0x2c, 0x81, 0xef, + 0x83, 0x0b, 0xf9, 0x62, 0x51, 0xaf, 0xd5, 0xcc, 0xfa, 0x6e, 0x55, 0x37, 0x6f, 0x97, 0x6b, 0x55, + 0xbd, 0x68, 0x7c, 0x64, 0xe8, 0x25, 0x35, 0x92, 0x5c, 0x3d, 0x38, 0xcc, 0xac, 0x8c, 0x8c, 0x6f, + 0x7b, 0xac, 0x43, 0x2c, 0x67, 0xcf, 0x21, 0x36, 0xbc, 0x06, 0xe0, 0x38, 0xaf, 0x5c, 0x29, 0x54, + 0x4a, 0xbb, 0xaa, 0x92, 0x5c, 0x3e, 0x38, 0xcc, 0xa8, 0x23, 0x4a, 0x99, 0x36, 0xa8, 0xdd, 0x87, + 0x1f, 0x80, 0xc4, 0xb8, 0x75, 0xa5, 0xfc, 0xf1, 0xae, 0x99, 0x2f, 0x95, 0x90, 0x5e, 0xab, 0xa9, + 0xd1, 0x17, 0x65, 0x2a, 0x9e, 0xdb, 0x0f, 0xff, 0xe5, 0x36, 0xc0, 0xca, 0x38, 0x51, 0xff, 0x44, + 0x47, 0xbb, 0x42, 0x29, 0x96, 0xbc, 0x70, 0x70, 0x98, 0xf9, 0xdf, 0x88, 0xa5, 0xef, 0x13, 0xbf, + 0x1f, 0x88, 0x25, 0x67, 0xbf, 0xf8, 0x3e, 0x15, 0x79, 0xf8, 0x43, 0x2a, 0x72, 0xe5, 0xc7, 0x18, + 0xc8, 0x9c, 0x75, 0xd3, 0x20, 0x01, 0xef, 0x14, 0x2b, 0xe5, 0x3a, 0xca, 0x17, 0xeb, 0x66, 0xb1, + 0x52, 0xd2, 0xcd, 0x2d, 0xa3, 0x56, 0xaf, 0xa0, 0x5d, 0xb3, 0x52, 0xd5, 0x51, 0xbe, 0x6e, 0x54, + 0xca, 0xa7, 0x95, 0x26, 0x77, 0x70, 0x98, 0xb9, 0x7a, 0x96, 0xef, 0xf1, 0x82, 0xdd, 0x01, 0x97, + 0x27, 0x92, 0x31, 0xca, 0x46, 0x5d, 0x55, 0x92, 0xeb, 0x07, 0x87, 0x99, 0x4b, 0x67, 0xf9, 0x37, + 0x3c, 0x87, 0xc3, 0xbb, 0xe0, 0xda, 0x44, 0x8e, 0x77, 0x8c, 0x5b, 0x28, 0x5f, 0xd7, 0xd5, 0x68, + 0xf2, 0xea, 0xc1, 0x61, 0xe6, 0xed, 0xb3, 0x7c, 0xef, 0x38, 0x4d, 0x1f, 0x73, 0x32, 0xb1, 0xfb, + 0x5b, 0x7a, 0x59, 0xaf, 0x19, 0x35, 0x35, 0x36, 0x99, 0xfb, 0x5b, 0xc4, 0x23, 0xcc, 0x61, 0xc9, + 0x78, 0xd0, 0xac, 0xc2, 0xd6, 0xe3, 0x3f, 0x52, 0x91, 0x87, 0x47, 0x29, 0xe5, 0xf1, 0x51, 0x4a, + 0x79, 0x72, 0x94, 0x52, 0x7e, 0x3f, 0x4a, 0x29, 0x5f, 0x3d, 0x4d, 0x45, 0x9e, 0x3c, 0x4d, 0x45, + 0x7e, 0x7d, 0x9a, 0x8a, 0x7c, 0xfa, 0xd6, 0xd8, 0x3b, 0x28, 0x52, 0xd6, 0xbe, 0x13, 0x7e, 0x37, + 0xda, 0xb9, 0x9e, 0xfc, 0x7e, 0x14, 0x1f, 0x8f, 0x8d, 0x69, 0x31, 0xd5, 0xde, 0xfd, 0x27, 0x00, + 0x00, 0xff, 0xff, 0x8a, 0x3c, 0x4a, 0xb6, 0x5d, 0x0a, 0x00, 0x00, } func (this *ExecuteContractAuthorization) Equal(that interface{}) bool { @@ -592,22 +635,49 @@ func (this *ExecuteContractAuthorization) Equal(that interface{}) bool { } else if this == nil { return false } - if len(this.TargetContracts) != len(that1.TargetContracts) { + if len(this.AllowedContracts) != len(that1.AllowedContracts) { return false } - for i := range this.TargetContracts { - if this.TargetContracts[i] != that1.TargetContracts[i] { + for i := range this.AllowedContracts { + if !this.AllowedContracts[i].Equal(that1.AllowedContracts[i]) { return false } } - if len(this.AllowedFunctions) != len(that1.AllowedFunctions) { + return true +} +func (this *AllowedContract) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*AllowedContract) + if !ok { + that2, ok := that.(AllowedContract) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.ContractAddress != that1.ContractAddress { return false } - for i := range this.AllowedFunctions { - if this.AllowedFunctions[i] != that1.AllowedFunctions[i] { + if len(this.AllowedMessages) != len(that1.AllowedMessages) { + return false + } + for i := range this.AllowedMessages { + if this.AllowedMessages[i] != that1.AllowedMessages[i] { return false } } + if this.Once != that1.Once { + return false + } return true } func (this *AccessTypeParam) Equal(that interface{}) bool { @@ -870,24 +940,69 @@ func (m *ExecuteContractAuthorization) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l - if len(m.AllowedFunctions) > 0 { - for iNdEx := len(m.AllowedFunctions) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.AllowedFunctions[iNdEx]) - copy(dAtA[i:], m.AllowedFunctions[iNdEx]) - i = encodeVarintTypes(dAtA, i, uint64(len(m.AllowedFunctions[iNdEx]))) + if len(m.AllowedContracts) > 0 { + for iNdEx := len(m.AllowedContracts) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.AllowedContracts[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *AllowedContract) 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 *AllowedContract) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllowedContract) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Once { + i-- + if m.Once { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } + i-- + dAtA[i] = 0x18 } - if len(m.TargetContracts) > 0 { - for iNdEx := len(m.TargetContracts) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.TargetContracts[iNdEx]) - copy(dAtA[i:], m.TargetContracts[iNdEx]) - i = encodeVarintTypes(dAtA, i, uint64(len(m.TargetContracts[iNdEx]))) + if len(m.AllowedMessages) > 0 { + for iNdEx := len(m.AllowedMessages) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.AllowedMessages[iNdEx]) + copy(dAtA[i:], m.AllowedMessages[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AllowedMessages[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if len(m.ContractAddress) > 0 { + i -= len(m.ContractAddress) + copy(dAtA[i:], m.ContractAddress) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ContractAddress))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } @@ -1263,18 +1378,34 @@ func (m *ExecuteContractAuthorization) Size() (n int) { } var l int _ = l - if len(m.TargetContracts) > 0 { - for _, s := range m.TargetContracts { - l = len(s) + if len(m.AllowedContracts) > 0 { + for _, e := range m.AllowedContracts { + l = e.Size() n += 1 + l + sovTypes(uint64(l)) } } - if len(m.AllowedFunctions) > 0 { - for _, s := range m.AllowedFunctions { + return n +} + +func (m *AllowedContract) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ContractAddress) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if len(m.AllowedMessages) > 0 { + for _, s := range m.AllowedMessages { l = len(s) n += 1 + l + sovTypes(uint64(l)) } } + if m.Once { + n += 2 + } return n } @@ -1470,7 +1601,91 @@ func (m *ExecuteContractAuthorization) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TargetContracts", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AllowedContracts", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AllowedContracts = append(m.AllowedContracts, &AllowedContract{}) + if err := m.AllowedContracts[len(m.AllowedContracts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *AllowedContract) 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 ErrIntOverflowTypes + } + 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: AllowedContract: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AllowedContract: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ContractAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1498,11 +1713,11 @@ func (m *ExecuteContractAuthorization) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TargetContracts = append(m.TargetContracts, string(dAtA[iNdEx:postIndex])) + m.ContractAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AllowedFunctions", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AllowedMessages", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1530,8 +1745,28 @@ func (m *ExecuteContractAuthorization) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.AllowedFunctions = append(m.AllowedFunctions, string(dAtA[iNdEx:postIndex])) + m.AllowedMessages = append(m.AllowedMessages, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Once", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Once = bool(v != 0) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:])