diff --git a/.golangci.yml b/.golangci.yml index d679efafdf..5982d9864a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -120,6 +120,8 @@ linters-settings: - github.com/stretchr/testify/assert - github.com/stretchr/testify/suite + - github.com/cometbft/cometbft-db + - github.com/tendermint/tendermint - github.com/tendermint/tm-db diff --git a/CHANGELOG.md b/CHANGELOG.md index 57d5c02630..6b3d654ec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ * Allow force transfers from marker and market accounts [#1855](https://github.com/provenance-io/provenance/pull/1855). * Add a `tourmaline-rc3` upgrade handler to set some new exchange module params related to payments [#1703](https://github.com/provenance-io/provenance/issues/1703). +* Remove the startup warning issued when disable-iavl-fastnode is true (we recommend keeping it as true if you already have it that way) [#1874](https://github.com/provenance-io/provenance/pull/1874). +* Switch to `github.com/cometbft/cometbft-db` `v0.7.0` (from `github.com/tendermint/tm-db` `v0.6.7`) [#1874](https://github.com/provenance-io/provenance/pull/1874). ### Bug Fixes @@ -60,6 +62,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ - Bump `github.com/golang/protobuf` from 1.5.3 to 1.5.4 ([#1863](https://github.com/provenance-io/provenance/pull/1863)) - Bump `github.com/stretchr/testify` from 1.8.4 to 1.9.0 ([#1860](https://github.com/provenance-io/provenance/pull/1860)) - Bump `bufbuild/buf-setup-action` from 1.29.0 to 1.30.0 ([#1871](https://github.com/provenance-io/provenance/pull/1871)) +- Bump `github.com/cosmos/cosmos-sdk` from v0.46.13-pio-3 to v0.46.13-pio-4 ([#1874](https://github.com/provenance-io/provenance/pull/1874)). +- Bump `github.com/cosmos/ibc-go/v6` from v6.2.0-pio-1 to v6.2.0-pio-2 ([#1874](https://github.com/provenance-io/provenance/pull/1874)). +- Bump `github.com/CosmWasm/wasmd` from v0.30.0-pio-6 to v0.30.0-pio-7 ([#1874](https://github.com/provenance-io/provenance/pull/1874)). +- Bump `github.com/cosmos/iavl` from v0.19.6 to v0.20.1 ([#1874](https://github.com/provenance-io/provenance/pull/1874)). --- diff --git a/app/app.go b/app/app.go index c3a6dd2d82..7ffbf424aa 100644 --- a/app/app.go +++ b/app/app.go @@ -13,6 +13,7 @@ import ( wasmclient "github.com/CosmWasm/wasmd/x/wasm/client" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + dbm "github.com/cometbft/cometbft-db" "github.com/gorilla/mux" "github.com/rakyll/statik/fs" "github.com/spf13/cast" @@ -21,7 +22,6 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" diff --git a/app/app_test.go b/app/app_test.go index 7f21e23171..0fdeefc6d3 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -17,10 +17,11 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" markermodule "github.com/provenance-io/provenance/x/marker" markertypes "github.com/provenance-io/provenance/x/marker/types" diff --git a/app/sim_test.go b/app/sim_test.go index 5ebd66a479..18ee5304c9 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -13,13 +13,15 @@ import ( "testing" "time" - icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v6/types" "github.com/stretchr/testify/require" + icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v6/types" + + dbm "github.com/cometbft/cometbft-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" diff --git a/app/store_loader.go b/app/store_loader.go index 7ad918773f..bb626603c2 100644 --- a/app/store_loader.go +++ b/app/store_loader.go @@ -7,10 +7,10 @@ import ( "strings" "time" + dbm "github.com/cometbft/cometbft-db" "github.com/spf13/cast" "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/server" @@ -50,7 +50,6 @@ func IssueConfigWarnings(logger log.Logger, appOpts servertypes.AppOptions, slee interval := cast.ToUint64(appOpts.Get("pruning-interval")) txIndexer := cast.ToStringMap(appOpts.Get("tx_index")) indexer := cast.ToString(txIndexer["indexer"]) - fastNode := cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode)) backend := server.GetAppDBBackend(appOpts) var errs []string @@ -62,10 +61,6 @@ func IssueConfigWarnings(logger log.Logger, appOpts servertypes.AppOptions, slee errs = append(errs, fmt.Sprintf("indexer \"%s\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"%s\".", indexer, "null")) } - if fastNode { - errs = append(errs, fmt.Sprintf("%s \"%v\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"%v\".", server.FlagDisableIAVLFastNode, fastNode, !fastNode)) - } - if backend != dbm.GoLevelDBBackend { errs = append(errs, fmt.Sprintf("%s IS NO LONGER SUPPORTED. MIGRATE TO %s.", backend, dbm.GoLevelDBBackend)) } diff --git a/app/store_loader_test.go b/app/store_loader_test.go index a1fed24c49..a0b0d90d84 100644 --- a/app/store_loader_test.go +++ b/app/store_loader_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/server" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/provenance-io/provenance/internal" @@ -53,10 +52,9 @@ func (s *MockSleeper) Sleep(d time.Duration) { // MockAppOptions is a mocked version of AppOpts that allows the developer to provide the pruning attribute. type MockAppOptions struct { - pruning string - indexer string - db string - fastNode string + pruning string + indexer string + db string } // Get returns the value for the provided option. @@ -72,8 +70,6 @@ func (m MockAppOptions) Get(opt string) interface{} { return m.db case "db-backend": return m.db - case server.FlagDisableIAVLFastNode: - return m.fastNode } return nil @@ -85,10 +81,9 @@ func TestValidateWrapper(t *testing.T) { }() recAppOpts := MockAppOptions{ - pruning: "10", - db: "goleveldb", - fastNode: "false", - indexer: "null", + pruning: "10", + db: "goleveldb", + indexer: "null", } tests := []struct { @@ -131,7 +126,7 @@ func TestValidateWrapper(t *testing.T) { { name: "bad config and err from store loader", appOpts: MockAppOptions{ - fastNode: "true", + db: "somethingelse", }, expErr: "another injected error for testing", expLogMsgs: true, @@ -140,7 +135,7 @@ func TestValidateWrapper(t *testing.T) { { name: "bad config and err from store loader no sleep", appOpts: MockAppOptions{ - fastNode: "true", + db: "somethingelse", }, pioAckWarn: true, expErr: "another injected error for testing", @@ -202,20 +197,18 @@ func TestIssueConfigWarnings(t *testing.T) { { name: "recommended app opts", appOpts: MockAppOptions{ - pruning: "10", - db: "goleveldb", - fastNode: "false", - indexer: "null", + pruning: "10", + db: "goleveldb", + indexer: "null", }, expLogLines: nil, }, { name: "bad pruning interval", appOpts: MockAppOptions{ - pruning: "1000", - db: "goleveldb", - fastNode: "false", - indexer: "null", + pruning: "1000", + db: "goleveldb", + indexer: "null", }, expLogLines: []string{ "ERR pruning-interval 1000 EXCEEDS 999 AND IS NOT RECOMMENDED, AS IT CAN LEAD TO MISSED BLOCKS ON VALIDATORS.", @@ -227,10 +220,9 @@ func TestIssueConfigWarnings(t *testing.T) { { name: "bad indexer", appOpts: MockAppOptions{ - pruning: "10", - db: "goleveldb", - fastNode: "false", - indexer: "kv", + pruning: "10", + db: "goleveldb", + indexer: "kv", }, expLogLines: []string{ "ERR indexer \"kv\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"null\".", @@ -239,28 +231,12 @@ func TestIssueConfigWarnings(t *testing.T) { }, expSleep: true, }, - { - name: "bad fastnode", - appOpts: MockAppOptions{ - pruning: "10", - db: "goleveldb", - fastNode: "true", - indexer: "null", - }, - expLogLines: []string{ - "ERR iavl-disable-fastnode \"true\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"false\".", - sleepErr1, - sleepErr2, - }, - expSleep: true, - }, { name: "bad db", appOpts: MockAppOptions{ - pruning: "10", - db: "cleveldb", - fastNode: "false", - indexer: "null", + pruning: "10", + db: "cleveldb", + indexer: "null", }, expLogLines: []string{ "ERR cleveldb IS NO LONGER SUPPORTED. MIGRATE TO goleveldb.", @@ -272,15 +248,13 @@ func TestIssueConfigWarnings(t *testing.T) { { name: "all bad with sleep", appOpts: MockAppOptions{ - pruning: "1001", - db: "badgerdb", - fastNode: "true", - indexer: "psql", + pruning: "1001", + db: "badgerdb", + indexer: "psql", }, expLogLines: []string{ "ERR pruning-interval 1001 EXCEEDS 999 AND IS NOT RECOMMENDED, AS IT CAN LEAD TO MISSED BLOCKS ON VALIDATORS.", "ERR indexer \"psql\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"null\".", - "ERR iavl-disable-fastnode \"true\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"false\".", "ERR badgerdb IS NO LONGER SUPPORTED. MIGRATE TO goleveldb.", sleepErr1, sleepErr2, @@ -290,16 +264,14 @@ func TestIssueConfigWarnings(t *testing.T) { { name: "all bad no sleep", appOpts: MockAppOptions{ - pruning: "1001", - db: "badgerdb", - fastNode: "true", - indexer: "psql", + pruning: "1001", + db: "badgerdb", + indexer: "psql", }, pioAckWarn: "1", expLogLines: []string{ "ERR pruning-interval 1001 EXCEEDS 999 AND IS NOT RECOMMENDED, AS IT CAN LEAD TO MISSED BLOCKS ON VALIDATORS.", "ERR indexer \"psql\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"null\".", - "ERR iavl-disable-fastnode \"true\" IS NOT RECOMMENDED, AND IT IS RECOMMENDED TO USE \"false\".", "ERR badgerdb IS NO LONGER SUPPORTED. MIGRATE TO goleveldb.", }, expSleep: false, diff --git a/app/test_helpers.go b/app/test_helpers.go index a5cc1eb09a..e54e725299 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -12,6 +12,7 @@ import ( "testing" "time" + dbm "github.com/cometbft/cometbft-db" "github.com/rs/zerolog" "github.com/stretchr/testify/require" @@ -20,7 +21,6 @@ import ( "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" sdkmath "cosmossdk.io/math" diff --git a/cmd/dbmigrate/utils/badgerdb.go b/cmd/dbmigrate/utils/badgerdb.go index 6987119e27..80a3b4e9d2 100644 --- a/cmd/dbmigrate/utils/badgerdb.go +++ b/cmd/dbmigrate/utils/badgerdb.go @@ -4,7 +4,7 @@ package utils import ( - tmdb "github.com/tendermint/tm-db" + tmdb "github.com/cometbft/cometbft-db" ) // This file is included when built with the badgerdb tag (which matches the tag Tendermint looks for). diff --git a/cmd/dbmigrate/utils/boltdb.go b/cmd/dbmigrate/utils/boltdb.go index be80890982..8836fd39c2 100644 --- a/cmd/dbmigrate/utils/boltdb.go +++ b/cmd/dbmigrate/utils/boltdb.go @@ -4,7 +4,7 @@ package utils import ( - tmdb "github.com/tendermint/tm-db" + tmdb "github.com/cometbft/cometbft-db" ) // This file is included when built with the boltdb tag (which matches the tag Tendermint looks for). diff --git a/cmd/dbmigrate/utils/cleveldb.go b/cmd/dbmigrate/utils/cleveldb.go index 48edd4553c..b430df8556 100644 --- a/cmd/dbmigrate/utils/cleveldb.go +++ b/cmd/dbmigrate/utils/cleveldb.go @@ -4,7 +4,7 @@ package utils import ( - tmdb "github.com/tendermint/tm-db" + tmdb "github.com/cometbft/cometbft-db" ) // This file is included when built with the cleveldb tag (which matches the tag Tendermint looks for). diff --git a/cmd/dbmigrate/utils/migrator.go b/cmd/dbmigrate/utils/migrator.go index 76eda9656b..165287b770 100644 --- a/cmd/dbmigrate/utils/migrator.go +++ b/cmd/dbmigrate/utils/migrator.go @@ -11,10 +11,10 @@ import ( "syscall" "time" + tmdb "github.com/cometbft/cometbft-db" copier "github.com/otiai10/copy" tmlog "github.com/tendermint/tendermint/libs/log" - tmdb "github.com/tendermint/tm-db" ) const ( diff --git a/cmd/dbmigrate/utils/migrator_test.go b/cmd/dbmigrate/utils/migrator_test.go index cd90b43167..764f59ca5b 100644 --- a/cmd/dbmigrate/utils/migrator_test.go +++ b/cmd/dbmigrate/utils/migrator_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + tmdb "github.com/cometbft/cometbft-db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmdb "github.com/tendermint/tm-db" ) type MigratorTestSuite struct { diff --git a/cmd/dbmigrate/utils/rocksdb.go b/cmd/dbmigrate/utils/rocksdb.go index 21606f53d9..3e23ba8b94 100644 --- a/cmd/dbmigrate/utils/rocksdb.go +++ b/cmd/dbmigrate/utils/rocksdb.go @@ -4,7 +4,7 @@ package utils import ( - tmdb "github.com/tendermint/tm-db" + tmdb "github.com/cometbft/cometbft-db" ) // This file is included when built with the rocksdb tag (which matches the tag Tendermint looks for). diff --git a/cmd/provenanced/cmd/root.go b/cmd/provenanced/cmd/root.go index 9addcb322b..fa7b853ad5 100644 --- a/cmd/provenanced/cmd/root.go +++ b/cmd/provenanced/cmd/root.go @@ -9,6 +9,7 @@ import ( "path/filepath" "time" + dbm "github.com/cometbft/cometbft-db" "github.com/rs/zerolog" "github.com/spf13/cast" "github.com/spf13/cobra" @@ -17,7 +18,6 @@ import ( tmcfg "github.com/tendermint/tendermint/config" tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" diff --git a/cmd/provenanced/config/manager.go b/cmd/provenanced/config/manager.go index 3c6cf1c074..5f52226770 100644 --- a/cmd/provenanced/config/manager.go +++ b/cmd/provenanced/config/manager.go @@ -90,7 +90,7 @@ func ExtractAppConfigAndMap(cmd *cobra.Command) (*serverconfig.Config, FieldValu func DefaultAppConfig() *serverconfig.Config { rv := serverconfig.DefaultConfig() rv.MinGasPrices = pioconfig.GetProvenanceConfig().ProvenanceMinGasPrices - rv.IAVLDisableFastNode = false + rv.IAVLDisableFastNode = true return rv } diff --git a/go.mod b/go.mod index f1019f1246..64876868c0 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/CosmWasm/wasmd v0.30.0 github.com/CosmWasm/wasmvm v1.2.6 github.com/armon/go-metrics v0.4.1 + github.com/cometbft/cometbft-db v0.7.0 github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.46.13 github.com/cosmos/go-bip39 v1.0.0 @@ -29,7 +30,6 @@ require ( github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 github.com/tendermint/tendermint v0.34.28 - github.com/tendermint/tm-db v0.6.7 golang.org/x/exp v0.0.0-20231006140011-7918f672742d golang.org/x/text v0.14.0 google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 @@ -61,12 +61,10 @@ require ( github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogoproto v1.4.11 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.6 // indirect + github.com/cosmos/iavl v0.20.1 // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect github.com/creachadair/taskgroup v0.3.2 // indirect @@ -189,9 +187,9 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.46.13-pio-3 +replace github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.46.13-pio-4 -replace github.com/cosmos/ibc-go/v6 => github.com/provenance-io/ibc-go/v6 v6.2.0-pio-1 +replace github.com/cosmos/ibc-go/v6 => github.com/provenance-io/ibc-go/v6 v6.2.0-pio-2 // Use cometbft as requied by the SDK at v0.46.13 replace github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29 @@ -208,4 +206,4 @@ replace github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.1.1 replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0 // TODO: This is also required for https://github.com/provenance-io/provenance/issues/1414 -replace github.com/CosmWasm/wasmd => github.com/provenance-io/wasmd v0.30.0-pio-6 +replace github.com/CosmWasm/wasmd => github.com/provenance-io/wasmd v0.30.0-pio-7 diff --git a/go.sum b/go.sum index de77ba7364..ed1a800bff 100644 --- a/go.sum +++ b/go.sum @@ -371,9 +371,8 @@ github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSoht github.com/cosmos/gorocksdb v1.1.1 h1:N0OqpEKXgsi2qtDm8T1+AlNMXkTm6s1jowYf7/4pH5I= github.com/cosmos/gorocksdb v1.1.1/go.mod h1:b/U29r/CtguX3TF7mKG1Jjn4APDqh4wECshxXdiWHpA= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= -github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU= -github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= +github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ibc-apps/modules/async-icq/v6 v6.1.0 h1:4+qVTP35moRUv9vZoJ/eLt86JltdGkRPkb9Fn3jpakU= github.com/cosmos/ibc-apps/modules/async-icq/v6 v6.1.0/go.mod h1:5ZoCEfvABWqmmWuZw5GW8+wKz59wD1xsMa3b/cn7uEc= github.com/cosmos/interchain-accounts v0.4.2 h1:BxdzY22uouwe9wGK7h/HbzPNIH89JJ/4+V6n02l3cG4= @@ -1010,12 +1009,12 @@ github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/provenance-io/cosmos-sdk v0.46.13-pio-3 h1:3Nr5FCjzGNCqoo08/ebPzed61EAn92XIAlUW/lgtHrk= -github.com/provenance-io/cosmos-sdk v0.46.13-pio-3/go.mod h1:H7JTxq/UEPvM/LSs5bNYvMwmZlVl2NBT5UlqNe8tjEU= -github.com/provenance-io/ibc-go/v6 v6.2.0-pio-1 h1:IQ+H6+PiRJhGmSjNxA+5VmX34M3sWG5iQI99WbKgbeA= -github.com/provenance-io/ibc-go/v6 v6.2.0-pio-1/go.mod h1:ZxvTNnra+3aTGaKeg0GR0C8do06lAVdSGmMJHe2fkOM= -github.com/provenance-io/wasmd v0.30.0-pio-6 h1:pqlN1kE2nwYEXTcbN1LodaRaeKg+SG/cSMC+9vtEnRY= -github.com/provenance-io/wasmd v0.30.0-pio-6/go.mod h1:wDkm/LVnwFR/5lOCLrv05tBJ/2cAKNPY0gdl5WIvUrQ= +github.com/provenance-io/cosmos-sdk v0.46.13-pio-4 h1:Gg/4TrEy1sbyGPolRYOXfKo0ylYA/DCqVxYdU+YnTdM= +github.com/provenance-io/cosmos-sdk v0.46.13-pio-4/go.mod h1:kO84OU6MrWHy8cBteFV9PlRAqcTW4WL/445OdoZcS1I= +github.com/provenance-io/ibc-go/v6 v6.2.0-pio-2 h1:MdTlJkkEC/kXaWqVgzhYvlEmrbyleUQCnQDO9YJK8TQ= +github.com/provenance-io/ibc-go/v6 v6.2.0-pio-2/go.mod h1:PWhR9IozeddT6JLYj5Xvn9I4NqYVEsHtL3ROovyql1Y= +github.com/provenance-io/wasmd v0.30.0-pio-7 h1:AYmm4/cWyRcCh7veZ2Y0u366MUOnj3llR9Cacf424wQ= +github.com/provenance-io/wasmd v0.30.0-pio-7/go.mod h1:XpzwJRZfWRTots+zq4Zaf8uJASkCc90mu5GLfRMOLOA= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -1118,7 +1117,6 @@ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45 github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= -github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= diff --git a/internal/handlers/msg_service_router_test.go b/internal/handlers/msg_service_router_test.go index 3809ae35d9..6b369a17db 100644 --- a/internal/handlers/msg_service_router_test.go +++ b/internal/handlers/msg_service_router_test.go @@ -12,11 +12,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" diff --git a/testutil/network.go b/testutil/network.go index b35fab9bb1..d7b53935c5 100644 --- a/testutil/network.go +++ b/testutil/network.go @@ -5,8 +5,9 @@ import ( "testing" "time" + dbm "github.com/cometbft/cometbft-db" + tmrand "github.com/tendermint/tendermint/libs/rand" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/x/exchange/keeper/orders.go b/x/exchange/keeper/orders.go index f8cf9b96bf..81753422e8 100644 --- a/x/exchange/keeper/orders.go +++ b/x/exchange/keeper/orders.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - db "github.com/tendermint/tm-db" + db "github.com/cometbft/cometbft-db" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/hold/keeper/grpc_query.go b/x/hold/keeper/grpc_query.go index dc245dce0a..442ce5d38d 100644 --- a/x/hold/keeper/grpc_query.go +++ b/x/hold/keeper/grpc_query.go @@ -4,11 +4,10 @@ import ( "context" "fmt" + db "github.com/cometbft/cometbft-db" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - db "github.com/tendermint/tm-db" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/ibchooks/ibc_middleware_test.go b/x/ibchooks/ibc_middleware_test.go index 1c55a7cc39..a7b15ab763 100644 --- a/x/ibchooks/ibc_middleware_test.go +++ b/x/ibchooks/ibc_middleware_test.go @@ -20,6 +20,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" + dbm "github.com/cometbft/cometbft-db" + sdksim "github.com/cosmos/cosmos-sdk/simapp" transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" @@ -27,7 +29,6 @@ import ( ibcexported "github.com/cosmos/ibc-go/v6/modules/core/exported" ibctesting "github.com/cosmos/ibc-go/v6/testing" "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" ) var ( diff --git a/x/ibcratelimit/module/ibc_middleware_test.go b/x/ibcratelimit/module/ibc_middleware_test.go index 2bf5464d98..a0570ef258 100644 --- a/x/ibcratelimit/module/ibc_middleware_test.go +++ b/x/ibcratelimit/module/ibc_middleware_test.go @@ -9,26 +9,27 @@ import ( "testing" "time" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/stretchr/testify/suite" "golang.org/x/exp/slices" - sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - ibctesting "github.com/cosmos/ibc-go/v6/testing" - "github.com/stretchr/testify/suite" + dbm "github.com/cometbft/cometbft-db" + + "github.com/tendermint/tendermint/libs/log" sdkmath "cosmossdk.io/math" + sdksim "github.com/cosmos/cosmos-sdk/simapp" + sdk "github.com/cosmos/cosmos-sdk/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" + ibctesting "github.com/cosmos/ibc-go/v6/testing" "github.com/provenance-io/provenance/app" "github.com/provenance-io/provenance/internal/pioconfig" testutil "github.com/provenance-io/provenance/testutil/ibc" "github.com/provenance-io/provenance/x/ibcratelimit" - - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" ) type MiddlewareTestSuite struct {