diff --git a/proto/ibc/channel/query.proto b/proto/ibc/channel/query.proto index 08c87bc30..3eddbb23b 100644 --- a/proto/ibc/channel/query.proto +++ b/proto/ibc/channel/query.proto @@ -32,6 +32,7 @@ service Query { // TODO: blocked by client proto migration // rpc ChannelClientState(QueryChannelClientStateRequest) returns (QueryChannelClientStateRequest) {} + // rpc ChannelConsensusState(QueryChannelConsensusStateRequest) returns (QueryChannelConsensusStateRequest) {} } // QueryChannelRequest is the request type for the Query/Channel RPC method @@ -181,3 +182,11 @@ message QueryChannelClientStateRequest { // channel unique identifier string channel_id = 2 [(gogoproto.customname) = "ChannelID"]; } + +// QueryChannelConsensusStateRequest is the request type for the Query/ConsensusState RPC method +message QueryChannelConsensusStateRequest { + // port unique identifier + string port_id = 1 [(gogoproto.customname) = "PortID"]; + // channel unique identifier + string channel_id = 2 [(gogoproto.customname) = "ChannelID"]; +} diff --git a/x/ibc-transfer/client/cli/tx.go b/x/ibc-transfer/client/cli/tx.go index 208878116..451245d74 100644 --- a/x/ibc-transfer/client/cli/tx.go +++ b/x/ibc-transfer/client/cli/tx.go @@ -2,6 +2,7 @@ package cli import ( "fmt" + "strings" "github.com/spf13/cobra" @@ -11,18 +12,24 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types" + channelutils "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/client/utils" ) const ( flagTimeoutHeight = "timeout-height" flagTimeoutTimestamp = "timeout-timestamp" + flagAbsoluteTimeouts = "absolute-timeouts" ) // NewTransferTxCmd returns the command to create a NewMsgTransfer transaction func NewTransferTxCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "transfer [src-port] [src-channel] [receiver] [amount]", - Short: "Transfer a fungible token through IBC", + Use: "transfer [src-port] [src-channel] [receiver] [amount]", + Short: "Transfer a fungible token through IBC", + Long: strings.TrimSpace(`Transfer a fungible token through IBC. Timeouts can be specified +as absolute or relative using the "absolute-timeouts" flag. Relative timeouts are added to +the block height and block timestamp queried from the latest consensus state corresponding +to the counterparty channel. Any timeout set to 0 is disabled.`), Example: fmt.Sprintf("%s tx ibc-transfer transfer [src-port] [src-channel] [receiver] [amount]", version.AppName), Args: cobra.ExactArgs(4), RunE: func(cmd *cobra.Command, args []string) error { @@ -42,8 +49,37 @@ func NewTransferTxCmd() *cobra.Command { return err } - timeoutHeight, _ := cmd.Flags().GetUint64(flagTimeoutHeight) - timeoutTimestamp, _ := cmd.Flags().GetUint64(flagTimeoutHeight) + timeoutHeight, err := cmd.Flags().GetUint64(flagTimeoutHeight) + if err != nil { + return err + } + + timeoutTimestamp, err := cmd.Flags().GetUint64(flagTimeoutHeight) + if err != nil { + return err + } + + absoluteTimeouts, err := cmd.Flags().GetBool(flagAbsoluteTimeouts) + if err != nil { + return err + } + + // if the timeouts are not absolute, retrieve latest block height and block timestamp + // for the consensus state connected to the destination port/channel + if !absoluteTimeouts { + consensusState, _, err := channelutils.QueryCounterpartyConsensusState(clientCtx, srcPort, srcChannel) + if err != nil { + return err + } + + if timeoutHeight != 0 { + timeoutHeight = consensusState.GetHeight() + timeoutHeight + } + + if timeoutTimestamp != 0 { + timeoutTimestamp = consensusState.GetTimestamp() + timeoutTimestamp + } + } msg := types.NewMsgTransfer( srcPort, srcChannel, coins, sender, receiver, timeoutHeight, timeoutTimestamp, @@ -56,8 +92,9 @@ func NewTransferTxCmd() *cobra.Command { }, } - cmd.Flags().Uint64(flagTimeoutHeight, types.DefaultAbsolutePacketTimeoutHeight, "Absolute timeout block height. The timeout is disabled when set to 0.") - cmd.Flags().Uint64(flagTimeoutTimestamp, types.DefaultAbsolutePacketTimeoutTimestamp, "Absolute timeout timestamp in nanoseconds. The timeout is disabled when set to 0.") + cmd.Flags().Uint64(flagTimeoutHeight, types.DefaultRelativePacketTimeoutHeight, "Timeout block height. The timeout is disabled when set to 0.") + cmd.Flags().Uint64(flagTimeoutTimestamp, types.DefaultRelativePacketTimeoutTimestamp, "Timeout timestamp in nanoseconds. Default is 10 minutes. The timeout is disabled when set to 0.") + cmd.Flags().Bool(flagAbsoluteTimeouts, false, "Timeout flags are used as absolute timeouts.") flags.AddTxFlagsToCmd(cmd) return cmd diff --git a/x/ibc-transfer/keeper/keeper.go b/x/ibc-transfer/keeper/keeper.go index 6faca73d1..8c028cbb5 100644 --- a/x/ibc-transfer/keeper/keeper.go +++ b/x/ibc-transfer/keeper/keeper.go @@ -64,7 +64,7 @@ func (k Keeper) GetTransferAccount(ctx sdk.Context) authtypes.ModuleAccountI { // PacketExecuted defines a wrapper function for the channel Keeper's function // in order to expose it to the ICS20 transfer handler. -// Keeper retreives channel capability and passes it into channel keeper for authentication +// Keeper retrieves channel capability and passes it into channel keeper for authentication func (k Keeper) PacketExecuted(ctx sdk.Context, packet channelexported.PacketI, acknowledgement []byte) error { chanCap, ok := k.scopedKeeper.GetCapability(ctx, host.ChannelCapabilityPath(packet.GetDestPort(), packet.GetDestChannel())) if !ok { diff --git a/x/ibc-transfer/types/packet.go b/x/ibc-transfer/types/packet.go index f107643ba..9386a5bf5 100644 --- a/x/ibc-transfer/types/packet.go +++ b/x/ibc-transfer/types/packet.go @@ -2,27 +2,23 @@ package types import ( "strings" + "time" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -const ( +var ( // DefaultRelativePacketTimeoutHeight is the default packet timeout height (in blocks) relative - // to the current block height. The timeout is disabled when set to 0. - DefaultRelativePacketTimeoutHeight = 1000 + // to the current block height of the counterparty chain provided by the client state. The + // timeout is disabled when set to 0. + DefaultRelativePacketTimeoutHeight = uint64(1000) // DefaultRelativePacketTimeoutTimestamp is the default packet timeout timestamp (in nanoseconds) - // relative to the current block timestamp. The timeout is disabled when set to 0. - DefaultRelativePacketTimeoutTimestamp = 0 - - // DefaultAbsolutePacketTimeoutHeight is the default packet timeout in blocks. - // The timeout is disabled when set to 0. - DefaultAbsolutePacketTimeoutHeight = 0 - - // DefaultAbsolutePacketTimeoutTimestamp is the default packet timeout timestamp (in nanoseconds) - // relative to the current block timestamp. The timeout is disabled when set to 0. - DefaultAbsolutePacketTimeoutTimestamp = 0 + // relative to the current block timestamp of the counterparty chain provided by the client + // state. The timeout is disabled when set to 0. The default is currently set to a 10 minute + // timeout. + DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) ) // NewFungibleTokenPacketData contructs a new FungibleTokenPacketData instance diff --git a/x/ibc/04-channel/client/utils/utils.go b/x/ibc/04-channel/client/utils/utils.go index d1cd2aac6..b36cc2eb9 100644 --- a/x/ibc/04-channel/client/utils/utils.go +++ b/x/ibc/04-channel/client/utils/utils.go @@ -119,11 +119,51 @@ func QueryChannelClientState(clientCtx client.Context, portID, channelID string) var clientState clientexported.ClientState err = clientCtx.JSONMarshaler.UnmarshalJSON(res, &clientState) if err != nil { - return nil, 0, fmt.Errorf("failed to unmarshal connections: %w", err) + return nil, 0, fmt.Errorf("failed to unmarshal client state: %w", err) } return clientState, height, nil } +// QueryChannelConsensusState uses the channel Querier to return the ConsensusState +// of a Channel. +func QueryChannelConsensusState(clientCtx client.Context, portID, channelID string) (clientexported.ConsensusState, int64, error) { + params := types.NewQueryChannelConsensusStateRequest(portID, channelID) + bz, err := clientCtx.JSONMarshaler.MarshalJSON(params) + if err != nil { + return nil, 0, fmt.Errorf("failed to marshal query params: %w", err) + } + + route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryChannelConsensusState) + res, height, err := clientCtx.QueryWithData(route, bz) + if err != nil { + return nil, 0, err + } + + var consensusState clientexported.ConsensusState + err = clientCtx.JSONMarshaler.UnmarshalJSON(res, &consensusState) + if err != nil { + return nil, 0, fmt.Errorf("failed to unmarshal consensus state: %w", err) + } + return consensusState, height, nil +} + +// QueryCounterpartyConsensusState uses the channel Querier to return the +// counterparty ConsensusState given the source port ID and source channel ID. +func QueryCounterpartyConsensusState(clientCtx client.Context, portID, channelID string) (clientexported.ConsensusState, int64, error) { + channelRes, err := QueryChannel(clientCtx, portID, channelID, false) + if err != nil { + return nil, 0, err + } + + counterparty := channelRes.Channel.Counterparty + clientState, height, err := QueryChannelConsensusState(clientCtx, counterparty.PortID, counterparty.ChannelID) + if err != nil { + return nil, 0, err + } + + return clientState, height, nil +} + // QueryNextSequenceReceive returns the next sequence receive. // If prove is true, it performs an ABCI store query in order to retrieve the merkle proof. Otherwise, // it uses the gRPC query client. diff --git a/x/ibc/04-channel/types/querier.go b/x/ibc/04-channel/types/querier.go index fa35b0a50..65f810a23 100644 --- a/x/ibc/04-channel/types/querier.go +++ b/x/ibc/04-channel/types/querier.go @@ -13,6 +13,7 @@ const ( QueryChannel = "channel" QueryConnectionChannels = "connection-channels" QueryChannelClientState = "channel-client-state" + QueryChannelConsensusState = "channel-consensus-state" QueryPacketCommitments = "packet-commitments" QueryUnrelayedAcknowledgements = "unrelayed-acknowledgements" QueryUnrelayedPacketSends = "unrelayed-packet-sends" @@ -62,3 +63,11 @@ func NewQueryChannelClientStateRequest(portID, channelID string) *QueryChannelCl ChannelID: channelID, } } + +// NewQueryChannelConsensusStateRequest creates a new QueryChannelConsensusStateRequest instance. +func NewQueryChannelConsensusStateRequest(portID, channelID string) *QueryChannelConsensusStateRequest { + return &QueryChannelConsensusStateRequest{ + PortID: portID, + ChannelID: channelID, + } +} diff --git a/x/ibc/04-channel/types/query.pb.go b/x/ibc/04-channel/types/query.pb.go index ca1044481..f0d492362 100644 --- a/x/ibc/04-channel/types/query.pb.go +++ b/x/ibc/04-channel/types/query.pb.go @@ -973,6 +973,61 @@ func (m *QueryChannelClientStateRequest) GetChannelID() string { return "" } +// QueryChannelConsensusStateRequest is the request type for the Query/ConsensusState RPC method +type QueryChannelConsensusStateRequest struct { + // port unique identifier + PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + // channel unique identifier + ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` +} + +func (m *QueryChannelConsensusStateRequest) Reset() { *m = QueryChannelConsensusStateRequest{} } +func (m *QueryChannelConsensusStateRequest) String() string { return proto.CompactTextString(m) } +func (*QueryChannelConsensusStateRequest) ProtoMessage() {} +func (*QueryChannelConsensusStateRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_2150995751d4f15a, []int{15} +} +func (m *QueryChannelConsensusStateRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryChannelConsensusStateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryChannelConsensusStateRequest.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 *QueryChannelConsensusStateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryChannelConsensusStateRequest.Merge(m, src) +} +func (m *QueryChannelConsensusStateRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryChannelConsensusStateRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryChannelConsensusStateRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryChannelConsensusStateRequest proto.InternalMessageInfo + +func (m *QueryChannelConsensusStateRequest) GetPortID() string { + if m != nil { + return m.PortID + } + return "" +} + +func (m *QueryChannelConsensusStateRequest) GetChannelID() string { + if m != nil { + return m.ChannelID + } + return "" +} + func init() { proto.RegisterType((*QueryChannelRequest)(nil), "ibc.channel.QueryChannelRequest") proto.RegisterType((*QueryChannelResponse)(nil), "ibc.channel.QueryChannelResponse") @@ -989,64 +1044,66 @@ func init() { proto.RegisterType((*QueryNextSequenceReceiveRequest)(nil), "ibc.channel.QueryNextSequenceReceiveRequest") proto.RegisterType((*QueryNextSequenceReceiveResponse)(nil), "ibc.channel.QueryNextSequenceReceiveResponse") proto.RegisterType((*QueryChannelClientStateRequest)(nil), "ibc.channel.QueryChannelClientStateRequest") + proto.RegisterType((*QueryChannelConsensusStateRequest)(nil), "ibc.channel.QueryChannelConsensusStateRequest") } func init() { proto.RegisterFile("ibc/channel/query.proto", fileDescriptor_2150995751d4f15a) } var fileDescriptor_2150995751d4f15a = []byte{ - // 827 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xbd, 0x72, 0xd3, 0x4a, - 0x14, 0xb6, 0x62, 0xc7, 0x8e, 0x8f, 0x73, 0x67, 0xee, 0xdd, 0x38, 0x17, 0x47, 0x93, 0x28, 0x8e, - 0x68, 0x0c, 0x49, 0x64, 0xc6, 0xa1, 0xa2, 0x23, 0x4e, 0x81, 0x0b, 0x18, 0xa3, 0x0c, 0x0d, 0x8d, - 0x47, 0x96, 0x37, 0xb6, 0xc6, 0xb1, 0x24, 0x6b, 0x37, 0x4c, 0x52, 0xf1, 0x04, 0xcc, 0xd0, 0x31, - 0x34, 0x50, 0xd0, 0x51, 0xf0, 0x04, 0x3c, 0x00, 0x65, 0x4a, 0xaa, 0x0c, 0x38, 0x2f, 0xc2, 0x68, - 0x7f, 0x1c, 0xff, 0x48, 0x19, 0x15, 0xf1, 0x0c, 0x95, 0xb4, 0x67, 0xbf, 0x3d, 0xe7, 0x7c, 0xdf, - 0x9e, 0x3d, 0xbb, 0x70, 0xcf, 0x69, 0xdb, 0x55, 0xbb, 0x67, 0xb9, 0x2e, 0x3e, 0xad, 0x0e, 0xcf, - 0x70, 0x70, 0x61, 0xf8, 0x81, 0x47, 0x3d, 0x54, 0x70, 0xda, 0xb6, 0x21, 0x26, 0xd4, 0x62, 0xd7, - 0xeb, 0x7a, 0xcc, 0x5e, 0x0d, 0xff, 0x38, 0x44, 0xdd, 0xb2, 0x3d, 0x32, 0xf0, 0x08, 0x5f, 0x56, - 0xf5, 0xad, 0xae, 0xe3, 0x5a, 0xd4, 0xf1, 0x5c, 0x31, 0xbd, 0x31, 0xe9, 0x5a, 0x7c, 0xf9, 0x94, - 0xde, 0x83, 0xb5, 0x97, 0xe1, 0xa2, 0x3a, 0xb7, 0x9a, 0x78, 0x78, 0x86, 0x09, 0x45, 0xf7, 0x21, - 0xe7, 0x7b, 0x01, 0x6d, 0x39, 0x9d, 0x92, 0x52, 0x56, 0x2a, 0xf9, 0x43, 0x18, 0x5d, 0x6d, 0x67, - 0x9b, 0x5e, 0x40, 0x1b, 0x47, 0x66, 0x36, 0x9c, 0x6a, 0x74, 0xd0, 0x1e, 0x80, 0x70, 0x16, 0xe2, - 0x96, 0x18, 0xee, 0x9f, 0xd1, 0xd5, 0x76, 0x5e, 0x38, 0x6b, 0x1c, 0x99, 0x79, 0x01, 0x68, 0x74, - 0xf4, 0x4f, 0x0a, 0x14, 0xa7, 0x43, 0x11, 0xdf, 0x73, 0x09, 0x46, 0x06, 0xe4, 0x04, 0x8a, 0xc5, - 0x2a, 0xd4, 0x8a, 0xc6, 0x04, 0x63, 0x43, 0xc2, 0x25, 0x08, 0x15, 0x61, 0xd9, 0x0f, 0x3c, 0xef, - 0x84, 0x45, 0x5c, 0x35, 0xf9, 0x00, 0x6d, 0x01, 0xb0, 0x9f, 0x96, 0x6f, 0xd1, 0x5e, 0x29, 0x1d, - 0x26, 0x63, 0xe6, 0x99, 0xa5, 0x69, 0xd1, 0x1e, 0xda, 0x81, 0x55, 0x3e, 0xdd, 0xc3, 0x4e, 0xb7, - 0x47, 0x4b, 0x99, 0xb2, 0x52, 0xc9, 0x98, 0x05, 0x66, 0x7b, 0xc6, 0x4c, 0x7a, 0x7d, 0x3a, 0x3f, - 0x22, 0xb5, 0xd8, 0x85, 0x74, 0x80, 0x87, 0x22, 0xb7, 0x0d, 0x83, 0x4b, 0x6d, 0xf0, 0x1d, 0x6a, - 0x5a, 0x5d, 0x2c, 0x70, 0x66, 0x88, 0xd2, 0x3f, 0x2a, 0xb0, 0x3e, 0xe3, 0x45, 0xd0, 0x7c, 0x02, - 0x2b, 0x82, 0x01, 0x29, 0x29, 0xe5, 0x74, 0xa5, 0x50, 0xd3, 0xa6, 0x78, 0x36, 0x3a, 0xd8, 0xa5, - 0xce, 0x89, 0x83, 0x3b, 0x92, 0xf1, 0x18, 0x8f, 0xf6, 0xc2, 0x14, 0x08, 0x23, 0x5c, 0xa8, 0xa9, - 0x51, 0x29, 0xf0, 0x20, 0x61, 0x0e, 0x04, 0xfd, 0x0f, 0x59, 0xc1, 0x32, 0x94, 0x21, 0x6d, 0x8a, - 0x91, 0x3e, 0x00, 0x8d, 0xa7, 0xe6, 0xb9, 0x2e, 0xb6, 0xc3, 0xfa, 0x98, 0xa5, 0xaa, 0x01, 0xd8, - 0xe3, 0x49, 0xbe, 0xf3, 0xe6, 0x84, 0x45, 0x4a, 0xb1, 0x94, 0x48, 0x8a, 0x2f, 0x0a, 0x6c, 0xc7, - 0xc6, 0xfb, 0x6b, 0x44, 0x79, 0xa7, 0xc0, 0x26, 0xcb, 0xb2, 0x69, 0xd9, 0x7d, 0x4c, 0xeb, 0xde, - 0x60, 0xe0, 0xd0, 0x01, 0x76, 0xe9, 0xe2, 0x8e, 0x02, 0x52, 0x61, 0x85, 0x84, 0xde, 0x5d, 0x1b, - 0xb3, 0x6c, 0x32, 0xe6, 0x78, 0xac, 0x7f, 0x50, 0x60, 0x2b, 0x26, 0x1f, 0xa1, 0x19, 0xdb, 0x24, - 0x69, 0x65, 0x39, 0xad, 0x9a, 0x13, 0x96, 0x85, 0x9d, 0x8f, 0xcf, 0x71, 0x99, 0x91, 0x05, 0x4a, - 0x25, 0x2a, 0x2e, 0x9d, 0xa8, 0xe2, 0xbe, 0x2a, 0xa2, 0xc2, 0x23, 0x32, 0x14, 0xe2, 0x1d, 0x42, - 0xe1, 0x46, 0x2a, 0x59, 0x73, 0xe5, 0xa9, 0x9a, 0xe3, 0x8b, 0x9f, 0xda, 0xfd, 0x09, 0xed, 0x27, - 0x17, 0xdd, 0x51, 0xe1, 0x7d, 0x97, 0x85, 0xf7, 0xca, 0x0d, 0xf0, 0xa9, 0x75, 0x81, 0x3b, 0x3c, - 0xf0, 0x22, 0xd5, 0xdc, 0x84, 0xbc, 0x2c, 0x34, 0x52, 0x4a, 0x97, 0xd3, 0x95, 0x8c, 0x79, 0x63, - 0x90, 0x5a, 0x67, 0x12, 0x69, 0xfd, 0x56, 0x14, 0xc3, 0x7c, 0xf6, 0x42, 0xe9, 0x12, 0xe4, 0x7c, - 0x6e, 0x62, 0x2a, 0x67, 0x4c, 0x39, 0xbc, 0x23, 0xfd, 0xa8, 0xe8, 0x2e, 0x2f, 0xf0, 0x39, 0x3d, - 0x16, 0x1c, 0x4c, 0x6c, 0x63, 0xe7, 0x0d, 0x5e, 0xe0, 0x2d, 0xf6, 0x4d, 0x81, 0x72, 0x7c, 0x58, - 0x41, 0xbd, 0x06, 0xeb, 0x2e, 0x3e, 0xa7, 0x2d, 0x29, 0x6d, 0x2b, 0xe0, 0x00, 0x96, 0x45, 0xc6, - 0x5c, 0x73, 0xe7, 0xd7, 0x2e, 0xec, 0xd4, 0x12, 0xd9, 0xf4, 0x39, 0x85, 0xfa, 0xa9, 0x83, 0x5d, - 0x7a, 0x4c, 0x2d, 0xba, 0x40, 0x95, 0x6a, 0xbf, 0x97, 0x61, 0x99, 0x45, 0x45, 0x4d, 0xc8, 0x09, - 0x04, 0x9a, 0x3e, 0x65, 0x11, 0xaf, 0x0e, 0x75, 0xe7, 0x16, 0x04, 0x97, 0x56, 0x4f, 0xa1, 0x63, - 0x58, 0x91, 0xd7, 0x08, 0x8a, 0x5f, 0x20, 0x4f, 0x91, 0xaa, 0xdf, 0x06, 0x19, 0x3b, 0x1d, 0x02, - 0x9a, 0xbf, 0xa5, 0xd0, 0x6e, 0xc4, 0xda, 0xb8, 0xbb, 0x53, 0xdd, 0x4b, 0x06, 0x1e, 0x87, 0xec, - 0xc3, 0xbf, 0xb3, 0x6d, 0x0a, 0x3d, 0x98, 0xf7, 0x11, 0x73, 0x2d, 0xa9, 0x0f, 0x93, 0x40, 0xc7, - 0xc1, 0x5c, 0xf8, 0x6f, 0xae, 0x27, 0xa2, 0x04, 0x2e, 0xc6, 0xec, 0x76, 0x13, 0x61, 0x27, 0xc9, - 0xcd, 0x36, 0x86, 0x28, 0x72, 0x31, 0xad, 0x2f, 0x8a, 0x5c, 0x5c, 0x9f, 0xd1, 0x53, 0x88, 0xc2, - 0x5a, 0xc4, 0x69, 0x44, 0x11, 0x1b, 0x12, 0xdf, 0x2b, 0xd4, 0xfd, 0x84, 0x68, 0x19, 0xf5, 0xf0, - 0xf9, 0x8f, 0x91, 0xa6, 0x5c, 0x8e, 0x34, 0xe5, 0xd7, 0x48, 0x53, 0xde, 0x5f, 0x6b, 0xa9, 0xcb, - 0x6b, 0x2d, 0xf5, 0xf3, 0x5a, 0x4b, 0xbd, 0x3e, 0xe8, 0x3a, 0xb4, 0x77, 0xd6, 0x36, 0x6c, 0x6f, - 0x50, 0x15, 0x0f, 0x73, 0xfe, 0xd9, 0x27, 0x9d, 0x7e, 0xf5, 0xbc, 0x1a, 0xbe, 0xc6, 0x1f, 0x3d, - 0xde, 0x97, 0x0f, 0x72, 0x7a, 0xe1, 0x63, 0xd2, 0xce, 0xb2, 0xf7, 0xf8, 0xc1, 0x9f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xdf, 0x68, 0xc7, 0x94, 0x07, 0x0c, 0x00, 0x00, + // 839 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xbf, 0x72, 0xfb, 0x44, + 0x10, 0xb6, 0x62, 0xc7, 0x8e, 0xd7, 0x61, 0x06, 0x2e, 0x0e, 0x38, 0x9a, 0x44, 0x71, 0x44, 0x63, + 0x48, 0x22, 0x33, 0x0e, 0x15, 0x1d, 0x71, 0x0a, 0x5c, 0xc0, 0x18, 0x65, 0x68, 0x68, 0x3c, 0xb2, + 0x7c, 0xb1, 0x35, 0x8e, 0x4f, 0xb2, 0xee, 0x9c, 0x49, 0x2a, 0x9e, 0x80, 0x19, 0x3a, 0x86, 0x06, + 0x0a, 0x3a, 0x0a, 0x9e, 0x80, 0x07, 0xa0, 0x4c, 0x49, 0x95, 0x01, 0xe7, 0x45, 0x18, 0xdd, 0x1f, + 0xc7, 0x7f, 0xa4, 0x8c, 0x8a, 0x68, 0xe6, 0x57, 0x59, 0xb7, 0xf7, 0xdd, 0xee, 0x7e, 0xdf, 0xed, + 0xed, 0xf9, 0xe0, 0x23, 0xaf, 0xef, 0x36, 0xdd, 0x91, 0x43, 0x08, 0xbe, 0x6d, 0x4e, 0x67, 0x38, + 0x7c, 0xb0, 0x82, 0xd0, 0x67, 0x3e, 0xaa, 0x78, 0x7d, 0xd7, 0x92, 0x13, 0x7a, 0x75, 0xe8, 0x0f, + 0x7d, 0x6e, 0x6f, 0x46, 0x5f, 0x02, 0xa2, 0x1f, 0xb9, 0x3e, 0x9d, 0xf8, 0x54, 0x2c, 0x6b, 0x06, + 0xce, 0xd0, 0x23, 0x0e, 0xf3, 0x7c, 0x22, 0xa7, 0x0f, 0x96, 0x5d, 0xcb, 0x5f, 0x31, 0x65, 0x8e, + 0x60, 0xef, 0xdb, 0x68, 0x51, 0x5b, 0x58, 0x6d, 0x3c, 0x9d, 0x61, 0xca, 0xd0, 0xc7, 0x50, 0x0a, + 0xfc, 0x90, 0xf5, 0xbc, 0x41, 0x4d, 0xab, 0x6b, 0x8d, 0xf2, 0x25, 0xcc, 0x9f, 0x8e, 0x8b, 0x5d, + 0x3f, 0x64, 0x9d, 0x2b, 0xbb, 0x18, 0x4d, 0x75, 0x06, 0xe8, 0x0c, 0x40, 0x3a, 0x8b, 0x70, 0x5b, + 0x1c, 0xf7, 0xde, 0xfc, 0xe9, 0xb8, 0x2c, 0x9d, 0x75, 0xae, 0xec, 0xb2, 0x04, 0x74, 0x06, 0xe6, + 0xaf, 0x1a, 0x54, 0x57, 0x43, 0xd1, 0xc0, 0x27, 0x14, 0x23, 0x0b, 0x4a, 0x12, 0xc5, 0x63, 0x55, + 0x5a, 0x55, 0x6b, 0x89, 0xb1, 0xa5, 0xe0, 0x0a, 0x84, 0xaa, 0xb0, 0x1d, 0x84, 0xbe, 0x7f, 0xc3, + 0x23, 0xee, 0xda, 0x62, 0x80, 0x8e, 0x00, 0xf8, 0x47, 0x2f, 0x70, 0xd8, 0xa8, 0x96, 0x8f, 0x92, + 0xb1, 0xcb, 0xdc, 0xd2, 0x75, 0xd8, 0x08, 0x9d, 0xc0, 0xae, 0x98, 0x1e, 0x61, 0x6f, 0x38, 0x62, + 0xb5, 0x42, 0x5d, 0x6b, 0x14, 0xec, 0x0a, 0xb7, 0x7d, 0xc5, 0x4d, 0x66, 0x7b, 0x35, 0x3f, 0xaa, + 0xb4, 0x38, 0x85, 0x7c, 0x88, 0xa7, 0x32, 0xb7, 0x03, 0x4b, 0x48, 0x6d, 0x89, 0x1d, 0xea, 0x3a, + 0x43, 0x2c, 0x71, 0x76, 0x84, 0x32, 0x7f, 0xd1, 0x60, 0x7f, 0xcd, 0x8b, 0xa4, 0xf9, 0x05, 0xec, + 0x48, 0x06, 0xb4, 0xa6, 0xd5, 0xf3, 0x8d, 0x4a, 0xcb, 0x58, 0xe1, 0xd9, 0x19, 0x60, 0xc2, 0xbc, + 0x1b, 0x0f, 0x0f, 0x14, 0xe3, 0x05, 0x1e, 0x9d, 0x45, 0x29, 0x50, 0x4e, 0xb8, 0xd2, 0xd2, 0xe3, + 0x52, 0x10, 0x41, 0xa2, 0x1c, 0x28, 0xfa, 0x10, 0x8a, 0x92, 0x65, 0x24, 0x43, 0xde, 0x96, 0x23, + 0x73, 0x02, 0x86, 0x48, 0xcd, 0x27, 0x04, 0xbb, 0x51, 0x7d, 0xac, 0x53, 0x35, 0x00, 0xdc, 0xc5, + 0xa4, 0xd8, 0x79, 0x7b, 0xc9, 0xa2, 0xa4, 0xd8, 0x4a, 0x25, 0xc5, 0xef, 0x1a, 0x1c, 0x27, 0xc6, + 0x7b, 0x67, 0x44, 0xf9, 0x51, 0x83, 0x43, 0x9e, 0x65, 0xd7, 0x71, 0xc7, 0x98, 0xb5, 0xfd, 0xc9, + 0xc4, 0x63, 0x13, 0x4c, 0x58, 0x76, 0x47, 0x01, 0xe9, 0xb0, 0x43, 0x23, 0xef, 0xc4, 0xc5, 0x3c, + 0x9b, 0x82, 0xbd, 0x18, 0x9b, 0x3f, 0x6b, 0x70, 0x94, 0x90, 0x8f, 0xd4, 0x8c, 0x6f, 0x92, 0xb2, + 0xf2, 0x9c, 0x76, 0xed, 0x25, 0x4b, 0x66, 0xe7, 0xe3, 0xb7, 0xa4, 0xcc, 0x68, 0x86, 0x52, 0xc9, + 0x8a, 0xcb, 0xa7, 0xaa, 0xb8, 0x3f, 0x34, 0x59, 0xe1, 0x31, 0x19, 0x4a, 0xf1, 0x2e, 0xa1, 0xf2, + 0x22, 0x95, 0xaa, 0xb9, 0xfa, 0x4a, 0xcd, 0x89, 0xc5, 0x5f, 0xba, 0xe3, 0x25, 0xed, 0x97, 0x17, + 0xbd, 0x51, 0xe1, 0xfd, 0xa5, 0x0a, 0xef, 0x3b, 0x12, 0xe2, 0x5b, 0xe7, 0x01, 0x0f, 0x44, 0xe0, + 0x2c, 0xd5, 0x3c, 0x84, 0xb2, 0x2a, 0x34, 0x5a, 0xcb, 0xd7, 0xf3, 0x8d, 0x82, 0xfd, 0x62, 0x50, + 0x5a, 0x17, 0x52, 0x69, 0xfd, 0x83, 0x2c, 0x86, 0xcd, 0xec, 0xa5, 0xd2, 0x35, 0x28, 0x05, 0xc2, + 0xc4, 0x55, 0x2e, 0xd8, 0x6a, 0xf8, 0x46, 0xfa, 0x31, 0xd9, 0x5d, 0xbe, 0xc1, 0xf7, 0xec, 0x5a, + 0x72, 0xb0, 0xb1, 0x8b, 0xbd, 0x3b, 0x9c, 0xe1, 0x2d, 0xf6, 0xa7, 0x06, 0xf5, 0xe4, 0xb0, 0x92, + 0x7a, 0x0b, 0xf6, 0x09, 0xbe, 0x67, 0x3d, 0x25, 0x6d, 0x2f, 0x14, 0x00, 0x9e, 0x45, 0xc1, 0xde, + 0x23, 0x9b, 0x6b, 0x33, 0x3b, 0xb5, 0x54, 0x35, 0x7d, 0x41, 0xa1, 0x7d, 0xeb, 0x61, 0xc2, 0xae, + 0x99, 0xc3, 0xb2, 0x54, 0xe9, 0x0e, 0x4e, 0x56, 0x82, 0x46, 0xaa, 0x10, 0x3a, 0xa3, 0x19, 0xc7, + 0x6d, 0xfd, 0xb7, 0x0d, 0xdb, 0x3c, 0x30, 0xea, 0x42, 0x49, 0x22, 0xd0, 0xea, 0xe9, 0x8e, 0xf9, + 0xb7, 0xa3, 0x9f, 0xbc, 0x82, 0x10, 0x5b, 0x6a, 0xe6, 0xd0, 0x35, 0xec, 0xa8, 0xeb, 0x0b, 0x25, + 0x2f, 0x50, 0xa7, 0x57, 0x37, 0x5f, 0x83, 0x2c, 0x9c, 0x4e, 0x01, 0x6d, 0xde, 0x8e, 0xe8, 0x34, + 0x66, 0x6d, 0xd2, 0x9d, 0xad, 0x9f, 0xa5, 0x03, 0x2f, 0x42, 0x8e, 0xe1, 0xfd, 0xf5, 0xf6, 0x88, + 0x3e, 0xd9, 0xf4, 0x91, 0x70, 0x1d, 0xea, 0x9f, 0xa6, 0x81, 0x2e, 0x82, 0x11, 0xf8, 0x60, 0xa3, + 0x17, 0xa3, 0x14, 0x2e, 0x16, 0xec, 0x4e, 0x53, 0x61, 0x97, 0xc9, 0xad, 0x37, 0xa4, 0x38, 0x72, + 0x09, 0x2d, 0x37, 0x8e, 0x5c, 0x52, 0x7f, 0x33, 0x73, 0x88, 0xc1, 0x5e, 0x4c, 0x17, 0x40, 0x31, + 0x1b, 0x92, 0xdc, 0xa3, 0xf4, 0xf3, 0x94, 0x68, 0x15, 0xf5, 0xf2, 0xeb, 0xbf, 0xe7, 0x86, 0xf6, + 0x38, 0x37, 0xb4, 0x7f, 0xe7, 0x86, 0xf6, 0xd3, 0xb3, 0x91, 0x7b, 0x7c, 0x36, 0x72, 0xff, 0x3c, + 0x1b, 0xb9, 0xef, 0x2f, 0x86, 0x1e, 0x1b, 0xcd, 0xfa, 0x96, 0xeb, 0x4f, 0x9a, 0xf2, 0x41, 0x20, + 0x7e, 0xce, 0xe9, 0x60, 0xdc, 0xbc, 0x6f, 0x46, 0xaf, 0x80, 0xcf, 0x3e, 0x3f, 0x57, 0x0f, 0x01, + 0xf6, 0x10, 0x60, 0xda, 0x2f, 0xf2, 0x77, 0xc0, 0xc5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5a, + 0x54, 0x52, 0xc2, 0x7f, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2075,6 +2132,43 @@ func (m *QueryChannelClientStateRequest) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } +func (m *QueryChannelConsensusStateRequest) 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 *QueryChannelConsensusStateRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryChannelConsensusStateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ChannelID) > 0 { + i -= len(m.ChannelID) + copy(dAtA[i:], m.ChannelID) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID))) + i-- + dAtA[i] = 0x12 + } + if len(m.PortID) > 0 { + i -= len(m.PortID) + copy(dAtA[i:], m.PortID) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -2396,6 +2490,23 @@ func (m *QueryChannelClientStateRequest) Size() (n int) { return n } +func (m *QueryChannelConsensusStateRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PortID) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.ChannelID) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -4594,6 +4705,123 @@ func (m *QueryChannelClientStateRequest) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryChannelConsensusStateRequest) 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 ErrIntOverflowQuery + } + 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: QueryChannelConsensusStateRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryChannelConsensusStateRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PortID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChannelID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/ibc/07-tendermint/misbehaviour.go b/x/ibc/07-tendermint/misbehaviour.go index 3a502a306..e41ae444c 100644 --- a/x/ibc/07-tendermint/misbehaviour.go +++ b/x/ibc/07-tendermint/misbehaviour.go @@ -74,7 +74,7 @@ func checkMisbehaviour( // // NOTE: The first condition is a safety check as the consensus params cannot // be nil since the previous param values will be used in case they can't be - // retreived. If they are not set during initialization, Tendermint will always + // retrieved. If they are not set during initialization, Tendermint will always // use the default values. if consensusParams != nil && consensusParams.Evidence != nil && diff --git a/x/ibc/testing/chain.go b/x/ibc/testing/chain.go index dd9fd9d35..78d71e47e 100644 --- a/x/ibc/testing/chain.go +++ b/x/ibc/testing/chain.go @@ -230,7 +230,7 @@ func (chain *TestChain) SendMsg(msg sdk.Msg) error { return nil } -// GetClientState retreives the client state for the provided clientID. The client is +// GetClientState retrieves the client state for the provided clientID. The client is // expected to exist otherwise testing will fail. func (chain *TestChain) GetClientState(clientID string) clientexported.ClientState { clientState, found := chain.App.IBCKeeper.ClientKeeper.GetClientState(chain.GetContext(), clientID) @@ -239,7 +239,7 @@ func (chain *TestChain) GetClientState(clientID string) clientexported.ClientSta return clientState } -// GetConnection retreives an IBC Connection for the provided TestConnection. The +// GetConnection retrieves an IBC Connection for the provided TestConnection. The // connection is expected to exist otherwise testing will fail. func (chain *TestChain) GetConnection(testConnection *TestConnection) connectiontypes.ConnectionEnd { connection, found := chain.App.IBCKeeper.ConnectionKeeper.GetConnection(chain.GetContext(), testConnection.ID) @@ -248,7 +248,7 @@ func (chain *TestChain) GetConnection(testConnection *TestConnection) connection return connection } -// GetChannel retreives an IBC Channel for the provided TestChannel. The channel +// GetChannel retrieves an IBC Channel for the provided TestChannel. The channel // is expected to exist otherwise testing will fail. func (chain *TestChain) GetChannel(testChannel TestChannel) channeltypes.Channel { channel, found := chain.App.IBCKeeper.ChannelKeeper.GetChannel(chain.GetContext(), testChannel.PortID, testChannel.ID) @@ -257,7 +257,7 @@ func (chain *TestChain) GetChannel(testChannel TestChannel) channeltypes.Channel return channel } -// GetAcknowledgement retreives an acknowledgement for the provided packet. If the +// GetAcknowledgement retrieves an acknowledgement for the provided packet. If the // acknowledgement does not exist then testing will fail. func (chain *TestChain) GetAcknowledgement(packet channelexported.PacketI) []byte { ack, found := chain.App.IBCKeeper.ChannelKeeper.GetPacketAcknowledgement(chain.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence())