Revert "fix: update buf to v1.7.0 and regenerate proto files (#280)" (#…

…343) This reverts commit 98c7ba6.
celestiaorg · Aug 31, 2023 · c09602f · c09602f
1 parent 64adc6e
commit c09602f
Show file tree

Hide file tree

Showing 52 changed files with 67 additions and 57 deletions.
diff --git a/.github/workflows/proto-registry.yml b/.github/workflows/proto-registry.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.8.0
+      - uses: bufbuild/buf-setup-action@v1.4.0
       - uses: bufbuild/buf-push-action@v1
         with:
           input: "proto"

diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 5
     steps:
     - uses: actions/checkout@v3
-    - uses: bufbuild/buf-setup-action@v1.8.0
+    - uses: bufbuild/buf-setup-action@v1.4.0
     - uses: bufbuild/buf-lint-action@v1
       with:
         input: 'proto'
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.8.0
+      - uses: bufbuild/buf-setup-action@v1.4.0
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

diff --git 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.7.0
+DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 DOCS_DOMAIN=docs.cosmos.network
 

diff --git a/client/grpc/tmservice/query.pb.go b/client/grpc/tmservice/query.pb.go
diff --git a/client/grpc/tmservice/types.pb.go b/client/grpc/tmservice/types.pb.go
diff --git a/client/v2/internal/buf.lock b/client/v2/internal/buf.lock
@@ -4,16 +4,20 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-proto
+    branch: main
     commit: 1935555c206d4afb9e94615dfd0fad31
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: 44369accb517453db1f2228530da42c0
+    branch: main
+    commit: 86d2a697b026488089f13a71ceb3815c
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
-    commit: 6652e3443c3b4504bb3bf82e73a7e409
+    branch: main
+    commit: bee5511075b7499da6178d9e4aaa628b
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 62f35d8aed1149c291d606d958a7ce32
+    branch: main
+    commit: 40f07f5b563941f2b20b991a7aedd53d
diff --git 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.7.0 as BUILDER
+FROM bufbuild/buf:1.1.0 as BUILDER
 
 FROM golang:1.19-alpine
 

diff --git a/crypto/hd/hd.pb.go b/crypto/hd/hd.pb.go
diff --git a/crypto/keyring/record.pb.go b/crypto/keyring/record.pb.go
diff --git a/crypto/keys/ed25519/keys.pb.go b/crypto/keys/ed25519/keys.pb.go
diff --git a/crypto/keys/multisig/keys.pb.go b/crypto/keys/multisig/keys.pb.go
diff --git a/crypto/keys/secp256k1/keys.pb.go b/crypto/keys/secp256k1/keys.pb.go
diff --git a/crypto/keys/secp256r1/keys.pb.go b/crypto/keys/secp256r1/keys.pb.go
diff --git a/crypto/types/multisig.pb.go b/crypto/types/multisig.pb.go
diff --git a/go.mod b/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/cosmos/cosmos-proto v1.0.0-alpha7
 	github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1
 	github.com/cosmos/go-bip39 v1.0.0
-	github.com/cosmos/gogoproto v1.4.10
 	github.com/cosmos/iavl v0.19.6
 	github.com/cosmos/ledger-cosmos-go v0.12.2
 	github.com/gogo/gateway v1.1.0

diff --git a/go.sum b/go.sum
@@ -228,8 +228,6 @@ github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1/go.mod h1:JUMM2MxF9wuwzRWZJjb8BjXs
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
-github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI=
-github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
 github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
 github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU=

diff --git a/proto/buf.lock b/proto/buf.lock
@@ -4,12 +4,21 @@ 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
-    commit: 6652e3443c3b4504bb3bf82e73a7e409
+    branch: main
+    commit: bee5511075b7499da6178d9e4aaa628b
+    digest: b1-rrBIustouD-S80cVoZ_rM0qJsmei9AgbXy9GPQu6vxg=
+    create_time: 2021-12-02T20:01:17.069307Z
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 8d7204855ec14631a499bd7393ce1970
+    branch: main
+    commit: 40f07f5b563941f2b20b991a7aedd53d
+    digest: b1-Iv8fTR4AKXwNW80Ey6K5tY8cP053y_95sB5fro9IWZo=
+    create_time: 2021-12-02T15:07:41.896892Z
diff --git a/snapshots/types/snapshot.pb.go b/snapshots/types/snapshot.pb.go
diff --git a/store/types/commit_info.pb.go b/store/types/commit_info.pb.go
diff --git a/types/abci.pb.go b/types/abci.pb.go
diff --git a/types/coin.pb.go b/types/coin.pb.go
diff --git a/types/kv/kv.pb.go b/types/kv/kv.pb.go
diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go
diff --git a/x/auth/types/auth.pb.go b/x/auth/types/auth.pb.go
diff --git a/x/auth/types/genesis.pb.go b/x/auth/types/genesis.pb.go
diff --git a/x/auth/types/query.pb.go b/x/auth/types/query.pb.go
diff --git a/x/auth/vesting/types/tx.pb.go b/x/auth/vesting/types/tx.pb.go
diff --git a/x/auth/vesting/types/vesting.pb.go b/x/auth/vesting/types/vesting.pb.go
diff --git a/x/authz/authz.pb.go b/x/authz/authz.pb.go
diff --git a/x/authz/genesis.pb.go b/x/authz/genesis.pb.go
diff --git a/x/authz/tx.pb.go b/x/authz/tx.pb.go
diff --git a/x/bank/types/authz.pb.go b/x/bank/types/authz.pb.go
diff --git a/x/bank/types/bank.pb.go b/x/bank/types/bank.pb.go
diff --git a/x/bank/types/genesis.pb.go b/x/bank/types/genesis.pb.go
diff --git a/x/bank/types/query.pb.go b/x/bank/types/query.pb.go
diff --git a/x/bank/types/tx.pb.go b/x/bank/types/tx.pb.go
diff --git a/x/capability/types/capability.pb.go b/x/capability/types/capability.pb.go
diff --git a/x/capability/types/genesis.pb.go b/x/capability/types/genesis.pb.go
diff --git a/x/crisis/types/genesis.pb.go b/x/crisis/types/genesis.pb.go
diff --git a/x/crisis/types/tx.pb.go b/x/crisis/types/tx.pb.go