Skip to content

Commit 2c4a47b

Browse files
authored
Merge pull request #6524 from oasisprotocol/peternose/internal/bump-cometbft-db-1.0.4
go: Bump cometbft-db to 1.0.4
2 parents f46511e + 2aa345d commit 2c4a47b

4 files changed

Lines changed: 57 additions & 1634 deletions

File tree

.changelog/6524.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
go: Bump cometbft-db to 1.0.4

go/consensus/cometbft/db/badger/badger.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ func (d *badgerDBImpl) Stats() map[string]string {
255255
return m
256256
}
257257

258+
func (d *badgerDBImpl) Compact(start []byte, end []byte) error {
259+
// Explicit compaction is not currently supported in badger.
260+
return nil
261+
}
262+
258263
func (d *badgerDBImpl) Size() (int64, error) {
259264
lsm, vlog := d.db.Size()
260265
return lsm + vlog, nil

go/go.mod

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
2121
github.com/cenkalti/backoff/v4 v4.3.0
2222
github.com/cometbft/cometbft v0.37.18
23-
github.com/cometbft/cometbft-db v0.9.5
23+
github.com/cometbft/cometbft-db v1.0.4
2424
github.com/cosmos/gogoproto v1.7.0
2525
github.com/dgraph-io/badger/v4 v4.5.1
2626
github.com/eapache/channels v1.1.0
@@ -50,7 +50,7 @@ require (
5050
github.com/seccomp/libseccomp-golang v0.10.0
5151
github.com/spf13/cast v1.6.0
5252
github.com/spf13/cobra v1.8.1
53-
github.com/spf13/pflag v1.0.5
53+
github.com/spf13/pflag v1.0.6
5454
github.com/spf13/viper v1.19.0
5555
github.com/stretchr/testify v1.11.1
5656
github.com/thepudds/fzgo v0.2.2
@@ -71,30 +71,34 @@ require (
7171
require (
7272
filippo.io/bigmod v0.1.1-0.20260103110540-f8a47775ebe5 // indirect
7373
filippo.io/keygen v0.0.0-20260114151900-8e2790ea4c5b // indirect
74+
github.com/DataDog/zstd v1.5.6 // indirect
7475
github.com/benbjohnson/clock v1.3.5 // indirect
7576
github.com/beorn7/perks v1.0.1 // indirect
76-
github.com/cespare/xxhash v1.1.0 // indirect
7777
github.com/cespare/xxhash/v2 v2.3.0 // indirect
78+
github.com/cockroachdb/errors v1.11.3 // indirect
79+
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
80+
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
81+
github.com/cockroachdb/pebble v1.1.4 // indirect
82+
github.com/cockroachdb/redact v1.1.5 // indirect
83+
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
7884
github.com/creachadair/taskgroup v0.13.0 // indirect
7985
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8086
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
8187
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
82-
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
83-
github.com/dgraph-io/ristretto v1.0.0 // indirect
8488
github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
85-
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
8689
github.com/dunglas/httpsfv v1.1.0 // indirect
8790
github.com/dustin/go-humanize v1.0.1 // indirect
8891
github.com/eapache/queue v1.1.0 // indirect
8992
github.com/fatih/color v1.14.1 // indirect
9093
github.com/flynn/noise v1.1.0 // indirect
9194
github.com/fsnotify/fsnotify v1.7.0 // indirect
95+
github.com/getsentry/sentry-go v0.31.1 // indirect
9296
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
9397
github.com/go-kit/kit v0.13.0 // indirect
9498
github.com/go-logfmt/logfmt v0.6.0 // indirect
9599
github.com/gogo/protobuf v1.3.2 // indirect
96-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
97-
github.com/google/flatbuffers v24.12.23+incompatible // indirect
100+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
101+
github.com/google/flatbuffers v25.1.24+incompatible // indirect
98102
github.com/google/go-cmp v0.7.0 // indirect
99103
github.com/google/gofuzz v1.2.0 // indirect
100104
github.com/google/orderedcode v0.0.1 // indirect
@@ -115,6 +119,8 @@ require (
115119
github.com/klauspost/compress v1.18.0 // indirect
116120
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
117121
github.com/koron/go-ssdp v0.0.6 // indirect
122+
github.com/kr/pretty v0.3.1 // indirect
123+
github.com/kr/text v0.2.0 // indirect
118124
github.com/lib/pq v1.10.9 // indirect
119125
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
120126
github.com/libp2p/go-flow-metrics v0.2.0 // indirect
@@ -123,7 +129,7 @@ require (
123129
github.com/libp2p/go-netroute v0.4.0 // indirect
124130
github.com/libp2p/go-reuseport v0.4.0 // indirect
125131
github.com/libp2p/go-yamux/v5 v5.0.1 // indirect
126-
github.com/linxGnu/grocksdb v1.9.3 // indirect
132+
github.com/linxGnu/grocksdb v1.9.8 // indirect
127133
github.com/magiconair/properties v1.8.7 // indirect
128134
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
129135
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -181,6 +187,7 @@ require (
181187
github.com/quic-go/quic-go v0.59.0 // indirect
182188
github.com/quic-go/webtransport-go v0.10.0 // indirect
183189
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
190+
github.com/rogpeppe/go-internal v1.13.1 // indirect
184191
github.com/rs/cors v1.11.1 // indirect
185192
github.com/sagikazarmark/locafero v0.4.0 // indirect
186193
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -193,7 +200,7 @@ require (
193200
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
194201
github.com/wlynxg/anet v0.0.5 // indirect
195202
github.com/x448/float16 v0.8.4 // indirect
196-
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
203+
go.etcd.io/bbolt v1.4.0 // indirect
197204
go.opencensus.io v0.24.0 // indirect
198205
go.uber.org/dig v1.19.0 // indirect
199206
go.uber.org/fx v1.24.0 // indirect

0 commit comments

Comments
 (0)