Skip to content

Commit 8b61055

Browse files
aaroncaaronc
committed
revert unneeded makefile changes
1 parent 13aa9fa commit 8b61055

File tree

1 file changed

+29
-42
lines changed

1 file changed

+29
-42
lines changed

‎Makefile‎

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ifeq ($(findstring -,$(VERSION)),) # No "-" means it's just a hash
1212
VERSION := 0.0.0-$(VERSION_RAW)
1313
endif
1414
export VERSION
15-
export CMTVERSION := $(shell go list -m github.com/cometbft/cometbft/v2 | sed 's:.* ::')
15+
export CMTVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
1616
export COMMIT := $(shell git log -1 --format='%H')
1717
LEDGER_ENABLED ?= true
1818
BINDIR ?= $(GOPATH)/bin
@@ -67,7 +67,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \
6767
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
6868
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
6969
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
70-
-X github.com/cometbft/cometbft/v2/version.TMCoreSemVer=$(CMTVERSION)
70+
-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION)
7171

7272
# DB backend selection
7373
ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))
@@ -134,15 +134,11 @@ cosmovisor:
134134
confix:
135135
$(MAKE) -C tools/confix confix
136136

137-
hubl:
138-
$(MAKE) -C tools/hubl hubl
139-
140137
.PHONY: build build-linux-amd64 build-linux-arm64 cosmovisor confix
141138

142-
143139
#? mocks: Generate mock file
144140
mocks: $(MOCKS_DIR)
145-
@go install go.uber.org/mock/mockgen@v0.5.0
141+
@go install go.uber.org/mock/mockgen@v0.6.0
146142
sh ./scripts/mockgen.sh
147143
.PHONY: mocks
148144

@@ -383,21 +379,20 @@ benchmark:
383379
### Linting ###
384380
###############################################################################
385381

386-
golangci_version=v2.3.1
382+
golangci_version=v2.5.0
387383

388384
lint-install:
389385
@echo "--> Installing golangci-lint $(golangci_version)"
390386
@go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(golangci_version)
391387

392388
lint:
393389
@echo "--> Running linter on all files"
394-
$(MAKE) lint-install
390+
@$(MAKE) lint-install
395391
@./scripts/go-lint-all.bash --timeout=15m
396392

397-
398393
lint-fix:
399394
@echo "--> Running linter"
400-
$(MAKE) lint-install
395+
@$(MAKE) lint-install
401396
@./scripts/go-lint-all.bash --fix
402397

403398
.PHONY: lint lint-fix
@@ -431,52 +426,44 @@ proto-lint:
431426
proto-check-breaking:
432427
@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
433428

434-
CMT_VERSION_DIR = v1.0.1
435-
CMT_PROTO = v1
436-
CMT_URL = https://raw.githubusercontent.com/cometbft/cometbft/$(CMT_VERSION_DIR)/proto/cometbft
437-
CMT_CRYPTO_TYPES = proto/cometbft/crypto/$(CMT_PROTO)
438-
CMT_ABCI_TYPES = proto/cometbft/abci/$(CMT_PROTO)
439-
CMT_TYPES = proto/cometbft/types/$(CMT_PROTO)
440-
CMT_VERSION = proto/cometbft/version/$(CMT_PROTO)
441-
CMT_LIBS = proto/cometbft/libs/bits/$(CMT_PROTO)
442-
CMT_P2P = proto/cometbft/p2p/$(CMT_PROTO)
429+
CMT_URL = https://raw.githubusercontent.com/cometbft/cometbft/v0.38.0/proto/tendermint
443430

444-
proto-update-comet:
445-
@echo "Updating Protobuf dependency: downloading cometbft.$(CMT_PROTO) files from CometBFT $(CMT_VERSION_DIR)"
431+
CMT_CRYPTO_TYPES = proto/tendermint/crypto
432+
CMT_ABCI_TYPES = proto/tendermint/abci
433+
CMT_TYPES = proto/tendermint/types
434+
CMT_VERSION = proto/tendermint/version
435+
CMT_LIBS = proto/tendermint/libs/bits
436+
CMT_P2P = proto/tendermint/p2p
437+
438+
proto-update-deps:
439+
@echo "Updating Protobuf dependencies"
446440

447441
@mkdir -p $(CMT_ABCI_TYPES)
448-
@curl -fsSL $(CMT_URL)/abci/$(CMT_PROTO)/service.proto > $(CMT_ABCI_TYPES)/service.proto
449-
@curl -fsSL $(CMT_URL)/abci/$(CMT_PROTO)/types.proto > $(CMT_ABCI_TYPES)/types.proto
442+
@curl -sSL $(CMT_URL)/abci/types.proto > $(CMT_ABCI_TYPES)/types.proto
450443

451444
@mkdir -p $(CMT_VERSION)
452-
@curl -fsSL $(CMT_URL)/version/$(CMT_PROTO)/types.proto > $(CMT_VERSION)/types.proto
445+
@curl -sSL $(CMT_URL)/version/types.proto > $(CMT_VERSION)/types.proto
453446

454447
@mkdir -p $(CMT_TYPES)
455-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/block.proto > $(CMT_TYPES)/block.proto
456-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/canonical.proto > $(CMT_TYPES)/canonical.proto
457-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/events.proto > $(CMT_TYPES)/events.proto
458-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/evidence.proto > $(CMT_TYPES)/evidence.proto
459-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/params.proto > $(CMT_TYPES)/params.proto
460-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/types.proto > $(CMT_TYPES)/types.proto
461-
@curl -fsSL $(CMT_URL)/types/$(CMT_PROTO)/validator.proto > $(CMT_TYPES)/validator.proto
448+
@curl -sSL $(CMT_URL)/types/types.proto > $(CMT_TYPES)/types.proto
449+
@curl -sSL $(CMT_URL)/types/evidence.proto > $(CMT_TYPES)/evidence.proto
450+
@curl -sSL $(CMT_URL)/types/params.proto > $(CMT_TYPES)/params.proto
451+
@curl -sSL $(CMT_URL)/types/validator.proto > $(CMT_TYPES)/validator.proto
452+
@curl -sSL $(CMT_URL)/types/block.proto > $(CMT_TYPES)/block.proto
462453

463454
@mkdir -p $(CMT_CRYPTO_TYPES)
464-
@curl -fsSL $(CMT_URL)/crypto/$(CMT_PROTO)/keys.proto > $(CMT_CRYPTO_TYPES)/keys.proto
465-
@curl -fsSL $(CMT_URL)/crypto/$(CMT_PROTO)/proof.proto > $(CMT_CRYPTO_TYPES)/proof.proto
455+
@curl -sSL $(CMT_URL)/crypto/proof.proto > $(CMT_CRYPTO_TYPES)/proof.proto
456+
@curl -sSL $(CMT_URL)/crypto/keys.proto > $(CMT_CRYPTO_TYPES)/keys.proto
466457

467458
@mkdir -p $(CMT_LIBS)
468-
@curl -fsSL $(CMT_URL)/libs/bits/$(CMT_PROTO)/types.proto > $(CMT_LIBS)/types.proto
459+
@curl -sSL $(CMT_URL)/libs/bits/types.proto > $(CMT_LIBS)/types.proto
469460

470461
@mkdir -p $(CMT_P2P)
471-
@curl -fsSL $(CMT_URL)/p2p/$(CMT_PROTO)/conn.proto > $(CMT_P2P)/conn.proto
472-
@curl -fsSL $(CMT_URL)/p2p/$(CMT_PROTO)/pex.proto > $(CMT_P2P)/pex.proto
473-
@curl -fsSL $(CMT_URL)/p2p/$(CMT_PROTO)/types.proto > $(CMT_P2P)/types.proto
462+
@curl -sSL $(CMT_URL)/p2p/types.proto > $(CMT_P2P)/types.proto
474463

475-
proto-update-deps:
476-
@echo "Updating Protobuf dependencies: running 'buf dep update'"
477-
$(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace $(protoImageName) buf dep update
464+
$(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace $(protoImageName) buf mod update
478465

479-
.PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps proto-update-comet
466+
.PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps
480467

481468
###############################################################################
482469
### Localnet ###

0 commit comments

Comments
 (0)