From 518003ec29455e0eeb3b46219a940d32b860973f Mon Sep 17 00:00:00 2001
From: Roman <roman@osmosis.team>
Date: Tue, 6 Sep 2022 19:43:57 -0400
Subject: [PATCH] fix(build): proto generation (#13166)

* fix(build): proto generation

* restore proto ver

* Update proto/buf.lock

Co-authored-by: Julien Robert <julien@rbrt.fr>

* bimp proto ver

* fix internal client

Co-authored-by: Roman Akhtariev <roman@akhtariev.localdomain>
Co-authored-by: Julien Robert <julien@rbrt.fr>
---
 Makefile                    |  4 ++--
 client/v2/internal/buf.lock |  2 +-
 contrib/devtools/Dockerfile |  2 +-
 proto/buf.lock              | 11 +----------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index c6a605247b..eed12ffbed 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SIMAPP = ./simapp
 MOCKS_DIR = $(CURDIR)/tests/mocks
 HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
 DOCKER := $(shell which docker)
-DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
+DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.7.0
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 DOCS_DOMAIN=docs.cosmos.network
 # RocksDB is a native dependency, so we don't assume the library is installed.
@@ -389,7 +389,7 @@ devdoc-update:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-protoVer=v0.7
+protoVer=v0.8
 protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
 containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
 containerProtoGenAny=$(PROJECT_NAME)-proto-gen-any-$(protoVer)
diff --git a/client/v2/internal/buf.lock b/client/v2/internal/buf.lock
index 3278c9b656..d9908795e2 100644
--- a/client/v2/internal/buf.lock
+++ b/client/v2/internal/buf.lock
@@ -20,4 +20,4 @@ deps:
     owner: googleapis
     repository: googleapis
     branch: main
-    commit: 40f07f5b563941f2b20b991a7aedd53d
+    commit: 62f35d8aed1149c291d606d958a7ce32
diff --git a/contrib/devtools/Dockerfile b/contrib/devtools/Dockerfile
index d5f4469dc4..bf7c05d0eb 100644
--- a/contrib/devtools/Dockerfile
+++ b/contrib/devtools/Dockerfile
@@ -2,7 +2,7 @@
 # docker build --pull --rm -f "contrib/devtools/Dockerfile" -t cosmossdk-proto:latest "contrib/devtools"
 # docker run --rm -v $(pwd):/workspace --workdir /workspace cosmossdk-proto sh ./scripts/protocgen.sh
 
-FROM bufbuild/buf:1.1.0 as BUILDER
+FROM bufbuild/buf:1.7.0 as BUILDER
 
 FROM golang:1.19-alpine
 
diff --git a/proto/buf.lock b/proto/buf.lock
index 41b1ccf23e..93c49a365d 100644
--- a/proto/buf.lock
+++ b/proto/buf.lock
@@ -4,21 +4,12 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-proto
-    branch: main
     commit: 1935555c206d4afb9e94615dfd0fad31
-    digest: b1-TNqW6xj2Pjha5Uoj9a-5uOeRo4mwswKfyqMcN3I_gZ0=
-    create_time: 2021-12-02T22:04:00.31049Z
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
-    branch: main
     commit: bee5511075b7499da6178d9e4aaa628b
-    digest: b1-rrBIustouD-S80cVoZ_rM0qJsmei9AgbXy9GPQu6vxg=
-    create_time: 2021-12-02T20:01:17.069307Z
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    branch: main
-    commit: 40f07f5b563941f2b20b991a7aedd53d
-    digest: b1-Iv8fTR4AKXwNW80Ey6K5tY8cP053y_95sB5fro9IWZo=
-    create_time: 2021-12-02T15:07:41.896892Z
+    commit: 62f35d8aed1149c291d606d958a7ce32