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

Semantic versioning for v7 #804

Merged
merged 22 commits into from
Feb 16, 2022
Merged

Semantic versioning for v7 #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6b8549a
update go.mod
sunnya97 Jan 24, 2022
fffe5f4
fix order adding in app.go
sunnya97 Jan 24, 2022
aaf9565
update hardcoded gas amounts
sunnya97 Jan 24, 2022
b590d20
Annotate app.go
faddat Jan 27, 2022
2fac854
Delete .gitpod.yml
faddat Jan 27, 2022
475cb6c
go fmt
faddat Jan 27, 2022
d9fe967
Merge branch 'annotation' of https://github.com/notional-labs/osmosis…
faddat Jan 27, 2022
f3eb65e
finish annotation
faddat Jan 27, 2022
7b3c71c
Update CHANGELOG.md
faddat Jan 27, 2022
d29a93b
Update app/app.go
faddat Jan 27, 2022
9cab655
Merge branch 'annotation' of https://github.com/notional-labs/osmosis
faddat Jan 29, 2022
6faa85c
v7
faddat Jan 29, 2022
84ad107
Semantic versioning
faddat Jan 29, 2022
91ba10a
remove artifact that make-proto didn't catch
faddat Jan 29, 2022
188f89f
Merge https://github.com/osmosis-labs/osmosis into faddat/semverv7
faddat Jan 29, 2022
dc3dcf3
clean
faddat Jan 29, 2022
e6f1976
go mod tidy
faddat Jan 29, 2022
62dc5c1
Merge remote-tracking branch 'origin/faddat/semverv7'
faddat Feb 4, 2022
7bf6df1
ensure all imports refer to v7
faddat Feb 4, 2022
27062c3
Merge branch 'main' into faddat/semverv7
faddat Feb 11, 2022
d2ed995
Merge branch 'main' into faddat/semverv7
faddat Feb 16, 2022
d495ac5
fmt
faddat Feb 16, 2022
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions app/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

channelkeeper "github.com/cosmos/ibc-go/v2/modules/core/04-channel/keeper"
ibcante "github.com/cosmos/ibc-go/v2/modules/core/ante"
txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types"
txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types"
)

// Link to default ante handler used by cosmos sdk:
Expand Down
68 changes: 34 additions & 34 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,60 +132,60 @@ import (
ibckeeper "github.com/cosmos/ibc-go/v2/modules/core/keeper"

// Osmosis application prarmeters
appparams "github.com/osmosis-labs/osmosis/app/params"
appparams "github.com/osmosis-labs/osmosis/v7/app/params"

// Upgrades from earlier versions of Osmosis
v4 "github.com/osmosis-labs/osmosis/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/app/upgrades/v5"
v7 "github.com/osmosis-labs/osmosis/app/upgrades/v7"
_ "github.com/osmosis-labs/osmosis/client/docs/statik"
v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v5"
v7 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v7"
_ "github.com/osmosis-labs/osmosis/v7/client/docs/statik"

// Modules that live in the Osmosis repository and are specific to Osmosis
"github.com/osmosis-labs/osmosis/x/claim"
claimkeeper "github.com/osmosis-labs/osmosis/x/claim/keeper"
claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
"github.com/osmosis-labs/osmosis/v7/x/claim"
claimkeeper "github.com/osmosis-labs/osmosis/v7/x/claim/keeper"
claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"

// Epochs: gives Osmosis a sense of "clock time" so that events can be based on days instead of "number of blocks"
"github.com/osmosis-labs/osmosis/x/epochs"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
"github.com/osmosis-labs/osmosis/v7/x/epochs"
epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"

// Generalized Automated Market Maker
"github.com/osmosis-labs/osmosis/x/gamm"
gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
"github.com/osmosis-labs/osmosis/v7/x/gamm"
gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"

// Incentives: Allows Osmosis and foriegn chain communities to incentivize users to provide liquidity
"github.com/osmosis-labs/osmosis/x/incentives"
incentiveskeeper "github.com/osmosis-labs/osmosis/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
"github.com/osmosis-labs/osmosis/v7/x/incentives"
incentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types"

// Lockup: allows tokens to be locked (made non-transferrable)
"github.com/osmosis-labs/osmosis/x/lockup"
lockupkeeper "github.com/osmosis-labs/osmosis/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types"
"github.com/osmosis-labs/osmosis/v7/x/lockup"
lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"

// Mint: Our modified version of github.com/cosmos/cosmos-sdk/x/mint
"github.com/osmosis-labs/osmosis/x/mint"
mintkeeper "github.com/osmosis-labs/osmosis/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
"github.com/osmosis-labs/osmosis/v7/x/mint"
mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types"

// Pool incentives:
poolincentives "github.com/osmosis-labs/osmosis/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/x/pool-incentives/client"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"

// Superfluid: Allows users to stake gamm (bonded liquidity)
superfluid "github.com/osmosis-labs/osmosis/x/superfluid"
superfluidclient "github.com/osmosis-labs/osmosis/x/superfluid/client"
superfluidkeeper "github.com/osmosis-labs/osmosis/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/x/superfluid/types"
superfluid "github.com/osmosis-labs/osmosis/v7/x/superfluid"
superfluidclient "github.com/osmosis-labs/osmosis/v7/x/superfluid/client"
superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"

// txfees: Allows Osmosis to charge transaction fees without harming IBC user experience
"github.com/osmosis-labs/osmosis/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types"
"github.com/osmosis-labs/osmosis/v7/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types"

"github.com/CosmWasm/wasmd/x/wasm"
wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
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 @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keyring"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/testutil/network"
"github.com/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/v7/app/params"
dbm "github.com/tendermint/tm-db"

servertypes "github.com/cosmos/cosmos-sdk/server/types"
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
"github.com/cosmos/cosmos-sdk/std"
"github.com/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/v7/app/params"
)

// MakeEncodingConfig creates an EncodingConfig for testing
Expand Down
4 changes: 2 additions & 2 deletions app/forks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package app

import (
sdk "github.com/cosmos/cosmos-sdk/types"
v3 "github.com/osmosis-labs/osmosis/app/upgrades/v3"
v6 "github.com/osmosis-labs/osmosis/app/upgrades/v6"
v3 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v3"
v6 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v6"
)

// BeginBlockForks is intended to be ran in
Expand Down
42 changes: 21 additions & 21 deletions app/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,27 @@ import (
bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"
bech32ics20keeper "github.com/osmosis-labs/bech32-ibc/x/bech32ics20/keeper"
claimkeeper "github.com/osmosis-labs/osmosis/x/claim/keeper"
claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
superfluid "github.com/osmosis-labs/osmosis/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/x/superfluid/types"
"github.com/osmosis-labs/osmosis/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types"
claimkeeper "github.com/osmosis-labs/osmosis/v7/x/claim/keeper"
claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"
"github.com/osmosis-labs/osmosis/v7/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"
"github.com/osmosis-labs/osmosis/v7/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types"
)

func (app *OsmosisApp) InitSpecialKeepers(
Expand Down
2 changes: 1 addition & 1 deletion app/params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package params
import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/osmosis-labs/osmosis/v043_temp/address"
"github.com/osmosis-labs/osmosis/v7/v043_temp/address"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/osmosis-labs/osmosis/app"
v4 "github.com/osmosis-labs/osmosis/app/upgrades/v4"
"github.com/osmosis-labs/osmosis/v7/app"
v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4"
"github.com/stretchr/testify/suite"
abci "github.com/tendermint/tendermint/abci/types"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"

upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
)

func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator,
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/v5/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (

stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
connectionkeeper "github.com/cosmos/ibc-go/v2/modules/core/03-connection/keeper"
gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper"
gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper"

"github.com/osmosis-labs/osmosis/x/txfees"
"github.com/osmosis-labs/osmosis/v7/x/txfees"

authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
ibcconnectiontypes "github.com/cosmos/ibc-go/v2/modules/core/03-connection/types"
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"
txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types"
)

func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator,
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v5/whitelist_feetokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"

sdk "github.com/cosmos/cosmos-sdk/types"
gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/x/txfees/types"
gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v7/x/txfees/types"
)

// Every asset with a liquid osmo pairing pool on Osmosis, as of 12/01/21
Expand Down
5 changes: 3 additions & 2 deletions app/wasmtest/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package wasmtest

import (
"github.com/stretchr/testify/require"
"testing"
"time"

"github.com/stretchr/testify/require"

"github.com/cosmos/cosmos-sdk/simapp"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/v7/app"
)

func CreateTestInput() (*app.OsmosisApp, sdk.Context) {
Expand Down
2 changes: 1 addition & 1 deletion app/wasmtest/store_run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/v7/app"
)

func TestNoStorageWithoutProposal(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/osmosisd/cmd/balances_from_state_export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
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"
appparams "github.com/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/osmoutils"
claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types"
appparams "github.com/osmosis-labs/osmosis/v7/app/params"
"github.com/osmosis-labs/osmosis/v7/osmoutils"
claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"
"github.com/spf13/cobra"
tmjson "github.com/tendermint/tendermint/libs/json"
tmtypes "github.com/tendermint/tendermint/types"
Expand Down
12 changes: 6 additions & 6 deletions cmd/osmosisd/cmd/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ import (
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

appParams "github.com/osmosis-labs/osmosis/app/params"
appParams "github.com/osmosis-labs/osmosis/v7/app/params"

claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types"
minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types"
poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"
)

func PrepareGenesisCmd(defaultNodeHome string, mbm module.BasicManager) *cobra.Command {
Expand Down
5 changes: 3 additions & 2 deletions cmd/osmosisd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (

"github.com/prometheus/client_golang/prometheus"

"github.com/osmosis-labs/osmosis/v7/app/params"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/config"
Expand Down Expand Up @@ -36,8 +38,7 @@ import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"

osmosis "github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/app/params"
osmosis "github.com/osmosis-labs/osmosis/v7/app"
)

// NewRootCmd creates a new root command for simd. It is called once in the
Expand Down
2 changes: 1 addition & 1 deletion cmd/osmosisd/cmd/testnetify/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"

"github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/v7/app"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/osmosisd/cmd/testnetify/find_replace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package testnetify
import (
"bytes"

"github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/v7/app"
)

func replaceConsAddrHex(genesis app.GenesisState, fromAddr string, replaceAddr string) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testnetify

import (
"github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/v7/app"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/osmosisd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

osmosis "github.com/osmosis-labs/osmosis/app"
"github.com/osmosis-labs/osmosis/app/params"
"github.com/osmosis-labs/osmosis/cmd/osmosisd/cmd"
osmosis "github.com/osmosis-labs/osmosis/v7/app"
"github.com/osmosis-labs/osmosis/v7/app/params"
"github.com/osmosis-labs/osmosis/v7/cmd/osmosisd/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/osmosis-labs/osmosis
module github.com/osmosis-labs/osmosis/v7

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion proto/osmosis/claim/v1beta1/claim.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/bank/v1beta1/genesis.proto";

option go_package = "github.com/osmosis-labs/osmosis/x/claim/types";
option go_package = "github.com/osmosis-labs/osmosis/v7/x/claim/types";

enum Action {
option (gogoproto.goproto_enum_prefix) = false;
Expand Down
2 changes: 1 addition & 1 deletion proto/osmosis/claim/v1beta1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "google/protobuf/timestamp.proto";
import "osmosis/claim/v1beta1/claim.proto";
import "osmosis/claim/v1beta1/params.proto";

option go_package = "github.com/osmosis-labs/osmosis/x/claim/types";
option go_package = "github.com/osmosis-labs/osmosis/v7/x/claim/types";

// GenesisState defines the claim module's genesis state.
message GenesisState {
Expand Down
Loading