From 6c6fc82671e13b865124a037f3563b73ac3a19e9 Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Tue, 16 Jul 2024 16:55:03 -0600 Subject: [PATCH 1/4] Get rid of the cometbft replace and bump it to v0.38.10 (from v0.38.9). --- go.mod | 5 +---- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6240d337a..619b3f2a9 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.9 + github.com/cometbft/cometbft v0.38.10 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 @@ -212,9 +212,6 @@ replace ( // This is required for https://github.com/provenance-io/provenance/issues/1414 github.com/CosmWasm/wasmd => github.com/provenance-io/wasmd v0.52.0-pio-1 - // TODO: Remove this once cometbft has tagged their own version v0.38.10 (or later). - github.com/cometbft/cometbft => github.com/provenance-io/cometbft-pio v0.38.10-pio-1 - github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.50.7-pio-1 // Replace iavl to fix the node stop/start app hash problem. This can be removed once upstream is off v1.1.2 diff --git a/go.sum b/go.sum index f33782f93..24f8bbf0c 100644 --- a/go.sum +++ b/go.sum @@ -335,6 +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-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= @@ -904,8 +906,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= -github.com/provenance-io/cometbft-pio v0.38.10-pio-1 h1:WbRLWNc6logznZuNCXBq5dIjjbUK7xJ1EVXF5Z4K6NU= -github.com/provenance-io/cometbft-pio v0.38.10-pio-1/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= github.com/provenance-io/cosmos-sdk v0.50.7-pio-1 h1:A4WC4LzcQj6jh+WdIIP4OIN3DCSW1t5qONtkYrJ77jg= github.com/provenance-io/cosmos-sdk v0.50.7-pio-1/go.mod h1:84xDDJEHttRT7NDGwBaUOLVOMN0JNE9x7NbsYIxXs1s= github.com/provenance-io/ibc-apps/modules/async-icq/v8 v8.0.0-prov-1 h1:p+7pxHB0ukO2aow+M6uW9gHgeQl7YJyYGyMSKHZ5My8= From bdef7a613909d4182818f871401ad716916385ae Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Wed, 17 Jul 2024 09:44:31 -0600 Subject: [PATCH 2/4] Add changelog entry. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41991f0cd..89f327aa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ * Remove the warnings about some config settings [2095](https://github.com/provenance-io/provenance/pull/2095). +### Dependencies + +- Bump `github.com/cometbft/cometbft` from 0.38.10-pio-1 to v0.38.10 ([#2097](https://github.com/provenance-io/provenance/pull/2097)) + --- ## [v1.19.0-rc5](https://github.com/provenance-io/provenance/releases/tag/v1.19.0-rc5) - 2024-07-12 From ac9d354a57f3799a3d7e5ab535c76871babbfa84 Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Wed, 17 Jul 2024 09:47:01 -0600 Subject: [PATCH 3/4] Fix changelog entry. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f327aa6..67e9e1f8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,7 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Dependencies -- Bump `github.com/cometbft/cometbft` from 0.38.10-pio-1 to v0.38.10 ([#2097](https://github.com/provenance-io/provenance/pull/2097)) +- Bump `github.com/cometbft/cometbft` from v0.38.10-pio-1 to v0.38.10 ([#2097](https://github.com/provenance-io/provenance/pull/2097)) --- From 6a60ad06e0ef172b28e7c17f53dafff307a8c853 Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Wed, 17 Jul 2024 11:00:14 -0600 Subject: [PATCH 4/4] Fix the config test that broke because it has the comet version number in it that just changed. --- cmd/provenanced/cmd/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/provenanced/cmd/config_test.go b/cmd/provenanced/cmd/config_test.go index ec4a68df8..754883962 100644 --- a/cmd/provenanced/cmd/config_test.go +++ b/cmd/provenanced/cmd/config_test.go @@ -323,7 +323,7 @@ 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.9" +version="0.38.10" blocksync.version="v0" consensus.create_empty_blocks=true consensus.create_empty_blocks_interval="0s"