Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

auto: update Go import paths to v29 on branch main #8943

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+5,419 −5,420
Draft

auto: update Go import paths to v29 on branch main #8943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf0cd43
auto: update Go import paths to v29
deividaspetraitis Jan 16, 2025
3d10e09
Generated protofile changes
invalid-email-address Jan 16, 2025
ffcbe30
Force re-run actions
deividaspetraitis Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Contributions come in the form of writing documentation, raising issues / PRs, a

## First steps

The first step is to find an issue you want to fix. To identify issues we think are good for first-time contributors, we add the **good first issue** label. [You can see a list of issues to contribute here](https://github.com/osmosis-labs/osmosis/contribute).
The first step is to find an issue you want to fix. To identify issues we think are good for first-time contributors, we add the **good first issue** label. [You can see a list of issues to contribute here](https://github.com/osmosis-labs/osmosis/contribute).

We recommend setting up your IDE as per our [recommended IDE setup](https://docs.osmosis.zone/osmosis-core/ide-guide) before proceeding.

Expand Down
12 changes: 6 additions & 6 deletions app/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"

osmoante "github.com/osmosis-labs/osmosis/v28/ante"
v9 "github.com/osmosis-labs/osmosis/v28/app/upgrades/v9"
osmoante "github.com/osmosis-labs/osmosis/v29/ante"
v9 "github.com/osmosis-labs/osmosis/v29/app/upgrades/v9"

corestoretypes "cosmossdk.io/core/store"

smartaccountante "github.com/osmosis-labs/osmosis/v28/x/smart-account/ante"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v28/x/smart-account/keeper"
smartaccountante "github.com/osmosis-labs/osmosis/v29/x/smart-account/ante"
smartaccountkeeper "github.com/osmosis-labs/osmosis/v29/x/smart-account/keeper"

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

txfeeskeeper "github.com/osmosis-labs/osmosis/v28/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v28/x/txfees/types"
txfeeskeeper "github.com/osmosis-labs/osmosis/v29/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v29/x/txfees/types"

auctionante "github.com/skip-mev/block-sdk/v2/x/auction/ante"
)
Expand Down
122 changes: 61 additions & 61 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,24 @@ import (
"github.com/cosmos/ibc-go/v8/modules/apps/transfer"
ibc "github.com/cosmos/ibc-go/v8/modules/core"

"github.com/osmosis-labs/osmosis/v28/ingest/common/poolextractor"
"github.com/osmosis-labs/osmosis/v28/ingest/common/pooltracker"
"github.com/osmosis-labs/osmosis/v28/ingest/common/writelistener"
"github.com/osmosis-labs/osmosis/v28/ingest/indexer"
indexerdomain "github.com/osmosis-labs/osmosis/v28/ingest/indexer/domain"
indexerservice "github.com/osmosis-labs/osmosis/v28/ingest/indexer/service"
indexerwritelistener "github.com/osmosis-labs/osmosis/v28/ingest/indexer/service/writelistener"
"github.com/osmosis-labs/osmosis/v28/ingest/sqs"
"github.com/osmosis-labs/osmosis/v28/ingest/sqs/domain"
poolstransformer "github.com/osmosis-labs/osmosis/v28/ingest/sqs/pools/transformer"

sqsservice "github.com/osmosis-labs/osmosis/v28/ingest/sqs/service"
concentratedtypes "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/types"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/types"
gammtypes "github.com/osmosis-labs/osmosis/v28/x/gamm/types"

commondomain "github.com/osmosis-labs/osmosis/v28/ingest/common/domain"
commonservice "github.com/osmosis-labs/osmosis/v28/ingest/common/service"
"github.com/osmosis-labs/osmosis/v29/ingest/common/poolextractor"
"github.com/osmosis-labs/osmosis/v29/ingest/common/pooltracker"
"github.com/osmosis-labs/osmosis/v29/ingest/common/writelistener"
"github.com/osmosis-labs/osmosis/v29/ingest/indexer"
indexerdomain "github.com/osmosis-labs/osmosis/v29/ingest/indexer/domain"
indexerservice "github.com/osmosis-labs/osmosis/v29/ingest/indexer/service"
indexerwritelistener "github.com/osmosis-labs/osmosis/v29/ingest/indexer/service/writelistener"
"github.com/osmosis-labs/osmosis/v29/ingest/sqs"
"github.com/osmosis-labs/osmosis/v29/ingest/sqs/domain"
poolstransformer "github.com/osmosis-labs/osmosis/v29/ingest/sqs/pools/transformer"

sqsservice "github.com/osmosis-labs/osmosis/v29/ingest/sqs/service"
concentratedtypes "github.com/osmosis-labs/osmosis/v29/x/concentrated-liquidity/types"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v29/x/cosmwasmpool/types"
gammtypes "github.com/osmosis-labs/osmosis/v29/x/gamm/types"

commondomain "github.com/osmosis-labs/osmosis/v29/ingest/common/domain"
commonservice "github.com/osmosis-labs/osmosis/v29/ingest/common/service"

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

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

appparams "github.com/osmosis-labs/osmosis/v28/app/params"

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

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

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

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

blocksdkabci "github.com/skip-mev/block-sdk/v2/abci"
"github.com/skip-mev/block-sdk/v2/abci/checktx"
Expand All @@ -154,14 +154,14 @@ import (
govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"

clclient "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/client"
cwpoolclient "github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/client"
gammclient "github.com/osmosis-labs/osmosis/v28/x/gamm/client"
incentivesclient "github.com/osmosis-labs/osmosis/v28/x/incentives/client"
poolincentivesclient "github.com/osmosis-labs/osmosis/v28/x/pool-incentives/client"
poolmanagerclient "github.com/osmosis-labs/osmosis/v28/x/poolmanager/client"
superfluidclient "github.com/osmosis-labs/osmosis/v28/x/superfluid/client"
txfeesclient "github.com/osmosis-labs/osmosis/v28/x/txfees/client"
clclient "github.com/osmosis-labs/osmosis/v29/x/concentrated-liquidity/client"
cwpoolclient "github.com/osmosis-labs/osmosis/v29/x/cosmwasmpool/client"
gammclient "github.com/osmosis-labs/osmosis/v29/x/gamm/client"
incentivesclient "github.com/osmosis-labs/osmosis/v29/x/incentives/client"
poolincentivesclient "github.com/osmosis-labs/osmosis/v29/x/pool-incentives/client"
poolmanagerclient "github.com/osmosis-labs/osmosis/v29/x/poolmanager/client"
superfluidclient "github.com/osmosis-labs/osmosis/v29/x/superfluid/client"
txfeesclient "github.com/osmosis-labs/osmosis/v29/x/txfees/client"
)

const appName = "OsmosisApp"
Expand Down
12 changes: 6 additions & 6 deletions app/apptesting/concentrated_liquidity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmomath"
appparams "github.com/osmosis-labs/osmosis/v28/app/params"
clmath "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/math"
clmodel "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/model"
"github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
appparams "github.com/osmosis-labs/osmosis/v29/app/params"
clmath "github.com/osmosis-labs/osmosis/v29/x/concentrated-liquidity/math"
clmodel "github.com/osmosis-labs/osmosis/v29/x/concentrated-liquidity/model"
"github.com/osmosis-labs/osmosis/v29/x/concentrated-liquidity/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v29/x/poolmanager/types"

cl "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity"
cl "github.com/osmosis-labs/osmosis/v29/x/concentrated-liquidity"
)

type ConcentratedKeeperTestHelper struct {
Expand Down
8 changes: 4 additions & 4 deletions app/apptesting/cosmwasmpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (

"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/osmosis/osmoutils/cosmwasm"
"github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/cosmwasm/msg"
"github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/cosmwasm/msg/transmuter"
"github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/model"
"github.com/osmosis-labs/osmosis/v29/x/cosmwasmpool/cosmwasm/msg"
"github.com/osmosis-labs/osmosis/v29/x/cosmwasmpool/cosmwasm/msg/transmuter"
"github.com/osmosis-labs/osmosis/v29/x/cosmwasmpool/model"

cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/types"
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v29/x/cosmwasmpool/types"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions app/apptesting/gamm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmomath"
appparams "github.com/osmosis-labs/osmosis/v28/app/params"
gammkeeper "github.com/osmosis-labs/osmosis/v28/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/stableswap"
gammtypes "github.com/osmosis-labs/osmosis/v28/x/gamm/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
appparams "github.com/osmosis-labs/osmosis/v29/app/params"
gammkeeper "github.com/osmosis-labs/osmosis/v29/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v29/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/v29/x/gamm/pool-models/stableswap"
gammtypes "github.com/osmosis-labs/osmosis/v29/x/gamm/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v29/x/poolmanager/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions app/apptesting/pool_manager.go
View file
Open in desktop
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/v28/x/gamm/pool-models/balancer"
poolmanager "github.com/osmosis-labs/osmosis/v28/x/poolmanager"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v29/x/gamm/pool-models/balancer"
poolmanager "github.com/osmosis-labs/osmosis/v29/x/poolmanager"
poolmanagertypes "github.com/osmosis-labs/osmosis/v29/x/poolmanager/types"
)

func (s *KeeperTestHelper) RunBasicSwap(poolId uint64) {
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/superfluid.go
View file
Open in desktop
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/v28/x/gamm/types"
"github.com/osmosis-labs/osmosis/v28/x/superfluid/types"
gammtypes "github.com/osmosis-labs/osmosis/v29/x/gamm/types"
"github.com/osmosis-labs/osmosis/v29/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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ import (
"github.com/stretchr/testify/suite"

"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/osmosis/v28/app"
"github.com/osmosis-labs/osmosis/v29/app"

"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v28/x/gamm/types"
"github.com/osmosis-labs/osmosis/v29/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v29/x/gamm/types"

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

Expand All @@ -47,10 +47,10 @@ import (

"github.com/cosmos/cosmos-sdk/types/module"

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

type KeeperTestHelper struct {
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/txfees.go
View file
Open in desktop
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/v28/x/txfees/keeper"
"github.com/osmosis-labs/osmosis/v28/x/txfees/types"
"github.com/osmosis-labs/osmosis/v29/x/txfees/keeper"
"github.com/osmosis-labs/osmosis/v29/x/txfees/types"
)

var baseGas = uint64(10000)
Expand Down
2 changes: 1 addition & 1 deletion app/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

"github.com/osmosis-labs/osmosis/osmoutils"
"github.com/osmosis-labs/osmosis/v28/app/keepers"
"github.com/osmosis-labs/osmosis/v29/app/keepers"
)

type OTELConfig struct {
Expand Down
4 changes: 2 additions & 2 deletions app/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app

import (
"github.com/osmosis-labs/osmosis/v28/app/keepers"
"github.com/osmosis-labs/osmosis/v28/app/params"
"github.com/osmosis-labs/osmosis/v29/app/keepers"
"github.com/osmosis-labs/osmosis/v29/app/params"

"github.com/cosmos/cosmos-sdk/std"
)
Expand Down
2 changes: 1 addition & 1 deletion app/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

"github.com/osmosis-labs/osmosis/v28/app/keepers"
"github.com/osmosis-labs/osmosis/v29/app/keepers"
)

// The genesis state of the blockchain is represented here as a map of raw json
Expand Down
Loading
Loading