diff --git a/ante/ante.go b/ante/ante.go
index 105f428f580..bfe9dde49a0 100644
--- a/ante/ante.go
+++ b/ante/ante.go
@@ -1,8 +1,8 @@
package ante
import (
- ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
- ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
+ ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+ ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
errorsmod "cosmossdk.io/errors"
@@ -12,8 +12,6 @@ import (
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
- ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
- ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante"
diff --git a/ante/gov_ante_test.go b/ante/gov_ante_test.go
index 2564bdc77cd..6bd386d2a9f 100644
--- a/ante/gov_ante_test.go
+++ b/ante/gov_ante_test.go
@@ -4,14 +4,14 @@ import (
"fmt"
"testing"
- sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
tmrand "github.com/cometbft/cometbft/libs/rand"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
-
+ sdk "github.com/cosmos/cosmos-sdk/types"
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
"github.com/cosmos/gaia/v15/ante"
diff --git a/app/app.go b/app/app.go
index 3619dad6543..744e9987a5f 100644
--- a/app/app.go
+++ b/app/app.go
@@ -7,31 +7,39 @@ import (
"os"
"path/filepath"
- "github.com/cosmos/gaia/v15/app/params"
-
- autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
- reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
+ "github.com/gorilla/mux"
+ "github.com/rakyll/statik/fs"
+ "github.com/spf13/cast"
- "github.com/cosmos/cosmos-sdk/runtime"
- "github.com/cosmos/cosmos-sdk/server"
- "github.com/cosmos/cosmos-sdk/testutil/testdata"
+ // unnamed import of statik for swagger UI support
+ _ "github.com/cosmos/cosmos-sdk/client/docs/statik"
- errorsmod "cosmossdk.io/errors"
dbm "github.com/cometbft/cometbft-db"
abci "github.com/cometbft/cometbft/abci/types"
tmjson "github.com/cometbft/cometbft/libs/json"
"github.com/cometbft/cometbft/libs/log"
tmos "github.com/cometbft/cometbft/libs/os"
+
+ ibctesting "github.com/cosmos/ibc-go/v7/testing"
+ providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+
+ autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
+ reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
+ errorsmod "cosmossdk.io/errors"
+
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
+ "github.com/cosmos/cosmos-sdk/runtime"
runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
+ "github.com/cosmos/cosmos-sdk/server"
"github.com/cosmos/cosmos-sdk/server/api"
"github.com/cosmos/cosmos-sdk/server/config"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
+ "github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/module"
@@ -42,20 +50,13 @@ import (
"github.com/cosmos/cosmos-sdk/x/crisis"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
- ibctesting "github.com/cosmos/ibc-go/v7/testing"
- providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
- "github.com/gorilla/mux"
- "github.com/rakyll/statik/fs"
- "github.com/spf13/cast"
gaiaante "github.com/cosmos/gaia/v15/ante"
"github.com/cosmos/gaia/v15/app/keepers"
+ "github.com/cosmos/gaia/v15/app/params"
"github.com/cosmos/gaia/v15/app/upgrades"
v15 "github.com/cosmos/gaia/v15/app/upgrades/v15"
"github.com/cosmos/gaia/v15/x/globalfee"
-
- // unnamed import of statik for swagger UI support
- _ "github.com/cosmos/cosmos-sdk/client/docs/statik"
)
var (
diff --git a/app/app_helpers.go b/app/app_helpers.go
index 6948db79faf..093b3db0b38 100644
--- a/app/app_helpers.go
+++ b/app/app_helpers.go
@@ -2,11 +2,12 @@ package gaia
// TODO: Enable with ICS
import (
- capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types"
icstest "github.com/cosmos/interchain-security/v3/testutil/integration"
ibcproviderkeeper "github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
+
+ capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
)
// ProviderApp interface implementations for icstest tests
diff --git a/app/app_test.go b/app/app_test.go
index 592613731fb..846d2493500 100644
--- a/app/app_test.go
+++ b/app/app_test.go
@@ -3,9 +3,10 @@ package gaia_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
db "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
- "github.com/stretchr/testify/require"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
diff --git a/app/export.go b/app/export.go
index 05706980574..e8423cdd707 100644
--- a/app/export.go
+++ b/app/export.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
servertypes "github.com/cosmos/cosmos-sdk/server/types"
sdk "github.com/cosmos/cosmos-sdk/types"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go
index dcab4eb3b12..9ac54fcc775 100644
--- a/app/helpers/test_helpers.go
+++ b/app/helpers/test_helpers.go
@@ -5,23 +5,24 @@ import (
"testing"
"time"
- "github.com/cosmos/cosmos-sdk/server"
- "github.com/cosmos/cosmos-sdk/testutil/mock"
- simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+ "github.com/stretchr/testify/require"
dbm "github.com/cometbft/cometbft-db"
abci "github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/log"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
tmtypes "github.com/cometbft/cometbft/types"
+
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+ "github.com/cosmos/cosmos-sdk/server"
+ "github.com/cosmos/cosmos-sdk/testutil/mock"
+ simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
- "github.com/stretchr/testify/require"
gaiaapp "github.com/cosmos/gaia/v15/app"
)
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index eb490400d7d..af9ec25ff20 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -3,7 +3,30 @@ package keepers
import (
"os"
+ // unnamed import of statik for swagger UI support
+ _ "github.com/cosmos/cosmos-sdk/client/docs/statik"
+
"github.com/cometbft/cometbft/libs/log"
+
+ pfmrouter "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
+ pfmrouterkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
+ pfmroutertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
+ ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
+ icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host"
+ icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
+ icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
+ "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
+ ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper"
+ ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+ ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client"
+ ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+ porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
+ ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+ ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+ ibcprovider "github.com/cosmos/interchain-security/v3/x/ccv/provider"
+ ibcproviderkeeper "github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
+ providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -27,16 +50,10 @@ import (
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
"github.com/cosmos/cosmos-sdk/x/feegrant"
feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
- govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
- govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
- ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
-
- "github.com/cosmos/gaia/v15/x/globalfee"
-
- providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
-
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+ govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+ govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
"github.com/cosmos/cosmos-sdk/x/params"
@@ -50,25 +67,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
- pfmrouter "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
- pfmrouterkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
- pfmroutertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
- ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
- icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host"
- icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
- icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
- "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
- ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper"
- ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
- ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client"
- ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
- porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
- ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
- ibcprovider "github.com/cosmos/interchain-security/v3/x/ccv/provider"
- ibcproviderkeeper "github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
- // unnamed import of statik for swagger UI support
- _ "github.com/cosmos/cosmos-sdk/client/docs/statik"
+ "github.com/cosmos/gaia/v15/x/globalfee"
)
type AppKeepers struct {
@@ -439,7 +439,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
//nolint: staticcheck // SA1019: moduletypes.ParamKeyTable is deprecated
paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable())
- paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) //nolint: staticcheck // SA1019
+ paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable())
paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable())
paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable()) //nolint: staticcheck // SA1019
paramsKeeper.Subspace(distrtypes.ModuleName).WithKeyTable(distrtypes.ParamKeyTable()) //nolint: staticcheck // SA1019
diff --git a/app/keepers/keys.go b/app/keepers/keys.go
index 26e967a7230..5996f2437c4 100644
--- a/app/keepers/keys.go
+++ b/app/keepers/keys.go
@@ -2,6 +2,10 @@ package keepers
import (
routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
+ icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
+ ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+ ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+ providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -20,10 +24,6 @@ import (
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
- icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
- ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
- ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
- providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
)
func (appKeepers *AppKeepers) GenerateKeys() {
diff --git a/app/modules.go b/app/modules.go
index cee101d5ea5..f53e5c99c4f 100644
--- a/app/modules.go
+++ b/app/modules.go
@@ -3,6 +3,17 @@ package gaia
import (
pfmrouter "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
pfmroutertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
+ ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
+ icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
+ "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
+ ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+ ibc "github.com/cosmos/ibc-go/v7/modules/core"
+ ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client"
+ ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+ ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+ icsprovider "github.com/cosmos/interchain-security/v3/x/ccv/provider"
+ icsproviderclient "github.com/cosmos/interchain-security/v3/x/ccv/provider/client"
+ providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
@@ -43,17 +54,6 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
- ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
- icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
- "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
- ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
- ibc "github.com/cosmos/ibc-go/v7/modules/core"
- ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client"
- ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
- ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
- icsprovider "github.com/cosmos/interchain-security/v3/x/ccv/provider"
- icsproviderclient "github.com/cosmos/interchain-security/v3/x/ccv/provider/client"
- providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
gaiaappparams "github.com/cosmos/gaia/v15/app/params"
"github.com/cosmos/gaia/v15/x/globalfee"
diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go
index f622569cb04..31a52668b6e 100644
--- a/app/sim/sim_state.go
+++ b/app/sim/sim_state.go
@@ -8,13 +8,11 @@ import (
"os"
"time"
- "github.com/cosmos/gaia/v15/app/params"
-
- "cosmossdk.io/math"
-
tmjson "github.com/cometbft/cometbft/libs/json"
tmtypes "github.com/cometbft/cometbft/types"
+ "cosmossdk.io/math"
+
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -25,6 +23,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
gaia "github.com/cosmos/gaia/v15/app"
+ "github.com/cosmos/gaia/v15/app/params"
)
// Simulation parameter constants
diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go
index 35472831d7f..6499ca82a2c 100644
--- a/app/sim/sim_utils.go
+++ b/app/sim/sim_utils.go
@@ -5,11 +5,10 @@ import (
"fmt"
"os"
- "github.com/cosmos/cosmos-sdk/runtime"
-
dbm "github.com/cometbft/cometbft-db"
"github.com/cosmos/cosmos-sdk/codec"
+ "github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
diff --git a/app/sim_bench_test.go b/app/sim_bench_test.go
index c6e1f2e083d..eb0aad65bb5 100644
--- a/app/sim_bench_test.go
+++ b/app/sim_bench_test.go
@@ -4,17 +4,16 @@ import (
"os"
"testing"
+ "github.com/stretchr/testify/require"
+
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/server"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
- simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
- "github.com/stretchr/testify/require"
-
- gaia "github.com/cosmos/gaia/v15/app"
-
simulation2 "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"
+ simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
+ gaia "github.com/cosmos/gaia/v15/app"
"github.com/cosmos/gaia/v15/app/sim"
)
diff --git a/app/sim_test.go b/app/sim_test.go
index 5547c5811f6..8f7eb3299f6 100644
--- a/app/sim_test.go
+++ b/app/sim_test.go
@@ -7,18 +7,19 @@ import (
"os"
"testing"
- "github.com/cosmos/cosmos-sdk/client/flags"
- "github.com/cosmos/cosmos-sdk/server"
- simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+ "github.com/stretchr/testify/require"
dbm "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
+
"github.com/cosmos/cosmos-sdk/baseapp"
+ "github.com/cosmos/cosmos-sdk/client/flags"
+ "github.com/cosmos/cosmos-sdk/server"
"github.com/cosmos/cosmos-sdk/store"
+ simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
simulation2 "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"
simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
- "github.com/stretchr/testify/require"
gaia "github.com/cosmos/gaia/v15/app"
// "github.com/cosmos/gaia/v11/app/helpers"
diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go
index a30204a0ab8..f108d819217 100644
--- a/app/upgrades/v12/upgrades.go
+++ b/app/upgrades/v12/upgrades.go
@@ -27,9 +27,12 @@ func CreateUpgradeHandler(
params.ValidatorLiquidStakingCap = ValidatorLiquidStakingCap
params.GlobalLiquidStakingCap = GlobalLiquidStakingCap
- keepers.StakingKeeper.SetParams(ctx, params)
+ err = keepers.StakingKeeper.SetParams(ctx, params)
+ if err != nil {
+ return vm, err
+ }
ctx.Logger().Info("Upgrade complete")
- return vm, err
+ return vm, nil
}
}
diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go
index 02844565851..f65a97c7ef8 100644
--- a/app/upgrades/v8/upgrades.go
+++ b/app/upgrades/v8/upgrades.go
@@ -6,10 +6,6 @@ import (
"errors"
"fmt"
- icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
- icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
- ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
-
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
@@ -97,10 +93,10 @@ func QuicksilverFix(ctx sdk.Context, keepers *keepers.AppKeepers) error {
}
func closeChannel(keepers *keepers.AppKeepers, ctx sdk.Context, channelID string) {
- channel, found := keepers.IBCKeeper.ChannelKeeper.GetChannel(ctx, icatypes.PortID, channelID)
+ channel, found := keepers.IBCKeeper.ChannelKeeper.GetChannel(ctx, icatypes.HostPortID, channelID)
if found {
channel.State = ibcchanneltypes.CLOSED
- keepers.IBCKeeper.ChannelKeeper.SetChannel(ctx, icatypes.PortID, channelID, channel)
+ keepers.IBCKeeper.ChannelKeeper.SetChannel(ctx, icatypes.HostPortID, channelID, channel)
}
}
diff --git a/cmd/gaiad/cmd/genaccounts.go b/cmd/gaiad/cmd/genaccounts.go
index 3be49ba2dd9..02c9c8405ba 100644
--- a/cmd/gaiad/cmd/genaccounts.go
+++ b/cmd/gaiad/cmd/genaccounts.go
@@ -55,7 +55,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
if keyringBackend != "" && clientCtx.Keyring == nil {
var err error
- kr, err = keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf)
+ kr, err = keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf, clientCtx.Codec)
if err != nil {
return err
}
@@ -68,7 +68,10 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
return fmt.Errorf("failed to get address from Keyring: %w", err)
}
- addr = k.GetAddress()
+ addr, err = k.GetAddress()
+ if err != nil {
+ return fmt.Errorf("failed to GetAddress() from Keyring: %w", err)
+ }
}
coins, err := sdk.ParseCoinsNormalized(args[1])
diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go
index 7c0e243cbec..a1cc62eb428 100644
--- a/cmd/gaiad/cmd/root.go
+++ b/cmd/gaiad/cmd/root.go
@@ -6,22 +6,25 @@ import (
"os"
"path/filepath"
- tmcfg "github.com/cometbft/cometbft/config"
- tmtypes "github.com/cometbft/cometbft/types"
- "github.com/cosmos/cosmos-sdk/client/pruning"
+ "github.com/spf13/cast"
+ "github.com/spf13/cobra"
"github.com/spf13/viper"
- rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
-
dbm "github.com/cometbft/cometbft-db"
+ tmcfg "github.com/cometbft/cometbft/config"
tmcli "github.com/cometbft/cometbft/libs/cli"
"github.com/cometbft/cometbft/libs/log"
+ tmtypes "github.com/cometbft/cometbft/types"
+
+ rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
+
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/config"
"github.com/cosmos/cosmos-sdk/client/debug"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/keys"
+ "github.com/cosmos/cosmos-sdk/client/pruning"
"github.com/cosmos/cosmos-sdk/client/rpc"
"github.com/cosmos/cosmos-sdk/server"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
@@ -29,15 +32,12 @@ import (
"github.com/cosmos/cosmos-sdk/snapshots"
snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
"github.com/cosmos/cosmos-sdk/store"
-
sdk "github.com/cosmos/cosmos-sdk/types"
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
"github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
- "github.com/spf13/cast"
- "github.com/spf13/cobra"
gaia "github.com/cosmos/gaia/v15/app"
"github.com/cosmos/gaia/v15/app/params"
diff --git a/cmd/gaiad/cmd/testnet.go b/cmd/gaiad/cmd/testnet.go
index 815794aad88..f0ae3f725b6 100644
--- a/cmd/gaiad/cmd/testnet.go
+++ b/cmd/gaiad/cmd/testnet.go
@@ -8,16 +8,17 @@ import (
"os"
"path/filepath"
- "cosmossdk.io/math"
- "cosmossdk.io/simapp"
-
- "github.com/cosmos/cosmos-sdk/testutil/network"
+ "github.com/spf13/cobra"
"github.com/spf13/pflag"
tmconfig "github.com/cometbft/cometbft/config"
tmrand "github.com/cometbft/cometbft/libs/rand"
"github.com/cometbft/cometbft/types"
tmtime "github.com/cometbft/cometbft/types/time"
+
+ "cosmossdk.io/math"
+ "cosmossdk.io/simapp"
+
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/tx"
@@ -27,6 +28,7 @@ import (
"github.com/cosmos/cosmos-sdk/server"
srvconfig "github.com/cosmos/cosmos-sdk/server/config"
"github.com/cosmos/cosmos-sdk/testutil"
+ "github.com/cosmos/cosmos-sdk/testutil/network"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -34,7 +36,6 @@ import (
"github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
- "github.com/spf13/cobra"
)
var (
@@ -303,11 +304,7 @@ func initTestnetFiles(
valPubKeys[i],
sdk.NewCoin(sdk.DefaultBondDenom, valTokens),
stakingtypes.NewDescription(nodeDirName, "", "", "", ""),
-<<<<<<< HEAD
stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()),
-=======
- stakingtypes.NewCommissionRates(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()),
->>>>>>> main
)
if err != nil {
return err
diff --git a/go.sum b/go.sum
index 9b073e14ae6..82a3c49b0b4 100644
--- a/go.sum
+++ b/go.sum
@@ -639,9 +639,8 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnG
github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
@@ -762,10 +761,14 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA=
+github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0=
github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@@ -919,9 +922,8 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH
github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -1238,8 +1240,8 @@ github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChl
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
@@ -1346,8 +1348,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
-github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
-github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1358,20 +1358,22 @@ github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcD
github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
-github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
-github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
+github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
+github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@@ -1394,8 +1396,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
-github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
+github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
@@ -1479,8 +1481,6 @@ go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -1738,6 +1738,7 @@ golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go
index 48df1341546..774784694e6 100644
--- a/tests/e2e/chain.go
+++ b/tests/e2e/chain.go
@@ -4,14 +4,15 @@ import (
"fmt"
"os"
- authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
- upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-
tmrand "github.com/cometbft/cometbft/libs/rand"
+
+ providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
+ authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
distribtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
@@ -19,7 +20,7 @@ import (
govv1beta1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
paramsproptypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
- providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+ upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
gaiaparams "github.com/cosmos/gaia/v15/app/params"
)
diff --git a/tests/e2e/e2e_bypassminfee_test.go b/tests/e2e/e2e_bypassminfee_test.go
index 0913b1a8f08..8652cdf0c2c 100644
--- a/tests/e2e/e2e_bypassminfee_test.go
+++ b/tests/e2e/e2e_bypassminfee_test.go
@@ -7,6 +7,7 @@ import (
ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
"cosmossdk.io/math"
+
sdk "github.com/cosmos/cosmos-sdk/types"
distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
)
diff --git a/tests/e2e/e2e_exec_test.go b/tests/e2e/e2e_exec_test.go
index e84a8f04f9e..85ac056959e 100644
--- a/tests/e2e/e2e_exec_test.go
+++ b/tests/e2e/e2e_exec_test.go
@@ -9,18 +9,17 @@ import (
"strings"
"time"
- vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
- "github.com/cosmos/cosmos-sdk/x/feegrant"
- govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+ "github.com/ory/dockertest/v3/docker"
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
+ vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+ "github.com/cosmos/cosmos-sdk/x/feegrant"
+ govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-
- "github.com/ory/dockertest/v3/docker"
)
const (
diff --git a/tests/e2e/e2e_gov_test.go b/tests/e2e/e2e_gov_test.go
index 0756f8277f1..316590e8e3f 100644
--- a/tests/e2e/e2e_gov_test.go
+++ b/tests/e2e/e2e_gov_test.go
@@ -6,7 +6,6 @@ import (
"time"
sdk "github.com/cosmos/cosmos-sdk/types"
-
govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)
diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go
index cf97cd091f4..63026cd92f4 100644
--- a/tests/e2e/e2e_setup_test.go
+++ b/tests/e2e/e2e_setup_test.go
@@ -16,14 +16,18 @@ import (
"testing"
"time"
- govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
- govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
- upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+ "github.com/ory/dockertest/v3"
+ // "github.com/cosmos/cosmos-sdk/crypto/hd"
+ // "github.com/cosmos/cosmos-sdk/crypto/keyring"
+ "github.com/ory/dockertest/v3/docker"
+ "github.com/spf13/viper"
+ "github.com/stretchr/testify/suite"
tmconfig "github.com/cometbft/cometbft/config"
"github.com/cometbft/cometbft/crypto/ed25519"
tmjson "github.com/cometbft/cometbft/libs/json"
rpchttp "github.com/cometbft/cometbft/rpc/client/http"
+
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/crypto/hd"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -36,14 +40,10 @@ import (
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+ govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+ govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
- "github.com/ory/dockertest/v3"
- "github.com/stretchr/testify/suite"
-
- // "github.com/cosmos/cosmos-sdk/crypto/hd"
- // "github.com/cosmos/cosmos-sdk/crypto/keyring"
- "github.com/ory/dockertest/v3/docker"
- "github.com/spf13/viper"
+ upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)
const (
@@ -951,48 +951,6 @@ func (s *IntegrationTestSuite) writeLiquidStakingParamsUpdateProposal(c *chain,
s.Require().NoError(err)
}
-func (s *IntegrationTestSuite) writeLiquidStakingParamsUpdateProposal(c *chain) {
- type ParamInfo struct {
- Subspace string `json:"subspace"`
- Key string `json:"key"`
- Value sdk.Dec `json:"value"`
- }
-
- type ParamChangeMessage struct {
- Title string `json:"title"`
- Description string `json:"description"`
- Changes []ParamInfo `json:"changes"`
- Deposit string `json:"deposit"`
- }
-
- paramChangeProposalBody, err := json.MarshalIndent(ParamChangeMessage{
- Title: "liquid staking params update",
- Description: "liquid staking params update",
- Changes: []ParamInfo{
- {
- Subspace: "staking",
- Key: "GlobalLiquidStakingCap",
- Value: sdk.NewDecWithPrec(25, 2), // 25%
- },
- {
- Subspace: "staking",
- Key: "ValidatorLiquidStakingCap",
- Value: sdk.NewDecWithPrec(50, 2), // 50%
- },
- {
- Subspace: "staking",
- Key: "ValidatorBondFactor",
- Value: sdk.NewDec(250), // -1
- },
- },
- Deposit: "1000uatom",
- }, "", " ")
- s.Require().NoError(err)
-
- err = writeFile(filepath.Join(c.validators[0].configDir(), "config", proposalLSMParamUpdateFilename), paramChangeProposalBody)
- s.Require().NoError(err)
-}
-
func configFile(filename string) string {
filepath := filepath.Join(gaiaConfigPath, filename)
return filepath
diff --git a/tests/e2e/e2e_staking_test.go b/tests/e2e/e2e_staking_test.go
index f9ffe4f438b..483d522d646 100644
--- a/tests/e2e/e2e_staking_test.go
+++ b/tests/e2e/e2e_staking_test.go
@@ -6,6 +6,7 @@ import (
"time"
"cosmossdk.io/math"
+
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/staking/types"
)
diff --git a/tests/e2e/genesis.go b/tests/e2e/genesis.go
index 7e449009f71..acaf2127ca5 100644
--- a/tests/e2e/genesis.go
+++ b/tests/e2e/genesis.go
@@ -7,20 +7,21 @@ import (
"time"
tmtypes "github.com/cometbft/cometbft/types"
+
+ icagen "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types"
+ icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
+
"github.com/cosmos/cosmos-sdk/server"
sdk "github.com/cosmos/cosmos-sdk/types"
- "github.com/cosmos/cosmos-sdk/x/genutil"
-
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+ "github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
govmigrv3 "github.com/cosmos/cosmos-sdk/x/gov/migrations/v3"
govmigrv4 "github.com/cosmos/cosmos-sdk/x/gov/migrations/v4"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govlegacytypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
- icagen "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types"
- icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
globfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types"
)
@@ -49,7 +50,7 @@ func getGenDoc(path string) (*tmtypes.GenesisDoc, error) {
return doc, nil
}
-func modifyGenesis(path, moniker, amountStr string, addrAll []sdk.AccAddress, globfees string, denom string) error { //nolint:unparam
+func modifyGenesis(path, moniker, amountStr string, addrAll []sdk.AccAddress, globfees string, denom string) error {
serverCtx := server.NewDefaultContext()
config := serverCtx.Config
config.SetRoot(path)
diff --git a/tests/e2e/query.go b/tests/e2e/query.go
index b1f03ae968e..4696154cea8 100644
--- a/tests/e2e/query.go
+++ b/tests/e2e/query.go
@@ -12,13 +12,11 @@ import (
authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+ evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+ stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/cosmos/gaia/v15/x/globalfee/types"
-
- evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
-
- stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
)
func queryGaiaTx(endpoint, txHash string) error {
diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go
index 59690509838..c4fe4af6944 100644
--- a/tests/e2e/validator.go
+++ b/tests/e2e/validator.go
@@ -18,13 +18,11 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keyring"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/server"
- "github.com/cosmos/cosmos-sdk/x/genutil"
-
sdk "github.com/cosmos/cosmos-sdk/types"
sdktx "github.com/cosmos/cosmos-sdk/types/tx"
txsigning "github.com/cosmos/cosmos-sdk/types/tx/signing"
-
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
+ "github.com/cosmos/cosmos-sdk/x/genutil"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
gaia "github.com/cosmos/gaia/v15/app"
diff --git a/tests/ics/interchain_security_test.go b/tests/ics/interchain_security_test.go
index e063a290a91..debaf008426 100644
--- a/tests/ics/interchain_security_test.go
+++ b/tests/ics/interchain_security_test.go
@@ -4,14 +4,15 @@ import (
"encoding/json"
"testing"
- appConsumer "github.com/cosmos/interchain-security/v3/app/consumer"
- "github.com/cosmos/interchain-security/v3/tests/integration"
- icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing"
"github.com/stretchr/testify/suite"
tmdb "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
+
ibctesting "github.com/cosmos/ibc-go/v7/testing"
+ appConsumer "github.com/cosmos/interchain-security/v3/app/consumer"
+ "github.com/cosmos/interchain-security/v3/tests/integration"
+ icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing"
gaiaApp "github.com/cosmos/gaia/v15/app"
)
diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go
index dee698f5b54..bf754369bd3 100644
--- a/x/globalfee/ante/antetest/fee_test.go
+++ b/x/globalfee/ante/antetest/fee_test.go
@@ -5,12 +5,13 @@ import (
"github.com/stretchr/testify/suite"
+ ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+ ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
- ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
- ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante"
globfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types"
diff --git a/x/globalfee/ante/antetest/fee_test_setup.go b/x/globalfee/ante/antetest/fee_test_setup.go
index 63513162c22..254c555f422 100644
--- a/x/globalfee/ante/antetest/fee_test_setup.go
+++ b/x/globalfee/ante/antetest/fee_test_setup.go
@@ -3,8 +3,11 @@ package antetest
import (
"fmt"
+ "github.com/stretchr/testify/suite"
+
tmrand "github.com/cometbft/cometbft/libs/rand"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -12,14 +15,12 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
- "github.com/stretchr/testify/suite"
+ gaiaapp "github.com/cosmos/gaia/v15/app"
gaiahelpers "github.com/cosmos/gaia/v15/app/helpers"
gaiaparams "github.com/cosmos/gaia/v15/app/params"
- gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante"
-
- gaiaapp "github.com/cosmos/gaia/v15/app"
"github.com/cosmos/gaia/v15/x/globalfee"
+ gaiafeeante "github.com/cosmos/gaia/v15/x/globalfee/ante"
globfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types"
)
diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go
index f044cc3aa37..0679b0aa317 100644
--- a/x/globalfee/ante/fee.go
+++ b/x/globalfee/ante/fee.go
@@ -4,13 +4,12 @@ import (
"errors"
"fmt"
- tmstrings "github.com/tendermint/tendermint/libs/strings"
+ tmstrings "github.com/cometbft/cometbft/libs/strings"
errorsmod "cosmossdk.io/errors"
- tmstrings "github.com/cometbft/cometbft/libs/strings"
+
sdk "github.com/cosmos/cosmos-sdk/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
-
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go
index f9f3be2e850..6daa4411ca7 100644
--- a/x/globalfee/genesis_test.go
+++ b/x/globalfee/genesis_test.go
@@ -4,21 +4,20 @@ import (
"testing"
"time"
- tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
dbm "github.com/cometbft/cometbft-db"
- storetypes "github.com/cosmos/cosmos-sdk/store/types"
- paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
-
"github.com/cometbft/cometbft/libs/log"
+ tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
"github.com/cosmos/cosmos-sdk/store"
+ storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
+ paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
gaiaparams "github.com/cosmos/gaia/v15/app/params"
"github.com/cosmos/gaia/v15/x/globalfee/types"
-
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
)
func TestDefaultGenesis(t *testing.T) {
diff --git a/x/globalfee/migrations/v2/v2_test/migration_test.go b/x/globalfee/migrations/v2/v2_test/migration_test.go
index cd56078fe1d..9aa03a3fabd 100644
--- a/x/globalfee/migrations/v2/v2_test/migration_test.go
+++ b/x/globalfee/migrations/v2/v2_test/migration_test.go
@@ -3,16 +3,18 @@ package v2_test
import (
"testing"
+ "github.com/stretchr/testify/require"
+
cmdb "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/store"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
- "github.com/stretchr/testify/require"
v2 "github.com/cosmos/gaia/v15/x/globalfee/migrations/v2"
globalfeetypes "github.com/cosmos/gaia/v15/x/globalfee/types"
diff --git a/x/globalfee/module.go b/x/globalfee/module.go
index 917ba8e7493..909cd36f158 100644
--- a/x/globalfee/module.go
+++ b/x/globalfee/module.go
@@ -9,8 +9,10 @@ import (
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
- errorsmod "cosmossdk.io/errors"
abci "github.com/cometbft/cometbft/abci/types"
+
+ errorsmod "cosmossdk.io/errors"
+
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go
index 0a7cab846e9..a7eaed4ab6d 100644
--- a/x/globalfee/types/params.go
+++ b/x/globalfee/types/params.go
@@ -4,11 +4,13 @@ import (
"fmt"
"strings"
+ ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+ ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+
errorsmod "cosmossdk.io/errors"
+
sdk "github.com/cosmos/cosmos-sdk/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
- ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
- ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
gaiaerrors "github.com/cosmos/gaia/v15/types/errors"
)