Skip to content

Commit

Permalink
auto: update Go import paths to v25 on branch main (#8172)
Browse files Browse the repository at this point in the history
* auto: update Go import paths to v25

* Generated protofile changes

* chore: update sqsdomain to v25

* chore: update osmoutils to latest version

---------

Co-authored-by: PaddyMc <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: PaddyMc <[email protected]>
  • Loading branch information
4 people authored Apr 30, 2024
1 parent 9418695 commit f858642
Show file tree
Hide file tree
Showing 947 changed files with 4,612 additions and 4,619 deletions.
12 changes: 6 additions & 6 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ import (
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"

osmoante "github.com/osmosis-labs/osmosis/v24/ante"
v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9"
osmoante "github.com/osmosis-labs/osmosis/v25/ante"
v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9"

storetypes "github.com/cosmos/cosmos-sdk/store/types"

smartaccountante "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper"
smartaccountante "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper"

auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"

txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types"
txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types"

auctionante "github.com/skip-mev/block-sdk/x/auction/ante"
)
Expand Down
12 changes: 6 additions & 6 deletions app/ante_no_seq.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ import (
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"

osmoante "github.com/osmosis-labs/osmosis/v24/ante"
v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9"
osmoante "github.com/osmosis-labs/osmosis/v25/ante"
v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9"

storetypes "github.com/cosmos/cosmos-sdk/store/types"

smartaccountante "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper"
smartaccountante "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper"

auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"

txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types"
txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types"

auctionante "github.com/skip-mev/block-sdk/x/auction/ante"
)
Expand Down
74 changes: 37 additions & 37 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ import (
"github.com/cosmos/ibc-go/v7/modules/apps/transfer"
ibc "github.com/cosmos/ibc-go/v7/modules/core"

"github.com/osmosis-labs/osmosis/v24/ingest/sqs"
"github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain"
concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
"github.com/osmosis-labs/osmosis/v25/ingest/sqs"
"github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain"
concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"
gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types"

storetypes "github.com/cosmos/cosmos-sdk/store/types"

"github.com/osmosis-labs/osmosis/v24/ingest/sqs/service"
"github.com/osmosis-labs/osmosis/v24/ingest/sqs/service/writelistener"
"github.com/osmosis-labs/osmosis/v25/ingest/sqs/service"
"github.com/osmosis-labs/osmosis/v25/ingest/sqs/service/writelistener"

"github.com/osmosis-labs/osmosis/osmoutils"

Expand Down Expand Up @@ -89,36 +89,36 @@ import (
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
"github.com/cosmos/cosmos-sdk/x/crisis"

minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types"
protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types"

"github.com/osmosis-labs/osmosis/v24/app/keepers"
"github.com/osmosis-labs/osmosis/v24/app/upgrades"
v10 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v10"
v11 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v11"
v12 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v12"
v13 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v13"
v14 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v14"
v15 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v15"
v16 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v16"
v17 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v17"
v18 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v18"
v19 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v19"
v20 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v20"
v21 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v21"
v22 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v22"
v23 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v23"
v24 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v24"
v25 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v25"
v3 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v3"
v4 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v5"
v6 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v6"
v7 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v7"
v8 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8"
v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9"
_ "github.com/osmosis-labs/osmosis/v24/client/docs/statik"
"github.com/osmosis-labs/osmosis/v24/x/mint"
minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types"
protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types"

"github.com/osmosis-labs/osmosis/v25/app/keepers"
"github.com/osmosis-labs/osmosis/v25/app/upgrades"
v10 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v10"
v11 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v11"
v12 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v12"
v13 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v13"
v14 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v14"
v15 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v15"
v16 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v16"
v17 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v17"
v18 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v18"
v19 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v19"
v20 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v20"
v21 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v21"
v22 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v22"
v23 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v23"
v24 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v24"
v25 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v25"
v3 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v3"
v4 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v5"
v6 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v6"
v7 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v7"
v8 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v8"
v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9"
_ "github.com/osmosis-labs/osmosis/v25/client/docs/statik"
"github.com/osmosis-labs/osmosis/v25/x/mint"

blocksdkabci "github.com/skip-mev/block-sdk/abci"
"github.com/skip-mev/block-sdk/abci/checktx"
Expand Down
10 changes: 5 additions & 5 deletions app/apptesting/concentrated_liquidity.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmomath"
clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math"
clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model"
"github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math"
clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model"
"github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"

cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity"
cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity"
)

type ConcentratedKeeperTestHelper struct {
Expand Down
8 changes: 4 additions & 4 deletions app/apptesting/cosmwasmpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmoutils/cosmwasm"
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg"
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg/transmuter"
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model"
"github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg"
"github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg/transmuter"
"github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model"

cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions app/apptesting/gamm.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmomath"
gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap"
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap"
gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions app/apptesting/pool_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"
poolmanager "github.com/osmosis-labs/osmosis/v24/x/poolmanager"
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer"
poolmanager "github.com/osmosis-labs/osmosis/v25/x/poolmanager"
poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"
)

func (s *KeeperTestHelper) RunBasicSwap(poolId uint64) {
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/superfluid.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
"github.com/osmosis-labs/osmosis/v24/x/superfluid/types"
gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types"
"github.com/osmosis-labs/osmosis/v25/x/superfluid/types"
)

func (s *KeeperTestHelper) SuperfluidDelegateToDefaultVal(sender sdk.AccAddress, poolId uint64, lockId uint64) error {
Expand Down
14 changes: 7 additions & 7 deletions app/apptesting/test_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ import (
"github.com/stretchr/testify/suite"

"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/osmosis/v24/app"
"github.com/osmosis-labs/osmosis/v25/app"

"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
"github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types"

stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"

lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types"
minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types"
minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"
)

type KeeperTestHelper struct {
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/txfees.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
clienttx "github.com/cosmos/cosmos-sdk/client/tx"

"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
"github.com/osmosis-labs/osmosis/v24/x/txfees/types"
"github.com/osmosis-labs/osmosis/v25/x/txfees/keeper"
"github.com/osmosis-labs/osmosis/v25/x/txfees/types"
)

var baseGas = uint64(10000)
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app

import (
"github.com/osmosis-labs/osmosis/v24/app/params"
"github.com/osmosis-labs/osmosis/v25/app/params"

"github.com/cosmos/cosmos-sdk/std"
)
Expand Down
88 changes: 44 additions & 44 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ import (
icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper"
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"

appparams "github.com/osmosis-labs/osmosis/v24/app/params"
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"
downtimedetector "github.com/osmosis-labs/osmosis/v24/x/downtime-detector"
downtimetypes "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types"
"github.com/osmosis-labs/osmosis/v24/x/gamm"
ibcratelimit "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit"
ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types"
"github.com/osmosis-labs/osmosis/v24/x/poolmanager"
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v24/x/protorev"
appparams "github.com/osmosis-labs/osmosis/v25/app/params"
"github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"
downtimedetector "github.com/osmosis-labs/osmosis/v25/x/downtime-detector"
downtimetypes "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types"
"github.com/osmosis-labs/osmosis/v25/x/gamm"
ibcratelimit "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit"
ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types"
"github.com/osmosis-labs/osmosis/v25/x/poolmanager"
poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v25/x/protorev"
ibchooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
Expand All @@ -78,39 +78,39 @@ import (
// IBC Transfer: Defines the "transfer" IBC port
transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer"

"github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper"
smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types"

_ "github.com/osmosis-labs/osmosis/v24/client/docs/statik"
owasm "github.com/osmosis-labs/osmosis/v24/wasmbinding"
concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity"
concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"
gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/v24/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v24/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types"
protorevkeeper "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper"
protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types"
"github.com/osmosis-labs/osmosis/v24/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types"
tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v24/x/twap"
twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types"
"github.com/osmosis-labs/osmosis/v24/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types"
valsetpref "github.com/osmosis-labs/osmosis/v24/x/valset-pref"
valsetpreftypes "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types"
"github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper"
smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types"

_ "github.com/osmosis-labs/osmosis/v25/client/docs/statik"
owasm "github.com/osmosis-labs/osmosis/v25/wasmbinding"
concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity"
concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"
gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/v25/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v25/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types"
protorevkeeper "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper"
protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types"
"github.com/osmosis-labs/osmosis/v25/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types"
tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v25/x/twap"
twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types"
"github.com/osmosis-labs/osmosis/v25/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types"
valsetpref "github.com/osmosis-labs/osmosis/v25/x/valset-pref"
valsetpreftypes "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"

Expand Down
4 changes: 2 additions & 2 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

storetypes "github.com/cosmos/cosmos-sdk/store/types"

protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types"
twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types"
protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types"
twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types"
)

// GenerateKeys generates new keys (KV Store, Transient store, and memory store).
Expand Down
Loading

0 comments on commit f858642

Please sign in to comment.