Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
export GOBIN="${tools}/bin"

go install github.com/bufbuild/buf/cmd/buf
go install github.com/gogo/protobuf/protoc-gen-gogofaster@latest
go install github.com/cosmos/gogoproto/protoc-gen-gogofaster@latest

make proto-gen

Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ specify exactly the dependency you want to update, eg.
## Protobuf

We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along
with [`gogoproto`](https://github.com/gogo/protobuf) to generate code for use
with [`gogoproto`](https://github.com/cosmos/gogoproto) to generate code for use
across Tendermint Core.

To generate proto stubs, lint, and check protos for breaking changes, you will
Expand Down Expand Up @@ -283,8 +283,8 @@ cd test/e2e && \

### Model-based tests (ADVANCED)

*NOTE: if you're just submitting your first PR, you won't need to touch these
most probably (99.9%)*.
_NOTE: if you're just submitting your first PR, you won't need to touch these
most probably (99.9%)_.

For components, that have been [formally
verified](https://en.wikipedia.org/wiki/Formal_verification) using
Expand All @@ -304,8 +304,8 @@ Run: `cd light/mbt && go test`

### Fuzz tests (ADVANCED)

*NOTE: if you're just submitting your first PR, you won't need to touch these
most probably (99.9%)*.
_NOTE: if you're just submitting your first PR, you won't need to touch these
most probably (99.9%)_.

[Fuzz tests](https://en.wikipedia.org/wiki/Fuzzing) can be found inside the
`./test/fuzz` directory. See [README.md](./test/fuzz/README.md) for details.
Expand All @@ -314,8 +314,8 @@ Run: `cd test/fuzz && make fuzz-{PACKAGE-COMPONENT}`

### Jepsen tests (ADVANCED)

*NOTE: if you're just submitting your first PR, you won't need to touch these
most probably (99.9%)*.
_NOTE: if you're just submitting your first PR, you won't need to touch these
most probably (99.9%)_.

[Jepsen](http://jepsen.io/) tests are used to verify the
[linearizability](https://jepsen.io/consistency/models/linearizable) property
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ BUILD_IMAGE := ghcr.io/tendermint/docker-build-proto
BASE_BRANCH ?= v0.8-dev
DOCKER_PROTO := docker run -v $(shell pwd):/workspace --workdir /workspace $(BUILD_IMAGE)
CGO_ENABLED ?= 1
GOGOPROTO_PATH = $(shell go list -m -f '{{.Dir}}' github.com/gogo/protobuf)
GOGOPROTO_PATH = $(shell go list -m -f '{{.Dir}}' github.com/cosmos/gogoproto)

MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
CURR_DIR := $(dir $(MAKEFILE_PATH))
Expand Down Expand Up @@ -114,7 +114,7 @@ proto: proto-format proto-lint proto-doc proto-gen

check-proto-deps:
ifeq (,$(shell which protoc-gen-gogofaster))
$(error "gogofaster plugin for protoc is required. Run 'go install github.com/gogo/protobuf/protoc-gen-gogofaster@latest' to install")
$(error "gogofaster plugin for protoc is required. Run 'go install github.com/cosmos/gogoproto/protoc-gen-gogofaster@latest' to install")
endif
.PHONY: check-proto-deps

Expand Down
2 changes: 1 addition & 1 deletion abci/example/kvstore/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sort"
"strconv"

"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/proto"

abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto"
Expand Down
2 changes: 1 addition & 1 deletion abci/example/kvstore/kvstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
sync "github.com/sasha-s/go-deadlock"

dbm "github.com/cometbft/cometbft-db"
"github.com/cosmos/gogoproto/proto"
"github.com/dashpay/dashd-go/btcjson"
"github.com/gogo/protobuf/proto"

"github.com/dashpay/tenderdash/abci/example/code"
abci "github.com/dashpay/tenderdash/abci/types"
Expand Down
2 changes: 1 addition & 1 deletion abci/types/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package types
import (
"io"

"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/proto"

"github.com/dashpay/tenderdash/internal/libs/protoio"
)
Expand Down
2 changes: 1 addition & 1 deletion abci/types/messages_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/proto"
"github.com/stretchr/testify/assert"

tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
Expand Down
2 changes: 1 addition & 1 deletion abci/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"

"github.com/gogo/protobuf/jsonpb"
"github.com/cosmos/gogoproto/jsonpb"
"github.com/rs/zerolog"

"github.com/dashpay/tenderdash/crypto"
Expand Down
46 changes: 24 additions & 22 deletions abci/types/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: v1
version: v2
plugins:
- name: gogofaster
- local: protoc-gen-gogofaster
out: ./proto/
opt:
- Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types
- Mgoogle/protobuf/timestamp.proto=github.com/cosmos/gogoproto/types
- Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration
- plugins=grpc
- paths=source_relative
6 changes: 6 additions & 0 deletions buf.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Generated by buf. DO NOT EDIT.
version: v2
deps:
- name: buf.build/cosmos/gogo-proto
commit: 88ef6483f90f478fb938c37dde52ece3
digest: b5:f0c69202c9bca9672dc72a9737ea9bc83744daaed2b3da77e3a95b0e53b86dee76b5a7405b993181d6c863fd64afaca0976a302f700d6c4912eb1692a1782c0a
3 changes: 0 additions & 3 deletions buf.work.yaml

This file was deleted.

20 changes: 20 additions & 0 deletions buf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: v2
modules:
- path: proto
deps:
- buf.build/cosmos/gogo-proto
lint:
use:
- BASIC
- FILE_LOWER_SNAKE_CASE
- UNARY_RPC
except:
- FIELD_NOT_REQUIRED
- PACKAGE_NO_IMPORT_CYCLE
disallow_comment_ignores: true
breaking:
use:
- FILE
except:
- EXTENSION_NO_DELETE
- FIELD_SAME_DEFAULT
2 changes: 1 addition & 1 deletion cmd/abcidump/cmd/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"testing"

"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/proto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
4 changes: 2 additions & 2 deletions cmd/abcidump/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"io"

"github.com/gogo/protobuf/jsonpb"
"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/jsonpb"
"github.com/cosmos/gogoproto/proto"

"github.com/dashpay/tenderdash/abci/types"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/abcidump/parser/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"testing"

"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/proto"
"github.com/stretchr/testify/require"

"github.com/dashpay/tenderdash/abci/types"
Expand Down
2 changes: 1 addition & 1 deletion cmd/abcidump/parser/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"reflect"

"github.com/gogo/protobuf/proto"
"github.com/cosmos/gogoproto/proto"

protoAbci "github.com/dashpay/tenderdash/abci/types"
protoP2p "github.com/dashpay/tenderdash/proto/tendermint/p2p"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/fortytw2/leaktest v1.3.0
github.com/fxamacker/cbor/v2 v2.4.0
github.com/go-kit/kit v0.13.0
github.com/gogo/protobuf v1.3.2
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/golangci/golangci-lint v1.63.4
Expand Down Expand Up @@ -369,6 +369,7 @@ require (

require (
github.com/cometbft/cometbft-db v1.0.3
github.com/cosmos/gogoproto v1.7.0
github.com/creachadair/tomledit v0.0.27
github.com/jonboulle/clockwork v0.5.0
github.com/oasisprotocol/oasis-core/go v0.2500.0
Expand Down
Loading
Loading