Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance the config commands and change some defaults. #1968

Merged
merged 26 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
38c6110
[1760]: Turn off address caching in Test_TestnetCmd because it's cach…
SpicyLemon May 8, 2024
6ad34a5
[1760]: Fix some config unit tests that started failing because they …
SpicyLemon May 8, 2024
1bb59d3
[1760]: Update the config get and changed sub-commands to check all t…
SpicyLemon May 8, 2024
535ffb6
[1760]: Start renaming all the tendermint and tm stuff in the config …
SpicyLemon May 8, 2024
46e0ade
[1760]: Set the correct TMCoreSemVer variable when building.
SpicyLemon May 9, 2024
075eda9
[1760]: Take the tendermint libraries off the allowed import list. Up…
SpicyLemon May 9, 2024
87292c5
[1760]: Fix the rest of the tendermint references.
SpicyLemon May 9, 2024
8d9daf4
[1760]: Tweak the config get tests to check the current output agains…
SpicyLemon May 9, 2024
57c8707
[1760]: Update pre-upgrade command to change the broadcast mode from …
SpicyLemon May 9, 2024
bed3749
[1760]: Change the default keyring backend to os, but keep it as test…
SpicyLemon May 9, 2024
d5e5013
[1760]: Move the setting of the default keyring backend to inside the…
SpicyLemon May 9, 2024
f5939cb
[1760]: Fix a gofmt thing in internal/handlers/aggregate_events_test…
SpicyLemon May 9, 2024
32404e9
[1760]: Add a comment to Test_TestnetCmd explaining why address cachi…
SpicyLemon May 9, 2024
97e43c8
[1760]: Make the config get and changed commands also look for sub-fi…
SpicyLemon May 10, 2024
a1c018a
[1760]: Fix a couple unit tests that, when run together, were ending …
SpicyLemon May 10, 2024
08b7cb5
[1760]: Remove cmd/provenanced/cmd from the expected failures in the …
SpicyLemon May 10, 2024
d2367f7
[1760]: Add changelog entries.
SpicyLemon May 10, 2024
2e0f3ab
[1760]: Fix the config cmd tests that didn't work right because the m…
SpicyLemon May 10, 2024
14dfa75
[1760]: Add canary test on the config files to ensure that all field …
SpicyLemon May 10, 2024
8bd6de0
[1760]: Delete some unused functions from the msg_service_router_test.
SpicyLemon May 10, 2024
66daa31
[1760]: Fix a couple places that still referred to tendermint, but sh…
SpicyLemon May 10, 2024
5a22e5c
[1760]: Use HasSuffix and HasPrefix in removeUndesirableCmtConfigEntr…
SpicyLemon May 10, 2024
2c91887
Merge branch 'main' into dwedul/1760-fix-cmd-tests
SpicyLemon May 13, 2024
09033d6
Merge branch 'main' into dwedul/1760-fix-cmd-tests
SpicyLemon May 13, 2024
b810363
Merge branch 'main' into dwedul/1760-fix-cmd-tests
SpicyLemon May 13, 2024
51248cc
[1760]: Disable address caching in TestAddGenesisCustomMarketCmd beca…
SpicyLemon May 13, 2024
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: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
run: |
grep -vF \
-e 'github.com/provenance-io/provenance/app' \
-e 'github.com/provenance-io/provenance/cmd/provenanced/cmd' \
-e 'github.com/provenance-io/provenance/internal/antewrapper' \
-e 'github.com/provenance-io/provenance/x/ibchooks' \
-e 'github.com/provenance-io/provenance/x/ibcratelimit/module' \
Expand All @@ -63,7 +62,6 @@ jobs:
split -d -n l/3 pkgs.txt.tmp pkgs.txt.part.
printf '%s\n' \
'github.com/provenance-io/provenance/app' \
'github.com/provenance-io/provenance/cmd/provenanced/cmd' \
'github.com/provenance-io/provenance/internal/antewrapper' \
'github.com/provenance-io/provenance/x/ibchooks' \
'github.com/provenance-io/provenance/x/ibcratelimit/module' \
Expand Down
3 changes: 0 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ linters-settings:
- github.com/cometbft/cometbft/types/time
- github.com/cometbft/cometbft-db

- github.com/tendermint/tendermint
- github.com/tendermint/tm-db

- github.com/rs/zerolog
test:
files:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ Ref: https://keepachangelog.com/en/1.0.0/
* Removes sync-info code for sdk v0.50 [#1760](https://github.com/provenance-io/provenance/issues/1760).
* Fix most of the failing unit tests [#1943](https://github.com/provenance-io/provenance/pull/1943)
* Clean up ReadFromClient [#1760](https://github.com/provenance-io/provenance/issues/1760).
* Enhance the config get and changed commands to make it easier to find fields [#1968](https://github.com/provenance-io/provenance/pull/1968).
* Change the default keyring backend to "os", but leave it as "test" for testnets [#1968](https://github.com/provenance-io/provenance/pull/1968).
* Change the default broadcast mode to "sync" [#1968](https://github.com/provenance-io/provenance/pull/1968).
* The pre-upgrade command now updates the client config's broadcast mode to "sync" if it's set to "block" [#1968](https://github.com/provenance-io/provenance/pull/1968).
SpicyLemon marked this conversation as resolved.
Show resolved Hide resolved

### Deprecated

* In the config commands, the "tendermint" and "tm" options are deprecated, replaced with "cometbft", "comet", and "cmt" [#1968](https://github.com/provenance-io/provenance/pull/1968).
SpicyLemon marked this conversation as resolved.
Show resolved Hide resolved

### Dependencies

Expand Down
3 changes: 0 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ not required to an open issue to submit a PR, but be aware that for more complex
problems/features, if a PR is opened before an adequate design discussion has
taken place in a github issue, that PR runs a high likelihood of being rejected.

Take a peek at our [coding repo](https://github.com/tendermint/coding) for
overall information on repository workflow and standards. Note, we use `make tools` for installing the linting tools.

Other notes:

- Looking for a good place to start contributing? How about checking out some
SpicyLemon marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ endif

BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null)
BRANCH_PRETTY := $(subst /,-,$(BRANCH))
TM_VERSION := $(shell $(GO) list -m github.com/tendermint/tendermint 2> /dev/null | sed 's:.* ::') # grab everything after the space in "github.com/tendermint/tendermint v0.34.7"
export CMTVERSION := $(shell $(GO) list -m github.com/cometbft/cometbft 2> /dev/null | sed 's:.* ::')
COMMIT := $(shell git log -1 --format='%h' 2> /dev/null)
# don't override user values
ifeq (,$(VERSION))
Expand Down Expand Up @@ -108,7 +108,7 @@ ldflags = -w -s \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION)
-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION)

ldflags += $(LDFLAGS)
ldflags := $(strip $(ldflags))
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Please report security vulnerabilities to
The Provenance team will send a response indicating the next steps in handling your
report. After the initial reply to your report, the team will keep you informed
of the progress towards remediation and may ask for additional
information or guidance.  For critical problems you may encrypt your report using the public key below.
information or guidance. For critical problems you may encrypt your report using the public key below.

In addition, please include the following information along with your report:

Expand All @@ -27,7 +27,7 @@ an email to **[[email protected]](mailto:[email protected])**. The ema
a short description of why it should be handled according to this security
policy.

If you have found an issue with the Cosmos SDK or Tendermint modules not found in this repo you can report them through links found here. https://tendermint.com/security/
If you have found an issue with the Cosmos SDK or CometBFT modules not found in this repo you can report them through links found here: <https://github.com/cometbft/cometbft/blob/main/SECURITY.md>.

## Disclosure Policy

Expand Down
2 changes: 1 addition & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,7 @@ func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig serverconfig.API
// Register new tx routes from grpc-gateway.
authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)

// Register new tendermint queries routes from grpc-gateway.
// Register new queries routes from grpc-gateway.
cmtservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)

// Register node gRPC service for grpc-gateway.
Expand Down
3 changes: 1 addition & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ import (
"github.com/provenance-io/provenance/internal/pioconfig"
)

// DefaultConsensusParams defines the default Tendermint consensus params used in
// SimApp testing.
// DefaultConsensusParams defines the default consensus params used in SimApp testing.
var DefaultConsensusParams = &cmttmtypes.ConsensusParams{
Block: &cmttmtypes.BlockParams{
MaxBytes: 200000,
Expand Down
Loading
Loading