Skip to content

Commit

Permalink
Merge pull request #6033 from oasisprotocol/kostko/stable/24.3.x/back…
Browse files Browse the repository at this point in the history
…port-6032

[BACKPORT/24.3.x] Bump CometBFT to 0.37.15-oasis1
  • Loading branch information
kostko authored Feb 3, 2025
2 parents 861f035 + 9e00a01 commit 62cbedc
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 53 deletions.
1 change: 1 addition & 0 deletions .cargo/audit.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[advisories]
ignore = [
"RUSTSEC-2023-0071", # Does not affect our current use of the library.
"RUSTSEC-2024-0421", # Does not affect our current use of the library.
]
1 change: 1 addition & 0 deletions .changelog/6032.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump CometBFT to 0.37.15-oasis1
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 15 additions & 17 deletions go/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/oasisprotocol/oasis-core/go

replace (
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.11-oasis1
github.com/cometbft/cometbft => github.com/oasisprotocol/cometbft v0.37.15-oasis1

// v1.5.0 has broken uint parsing, use my commit with fixes instead until
// the maintainers merge my PR: https://github.com/spf13/cast/pull/144
Expand All @@ -17,7 +17,7 @@ require (
github.com/a8m/envsubst v1.4.2
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
github.com/cenkalti/backoff/v4 v4.2.1
github.com/cometbft/cometbft v0.37.11
github.com/cometbft/cometbft v0.37.15
github.com/cometbft/cometbft-db v0.9.5
github.com/cosmos/gogoproto v1.7.0
github.com/dgraph-io/badger/v4 v4.3.1
Expand All @@ -42,38 +42,36 @@ require (
github.com/olekukonko/tablewriter v0.0.5
github.com/powerman/rpc-codec v1.2.2
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/common v0.60.0
github.com/prometheus/common v0.60.1
github.com/prometheus/procfs v0.15.1
github.com/seccomp/libseccomp-golang v0.10.0
github.com/spf13/cast v1.6.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
github.com/thepudds/fzgo v0.2.2
github.com/tidwall/btree v1.6.0
github.com/tyler-smith/go-bip39 v1.1.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.28.0
golang.org/x/crypto v0.31.0
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
golang.org/x/net v0.30.0
golang.org/x/net v0.33.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1
google.golang.org/grpc v1.67.1
google.golang.org/grpc v1.68.0
google.golang.org/grpc/security/advancedtls v0.0.0-20221004221323-12db695f1648
google.golang.org/protobuf v1.35.1
google.golang.org/protobuf v1.36.1
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/creachadair/taskgroup v0.10.0 // indirect
github.com/creachadair/taskgroup v0.13.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
Expand Down Expand Up @@ -186,7 +184,7 @@ require (
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
Expand All @@ -197,21 +195,21 @@ require (
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/wlynxg/anet v0.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.etcd.io/bbolt v1.3.11 // indirect
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/dig v1.18.0 // indirect
go.uber.org/fx v1.23.0 // indirect
go.uber.org/mock v0.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.26.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
lukechampine.com/blake3 v1.3.0 // indirect
)

go 1.22.2
go 1.22.7
Loading

0 comments on commit 62cbedc

Please sign in to comment.