Merge branch 'master' into colin/7823-sm-fixes

cosmos · Nov 10, 2020 · 7c9dfd7 · 7c9dfd7
2 parents 34f5633 + 0895a2a
commit 7c9dfd7
Show file tree

Hide file tree

Showing 15 changed files with 310 additions and 310 deletions.
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
@@ -15760,7 +15760,7 @@ paths:
                         }
       tags:
         - Query
-  /ibc/channel/v1beta1/channels:
+  /ibc/core/channel/v1beta1/channels:
     get:
       summary: Channels queries all the IBC channels of a chain.
       operationId: Channels
@@ -16146,7 +16146,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}':
     get:
       summary: Channel queries an IBC Channel.
       operationId: Channel
@@ -16471,7 +16471,7 @@ paths:
           type: string
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/client_state':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/client_state':
     get:
       summary: >-
         ChannelClientState queries for the client state for the channel
@@ -16909,7 +16909,7 @@ paths:
           type: string
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/consensus_state/version/{version_number}/height/{version_height}':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/consensus_state/version/{version_number}/height/{version_height}':
     get:
       summary: |-
         ChannelConsensusState queries for the consensus state for the channel
@@ -17344,7 +17344,7 @@ paths:
           format: uint64
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/next_sequence':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/next_sequence':
     get:
       summary: >-
         NextSequenceReceive returns the next receive sequence for a given
@@ -17596,7 +17596,7 @@ paths:
           type: string
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acknowledgements':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acknowledgements':
     get:
       summary: >-
         PacketAcknowledgements returns all the packet acknowledgements
@@ -17945,7 +17945,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}':
     get:
       summary: PacketAcknowledgement queries a stored packet acknowledgement hash.
       operationId: PacketAcknowledgement
@@ -18205,7 +18205,7 @@ paths:
           format: uint64
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments':
     get:
       summary: |-
         PacketCommitments returns all the packet commitments hashes associated
@@ -18552,7 +18552,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_ack_sequences}/unreceived_acks':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_ack_sequences}/unreceived_acks':
     get:
       summary: >-
         UnreceivedAcks returns all the unreceived IBC acknowledgements
@@ -18814,7 +18814,7 @@ paths:
           minItems: 1
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_commitment_sequences}/unreceived_packets':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_commitment_sequences}/unreceived_packets':
     get:
       summary: >-
         UnreceivedPackets returns all the unreceived IBC packets associated with
@@ -19076,7 +19076,7 @@ paths:
           minItems: 1
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}':
     get:
       summary: PacketCommitment queries a stored packet commitment hash.
       operationId: PacketCommitment
@@ -19337,7 +19337,7 @@ paths:
           format: uint64
       tags:
         - Query
-  '/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_receipts/{sequence}':
+  '/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_receipts/{sequence}':
     get:
       summary: >-
         PacketReceipt queries if a given packet sequence has been received on
@@ -19599,7 +19599,7 @@ paths:
           format: uint64
       tags:
         - Query
-  '/ibc/channel/v1beta1/connections/{connection}/channels':
+  '/ibc/core/channel/v1beta1/connections/{connection}/channels':
     get:
       summary: |-
         ConnectionChannels queries all the channels associated with a connection
@@ -19992,7 +19992,7 @@ paths:
           type: boolean
       tags:
         - Query
-  /ibc/client/v1beta1/client_states:
+  /ibc/core/client/v1beta1/client_states:
     get:
       summary: ClientStates queries all the IBC light clients of a chain.
       operationId: ClientStates
@@ -20465,7 +20465,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/client/v1beta1/client_states/{client_id}':
+  '/ibc/core/client/v1beta1/client_states/{client_id}':
     get:
       summary: ClientState queries an IBC light client.
       operationId: ClientState
@@ -20883,7 +20883,7 @@ paths:
           type: string
       tags:
         - Query
-  '/ibc/client/v1beta1/consensus_states/{client_id}':
+  '/ibc/core/client/v1beta1/consensus_states/{client_id}':
     get:
       summary: |-
         ConsensusStates queries all the consensus state associated with a given
@@ -21383,7 +21383,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/client/v1beta1/consensus_states/{client_id}/version/{version_number}/height/{version_height}':
+  '/ibc/core/client/v1beta1/consensus_states/{client_id}/version/{version_number}/height/{version_height}':
     get:
       summary: >-
         ConsensusState queries a consensus state associated with a client state
@@ -21825,7 +21825,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/connection/v1beta1/client_connections/{client_id}':
+  '/ibc/core/connection/v1beta1/client_connections/{client_id}':
     get:
       summary: |-
         ClientConnections queries the connection paths associated with a client
@@ -22073,7 +22073,7 @@ paths:
           type: string
       tags:
         - Query
-  /ibc/connection/v1beta1/connections:
+  /ibc/core/connection/v1beta1/connections:
     get:
       summary: Connections queries all the IBC connections of a chain.
       operationId: Connections
@@ -22457,7 +22457,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc/connection/v1beta1/connections/{connection_id}':
+  '/ibc/core/connection/v1beta1/connections/{connection_id}':
     get:
       summary: Connection queries an IBC connection end.
       operationId: Connection
@@ -22777,7 +22777,7 @@ paths:
           type: string
       tags:
         - Query
-  '/ibc/connection/v1beta1/connections/{connection_id}/client_state':
+  '/ibc/core/connection/v1beta1/connections/{connection_id}/client_state':
     get:
       summary: |-
         ConnectionClientState queries the client state associated with the
@@ -23208,7 +23208,7 @@ paths:
           type: string
       tags:
         - Query
-  '/ibc/connection/v1beta1/connections/{connection_id}/consensus_state/version/{version_number}/height/{version_height}':
+  '/ibc/core/connection/v1beta1/connections/{connection_id}/consensus_state/version/{version_number}/height/{version_height}':
     get:
       summary: |-
         ConnectionConsensusState queries the consensus state associated with the
@@ -23636,7 +23636,7 @@ paths:
           format: uint64
       tags:
         - Query
-  /ibc_transfer/v1beta1/denom_traces:
+  /ibc/applications/transfer/v1beta1/denom_traces:
     get:
       summary: DenomTraces queries all denomination traces.
       operationId: DenomTraces
@@ -23761,7 +23761,7 @@ paths:
           type: boolean
       tags:
         - Query
-  '/ibc_transfer/v1beta1/denom_traces/{hash}':
+  '/ibc/applications/transfer/v1beta1/denom_traces/{hash}':
     get:
       summary: DenomTrace queries a denomination trace information.
       operationId: DenomTrace
@@ -23822,7 +23822,7 @@ paths:
           type: string
       tags:
         - Query
-  /ibc_transfer/v1beta1/params:
+  /ibc/applications/transfer/v1beta1/params:
     get:
       summary: Params queries all parameters of the ibc-transfer module.
       operationId: IBCTransferParams

diff --git a/docs/versions b/docs/versions
@@ -1,3 +1,2 @@
 master              master
-v0.40.x             v0.40
 launchpad/backports v0.39
diff --git a/proto/ibc/applications/transfer/v1/query.proto b/proto/ibc/applications/transfer/v1/query.proto
@@ -12,17 +12,17 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/ty
 service Query {
   // DenomTrace queries a denomination trace information.
   rpc DenomTrace(QueryDenomTraceRequest) returns (QueryDenomTraceResponse) {
-    option (google.api.http).get = "/ibc_transfer/v1beta1/denom_traces/{hash}";
+    option (google.api.http).get = "/ibc/applications/transfer/v1beta1/denom_traces/{hash}";
   }
 
   // DenomTraces queries all denomination traces.
   rpc DenomTraces(QueryDenomTracesRequest) returns (QueryDenomTracesResponse) {
-    option (google.api.http).get = "/ibc_transfer/v1beta1/denom_traces";
+    option (google.api.http).get = "/ibc/applications/transfer/v1beta1/denom_traces";
   }
 
   // Params queries all parameters of the ibc-transfer module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/ibc_transfer/v1beta1/params";
+    option (google.api.http).get = "/ibc/applications/transfer/v1beta1/params";
   }
 }
 

diff --git a/proto/ibc/core/channel/v1/query.proto b/proto/ibc/core/channel/v1/query.proto
@@ -14,79 +14,79 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types";
 service Query {
   // Channel queries an IBC Channel.
   rpc Channel(QueryChannelRequest) returns (QueryChannelResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}";
   }
 
   // Channels queries all the IBC channels of a chain.
   rpc Channels(QueryChannelsRequest) returns (QueryChannelsResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels";
   }
 
   // ConnectionChannels queries all the channels associated with a connection
   // end.
   rpc ConnectionChannels(QueryConnectionChannelsRequest) returns (QueryConnectionChannelsResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/connections/{connection}/channels";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/connections/{connection}/channels";
   }
 
   // ChannelClientState queries for the client state for the channel associated
   // with the provided channel identifiers.
   rpc ChannelClientState(QueryChannelClientStateRequest) returns (QueryChannelClientStateResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/client_state";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/client_state";
   }
 
   // ChannelConsensusState queries for the consensus state for the channel
   // associated with the provided channel identifiers.
   rpc ChannelConsensusState(QueryChannelConsensusStateRequest) returns (QueryChannelConsensusStateResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/consensus_state/version/"
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/consensus_state/version/"
                                    "{version_number}/height/{version_height}";
   }
 
   // PacketCommitment queries a stored packet commitment hash.
   rpc PacketCommitment(QueryPacketCommitmentRequest) returns (QueryPacketCommitmentResponse) {
     option (google.api.http).get =
-        "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}";
+        "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}";
   }
 
   // PacketCommitments returns all the packet commitments hashes associated
   // with a channel.
   rpc PacketCommitments(QueryPacketCommitmentsRequest) returns (QueryPacketCommitmentsResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments";
   }
 
   // PacketReceipt queries if a given packet sequence has been received on the queried chain
   rpc PacketReceipt(QueryPacketReceiptRequest) returns (QueryPacketReceiptResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_receipts/{sequence}";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_receipts/{sequence}";
   }
 
   // PacketAcknowledgement queries a stored packet acknowledgement hash.
   rpc PacketAcknowledgement(QueryPacketAcknowledgementRequest) returns (QueryPacketAcknowledgementResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}";
   }
 
   // PacketAcknowledgements returns all the packet acknowledgements associated
   // with a channel.
   rpc PacketAcknowledgements(QueryPacketAcknowledgementsRequest) returns (QueryPacketAcknowledgementsResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acknowledgements";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acknowledgements";
   }
 
 
   // UnreceivedPackets returns all the unreceived IBC packets associated with a
   // channel and sequences.
   rpc UnreceivedPackets(QueryUnreceivedPacketsRequest) returns (QueryUnreceivedPacketsResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/"
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/"
                                    "{packet_commitment_sequences}/unreceived_packets";
   }
 
   // UnreceivedAcks returns all the unreceived IBC acknowledgements associated with a
   // channel and sequences.
   rpc UnreceivedAcks(QueryUnreceivedAcksRequest) returns (QueryUnreceivedAcksResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/"
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/"
                                    "{packet_ack_sequences}/unreceived_acks";
   }
 
   // NextSequenceReceive returns the next receive sequence for a given channel.
   rpc NextSequenceReceive(QueryNextSequenceReceiveRequest) returns (QueryNextSequenceReceiveResponse) {
-    option (google.api.http).get = "/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/next_sequence";
+    option (google.api.http).get = "/ibc/core/channel/v1beta1/channels/{channel_id}/ports/{port_id}/next_sequence";
   }
 }
 

diff --git a/proto/ibc/core/client/v1/query.proto b/proto/ibc/core/client/v1/query.proto
@@ -13,25 +13,25 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types";
 service Query {
   // ClientState queries an IBC light client.
   rpc ClientState(QueryClientStateRequest) returns (QueryClientStateResponse) {
-    option (google.api.http).get = "/ibc/client/v1beta1/client_states/{client_id}";
+    option (google.api.http).get = "/ibc/core/client/v1beta1/client_states/{client_id}";
   }
 
   // ClientStates queries all the IBC light clients of a chain.
   rpc ClientStates(QueryClientStatesRequest) returns (QueryClientStatesResponse) {
-    option (google.api.http).get = "/ibc/client/v1beta1/client_states";
+    option (google.api.http).get = "/ibc/core/client/v1beta1/client_states";
   }
 
   // ConsensusState queries a consensus state associated with a client state at
   // a given height.
   rpc ConsensusState(QueryConsensusStateRequest) returns (QueryConsensusStateResponse) {
-    option (google.api.http).get = "/ibc/client/v1beta1/consensus_states/{client_id}/version/{version_number}/"
+    option (google.api.http).get = "/ibc/core/client/v1beta1/consensus_states/{client_id}/version/{version_number}/"
                                    "height/{version_height}";
   }
 
   // ConsensusStates queries all the consensus state associated with a given
   // client.
   rpc ConsensusStates(QueryConsensusStatesRequest) returns (QueryConsensusStatesResponse) {
-    option (google.api.http).get = "/ibc/client/v1beta1/consensus_states/{client_id}";
+    option (google.api.http).get = "/ibc/core/client/v1beta1/consensus_states/{client_id}";
   }
 }