Skip to content
GitLab
Unverified Commit 83f19ab5 authored by Roman's avatar Roman Committed by GitHub
Browse files

chore: update import paths on v11.x (#2401) 

* chore: update import paths on v11.x

* changelog
parent 3c9f1f4c
Hide whitespace changes
Inline Side-by-side
Showing
with 95 additions and 94 deletions
+95 -94
CHANGELOG.md
+ 1
- 0
View file @ 83f19ab5
......@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* [#1893](https://github.com/osmosis-labs/osmosis/pull/1893) Change `EpochsKeeper.SetEpochInfo` to `AddEpochInfo`, which has more safety checks with it. (Makes it suitable to be called within upgrades)
* [#2396](https://github.com/osmosis-labs/osmosis/pull/2396) x/mint remove unused mintCoins parameter from AfterDistributeMintedCoin
* [#2399](https://github.com/osmosis-labs/osmosis/pull/2399) Remove unused interface methods from expected keepers of each module
* [#2401](https://github.com/osmosis-labs/osmosis/pull/2401) Update Go import paths to v11
#### Bug Fixes
* [2291](https://github.com/osmosis-labs/osmosis/pull/2291) Remove liquidity event that was emitted twice per message.
......
app/ante.go
+ 4
- 4
View file @ 83f19ab5
......@@ -11,11 +11,11 @@ import (
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
osmoante "github.com/osmosis-labs/osmosis/v10/ante"
v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9"
osmoante "github.com/osmosis-labs/osmosis/v11/ante"
v9 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v9"
txfeeskeeper "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types"
txfeeskeeper "github.com/osmosis-labs/osmosis/v11/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v11/x/txfees/types"
)
// Link to default ante handler used by cosmos sdk:
......
app/app.go
+ 13
- 13
View file @ 83f19ab5
......@@ -40,19 +40,19 @@ import (
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/osmosis-labs/osmosis/v10/app/keepers"
appparams "github.com/osmosis-labs/osmosis/v10/app/params"
"github.com/osmosis-labs/osmosis/v10/app/upgrades"
v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10"
v11 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v11"
v3 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v3"
v4 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v5"
v6 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v6"
v7 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v7"
v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8"
v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9"
_ "github.com/osmosis-labs/osmosis/v10/client/docs/statik"
"github.com/osmosis-labs/osmosis/v11/app/keepers"
appparams "github.com/osmosis-labs/osmosis/v11/app/params"
"github.com/osmosis-labs/osmosis/v11/app/upgrades"
v10 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v10"
v11 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v11"
v3 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v3"
v4 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v5"
v6 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v6"
v7 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v7"
v8 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v8"
v9 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v9"
_ "github.com/osmosis-labs/osmosis/v11/client/docs/statik"
)
const appName = "OsmosisApp"
......
app/apptesting/gamm.go
+ 2
- 2
View file @ 83f19ab5
......@@ -3,8 +3,8 @@ package apptesting
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types"
"github.com/osmosis-labs/osmosis/v11/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v11/x/gamm/types"
)
var DefaultAcctFunds sdk.Coins = sdk.NewCoins(
......
app/apptesting/test_suite.go
+ 5
- 5
View file @ 83f19ab5
......@@ -23,11 +23,11 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
dbm "github.com/tendermint/tm-db"
"github.com/osmosis-labs/osmosis/v10/app"
"github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types"
"github.com/osmosis-labs/osmosis/v11/app"
"github.com/osmosis-labs/osmosis/v11/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v11/x/gamm/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v11/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v11/x/lockup/types"
)
type KeeperTestHelper struct {
......
app/config.go
+ 1
- 1
View file @ 83f19ab5
......@@ -6,7 +6,7 @@ import (
dbm "github.com/tendermint/tm-db"
"github.com/osmosis-labs/osmosis/v10/app/params"
"github.com/osmosis-labs/osmosis/v11/app/params"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/crypto/hd"
......
app/encoding.go
+ 1
- 1
View file @ 83f19ab5
package app
import (
"github.com/osmosis-labs/osmosis/v10/app/params"
"github.com/osmosis-labs/osmosis/v11/app/params"
"github.com/cosmos/cosmos-sdk/std"
)
......
app/keepers/keepers.go
+ 23
- 23
View file @ 83f19ab5
......@@ -51,29 +51,29 @@ import (
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"
bech32ics20keeper "github.com/osmosis-labs/bech32-ibc/x/bech32ics20/keeper"
owasm "github.com/osmosis-labs/osmosis/v10/app/wasm"
_ "github.com/osmosis-labs/osmosis/v10/client/docs/statik"
epochskeeper "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types"
gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/v10/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"
"github.com/osmosis-labs/osmosis/v10/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"
tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v10/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types"
owasm "github.com/osmosis-labs/osmosis/v11/app/wasm"
_ "github.com/osmosis-labs/osmosis/v11/client/docs/statik"
epochskeeper "github.com/osmosis-labs/osmosis/v11/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v11/x/epochs/types"
gammkeeper "github.com/osmosis-labs/osmosis/v11/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v11/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/v11/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v11/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v11/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v11/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/v11/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v11/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v11/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v11/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v11/x/pool-incentives/types"
"github.com/osmosis-labs/osmosis/v11/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/v11/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v11/x/superfluid/types"
tokenfactorykeeper "github.com/osmosis-labs/osmosis/v11/x/tokenfactory/keeper"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v11/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v11/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v11/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v11/x/txfees/types"
)
type AppKeepers struct {
......
app/keepers/modules.go
+ 12
- 12
View file @ 83f19ab5
......@@ -27,18 +27,18 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
_ "github.com/osmosis-labs/osmosis/v10/client/docs/statik"
"github.com/osmosis-labs/osmosis/v10/x/epochs"
"github.com/osmosis-labs/osmosis/v10/x/gamm"
"github.com/osmosis-labs/osmosis/v10/x/incentives"
"github.com/osmosis-labs/osmosis/v10/x/lockup"
"github.com/osmosis-labs/osmosis/v10/x/mint"
poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client"
superfluid "github.com/osmosis-labs/osmosis/v10/x/superfluid"
superfluidclient "github.com/osmosis-labs/osmosis/v10/x/superfluid/client"
"github.com/osmosis-labs/osmosis/v10/x/tokenfactory"
"github.com/osmosis-labs/osmosis/v10/x/txfees"
_ "github.com/osmosis-labs/osmosis/v11/client/docs/statik"
"github.com/osmosis-labs/osmosis/v11/x/epochs"
"github.com/osmosis-labs/osmosis/v11/x/gamm"
"github.com/osmosis-labs/osmosis/v11/x/incentives"
"github.com/osmosis-labs/osmosis/v11/x/lockup"
"github.com/osmosis-labs/osmosis/v11/x/mint"
poolincentives "github.com/osmosis-labs/osmosis/v11/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/v11/x/pool-incentives/client"
superfluid "github.com/osmosis-labs/osmosis/v11/x/superfluid"
superfluidclient "github.com/osmosis-labs/osmosis/v11/x/superfluid/client"
"github.com/osmosis-labs/osmosis/v11/x/tokenfactory"
"github.com/osmosis-labs/osmosis/v11/x/txfees"
)
// AppModuleBasics returns ModuleBasics for the module BasicManager.
......
app/modules.go
+ 21
- 21
View file @ 83f19ab5
......@@ -43,27 +43,27 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
appparams "github.com/osmosis-labs/osmosis/v10/app/params"
_ "github.com/osmosis-labs/osmosis/v10/client/docs/statik"
"github.com/osmosis-labs/osmosis/v10/osmoutils/partialord"
"github.com/osmosis-labs/osmosis/v10/x/epochs"
epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types"
"github.com/osmosis-labs/osmosis/v10/x/gamm"
gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types"
"github.com/osmosis-labs/osmosis/v10/x/incentives"
incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types"
"github.com/osmosis-labs/osmosis/v10/x/lockup"
lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types"
"github.com/osmosis-labs/osmosis/v10/x/mint"
minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives"
poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"
superfluid "github.com/osmosis-labs/osmosis/v10/x/superfluid"
superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"
"github.com/osmosis-labs/osmosis/v10/x/tokenfactory"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v10/x/txfees"
txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types"
appparams "github.com/osmosis-labs/osmosis/v11/app/params"
_ "github.com/osmosis-labs/osmosis/v11/client/docs/statik"
"github.com/osmosis-labs/osmosis/v11/osmoutils/partialord"
"github.com/osmosis-labs/osmosis/v11/x/epochs"
epochstypes "github.com/osmosis-labs/osmosis/v11/x/epochs/types"
"github.com/osmosis-labs/osmosis/v11/x/gamm"
gammtypes "github.com/osmosis-labs/osmosis/v11/x/gamm/types"
"github.com/osmosis-labs/osmosis/v11/x/incentives"
incentivestypes "github.com/osmosis-labs/osmosis/v11/x/incentives/types"
"github.com/osmosis-labs/osmosis/v11/x/lockup"
lockuptypes "github.com/osmosis-labs/osmosis/v11/x/lockup/types"
"github.com/osmosis-labs/osmosis/v11/x/mint"
minttypes "github.com/osmosis-labs/osmosis/v11/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v11/x/pool-incentives"
poolincentivestypes "github.com/osmosis-labs/osmosis/v11/x/pool-incentives/types"
superfluid "github.com/osmosis-labs/osmosis/v11/x/superfluid"
superfluidtypes "github.com/osmosis-labs/osmosis/v11/x/superfluid/types"
"github.com/osmosis-labs/osmosis/v11/x/tokenfactory"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v11/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v11/x/txfees"
txfeestypes "github.com/osmosis-labs/osmosis/v11/x/txfees/types"
)
// moduleAccountPermissions defines module account permissions
......
app/upgrades/types.go
+ 1
- 1
View file @ 83f19ab5
......@@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/osmosis-labs/osmosis/v10/app/keepers"
"github.com/osmosis-labs/osmosis/v11/app/keepers"
)
// Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal
......
app/upgrades/v10/constants.go
+ 1
- 1
View file @ 83f19ab5
package v10
import (
"github.com/osmosis-labs/osmosis/v10/app/upgrades"
"github.com/osmosis-labs/osmosis/v11/app/upgrades"
)
// Last executed block on the v9 code was 4713064.
......
app/upgrades/v10/fork.go
+ 1
- 1
View file @ 83f19ab5
......@@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/osmosis-labs/osmosis/v10/app/keepers"
"github.com/osmosis-labs/osmosis/v11/app/keepers"
)
func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) {
......
app/upgrades/v10/upgrades_test.go
+ 2
- 2
View file @ 83f19ab5
......@@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/suite"
"github.com/osmosis-labs/osmosis/v10/app/apptesting"
v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10"
"github.com/osmosis-labs/osmosis/v11/app/apptesting"
v10 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v10"
)
type UpgradeTestSuite struct {
......
app/upgrades/v11/constants.go
+ 1
- 1
View file @ 83f19ab5
......@@ -3,7 +3,7 @@ package v11
import (
store "github.com/cosmos/cosmos-sdk/store/types"
"github.com/osmosis-labs/osmosis/v10/app/upgrades"
"github.com/osmosis-labs/osmosis/v11/app/upgrades"
)
// UpgradeName defines the on-chain upgrade name for the Osmosis v11 upgrade.
......
app/upgrades/v11/upgrades.go
+ 1
- 1
View file @ 83f19ab5
......@@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/osmosis-labs/osmosis/v10/app/keepers"
"github.com/osmosis-labs/osmosis/v11/app/keepers"
)
func CreateUpgradeHandler(
......
app/upgrades/v3/constants.go
+ 1
- 1
View file @ 83f19ab5
package v3
import "github.com/osmosis-labs/osmosis/v10/app/upgrades"
import "github.com/osmosis-labs/osmosis/v11/app/upgrades"
const (
// UpgradeName defines the on-chain upgrade name for the Osmosis v3 upgrade.
......
app/upgrades/v3/forks.go
+ 1
- 1
View file @ 83f19ab5
......@@ -5,7 +5,7 @@ import (
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
"github.com/osmosis-labs/osmosis/v10/app/keepers"
"github.com/osmosis-labs/osmosis/v11/app/keepers"
)
// RunForkLogic executes height-gated on-chain fork logic for the Osmosis v3
......
app/upgrades/v4/constants.go
+ 1
- 1
View file @ 83f19ab5
package v4
import (
"github.com/osmosis-labs/osmosis/v10/app/upgrades"
"github.com/osmosis-labs/osmosis/v11/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
)
......
app/upgrades/v4/upgrade_test.go
+ 2
- 2
View file @ 83f19ab5
......@@ -11,8 +11,8 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
"github.com/osmosis-labs/osmosis/v10/app"
v4 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v4"
"github.com/osmosis-labs/osmosis/v11/app"
v4 "github.com/osmosis-labs/osmosis/v11/app/upgrades/v4"
sdk "github.com/cosmos/cosmos-sdk/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment