Skip to content

Commit e2d83a5

Browse files
committed
Revert use of iavl v1
The branch `kava-v0.47.10-release-x` should only ever use iavl v0. Use of IAVL v1 should be performed on branch `kava-release-v0.47.10-iavl-v1`.
1 parent c319d50 commit e2d83a5

File tree

16 files changed

+630
-427
lines changed

16 files changed

+630
-427
lines changed

client/pruning/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Supported app-db-backend types include 'goleveldb', 'rocksdb', 'pebbledb'.`,
106106
}
107107
cmd.Printf("pruning heights start from %v, end at %v\n", pruningHeights[0], pruningHeights[len(pruningHeights)-1])
108108

109-
if err = rootMultiStore.PruneStores(pruningHeights[len(pruningHeights)-1]); err != nil {
109+
if err = rootMultiStore.PruneStores(false, pruningHeights); err != nil {
110110
return err
111111
}
112112

@@ -119,7 +119,7 @@ Supported app-db-backend types include 'goleveldb', 'rocksdb', 'pebbledb'.`,
119119
cmd.Flags().String(FlagAppDBBackend, "", "The type of database for application and snapshots databases")
120120
cmd.Flags().Uint64(server.FlagPruningKeepRecent, 0, "Number of recent heights to keep on disk (ignored if pruning is not 'custom')")
121121
cmd.Flags().Uint64(server.FlagPruningInterval, 10,
122-
`Height interval at which pruned heights are removed from disk (ignored if pruning is not 'custom'),
122+
`Height interval at which pruned heights are removed from disk (ignored if pruning is not 'custom'),
123123
this is not used by this command but kept for compatibility with the complete pruning options`)
124124

125125
return cmd

go.mod

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
go 1.21
2-
3-
toolchain go1.21.6
1+
go 1.19
42

53
module github.com/cosmos/cosmos-sdk
64

@@ -20,17 +18,15 @@ require (
2018
github.com/cockroachdb/apd/v2 v2.0.2
2119
github.com/cockroachdb/errors v1.10.0
2220
github.com/cometbft/cometbft v0.37.4
23-
github.com/cometbft/cometbft-db v0.9.1
21+
github.com/cometbft/cometbft-db v0.7.0
2422
github.com/confio/ics23/go v0.9.0
2523
github.com/cosmos/btcutil v1.0.5
26-
github.com/cosmos/cosmos-db v1.0.0
2724
github.com/cosmos/cosmos-proto v1.0.0-beta.4
2825
github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a
2926
github.com/cosmos/go-bip39 v1.0.0
3027
github.com/cosmos/gogogateway v1.2.0
3128
github.com/cosmos/gogoproto v1.4.10
32-
github.com/cosmos/iavl v1.0.0
33-
github.com/cosmos/ics23/go v0.10.0
29+
github.com/cosmos/iavl v0.20.1
3430
github.com/cosmos/ledger-cosmos-go v0.13.1
3531
github.com/golang/mock v1.6.0
3632
github.com/golang/protobuf v1.5.3
@@ -53,7 +49,7 @@ require (
5349
github.com/prometheus/common v0.42.0
5450
github.com/rakyll/statik v0.1.7
5551
github.com/rs/zerolog v1.32.0
56-
github.com/spf13/cast v1.5.1
52+
github.com/spf13/cast v1.5.0
5753
github.com/spf13/cobra v1.6.1
5854
github.com/spf13/pflag v1.0.5
5955
github.com/spf13/viper v1.14.0
@@ -80,7 +76,6 @@ require (
8076
filippo.io/edwards25519 v1.0.0 // indirect
8177
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
8278
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
83-
github.com/DataDog/zstd v1.5.2 // indirect
8479
github.com/aws/aws-sdk-go v1.44.203 // indirect
8580
github.com/beorn7/perks v1.0.1 // indirect
8681
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
@@ -89,7 +84,6 @@ require (
8984
github.com/cespare/xxhash v1.1.0 // indirect
9085
github.com/cespare/xxhash/v2 v2.2.0 // indirect
9186
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
92-
github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 // indirect
9387
github.com/cockroachdb/redact v1.1.5 // indirect
9488
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
9589
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
@@ -103,7 +97,6 @@ require (
10397
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
10498
github.com/dustin/go-humanize v1.0.1 // indirect
10599
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
106-
github.com/emicklei/dot v1.4.2 // indirect
107100
github.com/felixge/httpsnoop v1.0.2 // indirect
108101
github.com/fsnotify/fsnotify v1.6.0 // indirect
109102
github.com/getsentry/sentry-go v0.23.0 // indirect
@@ -142,7 +135,6 @@ require (
142135
github.com/kr/text v0.2.0 // indirect
143136
github.com/lib/pq v1.10.7 // indirect
144137
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
145-
github.com/linxGnu/grocksdb v1.8.6 // indirect
146138
github.com/mattn/go-colorable v0.1.13 // indirect
147139
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
148140
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
@@ -152,6 +144,7 @@ require (
152144
github.com/mitchellh/mapstructure v1.5.0 // indirect
153145
github.com/mtibben/percent v0.2.1 // indirect
154146
github.com/nxadm/tail v1.4.8 // indirect
147+
github.com/onsi/gomega v1.20.0 // indirect
155148
github.com/pelletier/go-toml v1.9.5 // indirect
156149
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
157150
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
@@ -166,10 +159,11 @@ require (
166159
github.com/spf13/jwalterweatherman v1.1.0 // indirect
167160
github.com/subosito/gotenv v1.4.1 // indirect
168161
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
162+
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
169163
github.com/ulikunitz/xz v0.5.11 // indirect
170164
github.com/zondax/hid v0.9.2 // indirect
171165
github.com/zondax/ledger-go v0.14.3 // indirect
172-
go.etcd.io/bbolt v1.3.8 // indirect
166+
go.etcd.io/bbolt v1.3.7 // indirect
173167
go.opencensus.io v0.24.0 // indirect
174168
go.opentelemetry.io/otel v1.19.0 // indirect
175169
go.opentelemetry.io/otel/metric v1.19.0 // indirect
@@ -192,9 +186,6 @@ require (
192186
replace (
193187
// use cosmos fork of keyring
194188
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
195-
// Use cometbft fork of tendermint
196-
github.com/cometbft/cometbft => github.com/kava-labs/cometbft v0.37.4-kava.1
197-
github.com/cometbft/cometbft-db => github.com/kava-labs/cometbft-db v0.9.1-kava.1
198189
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
199190
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
200191
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2

0 commit comments

Comments
 (0)