Skip to content

Commit

Permalink
Backport: 2271 (cometbft to 0.38.17), 2282 (sdk to 0.50.12-pio-1). (#…
Browse files Browse the repository at this point in the history 
…2283)

* Bump github.com/cometbft/cometbft from 0.38.15 to 0.38.17 (#2271)

* Bump github.com/cometbft/cometbft from 0.38.15 to 0.38.17

Bumps [github.com/cometbft/cometbft](https://github.com/cometbft/cometbft) from 0.38.15 to 0.38.17.
- [Release notes](https://github.com/cometbft/cometbft/releases)
- [Changelog](https://github.com/cometbft/cometbft/blob/v0.38.17/CHANGELOG.md)
- [Commits](cometbft/cometbft@v0.38.15...v0.38.17)

---
updated-dependencies:
- dependency-name: github.com/cometbft/cometbft
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updated Changelog

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Wedul <github@wedul.com>

* Bump Cosmos SDK to v0.50.12-pio-1 (from v0.50.11-pio-1). (#2282)

* Switch the SDK to a local version.

* Switch to v0.50.12-pio-1

* Add changelog entry.

* Tell the lint action to not verify the json stuff. The authors of that action recently enabled that verification by default, which is why the most recent PRs are failing the lint action.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@SpicyLemon @dependabot
SpicyLemon and dependabot[bot] authored Feb 21, 2025
1 parent 106b406 commit 25d911c
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 65 deletions.
16 changes: 16 additions & 0 deletions .changelog/unreleased/dependencies/2271-github-com-cometbft-cometbft-0-38-17.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
* `github.com/cometbft/cometbft` bumped to v0.38.17 (from v0.38.15) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `github.com/golang/glog` bumped to v1.2.3 (from v1.2.2) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `github.com/prometheus/common` bumped to v0.62.0 (from v0.60.1) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `go.opentelemetry.io/otel` bumped to v1.32.0 (from v1.31.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `go.opentelemetry.io/otel/metric` bumped to v1.32.0 (from v1.31.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `go.opentelemetry.io/otel/trace` bumped to v1.32.0 (from v1.31.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `golang.org/x/crypto` bumped to v0.32.0 (from v0.31.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `golang.org/x/exp` bumped to v0.0.0-20240719175910-8a7402abbf56 (from v0.0.0-20240404231335-c0f41cb1a7a0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `golang.org/x/net` bumped to v0.34.0 (from v0.30.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `golang.org/x/oauth2` bumped to v0.24.0 (from v0.23.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `golang.org/x/sys` bumped to v0.29.0 (from v0.28.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `golang.org/x/term` bumped to v0.28.0 (from v0.27.0) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `google.golang.org/genproto/googleapis/api` bumped to v0.0.0-20241202173237-19429a94021a (from v0.0.0-20241015192408-796eee8c2d53) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `google.golang.org/genproto/googleapis/rpc` bumped to v0.0.0-20241202173237-19429a94021a (from v0.0.0-20241015192408-796eee8c2d53) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `google.golang.org/grpc` bumped to v1.70.0 (from v1.69.2) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
* `google.golang.org/protobuf` bumped to v1.36.4 (from v1.36.1) [PR 2271](https://github.com/provenance-io/provenance/pull/2271).
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2282-bump-sdk-to-0-50-12.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* `github.com/cosmos/cosmos-db` bumped to v1.1.1 (from v1.1.0) [PR 2282](https://github.com/provenance-io/provenance/pull/2282).
* `github.com/cosmos/cosmos-sdk` bumped to v0.50.12-pio-1 of `github.com/provenance-io/cosmos-sdk` (from v0.50.11-pio-1 of `github.com/provenance-io/cosmos-sdk`) [PR 2282](https://github.com/provenance-io/provenance/pull/2282).
* `github.com/cosmos/ledger-cosmos-go` bumped to v0.14.0 (from v0.13.3) [PR 2282](https://github.com/provenance-io/provenance/pull/2282).
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
version: v1.60
args: --timeout 10m --out-${NO_FUTURE}format colored-line-number
github-token: ${{ secrets.github_token }}
verify: false
- name: No Now Usage
if: env.GIT_DIFF
run: scripts/no-now-lint.sh
Expand Down
38 changes: 19 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ require (
cosmossdk.io/x/upgrade v0.1.3
github.com/CosmWasm/wasmd v0.52.0
github.com/CosmWasm/wasmvm/v2 v2.1.4
github.com/cometbft/cometbft v0.38.15
github.com/cometbft/cometbft v0.38.17
github.com/cometbft/cometbft-db v0.14.1
github.com/cosmos/cosmos-db v1.1.0
github.com/cosmos/cosmos-db v1.1.1
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.50.10
github.com/cosmos/go-bip39 v1.0.0
Expand All @@ -40,11 +40,11 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.10.0
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/text v0.21.0
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53
google.golang.org/grpc v1.69.2
google.golang.org/protobuf v1.36.1
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a
google.golang.org/grpc v1.70.0
google.golang.org/protobuf v1.36.4
sigs.k8s.io/yaml v1.4.0
)

Expand Down Expand Up @@ -82,7 +82,7 @@ require (
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v1.2.2 // indirect
github.com/cosmos/ics23/go v0.11.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand All @@ -106,7 +106,7 @@ require (
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.2.2 // indirect
github.com/golang/glog v1.2.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
Expand Down Expand Up @@ -165,7 +165,7 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
Expand All @@ -189,21 +189,21 @@ require (
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/otel v1.32.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.171.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -219,7 +219,7 @@ 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

github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.50.11-pio-1
github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.50.12-pio-1

// Replace iavl to fix the node stop/start app hash problem. This can be removed once upstream is off v1.1.2
github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0
Expand Down
Loading

0 comments on commit 25d911c

Please sign in to comment.