From 06106658ba90893918a35de21498ce4bd1cd4f7f Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Thu, 31 Aug 2023 08:48:45 -0500 Subject: [PATCH] Revert "fix: update buf to v1.7.0 and regenerate proto files (#280)" This reverts commit 98c7ba635155a76d26d52505a621c024bce3809a. --- .github/workflows/proto-registry.yml | 2 +- .github/workflows/proto.yml | 4 ++-- Makefile | 2 +- client/grpc/tmservice/query.pb.go | 2 +- client/grpc/tmservice/types.pb.go | 2 +- client/v2/internal/buf.lock | 10 +++++++--- contrib/devtools/Dockerfile | 2 +- crypto/hd/hd.pb.go | 2 +- crypto/keyring/record.pb.go | 2 +- crypto/keys/ed25519/keys.pb.go | 2 +- crypto/keys/multisig/keys.pb.go | 2 +- crypto/keys/secp256k1/keys.pb.go | 2 +- crypto/keys/secp256r1/keys.pb.go | 2 +- crypto/types/multisig.pb.go | 2 +- go.mod | 1 - go.sum | 2 -- proto/buf.lock | 13 +++++++++++-- snapshots/types/snapshot.pb.go | 2 +- store/types/commit_info.pb.go | 2 +- types/abci.pb.go | 2 +- types/coin.pb.go | 2 +- types/kv/kv.pb.go | 2 +- types/tx/tx.pb.go | 2 +- x/auth/types/auth.pb.go | 2 +- x/auth/types/genesis.pb.go | 2 +- x/auth/types/query.pb.go | 2 +- x/auth/vesting/types/tx.pb.go | 2 +- x/auth/vesting/types/vesting.pb.go | 2 +- x/authz/authz.pb.go | 2 +- x/authz/genesis.pb.go | 2 +- x/authz/tx.pb.go | 2 +- x/bank/types/authz.pb.go | 2 +- x/bank/types/bank.pb.go | 2 +- x/bank/types/genesis.pb.go | 2 +- x/bank/types/query.pb.go | 2 +- x/bank/types/tx.pb.go | 2 +- x/capability/types/capability.pb.go | 2 +- x/capability/types/genesis.pb.go | 2 +- x/crisis/types/genesis.pb.go | 2 +- x/crisis/types/tx.pb.go | 2 +- x/feegrant/feegrant.pb.go | 2 +- x/feegrant/genesis.pb.go | 2 +- x/group/query.pb.go | 2 +- x/group/tx.pb.go | 2 +- x/group/types.pb.go | 2 +- x/mint/types/genesis.pb.go | 2 +- x/mint/types/mint.pb.go | 2 +- x/mint/types/query.pb.go | 2 +- x/params/types/proposal/params.pb.go | 2 +- x/params/types/proposal/query.pb.go | 2 +- x/upgrade/types/tx.pb.go | 2 +- x/upgrade/types/upgrade.pb.go | 2 +- 52 files changed, 67 insertions(+), 57 deletions(-) diff --git a/.github/workflows/proto-registry.yml b/.github/workflows/proto-registry.yml index 5548fe346e63..c5be0bc8e4b5 100644 --- 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 index f03abbf44003..8a350668e881 100644 --- 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 index 08750a539aa3..8c3bb74f9435 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.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 index 47c0bba9bb69..6aa415fab1f9 100644 --- a/client/grpc/tmservice/query.pb.go +++ b/client/grpc/tmservice/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" p2p "github.com/tendermint/tendermint/proto/tendermint/p2p" diff --git a/client/grpc/tmservice/types.pb.go b/client/grpc/tmservice/types.pb.go index bfd6a4a3a8c3..5473ff3db315 100644 --- a/client/grpc/tmservice/types.pb.go +++ b/client/grpc/tmservice/types.pb.go @@ -5,7 +5,7 @@ package tmservice import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/client/v2/internal/buf.lock b/client/v2/internal/buf.lock index b010bbdb8a27..3278c9b656d8 100644 --- 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 index 1ce8b7f087e7..213950ec9e07 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.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 index 1b66752c2d18..bc262474aa25 100644 --- a/crypto/hd/hd.pb.go +++ b/crypto/hd/hd.pb.go @@ -5,7 +5,7 @@ package hd import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/crypto/keyring/record.pb.go b/crypto/keyring/record.pb.go index 23b63c1f8999..5e8df719a5c6 100644 --- a/crypto/keyring/record.pb.go +++ b/crypto/keyring/record.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" hd "github.com/cosmos/cosmos-sdk/crypto/hd" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/crypto/keys/ed25519/keys.pb.go b/crypto/keys/ed25519/keys.pb.go index 0522bf55d171..227b18701306 100644 --- a/crypto/keys/ed25519/keys.pb.go +++ b/crypto/keys/ed25519/keys.pb.go @@ -6,7 +6,7 @@ package ed25519 import ( crypto_ed25519 "crypto/ed25519" fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/crypto/keys/multisig/keys.pb.go b/crypto/keys/multisig/keys.pb.go index 5f5ca903b30c..0016efa8a545 100644 --- a/crypto/keys/multisig/keys.pb.go +++ b/crypto/keys/multisig/keys.pb.go @@ -6,7 +6,7 @@ package multisig import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/crypto/keys/secp256k1/keys.pb.go b/crypto/keys/secp256k1/keys.pb.go index 1b5c1607541e..afcbab54b05d 100644 --- a/crypto/keys/secp256k1/keys.pb.go +++ b/crypto/keys/secp256k1/keys.pb.go @@ -5,7 +5,7 @@ package secp256k1 import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/crypto/keys/secp256r1/keys.pb.go b/crypto/keys/secp256r1/keys.pb.go index 39d7a53d46d4..898f19a123cf 100644 --- a/crypto/keys/secp256r1/keys.pb.go +++ b/crypto/keys/secp256r1/keys.pb.go @@ -5,7 +5,7 @@ package secp256r1 import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/crypto/types/multisig.pb.go b/crypto/types/multisig.pb.go index 347de9fcfee0..b9c907ade0a4 100644 --- a/crypto/types/multisig.pb.go +++ b/crypto/types/multisig.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/go.mod b/go.mod index f6abddddc2db..6145ae05ffc3 100644 --- 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 index 30abd16628c2..61c228592bfe 100644 --- 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 index 267327892187..41b1ccf23ed7 100644 --- 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 index f9c6ddb63aff..703e9769e9cb 100644 --- a/snapshots/types/snapshot.pb.go +++ b/snapshots/types/snapshot.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/store/types/commit_info.pb.go b/store/types/commit_info.pb.go index c7549e979577..988804d2f307 100644 --- a/store/types/commit_info.pb.go +++ b/store/types/commit_info.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/types/abci.pb.go b/types/abci.pb.go index 44e3e7a8f704..80d0bf6fb486 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types1 "github.com/tendermint/tendermint/abci/types" io "io" diff --git a/types/coin.pb.go b/types/coin.pb.go index 992cab346c83..4df295645b85 100644 --- a/types/coin.pb.go +++ b/types/coin.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/types/kv/kv.pb.go b/types/kv/kv.pb.go index 17e4a8b552bf..eedb948bf5ae 100644 --- a/types/kv/kv.pb.go +++ b/types/kv/kv.pb.go @@ -5,7 +5,7 @@ package kv import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go index 5a59f65bedc8..75abd48f283a 100644 --- a/types/tx/tx.pb.go +++ b/types/tx/tx.pb.go @@ -11,7 +11,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types2 "github.com/cosmos/cosmos-sdk/types" signing "github.com/cosmos/cosmos-sdk/types/tx/signing" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/auth/types/auth.pb.go b/x/auth/types/auth.pb.go index 92aa202edeef..7391b2188ae4 100644 --- a/x/auth/types/auth.pb.go +++ b/x/auth/types/auth.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/auth/types/genesis.pb.go b/x/auth/types/genesis.pb.go index ea875fbbeb9c..4e7396ab7cb3 100644 --- a/x/auth/types/genesis.pb.go +++ b/x/auth/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/auth/types/query.pb.go b/x/auth/types/query.pb.go index bc47684e19d1..20aebd41bc57 100644 --- a/x/auth/types/query.pb.go +++ b/x/auth/types/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" diff --git a/x/auth/vesting/types/tx.pb.go b/x/auth/vesting/types/tx.pb.go index 4c0f70952103..0165ea83312e 100644 --- a/x/auth/vesting/types/tx.pb.go +++ b/x/auth/vesting/types/tx.pb.go @@ -10,7 +10,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/x/auth/vesting/types/vesting.pb.go b/x/auth/vesting/types/vesting.pb.go index cea677c9d902..9c05fa2dff68 100644 --- a/x/auth/vesting/types/vesting.pb.go +++ b/x/auth/vesting/types/vesting.pb.go @@ -8,7 +8,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types1 "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/x/auth/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/authz/authz.pb.go b/x/authz/authz.pb.go index 7540f6804b72..7ffbadd83512 100644 --- a/x/authz/authz.pb.go +++ b/x/authz/authz.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "google.golang.org/protobuf/types/known/timestamppb" diff --git a/x/authz/genesis.pb.go b/x/authz/genesis.pb.go index 52f9af4d369f..56f2157a92ee 100644 --- a/x/authz/genesis.pb.go +++ b/x/authz/genesis.pb.go @@ -5,7 +5,7 @@ package authz import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/authz/tx.pb.go b/x/authz/tx.pb.go index 7dd4e303a6fc..fd3ef5443fb0 100644 --- a/x/authz/tx.pb.go +++ b/x/authz/tx.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/x/bank/types/authz.pb.go b/x/bank/types/authz.pb.go index e160e23f039a..904a7f9ce793 100644 --- a/x/bank/types/authz.pb.go +++ b/x/bank/types/authz.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/bank/types/bank.pb.go b/x/bank/types/bank.pb.go index d359095af33f..93feea14672b 100644 --- a/x/bank/types/bank.pb.go +++ b/x/bank/types/bank.pb.go @@ -9,7 +9,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/bank/types/genesis.pb.go b/x/bank/types/genesis.pb.go index d27069d78fcf..1e8ecae3d0b5 100644 --- a/x/bank/types/genesis.pb.go +++ b/x/bank/types/genesis.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/bank/types/query.pb.go b/x/bank/types/query.pb.go index 4c4df08f31ad..80f94f5ec6ff 100644 --- a/x/bank/types/query.pb.go +++ b/x/bank/types/query.pb.go @@ -10,7 +10,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" diff --git a/x/bank/types/tx.pb.go b/x/bank/types/tx.pb.go index b30d2271e199..874c3dd8d862 100644 --- a/x/bank/types/tx.pb.go +++ b/x/bank/types/tx.pb.go @@ -10,7 +10,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/x/capability/types/capability.pb.go b/x/capability/types/capability.pb.go index 4b15278b338c..332666df70a4 100644 --- a/x/capability/types/capability.pb.go +++ b/x/capability/types/capability.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/capability/types/genesis.pb.go b/x/capability/types/genesis.pb.go index 984fea86ca4a..051e9f260e25 100644 --- a/x/capability/types/genesis.pb.go +++ b/x/capability/types/genesis.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/crisis/types/genesis.pb.go b/x/crisis/types/genesis.pb.go index 3556a87df02b..4356d61e0ef5 100644 --- a/x/crisis/types/genesis.pb.go +++ b/x/crisis/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/crisis/types/tx.pb.go b/x/crisis/types/tx.pb.go index 2d0ee9497c5e..412311aace83 100644 --- a/x/crisis/types/tx.pb.go +++ b/x/crisis/types/tx.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/x/feegrant/feegrant.pb.go b/x/feegrant/feegrant.pb.go index d9cb2a4aa0c2..42d6b0f03982 100644 --- a/x/feegrant/feegrant.pb.go +++ b/x/feegrant/feegrant.pb.go @@ -9,7 +9,7 @@ import ( types1 "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "google.golang.org/protobuf/types/known/durationpb" diff --git a/x/feegrant/genesis.pb.go b/x/feegrant/genesis.pb.go index d8aa154b9f24..36593a2c8ec4 100644 --- a/x/feegrant/genesis.pb.go +++ b/x/feegrant/genesis.pb.go @@ -5,7 +5,7 @@ package feegrant import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/group/query.pb.go b/x/group/query.pb.go index 0756ee8d0d54..ec7e0f9a6da0 100644 --- a/x/group/query.pb.go +++ b/x/group/query.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" diff --git a/x/group/tx.pb.go b/x/group/tx.pb.go index 94aab07ac68e..a2407e87dc44 100644 --- a/x/group/tx.pb.go +++ b/x/group/tx.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/x/group/types.pb.go b/x/group/types.pb.go index 76010d43b92f..5815d7da7138 100644 --- a/x/group/types.pb.go +++ b/x/group/types.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "google.golang.org/protobuf/types/known/durationpb" diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index 1820bb2091c2..1486c35f2232 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go index aa8807da23c5..a5f33f381d32 100644 --- a/x/mint/types/mint.pb.go +++ b/x/mint/types/mint.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index 04201a360dba..f707eb810d2d 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" diff --git a/x/params/types/proposal/params.pb.go b/x/params/types/proposal/params.pb.go index 7826e67db461..332b3bc27e11 100644 --- a/x/params/types/proposal/params.pb.go +++ b/x/params/types/proposal/params.pb.go @@ -6,7 +6,7 @@ package proposal import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" math "math" diff --git a/x/params/types/proposal/query.pb.go b/x/params/types/proposal/query.pb.go index e340f44f0efa..25bacb04795e 100644 --- a/x/params/types/proposal/query.pb.go +++ b/x/params/types/proposal/query.pb.go @@ -6,7 +6,7 @@ package proposal import ( context "context" fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" diff --git a/x/upgrade/types/tx.pb.go b/x/upgrade/types/tx.pb.go index e74fbe166b9e..47d9edbfd715 100644 --- a/x/upgrade/types/tx.pb.go +++ b/x/upgrade/types/tx.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/x/upgrade/types/upgrade.pb.go b/x/upgrade/types/upgrade.pb.go index aaaae123f2d9..1c4167f9fdd3 100644 --- a/x/upgrade/types/upgrade.pb.go +++ b/x/upgrade/types/upgrade.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/gogoproto/gogoproto" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "google.golang.org/protobuf/types/known/timestamppb"