Semantic versioning for v7 (#804)

* update go.mod

* fix order adding in app.go

* update hardcoded gas amounts

* Annotate app.go

* Delete .gitpod.yml

* go fmt

* finish annotation

* Update CHANGELOG.md

* Update app/app.go

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>

* v7

* Semantic versioning

* remove artifact that make-proto didn't catch

* clean

* go mod tidy

* ensure all imports refer to v7

* fmt

Co-authored-by: Sunny Aggarwal <sunnya97@protonmail.ch>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>

app/ante.go

@@ -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:

app/app.go

@@ -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"

app/config.go

@@ -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"

app/encoding.go

@@ -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

app/forks.go

@@ -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

app/keepers.go

@@ -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(

app/params/config.go

@@ -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 (

app/upgrades/v4/upgrade_test.go

@@ -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"

app/upgrades/v4/upgrades.go

@@ -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,

app/upgrades/v5/upgrades.go

@@ -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,

app/upgrades/v5/whitelist_feetokens.go

@@ -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

app/wasmtest/helpers_test.go

 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) {

app/wasmtest/store_run_test.go

@@ -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) {

cmd/osmosisd/cmd/balances_from_state_export.go

@@ -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"

cmd/osmosisd/cmd/genesis.go

@@ -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 {

cmd/osmosisd/cmd/root.go

@@ -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"
@@ -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

cmd/osmosisd/cmd/testnetify/cmd.go

@@ -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"
 )
 

cmd/osmosisd/cmd/testnetify/find_replace.go

@@ -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) {

cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go

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

cmd/osmosisd/main.go

@@ -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() {