Merge branch 'master' into am-tm-secp256k1

cosmos · Nov 13, 2020 · 1fb8020 · 1fb8020
2 parents faa7ba4 + c0d7233
commit 1fb8020
Show file tree

Hide file tree

Showing 155 changed files with 7,161 additions and 5,371 deletions.
diff --git a/Makefile b/Makefile
@@ -361,6 +361,11 @@ proto-all: proto-tools proto-gen proto-lint proto-check-breaking proto-swagger-g
 proto-gen:
 	@./scripts/protocgen.sh
 
+proto-gen-docker:
+	@echo "Generating Protobuf files"
+	docker run -v $(shell pwd):/workspace --workdir /workspace tendermintdev/sdk-proto-gen sh ./scripts/protocgen.sh
+.PHONY: proto-gen-docker
+
 proto-format:
 	@echo "Formatting Protobuf files"
 	docker run -v $(shell pwd):/workspace \

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/contrib/devtools/proto-tools-installer.sh b/contrib/devtools/proto-tools-installer.sh
@@ -6,8 +6,7 @@ DESTDIR=${DESTDIR:-}
 PREFIX=${PREFIX:-/usr/local}
 UNAME_S="$(uname -s 2>/dev/null)"
 UNAME_M="$(uname -m 2>/dev/null)"
-BUF_VERSION=0.11.0
-PROTOC_VERSION=3.13.0
+BUF_VERSION=0.30.0
 PROTOC_GRPC_GATEWAY_VERSION=1.14.7
 
 f_abort() {
@@ -61,19 +60,6 @@ f_needs_install() {
   return 0
 }
 
-f_install_protoc() {
-  f_print_installing_with_padding proto_c
-  f_needs_install "${DESTDIR}/${PREFIX}/bin/protoc" || return 0
-
-  pushd "${TEMPDIR}" >/dev/null
-  curl -o "${PROTOC_ZIP}" -sSL "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}"
-  unzip -q -o ${PROTOC_ZIP} -d ${DESTDIR}/${PREFIX} bin/protoc; \
-  unzip -q -o ${PROTOC_ZIP} -d ${DESTDIR}/${PREFIX} 'include/*'; \
-  rm -f ${PROTOC_ZIP}
-  popd >/dev/null
-  f_print_done
-}
-
 f_install_buf() {
   f_print_installing_with_padding buf
   f_needs_install "${DESTDIR}/${PREFIX}/bin/buf" || return 0
@@ -83,18 +69,6 @@ f_install_buf() {
   f_print_done
 }
 
-f_install_protoc_gen_gocosmos() {
-  f_print_installing_with_padding protoc-gen-gocosmos
-
-  if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &>/dev/null ; then
-    echo -e "\tPlease run this command from somewhere inside the cosmos-sdk folder."
-    return 1
-  fi
-
-  go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos 2>/dev/null
-  f_print_done
-}
-
 f_install_protoc_gen_grpc_gateway() {
   f_print_installing_with_padding protoc-gen-grpc-gateway
   f_needs_install "${DESTDIR}/${PREFIX}/bin/protoc-gen-grpc-gateway" || return 0
@@ -121,7 +95,6 @@ f_install_protoc_gen_swagger() {
 
 f_ensure_tools
 f_ensure_dirs
-f_install_protoc
 f_install_buf
 f_install_protoc_gen_gocosmos
 f_install_protoc_gen_grpc_gateway