diff --git a/app/app.go b/app/app.go index bbaef82bcd..0f5a10fd7e 100644 --- a/app/app.go +++ b/app/app.go @@ -11,13 +11,14 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - abci "github.com/cometbft/cometbft/abci/types" - cmtos "github.com/cometbft/cometbft/libs/os" "github.com/gorilla/mux" "github.com/rakyll/statik/fs" "github.com/spf13/cast" "github.com/spf13/viper" + abci "github.com/cometbft/cometbft/abci/types" + cmtos "github.com/cometbft/cometbft/libs/os" + "cosmossdk.io/log" sdkmath "cosmossdk.io/math" storetypes "cosmossdk.io/store/types" diff --git a/app/test_helpers.go b/app/test_helpers.go index a4498038b3..906240f8dd 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -12,12 +12,13 @@ import ( "testing" "time" + "github.com/rs/zerolog" + "github.com/stretchr/testify/require" + abci "github.com/cometbft/cometbft/abci/types" cmtjson "github.com/cometbft/cometbft/libs/json" cmttmtypes "github.com/cometbft/cometbft/proto/tendermint/types" cmttypes "github.com/cometbft/cometbft/types" - "github.com/rs/zerolog" - "github.com/stretchr/testify/require" "cosmossdk.io/log" sdkmath "cosmossdk.io/math" diff --git a/cmd/provenanced/cmd/init.go b/cmd/provenanced/cmd/init.go index 150947f0b2..199302201a 100644 --- a/cmd/provenanced/cmd/init.go +++ b/cmd/provenanced/cmd/init.go @@ -9,10 +9,11 @@ import ( "strings" "time" + "github.com/spf13/cobra" + cmtos "github.com/cometbft/cometbft/libs/os" cmtrand "github.com/cometbft/cometbft/libs/rand" cmttypes "github.com/cometbft/cometbft/types" - "github.com/spf13/cobra" cerrs "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" diff --git a/cmd/provenanced/cmd/pre_upgrade.go b/cmd/provenanced/cmd/pre_upgrade.go index 5db145647a..31050ca887 100644 --- a/cmd/provenanced/cmd/pre_upgrade.go +++ b/cmd/provenanced/cmd/pre_upgrade.go @@ -4,9 +4,10 @@ import ( "errors" "fmt" - cmtconfig "github.com/cometbft/cometbft/config" "github.com/spf13/cobra" + cmtconfig "github.com/cometbft/cometbft/config" + serverconfig "github.com/cosmos/cosmos-sdk/server/config" cmderrors "github.com/provenance-io/provenance/cmd/errors" diff --git a/cmd/provenanced/cmd/root.go b/cmd/provenanced/cmd/root.go index 1be5c869a2..7200d181ab 100644 --- a/cmd/provenanced/cmd/root.go +++ b/cmd/provenanced/cmd/root.go @@ -9,13 +9,14 @@ import ( "path/filepath" "time" - cmtconfig "github.com/cometbft/cometbft/config" - cmtcli "github.com/cometbft/cometbft/libs/cli" "github.com/rs/zerolog" "github.com/spf13/cast" "github.com/spf13/cobra" "github.com/spf13/pflag" + cmtconfig "github.com/cometbft/cometbft/config" + cmtcli "github.com/cometbft/cometbft/libs/cli" + "cosmossdk.io/log" "cosmossdk.io/store" "cosmossdk.io/store/snapshots" diff --git a/cmd/provenanced/cmd/testnet.go b/cmd/provenanced/cmd/testnet.go index 2abb1ef862..5503267df5 100644 --- a/cmd/provenanced/cmd/testnet.go +++ b/cmd/provenanced/cmd/testnet.go @@ -11,11 +11,12 @@ import ( "path/filepath" "time" + "github.com/spf13/cobra" + cmtconfig "github.com/cometbft/cometbft/config" cmtos "github.com/cometbft/cometbft/libs/os" cmtrand "github.com/cometbft/cometbft/libs/rand" cmttime "github.com/cometbft/cometbft/types/time" - "github.com/spf13/cobra" sdkmath "cosmossdk.io/math" diff --git a/cmd/provenanced/config/manager.go b/cmd/provenanced/config/manager.go index ae224e18cf..55d1dc3bac 100644 --- a/cmd/provenanced/config/manager.go +++ b/cmd/provenanced/config/manager.go @@ -6,10 +6,11 @@ import ( "os" "time" - cmtconfig "github.com/cometbft/cometbft/config" "github.com/spf13/cobra" "github.com/spf13/viper" + cmtconfig "github.com/cometbft/cometbft/config" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" diff --git a/internal/provwasm/query_plugins.go b/internal/provwasm/query_plugins.go index a2fe39d3f9..c182bb5bee 100644 --- a/internal/provwasm/query_plugins.go +++ b/internal/provwasm/query_plugins.go @@ -7,6 +7,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmvmtypes "github.com/CosmWasm/wasmvm/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/testutil/assertions/events.go b/testutil/assertions/events.go index 8746c0cbfd..3cdb55a1d3 100644 --- a/testutil/assertions/events.go +++ b/testutil/assertions/events.go @@ -4,9 +4,10 @@ import ( "fmt" "strings" - abci "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/assert" + abci "github.com/cometbft/cometbft/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/testutil/ibc/testchain.go b/testutil/ibc/testchain.go index 586a71739c..85016678ce 100644 --- a/testutil/ibc/testchain.go +++ b/testutil/ibc/testchain.go @@ -6,9 +6,10 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/suite" + cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" diff --git a/x/attribute/module.go b/x/attribute/module.go index bedb510363..61b43bb8ef 100644 --- a/x/attribute/module.go +++ b/x/attribute/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/exchange/module/module.go b/x/exchange/module/module.go index 7f97ad6a85..14ced0e1df 100644 --- a/x/exchange/module/module.go +++ b/x/exchange/module/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" sdkclient "github.com/cosmos/cosmos-sdk/client" diff --git a/x/hold/keeper/grpc_query.go b/x/hold/keeper/grpc_query.go index 3a55b33fb1..fecca2563c 100644 --- a/x/hold/keeper/grpc_query.go +++ b/x/hold/keeper/grpc_query.go @@ -4,10 +4,11 @@ import ( "context" "fmt" - dbm "github.com/cometbft/cometbft-db" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + dbm "github.com/cometbft/cometbft-db" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/hold/module/module.go b/x/hold/module/module.go index 121d9f89b4..64da569821 100644 --- a/x/hold/module/module.go +++ b/x/hold/module/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" sdkclient "github.com/cosmos/cosmos-sdk/client" diff --git a/x/ibchooks/keeper/keeper.go b/x/ibchooks/keeper/keeper.go index c43272d7e1..bde8a4aefa 100644 --- a/x/ibchooks/keeper/keeper.go +++ b/x/ibchooks/keeper/keeper.go @@ -7,6 +7,7 @@ import ( "strings" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + "github.com/cometbft/cometbft/crypto/tmhash" sdkerrors "cosmossdk.io/errors" diff --git a/x/ibchooks/module.go b/x/ibchooks/module.go index 59b905a03e..324da96a98 100644 --- a/x/ibchooks/module.go +++ b/x/ibchooks/module.go @@ -5,11 +5,12 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/ibcratelimit/module/module.go b/x/ibcratelimit/module/module.go index 7cc7da257b..6e05a17163 100644 --- a/x/ibcratelimit/module/module.go +++ b/x/ibcratelimit/module/module.go @@ -6,11 +6,12 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/marker/module.go b/x/marker/module.go index 597ddfbdf5..33978d7c43 100644 --- a/x/marker/module.go +++ b/x/marker/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" feegrantkeeper "cosmossdk.io/x/feegrant/keeper" diff --git a/x/metadata/module.go b/x/metadata/module.go index 6ecc18ea0f..d38e48aeea 100644 --- a/x/metadata/module.go +++ b/x/metadata/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/msgfees/module/module.go b/x/msgfees/module/module.go index bb30bd7962..8b680268eb 100644 --- a/x/msgfees/module/module.go +++ b/x/msgfees/module/module.go @@ -5,10 +5,11 @@ import ( "encoding/json" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" cerrs "cosmossdk.io/errors" diff --git a/x/msgfees/types/keys.go b/x/msgfees/types/keys.go index dc18ab7379..36a5fbd812 100644 --- a/x/msgfees/types/keys.go +++ b/x/msgfees/types/keys.go @@ -30,7 +30,7 @@ func GetMsgFeeKey(msgType string) []byte { } var ( - //MsgFeeKeyPrefix prefix for msgfee entry + // MsgFeeKeyPrefix prefix for msgfee entry MsgFeeKeyPrefix = []byte{0x00} // ParamStoreKey key for msgfees module's params ParamStoreKey = []byte{0x01} diff --git a/x/name/module.go b/x/name/module.go index 697d8f13b1..4b1b5b6fa5 100644 --- a/x/name/module.go +++ b/x/name/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" sdkclient "github.com/cosmos/cosmos-sdk/client" diff --git a/x/oracle/keeper/icq.go b/x/oracle/keeper/icq.go index a10838b503..482ca705e8 100644 --- a/x/oracle/keeper/icq.go +++ b/x/oracle/keeper/icq.go @@ -4,6 +4,7 @@ import ( "time" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + abci "github.com/cometbft/cometbft/abci/types" cerrs "cosmossdk.io/errors" diff --git a/x/oracle/module/module.go b/x/oracle/module/module.go index e8b56f1e45..007fe3b387 100644 --- a/x/oracle/module/module.go +++ b/x/oracle/module/module.go @@ -5,11 +5,12 @@ import ( "encoding/json" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" cerrs "cosmossdk.io/errors" diff --git a/x/quarantine/module/module.go b/x/quarantine/module/module.go index 8389e13f72..cc0bac33b8 100644 --- a/x/quarantine/module/module.go +++ b/x/quarantine/module/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" sdkclient "github.com/cosmos/cosmos-sdk/client" diff --git a/x/sanction/module/module.go b/x/sanction/module/module.go index 87385d56e9..060c1b2df7 100644 --- a/x/sanction/module/module.go +++ b/x/sanction/module/module.go @@ -6,10 +6,11 @@ import ( "fmt" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" sdkclient "github.com/cosmos/cosmos-sdk/client" diff --git a/x/trigger/module/module.go b/x/trigger/module/module.go index 660200a2ca..e56c59ed6e 100644 --- a/x/trigger/module/module.go +++ b/x/trigger/module/module.go @@ -5,11 +5,12 @@ import ( "encoding/json" "math/rand" - abci "github.com/cometbft/cometbft/abci/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/appmodule" cerrs "cosmossdk.io/errors"