backport 583

CHANGELOG.md

@@ -34,12 +34,16 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
-## [v1.2.4](https://github.com/cosmos/ibc-go/releases/tag/v1.2.4) - 2021-12-04
+## [v1.2.4](https://github.com/cosmos/ibc-go/releases/tag/v1.2.4) - 2021-12-03
 
 ### Dependencies
 
 * [\#567](https://github.com/cosmos/ibc-go/pull/567) Bump SDK version to v0.44.4
 
+### Improvements
+
+* [\#583](https://github.com/cosmos/ibc-go/pull/583) Move third_party/proto/confio/proofs.proto to third_party/proto/proofs.proto to enable proto service reflection. Migrate `buf` from v1beta1 to v1.
+
 ## [v1.2.3](https://github.com/cosmos/ibc-go/releases/tag/v1.2.3) - 2021-11-09
 
 ### Dependencies
@@ -77,12 +81,16 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * [\#386](https://github.com/cosmos/ibc-go/pull/386) Bump [tendermint](github.com/tendermint/tendermint) from v0.34.12 to v0.34.13.
 
-## [v1.1.4](https://github.com/cosmos/ibc-go/releases/tag/v1.1.4) - 2021-12-04
+## [v1.1.4](https://github.com/cosmos/ibc-go/releases/tag/v1.1.4) - 2021-12-03
 
 ### Dependencies
 
 * [\#567](https://github.com/cosmos/ibc-go/pull/567) Bump SDK version to v0.44.4
 
+### Improvements
+
+* [\#583](https://github.com/cosmos/ibc-go/pull/583) Move third_party/proto/confio/proofs.proto to third_party/proto/proofs.proto to enable proto service reflection. Migrate `buf` from v1beta1 to v1.
+
 ## [v1.1.3](https://github.com/cosmos/ibc-go/releases/tag/v1.1.3) - 2021-11-09
 
 ### Dependencies

Makefile

@@ -11,7 +11,7 @@ SIMAPP = ./testing/simapp
 MOCKS_DIR = $(CURDIR)/tests/mocks
 HTTPS_GIT := https://github.com/cosmos/ibc-go.git
 DOCKER := $(shell which docker)
-DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
+DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
 
 export GO111MODULE = on
 

buf.work.yaml

@@ -0,0 +1,9 @@
+# Generated by "buf config migrate-v1beta1". Edit as necessary, and
+# remove this comment when you're finished.
+#
+# This workspace file points to the roots found in your
+# previous "buf.yaml" configuration.
+version: v1
+directories:
+  - proto
+  - third_party/proto

proto/buf.yaml

@@ -0,0 +1,20 @@
+# Generated by "buf config migrate-v1beta1". Edit as necessary, and
+# remove this comment when you're finished.
+#
+# This module represents the "proto" root found in
+# the previous configuration.
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT
+    - COMMENTS
+    - FILE_LOWER_SNAKE_CASE
+  except:
+    - UNARY_RPC
+    - COMMENT_FIELD
+    - SERVICE_SUFFIX
+    - PACKAGE_VERSION_SUFFIX
+    - RPC_REQUEST_STANDARD_NAME

proto/ibc/core/client/v1/tx.proto

@@ -6,7 +6,6 @@ option go_package = "github.com/cosmos/ibc-go/modules/core/02-client/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
-import "ibc/core/client/v1/client.proto";
 
 // Msg defines the ibc/client Msg service.
 service Msg {

proto/ibc/core/commitment/v1/commitment.proto

@@ -5,7 +5,7 @@ package ibc.core.commitment.v1;
 option go_package = "github.com/cosmos/ibc-go/modules/core/23-commitment/types";
 
 import "gogoproto/gogo.proto";
-import "confio/proofs.proto";
+import "proofs.proto";
 
 // MerkleRoot defines a merkle root hash.
 // In the Cosmos SDK, the AppHash of a block header becomes the root.

proto/ibc/lightclients/tendermint/v1/tendermint.proto

@@ -6,7 +6,7 @@ option go_package = "github.com/cosmos/ibc-go/modules/light-clients/07-tendermin
 
 import "tendermint/types/validator.proto";
 import "tendermint/types/types.proto";
-import "confio/proofs.proto";
+import "proofs.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "ibc/core/client/v1/client.proto";

buf.yaml → third_party/proto/buf.yaml

@@ -1,11 +1,20 @@
-version: v1beta1
-
+# Generated by "buf config migrate-v1beta1". Edit as necessary, and
+# remove this comment when you're finished.
+#
+# This module represents the "third_party/proto" root found in
+# the previous configuration.
+version: v1
 build:
-  roots:
-    - proto
-    - third_party/proto
   excludes:
-    - third_party/proto/google/protobuf
+    - google/protobuf
+breaking:
+  use:
+    - FILE
+  ignore:
+    - confio
+    - gogoproto
+    - google
+    - tendermint
 lint:
   use:
     - DEFAULT
@@ -18,17 +27,7 @@ lint:
     - PACKAGE_VERSION_SUFFIX
     - RPC_REQUEST_STANDARD_NAME
   ignore:
-    - tendermint
-    - gogoproto
-    - cosmos_proto
-    - google
     - confio
-breaking:
-  use:
-    - FILE
-  ignore:
-    - tendermint
     - gogoproto
-    - cosmos_proto
     - google
-    - confio
+    - tendermint

third_party/proto/cosmos/upgrade/v1beta1/upgrade.proto

@@ -1,7 +1,6 @@
 syntax = "proto3";
 package cosmos.upgrade.v1beta1;
 
-import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";