chore: v2 module replace (#754) (#770)

* all replaces EXCEPT in price feeder

* fix make proto-gen output folder to allow major versions

(cherry picked from commit ed28fdc)

Co-authored-by: Adam Moser <63419657+toteki@users.noreply.github.com>

ante/ante_test.go

@@ -16,7 +16,7 @@ import (
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	umeeapp "github.com/umee-network/umee/app"
+	umeeapp "github.com/umee-network/umee/v2/app"
 )
 
 type IntegrationTestSuite struct {

ante/fee.go

@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 // MaxOracleMsgGasUsage defines the maximum gas allowed for an oracle transaction.

ante/fee_test.go

@@ -4,8 +4,8 @@ import (
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/umee-network/umee/ante"
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	"github.com/umee-network/umee/v2/ante"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 func (suite *IntegrationTestSuite) TestMempoolFee() {

ante/spam_prevention.go

@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 // SpamPreventionDecorator defines a custom Umee AnteHandler decorator that is

ante/spam_prevention_test.go

@@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/umee-network/umee/ante"
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	"github.com/umee-network/umee/v2/ante"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 func (suite *IntegrationTestSuite) TestOracleSpam() {

app/app.go

@@ -96,19 +96,19 @@ import (
 	"github.com/osmosis-labs/bech32-ibc/x/bech32ibc"
 	bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
 	bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"
-	customante "github.com/umee-network/umee/ante"
-	appparams "github.com/umee-network/umee/app/params"
-	"github.com/umee-network/umee/app/upgrades"
-	"github.com/umee-network/umee/app/upgrades/calypso"
-	uibctransfer "github.com/umee-network/umee/x/ibctransfer"
-	uibctransferkeeper "github.com/umee-network/umee/x/ibctransfer/keeper"
-	"github.com/umee-network/umee/x/leverage"
-	leverageclient "github.com/umee-network/umee/x/leverage/client"
-	leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
-	leveragetypes "github.com/umee-network/umee/x/leverage/types"
-	"github.com/umee-network/umee/x/oracle"
-	oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	customante "github.com/umee-network/umee/v2/ante"
+	appparams "github.com/umee-network/umee/v2/app/params"
+	"github.com/umee-network/umee/v2/app/upgrades"
+	"github.com/umee-network/umee/v2/app/upgrades/calypso"
+	uibctransfer "github.com/umee-network/umee/v2/x/ibctransfer"
+	uibctransferkeeper "github.com/umee-network/umee/v2/x/ibctransfer/keeper"
+	"github.com/umee-network/umee/v2/x/leverage"
+	leverageclient "github.com/umee-network/umee/v2/x/leverage/client"
+	leveragekeeper "github.com/umee-network/umee/v2/x/leverage/keeper"
+	leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
+	"github.com/umee-network/umee/v2/x/oracle"
+	oraclekeeper "github.com/umee-network/umee/v2/x/oracle/keeper"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 const (

app/encoding.go

@@ -3,7 +3,7 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 
-	"github.com/umee-network/umee/app/params"
+	"github.com/umee-network/umee/v2/app/params"
 )
 
 // MakeEncodingConfig returns the application's encoding configuration with all

app/test_helpers.go

@@ -19,8 +19,8 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
 
-	leveragetypes "github.com/umee-network/umee/x/leverage/types"
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 // DefaultConsensusParams defines the default Tendermint consensus params used

app/upgrades/calypso/handler.go

@@ -11,12 +11,12 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
-	"github.com/umee-network/umee/x/leverage"
-	leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
-	leveragetypes "github.com/umee-network/umee/x/leverage/types"
-	"github.com/umee-network/umee/x/oracle"
-	oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
-	oracletypes "github.com/umee-network/umee/x/oracle/types"
+	"github.com/umee-network/umee/v2/x/leverage"
+	leveragekeeper "github.com/umee-network/umee/v2/x/leverage/keeper"
+	leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
+	"github.com/umee-network/umee/v2/x/oracle"
+	oraclekeeper "github.com/umee-network/umee/v2/x/oracle/keeper"
+	oracletypes "github.com/umee-network/umee/v2/x/oracle/types"
 )
 
 // GetCalypsoUpgradeHandler contains the handler for the Calypso upgrade. It setups the Bech32IBC, Leverage and Oracle

app/upgrades/register.go

@@ -9,9 +9,9 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper"
-	"github.com/umee-network/umee/app/upgrades/calypso"
-	leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
-	oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
+	"github.com/umee-network/umee/v2/app/upgrades/calypso"
+	leveragekeeper "github.com/umee-network/umee/v2/x/leverage/keeper"
+	oraclekeeper "github.com/umee-network/umee/v2/x/oracle/keeper"
 )
 
 // RegisterUpgradeHandlers registers handlers for all upgrades

cmd/umeed/cmd/app_creator.go

@@ -18,8 +18,8 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/app/params"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/app/params"
 )
 
 type appCreator struct {

cmd/umeed/cmd/debug.go

@@ -11,7 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/spf13/cobra"
 
-	umeeapp "github.com/umee-network/umee/app"
+	umeeapp "github.com/umee-network/umee/v2/app"
 )
 
 const (

cmd/umeed/cmd/root.go

@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/pflag"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/app/params"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/app/params"
 )
 
 // NewRootCmd returns the root command handler for the Umee daemon.

cmd/umeed/main.go

@@ -5,8 +5,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/cmd/umeed/cmd"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/cmd/umeed/cmd"
 )
 
 func main() {

contrib/scripts/protocgen.sh

@@ -30,5 +30,5 @@ for dir in $proto_dirs; do
     $(find "${dir}" -maxdepth 1 -name '*.proto')
 done
 
-cp -r ./github.com/umee-network/umee/* ./
+cp -r ./github.com/umee-network/umee/v*/x/* x/
 rm -rf ./github.com

go.mod

@@ -1,4 +1,4 @@
-module github.com/umee-network/umee
+module github.com/umee-network/umee/v2
 
 go 1.17
 

proto/umee/leverage/v1beta1/genesis.proto

@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "umee/leverage/v1beta1/leverage.proto";
 
-option go_package = "github.com/umee-network/umee/x/leverage/types";
+option go_package = "github.com/umee-network/umee/v2/x/leverage/types";
 
 // GenesisState defines the x/leverage module's genesis state.
 message GenesisState {

proto/umee/leverage/v1beta1/gov.proto

@@ -4,7 +4,7 @@ package umeenetwork.umee.leverage.v1beta1;
 import "gogoproto/gogo.proto";
 import "umee/leverage/v1beta1/leverage.proto";
 
-option go_package = "github.com/umee-network/umee/x/leverage/types";
+option go_package = "github.com/umee-network/umee/v2/x/leverage/types";
 
 // UpdateRegistryProposal defines a governance proposal type where the token
 // registry can be updated in the Umee capital facility. Note, the registry

proto/umee/leverage/v1beta1/leverage.proto

@@ -3,7 +3,7 @@ package umeenetwork.umee.leverage.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/umee-network/umee/x/leverage/types";
+option go_package = "github.com/umee-network/umee/v2/x/leverage/types";
 
 // Params defines the parameters for the leverage module.
 message Params {

proto/umee/leverage/v1beta1/query.proto

@@ -6,7 +6,7 @@ import "umee/leverage/v1beta1/leverage.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/umee-network/umee/x/leverage/types";
+option go_package = "github.com/umee-network/umee/v2/x/leverage/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/umee/leverage/v1beta1/tx.proto

@@ -4,7 +4,7 @@ package umeenetwork.umee.leverage.v1beta1;
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/umee-network/umee/x/leverage/types";
+option go_package = "github.com/umee-network/umee/v2/x/leverage/types";
 
 // Msg defines the x/leverage module's Msg service.
 service Msg {

proto/umee/oracle/v1beta1/genesis.proto

@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "umee/oracle/v1beta1/oracle.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/umee-network/umee/x/oracle/types";
+option go_package = "github.com/umee-network/umee/v2/x/oracle/types";
 
 // GenesisState defines the oracle module's genesis state.
 message GenesisState {

proto/umee/oracle/v1beta1/oracle.proto

@@ -4,7 +4,7 @@ package umeenetwork.umee.oracle.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/umee-network/umee/x/oracle/types";
+option go_package = "github.com/umee-network/umee/v2/x/oracle/types";
 
 // Params defines the parameters for the oracle module.
 message Params {

proto/umee/oracle/v1beta1/query.proto

@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "umee/oracle/v1beta1/oracle.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/umee-network/umee/x/oracle/types";
+option go_package = "github.com/umee-network/umee/v2/x/oracle/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/umee/oracle/v1beta1/tx.proto

@@ -3,7 +3,7 @@ package umeenetwork.umee.oracle.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/umee-network/umee/x/oracle/types";
+option go_package = "github.com/umee-network/umee/v2/x/oracle/types";
 
 // Msg defines the oracle Msg service.
 service Msg {

tests/e2e/chain.go

@@ -12,8 +12,8 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/app/params"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/app/params"
 )
 
 const (

tests/e2e/e2e_setup_test.go

@@ -34,8 +34,8 @@ import (
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
 
-	umeeapp "github.com/umee-network/umee/app"
-	leveragetypes "github.com/umee-network/umee/x/leverage/types"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	leveragetypes "github.com/umee-network/umee/v2/x/leverage/types"
 )
 
 const (

tests/e2e/validator.go

@@ -25,7 +25,7 @@ import (
 	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/privval"
 
-	umeeapp "github.com/umee-network/umee/app"
+	umeeapp "github.com/umee-network/umee/v2/app"
 )
 
 type validator struct {

tests/simulation/sim_test.go

@@ -19,7 +19,7 @@ import (
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	dbm "github.com/tendermint/tm-db"
 
-	umeeapp "github.com/umee-network/umee/app"
+	umeeapp "github.com/umee-network/umee/v2/app"
 )
 
 func init() {

tests/simulation/state.go

@@ -22,8 +22,8 @@ import (
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	tmtypes "github.com/tendermint/tendermint/types"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/tests/util"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/tests/util"
 )
 
 // appStateFn returns the initial application state using a genesis file or

x/ibctransfer/keeper/keeper.go

@@ -11,7 +11,7 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
 
-	"github.com/umee-network/umee/x/ibctransfer/types"
+	"github.com/umee-network/umee/v2/x/ibctransfer/types"
 )
 
 // Keeper embeds the ICS-20 transfer keeper where we only override specific

x/ibctransfer/keeper/keeper_test.go

@@ -19,8 +19,8 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/tests/util"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/tests/util"
 )
 
 type KeeperTestSuite struct {

x/ibctransfer/keeper/util_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
-	umeeapp "github.com/umee-network/umee/app"
+	umeeapp "github.com/umee-network/umee/v2/app"
 )
 
 func SetupTestingApp() (ibctesting.TestingApp, map[string]json.RawMessage) {

x/ibctransfer/module.go

@@ -7,7 +7,7 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
 	ibcexported "github.com/cosmos/ibc-go/v2/modules/core/exported"
 
-	"github.com/umee-network/umee/x/ibctransfer/keeper"
+	"github.com/umee-network/umee/v2/x/ibctransfer/keeper"
 )
 
 // AppModule embeds the ICS-20 transfer AppModule where we only override specific

x/leverage/abci.go

@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/umee-network/umee/x/leverage/keeper"
+	"github.com/umee-network/umee/v2/x/leverage/keeper"
 )
 
 // EndBlocker implements EndBlock for the x/leverage module.

x/leverage/client/cli/proposal.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	"github.com/umee-network/umee/x/leverage/types"
+	"github.com/umee-network/umee/v2/x/leverage/types"
 )
 
 // ParseUpdateRegistryProposal attempts to parse a UpdateRegistryProposal from

x/leverage/client/cli/proposal_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	umeeapp "github.com/umee-network/umee/app"
-	"github.com/umee-network/umee/x/leverage/client/cli"
+	umeeapp "github.com/umee-network/umee/v2/app"
+	"github.com/umee-network/umee/v2/x/leverage/client/cli"
 )
 
 func TestParseUpdateRegistryProposal(t *testing.T) {

x/leverage/client/cli/query.go

@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
 
-	"github.com/umee-network/umee/x/leverage/types"
+	"github.com/umee-network/umee/v2/x/leverage/types"
 )
 
 // Flag constants