Merge pull request Canto-Network#113 from b-harvest/package-v6-to-v7-…

…bump build!: package version bump from v6 to v7
b-harvest · Aug 8, 2023 · da939e2 · da939e2
2 parents 7ebb314 + 143168a
commit da939e2
Show file tree

Hide file tree

Showing 217 changed files with 667 additions and 663 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
           excludelist+=" $(find ./ -type f -name '*.pb.gw.go')"
           excludelist+=" $(find ./ -type f -path './tests/mocks/*.go')"
           for filename in ${excludelist}; do
-            filename=$(echo $filename | sed 's/^./github.com\/Canto-Network\/Canto\/v6/g')
+            filename=$(echo $filename | sed 's/^./github.com\/Canto-Network\/Canto\/v7/g')
             echo "Excluding ${filename} from coverage report..."
             sed -i "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
           done

diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go
@@ -14,7 +14,7 @@ import (
 	ethante "github.com/evmos/ethermint/app/ante"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
-	cosmosante "github.com/Canto-Network/Canto/v6/app/ante/cosmos"
+	cosmosante "github.com/Canto-Network/Canto/v7/app/ante/cosmos"
 	sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 )
 

diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/Canto-Network/Canto/v6/app"
+	"github.com/Canto-Network/Canto/v7/app"
 	client "github.com/cosmos/cosmos-sdk/client"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/app/app.go b/app/app.go
@@ -106,44 +106,44 @@ import (
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/Canto-Network/Canto/v6/client/docs/statik"
-
-	"github.com/Canto-Network/Canto/v6/app/ante"
-	"github.com/Canto-Network/Canto/v6/x/epochs"
-	epochskeeper "github.com/Canto-Network/Canto/v6/x/epochs/keeper"
-	epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types"
-	"github.com/Canto-Network/Canto/v6/x/erc20"
-	erc20client "github.com/Canto-Network/Canto/v6/x/erc20/client"
-	erc20keeper "github.com/Canto-Network/Canto/v6/x/erc20/keeper"
-	erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types"
-
-	"github.com/Canto-Network/Canto/v6/x/inflation"
-	inflationkeeper "github.com/Canto-Network/Canto/v6/x/inflation/keeper"
-	inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types"
-	"github.com/Canto-Network/Canto/v6/x/onboarding"
-	onboardingkeeper "github.com/Canto-Network/Canto/v6/x/onboarding/keeper"
-	onboardingtypes "github.com/Canto-Network/Canto/v6/x/onboarding/types"
+	_ "github.com/Canto-Network/Canto/v7/client/docs/statik"
+
+	"github.com/Canto-Network/Canto/v7/app/ante"
+	"github.com/Canto-Network/Canto/v7/x/epochs"
+	epochskeeper "github.com/Canto-Network/Canto/v7/x/epochs/keeper"
+	epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types"
+	"github.com/Canto-Network/Canto/v7/x/erc20"
+	erc20client "github.com/Canto-Network/Canto/v7/x/erc20/client"
+	erc20keeper "github.com/Canto-Network/Canto/v7/x/erc20/keeper"
+	erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types"
+
+	"github.com/Canto-Network/Canto/v7/x/inflation"
+	inflationkeeper "github.com/Canto-Network/Canto/v7/x/inflation/keeper"
+	inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types"
+	"github.com/Canto-Network/Canto/v7/x/onboarding"
+	onboardingkeeper "github.com/Canto-Network/Canto/v7/x/onboarding/keeper"
+	onboardingtypes "github.com/Canto-Network/Canto/v7/x/onboarding/types"
 
 	//govshuttle imports
-	"github.com/Canto-Network/Canto/v6/x/govshuttle"
-	govshuttleclient "github.com/Canto-Network/Canto/v6/x/govshuttle/client"
-	govshuttlekeeper "github.com/Canto-Network/Canto/v6/x/govshuttle/keeper"
-	govshuttletypes "github.com/Canto-Network/Canto/v6/x/govshuttle/types"
-
-	"github.com/Canto-Network/Canto/v6/x/csr"
-	csrkeeper "github.com/Canto-Network/Canto/v6/x/csr/keeper"
-	csrtypes "github.com/Canto-Network/Canto/v6/x/csr/types"
-
-	"github.com/Canto-Network/Canto/v6/x/coinswap"
-	coinswapkeeper "github.com/Canto-Network/Canto/v6/x/coinswap/keeper"
-	coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types"
-
-	v2 "github.com/Canto-Network/Canto/v6/app/upgrades/v2"
-	v3 "github.com/Canto-Network/Canto/v6/app/upgrades/v3"
-	v4 "github.com/Canto-Network/Canto/v6/app/upgrades/v4"
-	v5 "github.com/Canto-Network/Canto/v6/app/upgrades/v5"
-	v6 "github.com/Canto-Network/Canto/v6/app/upgrades/v6"
-	v7 "github.com/Canto-Network/Canto/v6/app/upgrades/v7"
+	"github.com/Canto-Network/Canto/v7/x/govshuttle"
+	govshuttleclient "github.com/Canto-Network/Canto/v7/x/govshuttle/client"
+	govshuttlekeeper "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper"
+	govshuttletypes "github.com/Canto-Network/Canto/v7/x/govshuttle/types"
+
+	"github.com/Canto-Network/Canto/v7/x/csr"
+	csrkeeper "github.com/Canto-Network/Canto/v7/x/csr/keeper"
+	csrtypes "github.com/Canto-Network/Canto/v7/x/csr/types"
+
+	"github.com/Canto-Network/Canto/v7/x/coinswap"
+	coinswapkeeper "github.com/Canto-Network/Canto/v7/x/coinswap/keeper"
+	coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types"
+
+	v2 "github.com/Canto-Network/Canto/v7/app/upgrades/v2"
+	v3 "github.com/Canto-Network/Canto/v7/app/upgrades/v3"
+	v4 "github.com/Canto-Network/Canto/v7/app/upgrades/v4"
+	v5 "github.com/Canto-Network/Canto/v7/app/upgrades/v5"
+	v6 "github.com/Canto-Network/Canto/v7/app/upgrades/v6"
+	v7 "github.com/Canto-Network/Canto/v7/app/upgrades/v7"
 )
 
 func init() {

diff --git a/app/app_test.go b/app/app_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/evmos/ethermint/encoding"
 
-	"github.com/Canto-Network/Canto/v6/types"
+	"github.com/Canto-Network/Canto/v7/types"
 )
 
 func TestCantoExport(t *testing.T) {

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -30,11 +30,11 @@ import (
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
 
-	cantoconfig "github.com/Canto-Network/Canto/v6/cmd/config"
-	csrtypes "github.com/Canto-Network/Canto/v6/x/csr/types"
-	erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types"
-	govshuttletypes "github.com/Canto-Network/Canto/v6/x/govshuttle/types"
-	inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types"
+	cantoconfig "github.com/Canto-Network/Canto/v7/cmd/config"
+	csrtypes "github.com/Canto-Network/Canto/v7/x/csr/types"
+	erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types"
+	govshuttletypes "github.com/Canto-Network/Canto/v7/x/govshuttle/types"
+	inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types"
 )
 
 // Get flags every time the simulator is run

diff --git a/app/test_helpers.go b/app/test_helpers.go
@@ -19,8 +19,8 @@ import (
 	"github.com/evmos/ethermint/encoding"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
 
-	"github.com/Canto-Network/Canto/v6/cmd/config"
-	"github.com/Canto-Network/Canto/v6/types"
+	"github.com/Canto-Network/Canto/v7/cmd/config"
+	"github.com/Canto-Network/Canto/v7/types"
 )
 
 func init() {

diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go
@@ -1,7 +1,7 @@
 package v4
 
 import (
-	shuttleKeeper "github.com/Canto-Network/Canto/v6/x/govshuttle/keeper"
+	shuttleKeeper "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go
@@ -5,10 +5,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	coinswapkeeper "github.com/Canto-Network/Canto/v6/x/coinswap/keeper"
-	coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types"
-	onboardingkeeper "github.com/Canto-Network/Canto/v6/x/onboarding/keeper"
-	onboardingtypes "github.com/Canto-Network/Canto/v6/x/onboarding/types"
+	coinswapkeeper "github.com/Canto-Network/Canto/v7/x/coinswap/keeper"
+	coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types"
+	onboardingkeeper "github.com/Canto-Network/Canto/v7/x/onboarding/keeper"
+	onboardingtypes "github.com/Canto-Network/Canto/v7/x/onboarding/types"
 )
 
 // CreateUpgradeHandler creates an SDK upgrade handler for v7

diff --git a/app/upgrades/v7/upgrades_test.go b/app/upgrades/v7/upgrades_test.go
@@ -17,10 +17,10 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	chain "github.com/Canto-Network/Canto/v6/app"
-	v7 "github.com/Canto-Network/Canto/v6/app/upgrades/v7"
-	coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types"
-	onboardingtypes "github.com/Canto-Network/Canto/v6/x/onboarding/types"
+	chain "github.com/Canto-Network/Canto/v7/app"
+	v7 "github.com/Canto-Network/Canto/v7/app/upgrades/v7"
+	coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types"
+	onboardingtypes "github.com/Canto-Network/Canto/v7/x/onboarding/types"
 )
 
 type UpgradeTestSuite struct {

diff --git a/cmd/cantod/cmd_test.go b/cmd/cantod/cmd_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Canto-Network/Canto/v6/app"
-	cantod "github.com/Canto-Network/Canto/v6/cmd/cantod"
+	"github.com/Canto-Network/Canto/v7/app"
+	cantod "github.com/Canto-Network/Canto/v7/cmd/cantod"
 )
 
 func TestInitCmd(t *testing.T) {

diff --git a/cmd/cantod/genaccounts.go b/cmd/cantod/genaccounts.go
@@ -22,7 +22,7 @@ import (
 	ethermint "github.com/evmos/ethermint/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
-	cantokr "github.com/Canto-Network/Canto/v6/crypto/keyring"
+	cantokr "github.com/Canto-Network/Canto/v7/crypto/keyring"
 )
 
 // AddGenesisAccountCmd returns add-genesis-account cobra Command.

diff --git a/cmd/cantod/main.go b/cmd/cantod/main.go
@@ -7,8 +7,8 @@ import (
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/Canto-Network/Canto/v6/app"
-	cmdcfg "github.com/Canto-Network/Canto/v6/cmd/config"
+	"github.com/Canto-Network/Canto/v7/app"
+	cmdcfg "github.com/Canto-Network/Canto/v7/cmd/config"
 )
 
 func main() {

diff --git a/cmd/cantod/root.go b/cmd/cantod/root.go
@@ -38,9 +38,9 @@ import (
 	servercfg "github.com/evmos/ethermint/server/config"
 	srvflags "github.com/evmos/ethermint/server/flags"
 
-	"github.com/Canto-Network/Canto/v6/app"
-	cmdcfg "github.com/Canto-Network/Canto/v6/cmd/config"
-	cantokr "github.com/Canto-Network/Canto/v6/crypto/keyring"
+	"github.com/Canto-Network/Canto/v7/app"
+	cmdcfg "github.com/Canto-Network/Canto/v7/cmd/config"
+	cantokr "github.com/Canto-Network/Canto/v7/crypto/keyring"
 )
 
 const (

diff --git a/cmd/cantod/testnet.go b/cmd/cantod/testnet.go
@@ -43,9 +43,9 @@ import (
 	ethermint "github.com/evmos/ethermint/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
-	cmdcfg "github.com/Canto-Network/Canto/v6/cmd/config"
-	cantokr "github.com/Canto-Network/Canto/v6/crypto/keyring"
-	"github.com/Canto-Network/Canto/v6/testutil/network"
+	cmdcfg "github.com/Canto-Network/Canto/v7/cmd/config"
+	cantokr "github.com/Canto-Network/Canto/v7/crypto/keyring"
+	"github.com/Canto-Network/Canto/v7/testutil/network"
 )
 
 var (

diff --git a/contracts/erc20.go b/contracts/erc20.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
-	"github.com/Canto-Network/Canto/v6/x/erc20/types"
+	"github.com/Canto-Network/Canto/v7/x/erc20/types"
 )
 
 var (

diff --git a/contracts/erc20DirectBalanceManipulation.go b/contracts/erc20DirectBalanceManipulation.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
-	"github.com/Canto-Network/Canto/v6/x/erc20/types"
+	"github.com/Canto-Network/Canto/v7/x/erc20/types"
 )
 
 // This is an evil token. Whenever an A -> B transfer is called,

diff --git a/contracts/erc20maliciousdelayed.go b/contracts/erc20maliciousdelayed.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
-	"github.com/Canto-Network/Canto/v6/x/erc20/types"
+	"github.com/Canto-Network/Canto/v7/x/erc20/types"
 )
 
 // This is an evil token. Whenever an A -> B transfer is called,

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Canto-Network/Canto/v6
+module github.com/Canto-Network/Canto/v7
 
 go 1.18
 

diff --git a/ibc/testing/app.go b/ibc/testing/app.go
@@ -31,7 +31,7 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
 
-	cantoapp "github.com/Canto-Network/Canto/v6/app"
+	cantoapp "github.com/Canto-Network/Canto/v7/app"
 )
 
 var DefaultTestingAppInit func() (TestingApp, map[string]json.RawMessage) = SetupTestingApp

diff --git a/ibc/utils.go b/ibc/utils.go
@@ -7,7 +7,7 @@ import (
 	transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
 	channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 
-	canto "github.com/Canto-Network/Canto/v6/types"
+	canto "github.com/Canto-Network/Canto/v7/types"
 )
 
 // GetTransferSenderRecipient returns the sender and recipient sdk.AccAddresses

diff --git a/proto/canto/coinswap/v1/coinswap.proto b/proto/canto/coinswap/v1/coinswap.proto
@@ -4,7 +4,7 @@ package canto.coinswap.v1;
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/coinswap/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/coinswap/types";
 option (gogoproto.goproto_getters_all) = false;
 
 // Input defines the properties of order's input

diff --git a/proto/canto/coinswap/v1/genesis.proto b/proto/canto/coinswap/v1/genesis.proto
@@ -4,7 +4,7 @@ package canto.coinswap.v1;
 import "gogoproto/gogo.proto";
 import "canto/coinswap/v1/coinswap.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/coinswap/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/coinswap/types";
 
 // GenesisState defines the coinswap module's genesis state
 message GenesisState {

diff --git a/proto/canto/coinswap/v1/query.proto b/proto/canto/coinswap/v1/query.proto
@@ -7,7 +7,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "canto/coinswap/v1/coinswap.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/coinswap/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/coinswap/types";
 
 // Query creates service with coinswap as rpc
 service Query {

diff --git a/proto/canto/coinswap/v1/tx.proto b/proto/canto/coinswap/v1/tx.proto
@@ -5,7 +5,7 @@ import "canto/coinswap/v1/coinswap.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/coinswap/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/coinswap/types";
 option (gogoproto.goproto_getters_all) = false;
 
 // Msg defines the coinswap Msg service

diff --git a/proto/canto/csr/v1/csr.proto b/proto/canto/csr/v1/csr.proto
@@ -3,7 +3,7 @@ package canto.csr.v1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/csr/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/csr/types";
 
 // The CSR struct is a wrapper to all of the metadata associated with a given
 // CST NFT

diff --git a/proto/canto/csr/v1/genesis.proto b/proto/canto/csr/v1/genesis.proto
@@ -4,7 +4,7 @@ package canto.csr.v1;
 import "gogoproto/gogo.proto";
 import "canto/csr/v1/params.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/csr/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/csr/types";
 
 // GenesisState defines the csr module's genesis state.
 message GenesisState {

diff --git a/proto/canto/csr/v1/params.proto b/proto/canto/csr/v1/params.proto
@@ -3,7 +3,7 @@ package canto.csr.v1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/csr/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/csr/types";
 
 // Params holds parameters for the csr module
 message Params {

diff --git a/proto/canto/csr/v1/query.proto b/proto/canto/csr/v1/query.proto
@@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "canto/csr/v1/params.proto";
 import "canto/csr/v1/csr.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/csr/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/csr/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/canto/epochs/v1/genesis.proto b/proto/canto/epochs/v1/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/epochs/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/epochs/types";
 
 message EpochInfo {
   string identifier = 1;

diff --git a/proto/canto/epochs/v1/query.proto b/proto/canto/epochs/v1/query.proto
@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "canto/epochs/v1/genesis.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/epochs/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/epochs/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/canto/erc20/v1/erc20.proto b/proto/canto/erc20/v1/erc20.proto
@@ -3,7 +3,7 @@ package canto.erc20.v1;
 
 import "gogoproto/gogo.proto";
 import "cosmos/bank/v1beta1/bank.proto";
-option go_package = "github.com/Canto-Network/Canto/v6/x/erc20/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/erc20/types";
 
 // Owner enumerates the ownership of a ERC20 contract.
 enum Owner {

diff --git a/proto/canto/erc20/v1/genesis.proto b/proto/canto/erc20/v1/genesis.proto
@@ -4,7 +4,7 @@ package canto.erc20.v1;
 import "canto/erc20/v1/erc20.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/Canto-Network/Canto/v6/x/erc20/types";
+option go_package = "github.com/Canto-Network/Canto/v7/x/erc20/types";
 
 // GenesisState defines the module's genesis state.
 message GenesisState {