Skip to content
This repository was archived by the owner on May 13, 2022. It is now read-only.

Commit 710aff2

Browse files
author
Silas Davis
committed
Upgrade Tendermint and over dependencies
Note: we have been forced to upgrade our protobuf dependency but in order to keep our custom gogoproto types we need to generated marshallers for all types and handle this path specially. Signed-off-by: Silas Davis <[email protected]>
1 parent b27d0ff commit 710aff2

File tree

276 files changed

+64228
-20084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+64228
-20084
lines changed

.github/workflows/master.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/setup-go@v1
1313
with:
14-
go-version: 1.13
14+
go-version: 1.15
1515
id: go
1616
- uses: actions/checkout@v2
1717
- run: make test

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- run: git fetch --prune --unshallow
1414
- uses: actions/setup-go@v1
1515
with:
16-
go-version: 1.13.x
16+
go-version: 1.15
1717
- uses: goreleaser/goreleaser-action@v1
1818
with:
1919
version: latest
@@ -30,7 +30,7 @@ jobs:
3030
- run: git fetch --unshallow --prune
3131
- uses: actions/setup-node@v1
3232
with:
33-
node-version: '12.x'
33+
node-version: '14.x'
3434
- run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
3535
- name: publish
3636
env:

.github/workflows/test.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/setup-go@v1
1313
with:
14-
go-version: 1.13
14+
go-version: 1.15
1515
id: go
1616
- uses: actions/checkout@v2
1717
- run: git fetch --unshallow --prune
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: actions/setup-go@v1
2929
with:
30-
go-version: 1.13
30+
go-version: 1.15
3131
id: go
3232
- uses: actions/checkout@v1
3333
- run: make test_integration
@@ -66,9 +66,9 @@ jobs:
6666
needs: unit
6767
steps:
6868
- uses: actions/checkout@v2
69-
- uses: actions/setup-node@v1
69+
- uses: actions/setup-node@v2
7070
with:
71-
node-version: '14.x'
71+
node-version: '14'
7272
- uses: actions/download-artifact@master
7373
with:
7474
name: burrow
@@ -114,9 +114,9 @@ jobs:
114114
needs: unit
115115
steps:
116116
- uses: actions/checkout@v2
117-
- uses: actions/setup-node@v1
117+
- uses: actions/setup-node@v2
118118
with:
119-
node-version: '14.x'
119+
node-version: '14'
120120
- uses: actions/download-artifact@master
121121
with:
122122
name: burrow

Makefile

+10-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,13 @@ BURROW_TS_PATH = ./js
7777
PROTO_GEN_TS_PATH = ${BURROW_TS_PATH}/proto
7878
NODE_BIN = ${BURROW_TS_PATH}/node_modules/.bin
7979

80-
PROTO_FILES = $(shell find . -path $(BURROW_TS_PATH) -prune -o -path ./node_modules -prune -o -type f -name '*.proto' -print)
80+
# To access Tendermint bundled protobuf files from go module cache
81+
TENDERMINT_MOD=github.com/tendermint/tendermint
82+
TENDERMINT_VERSION=$(shell go list -m -f '{{ .Version }}' $(TENDERMINT_MOD))
83+
TENDERMINT_SRC=$(shell go env GOMODCACHE)/$(TENDERMINT_MOD)@$(TENDERMINT_VERSION)
84+
TENDERMINT_PROTO=$(TENDERMINT_SRC)/proto
85+
86+
PROTO_FILES = $(shell find . $(TENDERMINT_PROTO) -path $(BURROW_TS_PATH) -prune -o -path ./node_modules -prune -o -type f -name '*.proto' -print)
8187
PROTO_GO_FILES = $(patsubst %.proto, %.pb.go, $(PROTO_FILES))
8288
PROTO_GO_FILES_REAL = $(shell find . -type f -name '*.pb.go' -print)
8389
PROTO_TS_FILES = $(patsubst %.proto, %.pb.ts, $(PROTO_FILES))
@@ -88,11 +94,12 @@ protobuf: $(PROTO_GO_FILES) $(PROTO_TS_FILES) fix
8894
# Implicit compile rule for GRPC/proto files (note since pb.go files no longer generated
8995
# in same directory as proto file this just regenerates everything
9096
%.pb.go: %.proto
91-
protoc -I ./protobuf $< --gogo_out=plugins=grpc:${GOPATH}/src
97+
protoc -I ./protobuf -I $(TENDERMINT_PROTO) $< --gogo_out=${GOPATH}/src --go-grpc_out=${GOPATH}/src
9298

9399
# Using this: https://github.com/agreatfool/grpc_tools_node_protoc_ts
94100
%.pb.ts: %.proto
95-
$(NODE_BIN)/grpc_tools_node_protoc -I protobuf \
101+
mkdir -p $(PROTO_GEN_TS_PATH)
102+
$(NODE_BIN)/grpc_tools_node_protoc -I protobuf -I $(TENDERMINT_PROTO) \
96103
--plugin="protoc-gen-ts=$(NODE_BIN)/protoc-gen-ts" \
97104
--js_out="import_style=commonjs,binary:${PROTO_GEN_TS_PATH}" \
98105
--ts_out="generate_package_definition:${PROTO_GEN_TS_PATH}" \

acm/acm.pb.go

+35-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

acm/balance/balance.pb.go

+13-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)