Skip to content

Commit 63ccc36

Browse files
osmo-botPaddyMcgithub-actionsczarcas7ic
authored
auto: update Go import paths to v24 on branch main (#7864)
* auto: update Go import paths to v24 * Generated protofile changes * chore: change replace for sqsdomain to be v24 aware * fix: update function call from GetTotalValueLockedUOSMO to GetTotalValueLockedUSDC * gen proto --------- Co-authored-by: PaddyMc <6751821+PaddyMc@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: PaddyMc <paddymchale@hotmail.com> Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
1 parent 8b48850 commit 63ccc36

File tree

907 files changed

+4865
-4861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

907 files changed

+4865
-4861
lines changed

‎app/ante.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
1515
"github.com/cosmos/cosmos-sdk/x/auth/signing"
1616

17-
osmoante "github.com/osmosis-labs/osmosis/v23/ante"
18-
v9 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v9"
17+
osmoante "github.com/osmosis-labs/osmosis/v24/ante"
18+
v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9"
1919

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

22-
txfeeskeeper "github.com/osmosis-labs/osmosis/v23/x/txfees/keeper"
23-
txfeestypes "github.com/osmosis-labs/osmosis/v23/x/txfees/types"
22+
txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
23+
txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types"
2424
)
2525

2626
// Link to default ante handler used by cosmos sdk:

‎app/ante_no_seq.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
1515
"github.com/cosmos/cosmos-sdk/x/auth/signing"
1616

17-
osmoante "github.com/osmosis-labs/osmosis/v23/ante"
18-
v9 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v9"
17+
osmoante "github.com/osmosis-labs/osmosis/v24/ante"
18+
v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9"
1919

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

22-
txfeeskeeper "github.com/osmosis-labs/osmosis/v23/x/txfees/keeper"
23-
txfeestypes "github.com/osmosis-labs/osmosis/v23/x/txfees/types"
22+
txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
23+
txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types"
2424
)
2525

2626
// Link to default ante handler used by cosmos sdk:

‎app/app.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"github.com/cosmos/ibc-go/v7/modules/apps/transfer"
3535
ibc "github.com/cosmos/ibc-go/v7/modules/core"
3636

37-
"github.com/osmosis-labs/osmosis/v23/ingest/sqs"
38-
"github.com/osmosis-labs/osmosis/v23/ingest/sqs/domain"
37+
"github.com/osmosis-labs/osmosis/v24/ingest/sqs"
38+
"github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain"
3939

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

@@ -79,36 +79,36 @@ import (
7979
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
8080
"github.com/cosmos/cosmos-sdk/x/crisis"
8181

82-
minttypes "github.com/osmosis-labs/osmosis/v23/x/mint/types"
83-
protorevtypes "github.com/osmosis-labs/osmosis/v23/x/protorev/types"
84-
85-
"github.com/osmosis-labs/osmosis/v23/app/keepers"
86-
"github.com/osmosis-labs/osmosis/v23/app/upgrades"
87-
v10 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v10"
88-
v11 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v11"
89-
v12 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v12"
90-
v13 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v13"
91-
v14 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v14"
92-
v15 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v15"
93-
v16 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v16"
94-
v17 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v17"
95-
v18 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v18"
96-
v19 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v19"
97-
v20 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v20"
98-
v21 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v21"
99-
v22 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v22"
100-
v23 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v23"
101-
v24 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v24"
102-
v3 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v3"
103-
v4 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v4"
104-
v5 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v5"
105-
v6 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v6"
106-
v7 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v7"
107-
v8 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v8"
108-
v9 "github.com/osmosis-labs/osmosis/v23/app/upgrades/v9"
109-
_ "github.com/osmosis-labs/osmosis/v23/client/docs/statik"
110-
"github.com/osmosis-labs/osmosis/v23/ingest"
111-
"github.com/osmosis-labs/osmosis/v23/x/mint"
82+
minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types"
83+
protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types"
84+
85+
"github.com/osmosis-labs/osmosis/v24/app/keepers"
86+
"github.com/osmosis-labs/osmosis/v24/app/upgrades"
87+
v10 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v10"
88+
v11 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v11"
89+
v12 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v12"
90+
v13 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v13"
91+
v14 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v14"
92+
v15 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v15"
93+
v16 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v16"
94+
v17 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v17"
95+
v18 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v18"
96+
v19 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v19"
97+
v20 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v20"
98+
v21 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v21"
99+
v22 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v22"
100+
v23 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v23"
101+
v24 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v24"
102+
v3 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v3"
103+
v4 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v4"
104+
v5 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v5"
105+
v6 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v6"
106+
v7 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v7"
107+
v8 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8"
108+
v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9"
109+
_ "github.com/osmosis-labs/osmosis/v24/client/docs/statik"
110+
"github.com/osmosis-labs/osmosis/v24/ingest"
111+
"github.com/osmosis-labs/osmosis/v24/x/mint"
112112
)
113113

114114
const appName = "OsmosisApp"

‎app/apptesting/concentrated_liquidity.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
sdk "github.com/cosmos/cosmos-sdk/types"
77

88
"github.com/osmosis-labs/osmosis/osmomath"
9-
clmath "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/math"
10-
clmodel "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/model"
11-
"github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity/types"
12-
poolmanagertypes "github.com/osmosis-labs/osmosis/v23/x/poolmanager/types"
9+
clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math"
10+
clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model"
11+
"github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"
12+
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
1313

14-
cl "github.com/osmosis-labs/osmosis/v23/x/concentrated-liquidity"
14+
cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity"
1515
)
1616

1717
type ConcentratedKeeperTestHelper struct {

‎app/apptesting/cosmwasmpool.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
sdk "github.com/cosmos/cosmos-sdk/types"
1111

1212
"github.com/osmosis-labs/osmosis/osmoutils/cosmwasm"
13-
"github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/cosmwasm/msg"
14-
"github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/cosmwasm/msg/transmuter"
15-
"github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/model"
13+
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg"
14+
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg/transmuter"
15+
"github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model"
1616

17-
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v23/x/cosmwasmpool/types"
17+
cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"
1818
)
1919

2020
const (

‎app/apptesting/gamm.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

66
"github.com/osmosis-labs/osmosis/osmomath"
7-
gammkeeper "github.com/osmosis-labs/osmosis/v23/x/gamm/keeper"
8-
"github.com/osmosis-labs/osmosis/v23/x/gamm/pool-models/balancer"
9-
"github.com/osmosis-labs/osmosis/v23/x/gamm/pool-models/stableswap"
10-
gammtypes "github.com/osmosis-labs/osmosis/v23/x/gamm/types"
11-
poolmanagertypes "github.com/osmosis-labs/osmosis/v23/x/poolmanager/types"
7+
gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper"
8+
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"
9+
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap"
10+
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
11+
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
1212
)
1313

1414
const (

‎app/apptesting/pool_manager.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
sdk "github.com/cosmos/cosmos-sdk/types"
77

88
"github.com/osmosis-labs/osmosis/osmomath"
9-
"github.com/osmosis-labs/osmosis/v23/x/gamm/pool-models/balancer"
10-
poolmanager "github.com/osmosis-labs/osmosis/v23/x/poolmanager"
11-
poolmanagertypes "github.com/osmosis-labs/osmosis/v23/x/poolmanager/types"
9+
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"
10+
poolmanager "github.com/osmosis-labs/osmosis/v24/x/poolmanager"
11+
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
1212
)
1313

1414
func (s *KeeperTestHelper) RunBasicSwap(poolId uint64) {

‎app/apptesting/superfluid.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
66

7-
gammtypes "github.com/osmosis-labs/osmosis/v23/x/gamm/types"
8-
"github.com/osmosis-labs/osmosis/v23/x/superfluid/types"
7+
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
8+
"github.com/osmosis-labs/osmosis/v24/x/superfluid/types"
99
)
1010

1111
func (s *KeeperTestHelper) SuperfluidDelegateToDefaultVal(sender sdk.AccAddress, poolId uint64, lockId uint64) error {

‎app/apptesting/test_suite.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ import (
3232
"github.com/stretchr/testify/suite"
3333

3434
"github.com/osmosis-labs/osmosis/osmomath"
35-
"github.com/osmosis-labs/osmosis/v23/app"
35+
"github.com/osmosis-labs/osmosis/v24/app"
3636

37-
"github.com/osmosis-labs/osmosis/v23/x/gamm/pool-models/balancer"
38-
gammtypes "github.com/osmosis-labs/osmosis/v23/x/gamm/types"
37+
"github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"
38+
gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types"
3939

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

42-
lockupkeeper "github.com/osmosis-labs/osmosis/v23/x/lockup/keeper"
43-
lockuptypes "github.com/osmosis-labs/osmosis/v23/x/lockup/types"
44-
minttypes "github.com/osmosis-labs/osmosis/v23/x/mint/types"
45-
poolmanagertypes "github.com/osmosis-labs/osmosis/v23/x/poolmanager/types"
42+
lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper"
43+
lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types"
44+
minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types"
45+
poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"
4646
)
4747

4848
type KeeperTestHelper struct {

‎app/apptesting/txfees.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
clienttx "github.com/cosmos/cosmos-sdk/client/tx"
1313

1414
"github.com/osmosis-labs/osmosis/osmomath"
15-
"github.com/osmosis-labs/osmosis/v23/x/txfees/keeper"
16-
"github.com/osmosis-labs/osmosis/v23/x/txfees/types"
15+
"github.com/osmosis-labs/osmosis/v24/x/txfees/keeper"
16+
"github.com/osmosis-labs/osmosis/v24/x/txfees/types"
1717
)
1818

1919
var baseGas = uint64(10000)

0 commit comments

Comments
 (0)