From 4cc9ae704ed2fd239c303e4fae24914b8e83163d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 19:17:33 +0000 Subject: [PATCH 1/3] Bump github.com/cometbft/cometbft from 0.38.10 to 0.38.11 Bumps [github.com/cometbft/cometbft](https://github.com/cometbft/cometbft) from 0.38.10 to 0.38.11. - [Release notes](https://github.com/cometbft/cometbft/releases) - [Changelog](https://github.com/cometbft/cometbft/blob/v0.38.11/CHANGELOG.md) - [Commits](https://github.com/cometbft/cometbft/compare/v0.38.10...v0.38.11) --- updated-dependencies: - dependency-name: github.com/cometbft/cometbft dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 619b3f2a9..fcee9a35b 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( cosmossdk.io/x/upgrade v0.1.3 github.com/CosmWasm/wasmd v0.52.0 github.com/CosmWasm/wasmvm/v2 v2.1.0 - github.com/cometbft/cometbft v0.38.10 + github.com/cometbft/cometbft v0.38.11 github.com/cometbft/cometbft-db v0.9.1 github.com/cosmos/cosmos-db v1.0.2 github.com/cosmos/cosmos-proto v1.0.0-beta.5 diff --git a/go.sum b/go.sum index 24f8bbf0c..f97145c15 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v0.38.10 h1:2ePuglchT+j0Iao+cfmt/nw5U7K2lnGDzXSUPGVdXaU= -github.com/cometbft/cometbft v0.38.10/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= +github.com/cometbft/cometbft v0.38.11 h1:6bNDUB8/xq4uYonYwIfGc9OqK1ZH4NkdaMmR1LZIJqk= +github.com/cometbft/cometbft v0.38.11/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= github.com/cometbft/cometbft-db v0.9.1 h1:MIhVX5ja5bXNHF8EYrThkG9F7r9kSfv8BX4LWaxWJ4M= github.com/cometbft/cometbft-db v0.9.1/go.mod h1:iliyWaoV0mRwBJoizElCwwRA9Tf7jZJOURcRZF9m60U= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= From 6a8c1beebda1195277c8505b6d9d7a8aa6c8262d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 14 Aug 2024 19:19:15 +0000 Subject: [PATCH 2/3] Updated Changelog --- .../dependencies/2120-github-com-cometbft-cometbft-0-38-11.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/unreleased/dependencies/2120-github-com-cometbft-cometbft-0-38-11.md diff --git a/.changelog/unreleased/dependencies/2120-github-com-cometbft-cometbft-0-38-11.md b/.changelog/unreleased/dependencies/2120-github-com-cometbft-cometbft-0-38-11.md new file mode 100644 index 000000000..4f911beaf --- /dev/null +++ b/.changelog/unreleased/dependencies/2120-github-com-cometbft-cometbft-0-38-11.md @@ -0,0 +1 @@ +* `github.com/cometbft/cometbft` bumped to v0.38.11 (from v0.38.10) [PR 2120](https://github.com/provenance-io/provenance/pull/2120). From 7f283c93ce8d5895596cc218f6dfb75e006aebc8 Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Wed, 14 Aug 2024 13:48:17 -0600 Subject: [PATCH 3/3] Fix TestConfigCmdGet so that it doesn't fail every time we bump the CometBFT library. --- cmd/provenanced/cmd/config_test.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/provenanced/cmd/config_test.go b/cmd/provenanced/cmd/config_test.go index 754883962..61e6dc364 100644 --- a/cmd/provenanced/cmd/config_test.go +++ b/cmd/provenanced/cmd/config_test.go @@ -263,6 +263,12 @@ func (s *ConfigTestSuite) TestConfigCmdGet() { monikerLineMatch := regexp.MustCompile(`(?m)^moniker="([^"]*)"$`).FindStringSubmatch(noArgsOut) s.Require().Len(monikerLineMatch, 2, "moniker line regexp sub-matches") moniker := monikerLineMatch[1] + // The CometBFT version (not sure why that's in a config file, but whatever) changes each time the CometBFT + // library is bumped. So we'll get it and make sure it's in the right format, but we won't care about the + // specific value it has. The line should look something like this: `version="0.38.11"`. + versionLineMatch := regexp.MustCompile(`(?m)^version="([^"]*[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+[^"]*)"$`).FindStringSubmatch(noArgsOut) + s.Require().Len(versionLineMatch, 2, "CometBFT version line regexp sub-matches") + version := versionLineMatch[1] expectedAll := s.makeMultiLine( s.makeAppConfigHeaderLines(), @@ -322,9 +328,9 @@ log_level="info"`, priv_validator_key_file="config/priv_validator_key.json" priv_validator_laddr="" priv_validator_state_file="data/priv_validator_state.json" -proxy_app="tcp://127.0.0.1:26658" -version="0.38.10" -blocksync.version="v0" +proxy_app="tcp://127.0.0.1:26658"`, + fmt.Sprintf("version=%q", version), + `blocksync.version="v0" consensus.create_empty_blocks=true consensus.create_empty_blocks_interval="0s" consensus.double_sign_check_height=0