Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc…

…-1.65.0
provenance-io · Jul 9, 2024 · 47afd9e · 47afd9e
2 parents ae1a73d + eb414b7
commit 47afd9e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - Bump `github.com/hashicorp/go-getter` from 1.7.4 to 1.7.5 ([#2057](https://github.com/provenance-io/provenance/pull/2057))
 - Bump `bufbuild/buf-setup-action` from 1.33.0 to 1.34.0 ([#2049](https://github.com/provenance-io/provenance/pull/2049))
 - Bump `google.golang.org/grpc` from 1.64.0 to 1.65.0 ([#2065](https://github.com/provenance-io/provenance/pull/2065))
+- Bump `github.com/cometbft/cometbft` from 0.38.7 to 0.38.9 ([#2061](https://github.com/provenance-io/provenance/pull/2061))
 
 ---
 

diff --git 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.7"
+version="0.38.9"
 blocksync.version="v0"
 consensus.create_empty_blocks=true
 consensus.create_empty_blocks_interval="0s"
@@ -352,6 +352,7 @@ mempool.max_batch_bytes=0
 mempool.max_tx_bytes=1048576
 mempool.max_txs_bytes=1073741824
 mempool.recheck=true
+mempool.recheck_timeout="1s"
 mempool.size=5000
 mempool.type="flood"
 mempool.wal_dir=""
@@ -387,6 +388,7 @@ rpc.laddr="tcp://127.0.0.1:26657"
 rpc.max_body_bytes=1000000
 rpc.max_header_bytes=1048576
 rpc.max_open_connections=900
+rpc.max_request_batch_size=10
 rpc.max_subscription_clients=100
 rpc.max_subscriptions_per_client=5
 rpc.pprof_laddr=""
@@ -521,6 +523,7 @@ func (s *ConfigTestSuite) TestConfigGetMulti() {
 				`mempool.max_tx_bytes=1048576`,
 				`mempool.max_txs_bytes=1073741824`,
 				`mempool.recheck=true`,
+				`mempool.recheck_timeout="1s"`,
 				`mempool.size=5000`,
 				`mempool.type="flood"`,
 				`mempool.wal_dir=""`,
@@ -699,6 +702,7 @@ func (s *ConfigTestSuite) TestConfigChanged() {
 				`mempool.max_tx_bytes=1048576 (same as default)`,
 				`mempool.max_txs_bytes=1073741824 (same as default)`,
 				`mempool.recheck=true (same as default)`,
+				`mempool.recheck_timeout="1s" (same as default)`,
 				`mempool.size=5000 (same as default)`,
 				`mempool.type="flood" (same as default)`,
 				`mempool.wal_dir="" (same as default)`,

diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	cosmossdk.io/x/upgrade v0.1.3
 	github.com/CosmWasm/wasmd v0.51.0
 	github.com/CosmWasm/wasmvm/v2 v2.0.1
-	github.com/cometbft/cometbft v0.38.7
+	github.com/cometbft/cometbft v0.38.9
 	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
@@ -128,6 +128,7 @@ require (
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect

diff --git 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.7 h1:ULhIOJ9+LgSy6nLekhq9ae3juX3NnQUMMPyVdhZV6Hk=
-github.com/cometbft/cometbft v0.38.7/go.mod h1:HIyf811dFMI73IE0F7RrnY/Fr+d1+HuJAgtkEpQjCMY=
+github.com/cometbft/cometbft v0.38.9 h1:cJBJBG0mPKz+sqelCi/hlfZjadZQGdDNnu6YQ1ZsUHQ=
+github.com/cometbft/cometbft v0.38.9/go.mod h1:xOoGZrtUT+A5izWfHSJgl0gYZUE7lu7Z2XIS1vWG/QQ=
 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=
@@ -671,6 +671,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=