diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 840c6968..297e46b2 100644 --- 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 index f518e1b8..072fa4fa 100644 --- 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 index 8d56d9b8..6864a9ef 100644 --- 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 index ccab803d..3d488010 100644 --- 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 index 14da5c99..00c71022 100644 --- 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 index 2a002cff..bbac1d06 100644 --- 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 index 900bc67c..71eff286 100644 --- 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 index 5abf0453..55ce34f9 100644 --- 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 index 1b819f06..edfa45ed 100644 --- 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 index 1adb55ed..6b579c30 100644 --- 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 index 17a2eb08..fdb80311 100644 --- 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 index 13835d60..12efafe9 100644 --- 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 index b6d5fba2..4f9e899c 100644 --- 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 index 10448857..e017b5b7 100644 --- 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 index 4ae7feb8..fd9606c3 100644 --- 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 index 41017c8e..4bd1dadd 100644 --- 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 index d2df9479..493e4f25 100644 --- 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 index 9fb24742..babbb8fe 100644 --- 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 index 417c85e2..dbb86260 100644 --- 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 index d4a8791b..ce1ef4b9 100644 --- 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 index c26ad3b9..747a2466 100644 --- 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 index f41bf2f6..8b03ac88 100644 --- 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 index d2a48be1..e7e4c673 100644 --- 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 index 8d6bd992..1d219faa 100644 --- 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 index 5db4b985..85744b98 100644 --- 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 index ad20c3db..3f0616e9 100644 --- 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 index 16fb763b..d9370ecd 100644 --- 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 index 18f6b1f1..9fa7c219 100644 --- 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 index 2d442be7..de12d84b 100644 --- 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 index 1ee819ee..a6c6f0f9 100644 --- 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 index ed4386bb..abe55d6f 100644 --- 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 index 638cef80..ef5b96f5 100644 --- 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 index 6abc9cf9..b96995b3 100644 --- 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 { diff --git a/proto/canto/erc20/v1/query.proto b/proto/canto/erc20/v1/query.proto index 6af3b1d7..1b7b29d3 100644 --- a/proto/canto/erc20/v1/query.proto +++ b/proto/canto/erc20/v1/query.proto @@ -7,7 +7,7 @@ import "canto/erc20/v1/erc20.proto"; import "google/api/annotations.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"; // Query defines the gRPC querier service. service Query { diff --git a/proto/canto/erc20/v1/tx.proto b/proto/canto/erc20/v1/tx.proto index d5afd73b..e3445049 100644 --- a/proto/canto/erc20/v1/tx.proto +++ b/proto/canto/erc20/v1/tx.proto @@ -5,7 +5,7 @@ import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.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"; // Msg defines the erc20 Msg service. service Msg { diff --git a/proto/canto/govshuttle/v1/genesis.proto b/proto/canto/govshuttle/v1/genesis.proto index 371f6d5f..5bc4b9a8 100644 --- a/proto/canto/govshuttle/v1/genesis.proto +++ b/proto/canto/govshuttle/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "canto/govshuttle/v1/govshuttle.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/Canto-Network/Canto/v6/x/govshuttle/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/govshuttle/types"; // GenesisState defines the govshuttle module's genesis state. message GenesisState { diff --git a/proto/canto/govshuttle/v1/govshuttle.proto b/proto/canto/govshuttle/v1/govshuttle.proto index f6dc8db3..98eb34dd 100644 --- a/proto/canto/govshuttle/v1/govshuttle.proto +++ b/proto/canto/govshuttle/v1/govshuttle.proto @@ -4,7 +4,7 @@ package canto.govshuttle.v1; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/Canto-Network/Canto/v6/x/govshuttle/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/govshuttle/types"; // Params defines the parameters for the module. message Params { option (gogoproto.goproto_stringer) = false; } diff --git a/proto/canto/govshuttle/v1/query.proto b/proto/canto/govshuttle/v1/query.proto index 38b54148..7c04a03c 100644 --- a/proto/canto/govshuttle/v1/query.proto +++ b/proto/canto/govshuttle/v1/query.proto @@ -8,7 +8,7 @@ import "canto/govshuttle/v1/govshuttle.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/Canto-Network/Canto/v6/x/govshuttle/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/govshuttle/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/canto/govshuttle/v1/tx.proto b/proto/canto/govshuttle/v1/tx.proto index dfcb6bcf..2cfe96ec 100644 --- a/proto/canto/govshuttle/v1/tx.proto +++ b/proto/canto/govshuttle/v1/tx.proto @@ -3,7 +3,7 @@ package canto.govshuttle.v1; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/Canto-Network/Canto/v6/x/govshuttle/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/govshuttle/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/canto/inflation/v1/genesis.proto b/proto/canto/inflation/v1/genesis.proto index 609aacfd..a1d9bab2 100644 --- a/proto/canto/inflation/v1/genesis.proto +++ b/proto/canto/inflation/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "canto/inflation/v1/inflation.proto"; -option go_package = "github.com/Canto-Network/Canto/v6/x/inflation/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/inflation/types"; // GenesisState defines the inflation module's genesis state. message GenesisState { diff --git a/proto/canto/inflation/v1/inflation.proto b/proto/canto/inflation/v1/inflation.proto index 83c4e8d4..a9cd9bd6 100644 --- a/proto/canto/inflation/v1/inflation.proto +++ b/proto/canto/inflation/v1/inflation.proto @@ -3,7 +3,7 @@ package canto.inflation.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/Canto-Network/Canto/v6/x/inflation/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/inflation/types"; // InflationDistribution defines the distribution in which inflation is // allocated through minting on each epoch (staking, incentives, community). It diff --git a/proto/canto/inflation/v1/query.proto b/proto/canto/inflation/v1/query.proto index 333d6ae2..2de7eb0b 100644 --- a/proto/canto/inflation/v1/query.proto +++ b/proto/canto/inflation/v1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; import "canto/inflation/v1/genesis.proto"; -option go_package = "github.com/Canto-Network/Canto/v6/x/inflation/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/inflation/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/canto/onboarding/v1/genesis.proto b/proto/canto/onboarding/v1/genesis.proto index 30549d67..169230af 100644 --- a/proto/canto/onboarding/v1/genesis.proto +++ b/proto/canto/onboarding/v1/genesis.proto @@ -4,7 +4,7 @@ package canto.onboarding.v1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/Canto-Network/Canto/v6/x/onboarding/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/onboarding/types"; // GenesisState defines the onboarding module's genesis state. message GenesisState { diff --git a/proto/canto/onboarding/v1/query.proto b/proto/canto/onboarding/v1/query.proto index 07c266d2..1caaf1af 100644 --- a/proto/canto/onboarding/v1/query.proto +++ b/proto/canto/onboarding/v1/query.proto @@ -5,7 +5,7 @@ import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; import "canto/onboarding/v1/genesis.proto"; -option go_package = "github.com/Canto-Network/Canto/v6/x/onboarding/types"; +option go_package = "github.com/Canto-Network/Canto/v7/x/onboarding/types"; // Query defines the gRPC querier service. service Query { diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 0952d0e8..81769cb5 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -49,5 +49,5 @@ echo "3" # move proto files to the right places -cp -r github.com/Canto-Network/Canto/v6/x/* x/ +cp -r github.com/Canto-Network/Canto/v7/x/* x/ rm -rf github.com diff --git a/testutil/fund.go b/testutil/fund.go index b8f2100b..fb5fb266 100644 --- a/testutil/fund.go +++ b/testutil/fund.go @@ -1,7 +1,7 @@ package testutil import ( - inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" ) diff --git a/testutil/network/network.go b/testutil/network/network.go index e1858059..d1c7c20e 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -49,7 +49,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/evmos/ethermint/crypto/hd" - "github.com/Canto-Network/Canto/v6/app" + "github.com/Canto-Network/Canto/v7/app" "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/server/config" diff --git a/testutil/network/network_test.go b/testutil/network/network_test.go index 452443d9..e7276ca3 100644 --- a/testutil/network/network_test.go +++ b/testutil/network/network_test.go @@ -14,7 +14,7 @@ import ( "github.com/evmos/ethermint/server/config" "github.com/evmos/ethermint/testutil/network" - cantonetwork "github.com/Canto-Network/Canto/v6/testutil/network" + cantonetwork "github.com/Canto-Network/Canto/v7/testutil/network" ) type IntegrationTestSuite struct { diff --git a/testutil/network/util.go b/testutil/network/util.go index d3217448..39ae9b97 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -16,7 +16,7 @@ import ( "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" - inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" "github.com/cosmos/cosmos-sdk/server/api" servergrpc "github.com/cosmos/cosmos-sdk/server/grpc" srvtypes "github.com/cosmos/cosmos-sdk/server/types" diff --git a/x/coinswap/client/cli/query.go b/x/coinswap/client/cli/query.go index 965e0b91..5b85ebc3 100644 --- a/x/coinswap/client/cli/query.go +++ b/x/coinswap/client/cli/query.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/coinswap/client/cli/tx.go b/x/coinswap/client/cli/tx.go index b7f6b894..f36fe524 100644 --- a/x/coinswap/client/cli/tx.go +++ b/x/coinswap/client/cli/tx.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/coinswap/client/rest/query.go b/x/coinswap/client/rest/query.go index 98da0751..d554c109 100644 --- a/x/coinswap/client/rest/query.go +++ b/x/coinswap/client/rest/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) func registerQueryRoutes(cliCtx client.Context, r *mux.Router) { diff --git a/x/coinswap/client/rest/tx.go b/x/coinswap/client/rest/tx.go index 5c3a4ff2..ecba0e33 100644 --- a/x/coinswap/client/rest/tx.go +++ b/x/coinswap/client/rest/tx.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) func registerTxRoutes(cliCtx client.Context, r *mux.Router) { diff --git a/x/coinswap/handler.go b/x/coinswap/handler.go index 726e04a5..d4ee3d35 100644 --- a/x/coinswap/handler.go +++ b/x/coinswap/handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/coinswap/keeper" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/keeper" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // NewHandler returns a handler for all "coinswap" type messages. diff --git a/x/coinswap/keeper/fees.go b/x/coinswap/keeper/fees.go index 6bd0e423..fc7ea892 100644 --- a/x/coinswap/keeper/fees.go +++ b/x/coinswap/keeper/fees.go @@ -4,7 +4,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // DeductPoolCreationFee performs fee handling for creating liquidity pool diff --git a/x/coinswap/keeper/genesis.go b/x/coinswap/keeper/genesis.go index bbe14930..48c3b7f2 100644 --- a/x/coinswap/keeper/genesis.go +++ b/x/coinswap/keeper/genesis.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // InitGenesis initializes the coinswap module's state from a given genesis state. diff --git a/x/coinswap/keeper/genesis_test.go b/x/coinswap/keeper/genesis_test.go index 2ad78633..d141f817 100644 --- a/x/coinswap/keeper/genesis_test.go +++ b/x/coinswap/keeper/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) func TestGenesisSuite(t *testing.T) { diff --git a/x/coinswap/keeper/grpc_query.go b/x/coinswap/keeper/grpc_query.go index 08035642..1cca3d7b 100644 --- a/x/coinswap/keeper/grpc_query.go +++ b/x/coinswap/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/coinswap/keeper/grpc_query_test.go b/x/coinswap/keeper/grpc_query_test.go index fc22d682..02297112 100644 --- a/x/coinswap/keeper/grpc_query_test.go +++ b/x/coinswap/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) func (s *TestSuite) TestGRPCParams() { diff --git a/x/coinswap/keeper/keeper.go b/x/coinswap/keeper/keeper.go index bda6ba2d..fe715cac 100644 --- a/x/coinswap/keeper/keeper.go +++ b/x/coinswap/keeper/keeper.go @@ -13,7 +13,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // Keeper of the coinswap store diff --git a/x/coinswap/keeper/keeper_test.go b/x/coinswap/keeper/keeper_test.go index ae7b7e65..9b2d456f 100644 --- a/x/coinswap/keeper/keeper_test.go +++ b/x/coinswap/keeper/keeper_test.go @@ -14,9 +14,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/x/coinswap/keeper" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/coinswap/keeper" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) const ( diff --git a/x/coinswap/keeper/msg_server.go b/x/coinswap/keeper/msg_server.go index 10fa3548..69344965 100644 --- a/x/coinswap/keeper/msg_server.go +++ b/x/coinswap/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) type msgServer struct { diff --git a/x/coinswap/keeper/pool.go b/x/coinswap/keeper/pool.go index b25a86fe..2264bc9c 100644 --- a/x/coinswap/keeper/pool.go +++ b/x/coinswap/keeper/pool.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // CreatePool create a liquidity that saves relevant information about popular pool tokens diff --git a/x/coinswap/keeper/swap.go b/x/coinswap/keeper/swap.go index 67e04ef9..9a441988 100644 --- a/x/coinswap/keeper/swap.go +++ b/x/coinswap/keeper/swap.go @@ -2,10 +2,11 @@ package keeper import ( "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) func (k Keeper) swapCoins(ctx sdk.Context, sender, recipient sdk.AccAddress, coinSold, coinBought sdk.Coin) error { diff --git a/x/coinswap/keeper/swap_test.go b/x/coinswap/keeper/swap_test.go index 2c0df662..e6042ec4 100644 --- a/x/coinswap/keeper/swap_test.go +++ b/x/coinswap/keeper/swap_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/coinswap/keeper" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/keeper" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) func TestSwapSuite(t *testing.T) { diff --git a/x/coinswap/module.go b/x/coinswap/module.go index 10dca185..17b280e8 100644 --- a/x/coinswap/module.go +++ b/x/coinswap/module.go @@ -19,11 +19,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/Canto-Network/Canto/v6/x/coinswap/client/cli" - "github.com/Canto-Network/Canto/v6/x/coinswap/client/rest" - "github.com/Canto-Network/Canto/v6/x/coinswap/keeper" - "github.com/Canto-Network/Canto/v6/x/coinswap/simulation" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/client/cli" + "github.com/Canto-Network/Canto/v7/x/coinswap/client/rest" + "github.com/Canto-Network/Canto/v7/x/coinswap/keeper" + "github.com/Canto-Network/Canto/v7/x/coinswap/simulation" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) var ( diff --git a/x/coinswap/simulation/operations.go b/x/coinswap/simulation/operations.go index 241adffd..d00e7218 100644 --- a/x/coinswap/simulation/operations.go +++ b/x/coinswap/simulation/operations.go @@ -15,8 +15,8 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/Canto-Network/Canto/v6/x/coinswap/keeper" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/keeper" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // Simulation operation weights constants diff --git a/x/coinswap/simulation/params.go b/x/coinswap/simulation/params.go index c9879bc1..7b2badc7 100644 --- a/x/coinswap/simulation/params.go +++ b/x/coinswap/simulation/params.go @@ -8,7 +8,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/Canto-Network/Canto/v6/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) // ParamChanges defines the parameters that can be modified by param change proposals diff --git a/x/csr/client/cli/query.go b/x/csr/client/cli/query.go index e20a1575..6a317896 100644 --- a/x/csr/client/cli/query.go +++ b/x/csr/client/cli/query.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" ) // GetQueryCmd returns the cli query commands for the CSR module diff --git a/x/csr/client/cli/tx.go b/x/csr/client/cli/tx.go index 6e9d11dc..c7a6243d 100644 --- a/x/csr/client/cli/tx.go +++ b/x/csr/client/cli/tx.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/cosmos/cosmos-sdk/client" ) diff --git a/x/csr/genesis.go b/x/csr/genesis.go index 85917ea5..2c4089e9 100644 --- a/x/csr/genesis.go +++ b/x/csr/genesis.go @@ -1,8 +1,8 @@ package csr import ( - "github.com/Canto-Network/Canto/v6/x/csr/keeper" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/keeper" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" ) diff --git a/x/csr/handler.go b/x/csr/handler.go index 7c94dca6..0f7c8d53 100644 --- a/x/csr/handler.go +++ b/x/csr/handler.go @@ -3,8 +3,8 @@ package csr import ( "fmt" - "github.com/Canto-Network/Canto/v6/x/csr/keeper" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/keeper" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/csr/keeper/begin_block_test.go b/x/csr/keeper/begin_block_test.go index 5a5de408..f3466c84 100644 --- a/x/csr/keeper/begin_block_test.go +++ b/x/csr/keeper/begin_block_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/csr/keeper/csr.go b/x/csr/keeper/csr.go index 8157b85d..7846eb3b 100644 --- a/x/csr/keeper/csr.go +++ b/x/csr/keeper/csr.go @@ -3,7 +3,7 @@ package keeper import ( "encoding/binary" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" diff --git a/x/csr/keeper/csr_test.go b/x/csr/keeper/csr_test.go index f2d32029..0dd39e1f 100644 --- a/x/csr/keeper/csr_test.go +++ b/x/csr/keeper/csr_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/evmos/ethermint/tests" ) diff --git a/x/csr/keeper/errors.go b/x/csr/keeper/errors.go index 74daf9f9..c51f79af 100644 --- a/x/csr/keeper/errors.go +++ b/x/csr/keeper/errors.go @@ -3,7 +3,7 @@ package keeper // DONTCOVER import ( - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/csr/keeper/event_handler.go b/x/csr/keeper/event_handler.go index 8ed6ecbd..e29b5bbe 100644 --- a/x/csr/keeper/event_handler.go +++ b/x/csr/keeper/event_handler.go @@ -4,7 +4,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/csr/keeper/event_handler_test.go b/x/csr/keeper/event_handler_test.go index 0aaba769..44a5545b 100644 --- a/x/csr/keeper/event_handler_test.go +++ b/x/csr/keeper/event_handler_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "strings" - _ "github.com/Canto-Network/Canto/v6/x/csr/keeper" - "github.com/Canto-Network/Canto/v6/x/csr/types" + _ "github.com/Canto-Network/Canto/v7/x/csr/keeper" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/ethereum/go-ethereum/common" "github.com/evmos/ethermint/tests" "github.com/evmos/ethermint/x/evm/statedb" diff --git a/x/csr/keeper/evm.go b/x/csr/keeper/evm.go index 969bd113..2961936e 100644 --- a/x/csr/keeper/evm.go +++ b/x/csr/keeper/evm.go @@ -3,8 +3,8 @@ package keeper import ( "math/big" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" diff --git a/x/csr/keeper/evm_hook_test.go b/x/csr/keeper/evm_hook_test.go index 759b4b6d..e17d823b 100644 --- a/x/csr/keeper/evm_hook_test.go +++ b/x/csr/keeper/evm_hook_test.go @@ -8,10 +8,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/tests" - "github.com/Canto-Network/Canto/v6/contracts" - csrTypes "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/contracts" + csrTypes "github.com/Canto-Network/Canto/v7/x/csr/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // This test suite will run a simulation of sorts where transactions will have diff --git a/x/csr/keeper/evm_hooks.go b/x/csr/keeper/evm_hooks.go index 01c26167..f93b9f8d 100644 --- a/x/csr/keeper/evm_hooks.go +++ b/x/csr/keeper/evm_hooks.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/csr/keeper/evm_test.go b/x/csr/keeper/evm_test.go index c25a10b5..b703cffd 100644 --- a/x/csr/keeper/evm_test.go +++ b/x/csr/keeper/evm_test.go @@ -6,9 +6,9 @@ import ( "log" "math/big" - "github.com/Canto-Network/Canto/v6/contracts" - _ "github.com/Canto-Network/Canto/v6/x/csr/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + _ "github.com/Canto-Network/Canto/v7/x/csr/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" evmtypes "github.com/evmos/ethermint/x/evm/types" diff --git a/x/csr/keeper/grpc_query.go b/x/csr/keeper/grpc_query.go index 46933a03..0b6e12a8 100644 --- a/x/csr/keeper/grpc_query.go +++ b/x/csr/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/csr/keeper/grpc_query_test.go b/x/csr/keeper/grpc_query_test.go index 7721d5f8..ec19f974 100644 --- a/x/csr/keeper/grpc_query_test.go +++ b/x/csr/keeper/grpc_query_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/evmos/ethermint/tests" diff --git a/x/csr/keeper/integration_test.go b/x/csr/keeper/integration_test.go index 0593d7b6..8f71699a 100644 --- a/x/csr/keeper/integration_test.go +++ b/x/csr/keeper/integration_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/testutil" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/testutil" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/crypto/ethsecp256k1" @@ -19,7 +19,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -/// Load in all of the test contracts that will be used in the integration tests +// / Load in all of the test contracts that will be used in the integration tests +// //go:embed test_contracts/compiled_contracts/factoryContract.json var factoryContractJson []byte // nolint: golint var factoryContract evmtypes.CompiledContract diff --git a/x/csr/keeper/keeper.go b/x/csr/keeper/keeper.go index 00ffb16c..6541425a 100644 --- a/x/csr/keeper/keeper.go +++ b/x/csr/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/csr/keeper/keeper_test.go b/x/csr/keeper/keeper_test.go index 3cad24e7..5e779918 100644 --- a/x/csr/keeper/keeper_test.go +++ b/x/csr/keeper/keeper_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" diff --git a/x/csr/keeper/params.go b/x/csr/keeper/params.go index 292b00a0..cfb5b19a 100644 --- a/x/csr/keeper/params.go +++ b/x/csr/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/csr/keeper/params_test.go b/x/csr/keeper/params_test.go index 7a160f55..d143d841 100644 --- a/x/csr/keeper/params_test.go +++ b/x/csr/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - _ "github.com/Canto-Network/Canto/v6/x/csr/keeper" + _ "github.com/Canto-Network/Canto/v7/x/csr/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/csr/module.go b/x/csr/module.go index c18e40f5..7845ade4 100644 --- a/x/csr/module.go +++ b/x/csr/module.go @@ -11,9 +11,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/Canto-Network/Canto/v6/x/csr/client/cli" - "github.com/Canto-Network/Canto/v6/x/csr/keeper" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/client/cli" + "github.com/Canto-Network/Canto/v7/x/csr/keeper" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/csr/types/genesis_test.go b/x/csr/types/genesis_test.go index 16465601..f0ce8eae 100644 --- a/x/csr/types/genesis_test.go +++ b/x/csr/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/Canto-Network/Canto/v6/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/csr/types" "github.com/stretchr/testify/suite" ) diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index 43f0cc51..3852a764 100644 --- a/x/epochs/client/cli/query.go +++ b/x/epochs/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/epochs/genesis.go b/x/epochs/genesis.go index 137125f1..7f79726e 100644 --- a/x/epochs/genesis.go +++ b/x/epochs/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/epochs/keeper" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/keeper" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) // InitGenesis initializes the epochs module's state from a provided genesis diff --git a/x/epochs/genesis_test.go b/x/epochs/genesis_test.go index 8dcdc0d3..95376907 100644 --- a/x/epochs/genesis_test.go +++ b/x/epochs/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/x/epochs" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + simapp "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/epochs" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index 0421cb69..df1045d7 100644 --- a/x/epochs/keeper/abci.go +++ b/x/epochs/keeper/abci.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) // BeginBlocker of epochs module diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index 0567bb32..4cfb7c06 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/Canto-Network/Canto/v6/x/epochs" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochInfoChangesBeginBlockerAndInitGenesis() { diff --git a/x/epochs/keeper/epoch_infos.go b/x/epochs/keeper/epoch_infos.go index d2ea91e8..288a5eda 100644 --- a/x/epochs/keeper/epoch_infos.go +++ b/x/epochs/keeper/epoch_infos.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) // GetEpochInfo returns epoch info by identifier diff --git a/x/epochs/keeper/epoch_infos_test.go b/x/epochs/keeper/epoch_infos_test.go index fedb0089..4d95d8bf 100644 --- a/x/epochs/keeper/epoch_infos_test.go +++ b/x/epochs/keeper/epoch_infos_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochLifeCycle() { diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index b75afe3d..e6546ac4 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index 10b725fa..98e66f8f 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" ) diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go index 0867374e..f82f90f5 100644 --- a/x/epochs/keeper/hooks.go +++ b/x/epochs/keeper/hooks.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index 49a2a4bc..3155abf9 100644 --- a/x/epochs/keeper/keeper.go +++ b/x/epochs/keeper/keeper.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) // Keeper of this module maintains collections of epochs and hooks. diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index 45bd0fb3..f55d556c 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -26,8 +26,8 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) var denomMint = evm.DefaultEVMDenom diff --git a/x/epochs/module.go b/x/epochs/module.go index c84adff8..303cb635 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/Canto-Network/Canto/v6/x/epochs/client/cli" - "github.com/Canto-Network/Canto/v6/x/epochs/keeper" - "github.com/Canto-Network/Canto/v6/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/epochs/client/cli" + "github.com/Canto-Network/Canto/v7/x/epochs/keeper" + "github.com/Canto-Network/Canto/v7/x/epochs/types" ) var ( diff --git a/x/erc20/client/cli/query.go b/x/erc20/client/cli/query.go index 2d22a6e5..2f977d60 100644 --- a/x/erc20/client/cli/query.go +++ b/x/erc20/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // GetQueryCmd returns the parent command for all erc20 CLI query commands diff --git a/x/erc20/client/cli/tx.go b/x/erc20/client/cli/tx.go index 6538753c..96189627 100644 --- a/x/erc20/client/cli/tx.go +++ b/x/erc20/client/cli/tx.go @@ -17,7 +17,7 @@ import ( ethermint "github.com/evmos/ethermint/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // NewTxCmd returns a root CLI command handler for erc20 transaction commands diff --git a/x/erc20/client/proposal_handler.go b/x/erc20/client/proposal_handler.go index d53d7f75..ab65b4dc 100644 --- a/x/erc20/client/proposal_handler.go +++ b/x/erc20/client/proposal_handler.go @@ -3,8 +3,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/Canto-Network/Canto/v6/x/erc20/client/cli" - "github.com/Canto-Network/Canto/v6/x/erc20/client/rest" + "github.com/Canto-Network/Canto/v7/x/erc20/client/cli" + "github.com/Canto-Network/Canto/v7/x/erc20/client/rest" ) var ( diff --git a/x/erc20/client/rest/rest.go b/x/erc20/client/rest/rest.go index e552605b..43eb9408 100644 --- a/x/erc20/client/rest/rest.go +++ b/x/erc20/client/rest/rest.go @@ -11,7 +11,7 @@ import ( govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // RegisterCoinProposalRequest defines a request for a new register coin proposal. diff --git a/x/erc20/genesis.go b/x/erc20/genesis.go index 9eb33763..785bb586 100644 --- a/x/erc20/genesis.go +++ b/x/erc20/genesis.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // InitGenesis import module genesis diff --git a/x/erc20/genesis_test.go b/x/erc20/genesis_test.go index 23f150bc..52f90a57 100644 --- a/x/erc20/genesis_test.go +++ b/x/erc20/genesis_test.go @@ -16,9 +16,9 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/x/erc20" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/erc20" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) type GenesisTestSuite struct { diff --git a/x/erc20/handler.go b/x/erc20/handler.go index f5fe4b07..02f43e92 100644 --- a/x/erc20/handler.go +++ b/x/erc20/handler.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // NewHandler defines the erc20 module handler instance diff --git a/x/erc20/keeper/evm.go b/x/erc20/keeper/evm.go index d5fe27e8..6e06daf4 100644 --- a/x/erc20/keeper/evm.go +++ b/x/erc20/keeper/evm.go @@ -15,8 +15,8 @@ import ( "github.com/evmos/ethermint/server/config" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // DeployERC20Contract creates and deploys an ERC20 contract on the EVM with the diff --git a/x/erc20/keeper/evm_hooks.go b/x/erc20/keeper/evm_hooks.go index efd3a89f..47c08e63 100644 --- a/x/erc20/keeper/evm_hooks.go +++ b/x/erc20/keeper/evm_hooks.go @@ -11,8 +11,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) var _ evmtypes.EvmHooks = Hooks{} @@ -32,8 +32,8 @@ func (k Keeper) Hooks() Hooks { // the module account address. This hook applies to both token pairs that have // been registered through a native Cosmos coin or an ERC20 token. If token pair // has been registered with: -// - coin -> burn tokens and transfer escrowed coins on module to sender -// - token -> escrow tokens on module account and mint & transfer coins to sender +// - coin -> burn tokens and transfer escrowed coins on module to sender +// - token -> escrow tokens on module account and mint & transfer coins to sender // // Note that the PostTxProcessing hook is only called by sending an EVM // transaction that triggers `ApplyTransaction`. A cosmos tx with a diff --git a/x/erc20/keeper/evm_hooks_test.go b/x/erc20/keeper/evm_hooks_test.go index ad819329..f721ab96 100644 --- a/x/erc20/keeper/evm_hooks_test.go +++ b/x/erc20/keeper/evm_hooks_test.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" "github.com/evmos/ethermint/tests" ) diff --git a/x/erc20/keeper/evm_test.go b/x/erc20/keeper/evm_test.go index 645ea735..9abb3a23 100644 --- a/x/erc20/keeper/evm_test.go +++ b/x/erc20/keeper/evm_test.go @@ -8,9 +8,9 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/stretchr/testify/mock" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) func (suite *KeeperTestSuite) TestQueryERC20() { diff --git a/x/erc20/keeper/grpc_query.go b/x/erc20/keeper/grpc_query.go index 6ea818c1..edf3ba39 100644 --- a/x/erc20/keeper/grpc_query.go +++ b/x/erc20/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" ethermint "github.com/evmos/ethermint/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/erc20/keeper/grpc_query_test.go b/x/erc20/keeper/grpc_query_test.go index 0d2c59f4..3043c3e4 100644 --- a/x/erc20/keeper/grpc_query_test.go +++ b/x/erc20/keeper/grpc_query_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/evmos/ethermint/tests" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) func (suite *KeeperTestSuite) TestTokenPairs() { diff --git a/x/erc20/keeper/integration_test.go b/x/erc20/keeper/integration_test.go index 81293a6a..6935408d 100644 --- a/x/erc20/keeper/integration_test.go +++ b/x/erc20/keeper/integration_test.go @@ -14,9 +14,9 @@ import ( "github.com/evmos/ethermint/encoding" ethermint "github.com/evmos/ethermint/types" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/testutil" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/testutil" + "github.com/Canto-Network/Canto/v7/x/erc20/types" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" abci "github.com/tendermint/tendermint/abci/types" diff --git a/x/erc20/keeper/keeper.go b/x/erc20/keeper/keeper.go index f4e0a50a..c74a2e04 100644 --- a/x/erc20/keeper/keeper.go +++ b/x/erc20/keeper/keeper.go @@ -8,7 +8,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // Keeper of this module maintains collections of erc20. diff --git a/x/erc20/keeper/keeper_test.go b/x/erc20/keeper/keeper_test.go index 588e1cf7..4a1f3c2b 100644 --- a/x/erc20/keeper/keeper_test.go +++ b/x/erc20/keeper/keeper_test.go @@ -45,9 +45,9 @@ import ( feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) type KeeperTestSuite struct { diff --git a/x/erc20/keeper/migrations.go b/x/erc20/keeper/migrations.go index 21694f50..7cd20549 100644 --- a/x/erc20/keeper/migrations.go +++ b/x/erc20/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - v2 "github.com/Canto-Network/Canto/v6/x/erc20/migrations/v2" + v2 "github.com/Canto-Network/Canto/v7/x/erc20/migrations/v2" ) var _ module.MigrationHandler = Migrator{}.Migrate1to2 diff --git a/x/erc20/keeper/mint.go b/x/erc20/keeper/mint.go index a6040bdb..44661586 100644 --- a/x/erc20/keeper/mint.go +++ b/x/erc20/keeper/mint.go @@ -5,14 +5,14 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // MintingEnabled checks that: -// - the global parameter for erc20 conversion is enabled -// - minting is enabled for the given (erc20,coin) token pair -// - recipient address is not on the blocked list -// - bank module transfers are enabled for the Cosmos coin +// - the global parameter for erc20 conversion is enabled +// - minting is enabled for the given (erc20,coin) token pair +// - recipient address is not on the blocked list +// - bank module transfers are enabled for the Cosmos coin func (k Keeper) MintingEnabled( ctx sdk.Context, sender, receiver sdk.AccAddress, diff --git a/x/erc20/keeper/mint_test.go b/x/erc20/keeper/mint_test.go index 30531e82..bc551efb 100644 --- a/x/erc20/keeper/mint_test.go +++ b/x/erc20/keeper/mint_test.go @@ -7,7 +7,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/evmos/ethermint/tests" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) func (suite *KeeperTestSuite) TestMintingEnabled() { diff --git a/x/erc20/keeper/msg_server.go b/x/erc20/keeper/msg_server.go index 328b262a..03423445 100644 --- a/x/erc20/keeper/msg_server.go +++ b/x/erc20/keeper/msg_server.go @@ -10,8 +10,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) var _ types.MsgServer = &Keeper{} @@ -102,9 +102,9 @@ func (k Keeper) ConvertERC20( // convertCoinNativeCoin handles the coin conversion for a native Cosmos coin // token pair: -// - escrow coins on module account -// - mint tokens and send to receiver -// - check if token balance increased by amount +// - escrow coins on module account +// - mint tokens and send to receiver +// - check if token balance increased by amount func (k Keeper) convertCoinNativeCoin( ctx sdk.Context, pair types.TokenPair, @@ -188,10 +188,10 @@ func (k Keeper) convertCoinNativeCoin( // convertERC20NativeCoin handles the erc20 conversion for a native Cosmos coin // token pair: -// - burn escrowed tokens -// - unescrow coins that have been previously escrowed with ConvertCoin -// - check if coin balance increased by amount -// - check if token balance decreased by amount +// - burn escrowed tokens +// - unescrow coins that have been previously escrowed with ConvertCoin +// - check if coin balance increased by amount +// - check if token balance decreased by amount func (k Keeper) convertERC20NativeCoin( ctx sdk.Context, pair types.TokenPair, @@ -288,12 +288,12 @@ func (k Keeper) convertERC20NativeCoin( // convertERC20NativeToken handles the erc20 conversion for a native erc20 token // pair: -// - escrow tokens on module account -// - mint coins on bank module -// - send minted coins to the receiver -// - check if coin balance increased by amount -// - check if token balance decreased by amount -// - check for unexpected `Approval` event in logs +// - escrow tokens on module account +// - mint coins on bank module +// - send minted coins to the receiver +// - check if coin balance increased by amount +// - check if token balance decreased by amount +// - check for unexpected `Approval` event in logs func (k Keeper) convertERC20NativeToken( ctx sdk.Context, pair types.TokenPair, @@ -416,11 +416,11 @@ func (k Keeper) convertERC20NativeToken( // convertCoinNativeERC20 handles the coin conversion for a native ERC20 token // pair: -// - escrow Coins on module account -// - unescrow Tokens that have been previously escrowed with ConvertERC20 and send to receiver -// - burn escrowed Coins -// - check if token balance increased by amount -// - check for unexpected `Approval` event in logs +// - escrow Coins on module account +// - unescrow Tokens that have been previously escrowed with ConvertERC20 and send to receiver +// - burn escrowed Coins +// - check if token balance increased by amount +// - check for unexpected `Approval` event in logs func (k Keeper) convertCoinNativeERC20( ctx sdk.Context, pair types.TokenPair, diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index 926807f9..a5c1ede1 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/x/erc20/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" ) diff --git a/x/erc20/keeper/params.go b/x/erc20/keeper/params.go index 701c1499..24438f2f 100644 --- a/x/erc20/keeper/params.go +++ b/x/erc20/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // GetParams returns the total set of erc20 parameters. diff --git a/x/erc20/keeper/params_test.go b/x/erc20/keeper/params_test.go index 0738ea5f..ddc592d1 100644 --- a/x/erc20/keeper/params_test.go +++ b/x/erc20/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/Canto-Network/Canto/v6/x/erc20/types" +import "github.com/Canto-Network/Canto/v7/x/erc20/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.Erc20Keeper.GetParams(suite.ctx) diff --git a/x/erc20/keeper/proposals.go b/x/erc20/keeper/proposals.go index e4305825..d072b1bc 100644 --- a/x/erc20/keeper/proposals.go +++ b/x/erc20/keeper/proposals.go @@ -8,7 +8,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // RegisterCoin deploys an erc20 contract and creates the token pair for the diff --git a/x/erc20/keeper/proposals_test.go b/x/erc20/keeper/proposals_test.go index 8caeae50..35171eae 100644 --- a/x/erc20/keeper/proposals_test.go +++ b/x/erc20/keeper/proposals_test.go @@ -12,9 +12,9 @@ import ( "github.com/evmos/ethermint/tests" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/Canto-Network/Canto/v6/x/erc20/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" - inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/erc20/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" ) const ( diff --git a/x/erc20/keeper/token_pairs.go b/x/erc20/keeper/token_pairs.go index 76a8b87a..537db758 100644 --- a/x/erc20/keeper/token_pairs.go +++ b/x/erc20/keeper/token_pairs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // GetTokenPairs - get all registered token tokenPairs diff --git a/x/erc20/keeper/token_pairs_test.go b/x/erc20/keeper/token_pairs_test.go index abfb2fe4..e1ef1fe0 100644 --- a/x/erc20/keeper/token_pairs_test.go +++ b/x/erc20/keeper/token_pairs_test.go @@ -7,7 +7,7 @@ import ( "github.com/evmos/ethermint/tests" 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" ) func (suite *KeeperTestSuite) TestGetTokenPairs() { diff --git a/x/erc20/migrations/v2/migration.go b/x/erc20/migrations/v2/migration.go index 5ca0949d..645674a4 100644 --- a/x/erc20/migrations/v2/migration.go +++ b/x/erc20/migrations/v2/migration.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // UpdateParams updates the module parameters EnableERC20 and EnableEMVHook diff --git a/x/erc20/migrations/v2/migration_test.go b/x/erc20/migrations/v2/migration_test.go index ed9f17b9..644a0258 100644 --- a/x/erc20/migrations/v2/migration_test.go +++ b/x/erc20/migrations/v2/migration_test.go @@ -12,9 +12,9 @@ import ( "github.com/evmos/ethermint/encoding" - "github.com/Canto-Network/Canto/v6/app" - v2 "github.com/Canto-Network/Canto/v6/x/erc20/migrations/v2" - erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/app" + v2 "github.com/Canto-Network/Canto/v7/x/erc20/migrations/v2" + erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types" ) func TestUpdateParams(t *testing.T) { diff --git a/x/erc20/module.go b/x/erc20/module.go index a1b1a70e..7402f264 100644 --- a/x/erc20/module.go +++ b/x/erc20/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/Canto-Network/Canto/v6/x/erc20/client/cli" - "github.com/Canto-Network/Canto/v6/x/erc20/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/client/cli" + "github.com/Canto-Network/Canto/v7/x/erc20/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // type check to ensure the interface is properly implemented diff --git a/x/erc20/proposal_handler.go b/x/erc20/proposal_handler.go index cfaf3de7..8e0130ae 100644 --- a/x/erc20/proposal_handler.go +++ b/x/erc20/proposal_handler.go @@ -6,8 +6,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/x/erc20/keeper" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/erc20/keeper" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ) // NewErc20ProposalHandler creates a governance handler to manage new proposal types. diff --git a/x/govshuttle/client/cli/query.go b/x/govshuttle/client/cli/query.go index a7c74418..d649d7fa 100644 --- a/x/govshuttle/client/cli/query.go +++ b/x/govshuttle/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/govshuttle/client/cli/query_params.go b/x/govshuttle/client/cli/query_params.go index a50534ae..9a02f25b 100644 --- a/x/govshuttle/client/cli/query_params.go +++ b/x/govshuttle/client/cli/query_params.go @@ -3,7 +3,7 @@ package cli import ( "context" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" diff --git a/x/govshuttle/client/cli/tx.go b/x/govshuttle/client/cli/tx.go index 5944cb04..9f06a371 100644 --- a/x/govshuttle/client/cli/tx.go +++ b/x/govshuttle/client/cli/tx.go @@ -15,7 +15,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) var ( @@ -125,7 +125,7 @@ Where metadata.json contains (example): return cmd } -//Register TreasuryProposal submit cmd +// Register TreasuryProposal submit cmd func NewTreasuryProposalCmd() *cobra.Command { cmd := &cobra.Command{ Use: "treasury-proposal [metadata]", diff --git a/x/govshuttle/client/cli/utils.go b/x/govshuttle/client/cli/utils.go index d888f5bd..91ec5835 100644 --- a/x/govshuttle/client/cli/utils.go +++ b/x/govshuttle/client/cli/utils.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" "github.com/cosmos/cosmos-sdk/codec" ) diff --git a/x/govshuttle/client/proposal_handler.go b/x/govshuttle/client/proposal_handler.go index c39a1749..ce8146fe 100644 --- a/x/govshuttle/client/proposal_handler.go +++ b/x/govshuttle/client/proposal_handler.go @@ -3,8 +3,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/Canto-Network/Canto/v6/x/erc20/client/rest" - "github.com/Canto-Network/Canto/v6/x/govshuttle/client/cli" + "github.com/Canto-Network/Canto/v7/x/erc20/client/rest" + "github.com/Canto-Network/Canto/v7/x/govshuttle/client/cli" ) var ( diff --git a/x/govshuttle/genesis.go b/x/govshuttle/genesis.go index 808bc3cc..cfd60638 100644 --- a/x/govshuttle/genesis.go +++ b/x/govshuttle/genesis.go @@ -1,8 +1,8 @@ package govshuttle import ( - "github.com/Canto-Network/Canto/v6/x/govshuttle/keeper" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" ) diff --git a/x/govshuttle/handler.go b/x/govshuttle/handler.go index 86582d1d..1d590b43 100644 --- a/x/govshuttle/handler.go +++ b/x/govshuttle/handler.go @@ -3,8 +3,8 @@ package govshuttle import ( "fmt" - "github.com/Canto-Network/Canto/v6/x/govshuttle/keeper" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/govshuttle/keeper/grpc_query.go b/x/govshuttle/keeper/grpc_query.go index c29133c3..9d20ef5c 100644 --- a/x/govshuttle/keeper/grpc_query.go +++ b/x/govshuttle/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/govshuttle/keeper/grpc_query_params.go b/x/govshuttle/keeper/grpc_query_params.go index 65efce49..934db11b 100644 --- a/x/govshuttle/keeper/grpc_query_params.go +++ b/x/govshuttle/keeper/grpc_query_params.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/govshuttle/keeper/keeper.go b/x/govshuttle/keeper/keeper.go index b76a64d5..d89f423b 100644 --- a/x/govshuttle/keeper/keeper.go +++ b/x/govshuttle/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/tendermint/tendermint/libs/log" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/govshuttle/keeper/keeper_test.go b/x/govshuttle/keeper/keeper_test.go index fa1f4a89..73096158 100644 --- a/x/govshuttle/keeper/keeper_test.go +++ b/x/govshuttle/keeper/keeper_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/Canto-Network/Canto/v6/app" + "github.com/Canto-Network/Canto/v7/app" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/require" //used for deploying contracts - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) @@ -43,7 +43,7 @@ func TestKeeperTestSuite(t *testing.T) { suite.Run(t, s) } -//Test Helpers +// Test Helpers func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { checkTx := false diff --git a/x/govshuttle/keeper/msg_server.go b/x/govshuttle/keeper/msg_server.go index 4d6a2d7a..77baed45 100644 --- a/x/govshuttle/keeper/msg_server.go +++ b/x/govshuttle/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) type msgServer struct { diff --git a/x/govshuttle/keeper/msg_server_test.go b/x/govshuttle/keeper/msg_server_test.go index 3672404a..7253f3a9 100644 --- a/x/govshuttle/keeper/msg_server_test.go +++ b/x/govshuttle/keeper/msg_server_test.go @@ -5,7 +5,7 @@ import ( "testing" //sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" //"github.com/Canto-Network/Canto/v2/x/govshuttle/keeper" //keepertest "github.com/Canto-Network/Canto/v2/testutil/keeper" ) diff --git a/x/govshuttle/keeper/params.go b/x/govshuttle/keeper/params.go index 2d667775..8e4d90f6 100644 --- a/x/govshuttle/keeper/params.go +++ b/x/govshuttle/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/govshuttle/keeper/proposals.go b/x/govshuttle/keeper/proposals.go index 6c9e0ff8..9e592b91 100644 --- a/x/govshuttle/keeper/proposals.go +++ b/x/govshuttle/keeper/proposals.go @@ -3,18 +3,18 @@ package keeper import ( "math/big" - "github.com/Canto-Network/Canto/v6/contracts" + "github.com/Canto-Network/Canto/v7/contracts" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" - erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types" + erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) -//method for appending govshuttle proposal types to the govshuttle Map contract +// method for appending govshuttle proposal types to the govshuttle Map contract func (k *Keeper) AppendLendingMarketProposal(ctx sdk.Context, lm *types.LendingMarketProposal) (*types.LendingMarketProposal, error) { m := lm.GetMetadata() var err error diff --git a/x/govshuttle/module.go b/x/govshuttle/module.go index 5795e7cf..66d460c8 100644 --- a/x/govshuttle/module.go +++ b/x/govshuttle/module.go @@ -12,9 +12,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/Canto-Network/Canto/v6/x/govshuttle/client/cli" - "github.com/Canto-Network/Canto/v6/x/govshuttle/keeper" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/client/cli" + "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/govshuttle/module_simulation.go b/x/govshuttle/module_simulation.go index caf81399..0fa01a22 100644 --- a/x/govshuttle/module_simulation.go +++ b/x/govshuttle/module_simulation.go @@ -4,8 +4,8 @@ import ( "math/rand" //"github.com/Canto-Network/Canto/v2/testutil/sample" - govshuttlesimulation "github.com/Canto-Network/Canto/v6/x/govshuttle/simulation" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + govshuttlesimulation "github.com/Canto-Network/Canto/v7/x/govshuttle/simulation" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" "github.com/cosmos/cosmos-sdk/baseapp" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/govshuttle/proposal_handler.go b/x/govshuttle/proposal_handler.go index 16bedde1..62eaefee 100644 --- a/x/govshuttle/proposal_handler.go +++ b/x/govshuttle/proposal_handler.go @@ -1,14 +1,14 @@ package govshuttle import ( - "github.com/Canto-Network/Canto/v6/x/govshuttle/keeper" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) -//Return governance handler to process Compound Proposal +// Return governance handler to process Compound Proposal func NewgovshuttleProposalHandler(k *keeper.Keeper) govtypes.Handler { return func(ctx sdk.Context, content govtypes.Content) error { switch c := content.(type) { @@ -36,7 +36,7 @@ func handleLendingMarketProposal(ctx sdk.Context, k *keeper.Keeper, p *types.Len return nil } -//governance proposal handler +// governance proposal handler func handleTreasuryProposal(ctx sdk.Context, k *keeper.Keeper, tp *types.TreasuryProposal) error { err := tp.ValidateBasic() if err != nil { diff --git a/x/govshuttle/types/genesis_test.go b/x/govshuttle/types/genesis_test.go index 70ee0b46..91c325c1 100644 --- a/x/govshuttle/types/genesis_test.go +++ b/x/govshuttle/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/Canto-Network/Canto/v6/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" "github.com/stretchr/testify/require" ) diff --git a/x/inflation/client/cli/query.go b/x/inflation/client/cli/query.go index 20cbe2ab..13fd81cb 100644 --- a/x/inflation/client/cli/query.go +++ b/x/inflation/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" ) diff --git a/x/inflation/genesis.go b/x/inflation/genesis.go index d09fb5a1..3c96fdc5 100644 --- a/x/inflation/genesis.go +++ b/x/inflation/genesis.go @@ -1,8 +1,8 @@ package inflation import ( - "github.com/Canto-Network/Canto/v6/x/inflation/keeper" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/keeper" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/epoch_info.go b/x/inflation/keeper/epoch_info.go index 1408294e..a5bc5603 100644 --- a/x/inflation/keeper/epoch_info.go +++ b/x/inflation/keeper/epoch_info.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/epoch_info_test.go b/x/inflation/keeper/epoch_info_test.go index 9822d7e6..bc457546 100644 --- a/x/inflation/keeper/epoch_info_test.go +++ b/x/inflation/keeper/epoch_info_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "fmt" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestSetGetEpochIdentifier() { diff --git a/x/inflation/keeper/epoch_mint_provisions.go b/x/inflation/keeper/epoch_mint_provisions.go index 70892a52..e6f0ac9d 100644 --- a/x/inflation/keeper/epoch_mint_provisions.go +++ b/x/inflation/keeper/epoch_mint_provisions.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/keeper/grpc_query.go b/x/inflation/keeper/grpc_query.go index e562473b..b7781afc 100644 --- a/x/inflation/keeper/grpc_query.go +++ b/x/inflation/keeper/grpc_query.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/inflation/keeper/grpc_query_test.go b/x/inflation/keeper/grpc_query_test.go index 4add8fe3..80d5aa3a 100644 --- a/x/inflation/keeper/grpc_query_test.go +++ b/x/inflation/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ethermint "github.com/evmos/ethermint/types" ) diff --git a/x/inflation/keeper/hooks.go b/x/inflation/keeper/hooks.go index bafd044e..d6926e3b 100644 --- a/x/inflation/keeper/hooks.go +++ b/x/inflation/keeper/hooks.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/inflation/keeper/hooks_test.go b/x/inflation/keeper/hooks_test.go index d8d05aeb..3d3bda94 100644 --- a/x/inflation/keeper/hooks_test.go +++ b/x/inflation/keeper/hooks_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestEpochIdentifierAfterEpochEnd() { diff --git a/x/inflation/keeper/inflation.go b/x/inflation/keeper/inflation.go index 78034c5e..c3c8ecc5 100644 --- a/x/inflation/keeper/inflation.go +++ b/x/inflation/keeper/inflation.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) // MintAndAllocateInflation performs inflation minting and allocation diff --git a/x/inflation/keeper/inflation_test.go b/x/inflation/keeper/inflation_test.go index c8f379e2..ca0d234d 100644 --- a/x/inflation/keeper/inflation_test.go +++ b/x/inflation/keeper/inflation_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "fmt" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ethermint "github.com/evmos/ethermint/types" diff --git a/x/inflation/keeper/integration_test.go b/x/inflation/keeper/integration_test.go index 1f64b908..83d2abe7 100644 --- a/x/inflation/keeper/integration_test.go +++ b/x/inflation/keeper/integration_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" diff --git a/x/inflation/keeper/keeper.go b/x/inflation/keeper/keeper.go index a73db52d..d0d6e6f4 100644 --- a/x/inflation/keeper/keeper.go +++ b/x/inflation/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) // Keeper of the inflation store diff --git a/x/inflation/keeper/keeper_test.go b/x/inflation/keeper/keeper_test.go index 49e631e0..ea7ba41e 100644 --- a/x/inflation/keeper/keeper_test.go +++ b/x/inflation/keeper/keeper_test.go @@ -22,9 +22,9 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/Canto-Network/Canto/v6/app" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/app" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/inflation/keeper/migrations.go b/x/inflation/keeper/migrations.go index 12ae2aeb..81983bcf 100644 --- a/x/inflation/keeper/migrations.go +++ b/x/inflation/keeper/migrations.go @@ -1,7 +1,7 @@ package keeper import ( - v2 "github.com/Canto-Network/Canto/v6/x/inflation/migrations/v2" + v2 "github.com/Canto-Network/Canto/v7/x/inflation/migrations/v2" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" ) diff --git a/x/inflation/keeper/params.go b/x/inflation/keeper/params.go index 3412fc7a..3c4662df 100644 --- a/x/inflation/keeper/params.go +++ b/x/inflation/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) // GetParams returns the total set of inflation parameters. diff --git a/x/inflation/keeper/params_test.go b/x/inflation/keeper/params_test.go index a65f3e87..296f174c 100644 --- a/x/inflation/keeper/params_test.go +++ b/x/inflation/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/inflation/keeper/periods.go b/x/inflation/keeper/periods.go index 3f384172..e8ab0781 100644 --- a/x/inflation/keeper/periods.go +++ b/x/inflation/keeper/periods.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/migrations/v2/migration.go b/x/inflation/migrations/v2/migration.go index 6210f938..8411aa7d 100644 --- a/x/inflation/migrations/v2/migration.go +++ b/x/inflation/migrations/v2/migration.go @@ -1,7 +1,7 @@ package v7 import ( - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/inflation/module.go b/x/inflation/module.go index 04095b2f..7d8cb58d 100644 --- a/x/inflation/module.go +++ b/x/inflation/module.go @@ -19,9 +19,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/Canto-Network/Canto/v6/x/inflation/client/cli" - "github.com/Canto-Network/Canto/v6/x/inflation/keeper" - "github.com/Canto-Network/Canto/v6/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/inflation/client/cli" + "github.com/Canto-Network/Canto/v7/x/inflation/keeper" + "github.com/Canto-Network/Canto/v7/x/inflation/types" ) // type check to ensure the interface is properly implemented diff --git a/x/inflation/types/genesis.go b/x/inflation/types/genesis.go index d5b3197b..c6045817 100644 --- a/x/inflation/types/genesis.go +++ b/x/inflation/types/genesis.go @@ -3,7 +3,7 @@ package types import ( fmt "fmt" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" ) // NewGenesisState creates a new GenesisState object diff --git a/x/inflation/types/genesis_test.go b/x/inflation/types/genesis_test.go index fc954071..a0dc2f75 100644 --- a/x/inflation/types/genesis_test.go +++ b/x/inflation/types/genesis_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - epochstypes "github.com/Canto-Network/Canto/v6/x/epochs/types" + epochstypes "github.com/Canto-Network/Canto/v7/x/epochs/types" "github.com/stretchr/testify/suite" ) diff --git a/x/onboarding/client/cli/query.go b/x/onboarding/client/cli/query.go index 820bd417..a5112adb 100644 --- a/x/onboarding/client/cli/query.go +++ b/x/onboarding/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) // GetQueryCmd returns the parent command for all onboarding CLI query commands. diff --git a/x/onboarding/genesis.go b/x/onboarding/genesis.go index 124517b6..b08a7998 100644 --- a/x/onboarding/genesis.go +++ b/x/onboarding/genesis.go @@ -3,8 +3,8 @@ package onboarding import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/keeper" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/keeper" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) // InitGenesis import module genesis diff --git a/x/onboarding/genesis_test.go b/x/onboarding/genesis_test.go index a26967aa..7cd91280 100644 --- a/x/onboarding/genesis_test.go +++ b/x/onboarding/genesis_test.go @@ -17,9 +17,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/x/onboarding" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/onboarding" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) type GenesisTestSuite struct { diff --git a/x/onboarding/ibc_middleware.go b/x/onboarding/ibc_middleware.go index 5af8f584..32df9e27 100644 --- a/x/onboarding/ibc_middleware.go +++ b/x/onboarding/ibc_middleware.go @@ -8,8 +8,8 @@ import ( porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" "github.com/cosmos/ibc-go/v3/modules/core/exported" - "github.com/Canto-Network/Canto/v6/ibc" - "github.com/Canto-Network/Canto/v6/x/onboarding/keeper" + "github.com/Canto-Network/Canto/v7/ibc" + "github.com/Canto-Network/Canto/v7/x/onboarding/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/onboarding/ibc_module_test.go b/x/onboarding/ibc_module_test.go index 26c58671..e377897a 100644 --- a/x/onboarding/ibc_module_test.go +++ b/x/onboarding/ibc_module_test.go @@ -15,12 +15,12 @@ import ( "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/contracts" - ibctesting "github.com/Canto-Network/Canto/v6/ibc/testing" - coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types" - inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types" - onboardingtest "github.com/Canto-Network/Canto/v6/x/onboarding/testutil" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/contracts" + ibctesting "github.com/Canto-Network/Canto/v7/ibc/testing" + coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" + onboardingtest "github.com/Canto-Network/Canto/v7/x/onboarding/testutil" ) var ( diff --git a/x/onboarding/keeper/grpc_query.go b/x/onboarding/keeper/grpc_query.go index 3ea85a73..704b8234 100644 --- a/x/onboarding/keeper/grpc_query.go +++ b/x/onboarding/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/onboarding/keeper/grpc_query_test.go b/x/onboarding/keeper/grpc_query_test.go index a44ecd99..17f79563 100644 --- a/x/onboarding/keeper/grpc_query_test.go +++ b/x/onboarding/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) func (suite *KeeperTestSuite) TestQueryParams() { diff --git a/x/onboarding/keeper/ibc_callbacks.go b/x/onboarding/keeper/ibc_callbacks.go index 90ee284b..5ef388b0 100644 --- a/x/onboarding/keeper/ibc_callbacks.go +++ b/x/onboarding/keeper/ibc_callbacks.go @@ -14,10 +14,10 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/ibc" - coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types" - erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/ibc" + coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types" + erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) // OnRecvPacket performs an IBC receive callback. diff --git a/x/onboarding/keeper/ibc_callbacks_integration_suite_test.go b/x/onboarding/keeper/ibc_callbacks_integration_suite_test.go index fa058793..68ef1fc4 100644 --- a/x/onboarding/keeper/ibc_callbacks_integration_suite_test.go +++ b/x/onboarding/keeper/ibc_callbacks_integration_suite_test.go @@ -17,13 +17,13 @@ import ( clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - "github.com/Canto-Network/Canto/v6/app" - ibcgotesting "github.com/Canto-Network/Canto/v6/ibc/testing" - coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types" - erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types" - inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types" - onboardingtest "github.com/Canto-Network/Canto/v6/x/onboarding/testutil" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/app" + ibcgotesting "github.com/Canto-Network/Canto/v7/ibc/testing" + coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types" + erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" + onboardingtest "github.com/Canto-Network/Canto/v7/x/onboarding/testutil" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) type IBCTestingSuite struct { diff --git a/x/onboarding/keeper/ibc_callbacks_integration_test.go b/x/onboarding/keeper/ibc_callbacks_integration_test.go index 31cae6f6..7ee79090 100644 --- a/x/onboarding/keeper/ibc_callbacks_integration_test.go +++ b/x/onboarding/keeper/ibc_callbacks_integration_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/x/erc20/types" - onboardingtest "github.com/Canto-Network/Canto/v6/x/onboarding/testutil" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/x/erc20/types" + onboardingtest "github.com/Canto-Network/Canto/v7/x/onboarding/testutil" ) var _ = Describe("Onboarding: Performing an IBC Transfer followed by autoswap and convert", Ordered, func() { diff --git a/x/onboarding/keeper/ibc_callbacks_test.go b/x/onboarding/keeper/ibc_callbacks_test.go index fcab42f8..cbda4500 100644 --- a/x/onboarding/keeper/ibc_callbacks_test.go +++ b/x/onboarding/keeper/ibc_callbacks_test.go @@ -20,14 +20,14 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v3/testing" ibcmock "github.com/cosmos/ibc-go/v3/testing/mock" - "github.com/Canto-Network/Canto/v6/contracts" - "github.com/Canto-Network/Canto/v6/testutil" - coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types" - erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types" - inflationtypes "github.com/Canto-Network/Canto/v6/x/inflation/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/keeper" - onboardingtest "github.com/Canto-Network/Canto/v6/x/onboarding/testutil" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/testutil" + coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types" + erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/keeper" + onboardingtest "github.com/Canto-Network/Canto/v7/x/onboarding/testutil" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) var ( diff --git a/x/onboarding/keeper/keeper.go b/x/onboarding/keeper/keeper.go index 8d701e7c..28d55203 100644 --- a/x/onboarding/keeper/keeper.go +++ b/x/onboarding/keeper/keeper.go @@ -13,7 +13,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" "github.com/cosmos/ibc-go/v3/modules/core/exported" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) var _ transfertypes.ICS4Wrapper = Keeper{} diff --git a/x/onboarding/keeper/keeper_test.go b/x/onboarding/keeper/keeper_test.go index e5ed1574..9710259f 100644 --- a/x/onboarding/keeper/keeper_test.go +++ b/x/onboarding/keeper/keeper_test.go @@ -20,8 +20,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/evmos/ethermint/crypto/ethsecp256k1" - "github.com/Canto-Network/Canto/v6/app" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) type KeeperTestSuite struct { diff --git a/x/onboarding/keeper/params.go b/x/onboarding/keeper/params.go index 91973fb1..a0fc7abc 100644 --- a/x/onboarding/keeper/params.go +++ b/x/onboarding/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) // GetParams returns the total set of onboarding parameters. diff --git a/x/onboarding/keeper/utils_test.go b/x/onboarding/keeper/utils_test.go index dbe01f33..d4180afd 100644 --- a/x/onboarding/keeper/utils_test.go +++ b/x/onboarding/keeper/utils_test.go @@ -11,7 +11,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) var _ types.TransferKeeper = &MockTransferKeeper{} diff --git a/x/onboarding/module.go b/x/onboarding/module.go index b7394b40..32b06f9d 100644 --- a/x/onboarding/module.go +++ b/x/onboarding/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/Canto-Network/Canto/v6/x/onboarding/client/cli" - "github.com/Canto-Network/Canto/v6/x/onboarding/keeper" - "github.com/Canto-Network/Canto/v6/x/onboarding/types" + "github.com/Canto-Network/Canto/v7/x/onboarding/client/cli" + "github.com/Canto-Network/Canto/v7/x/onboarding/keeper" + "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) // type check to ensure the interface is properly implemented diff --git a/x/onboarding/testutil/helpers.go b/x/onboarding/testutil/helpers.go index ed77d493..5d8b7d81 100644 --- a/x/onboarding/testutil/helpers.go +++ b/x/onboarding/testutil/helpers.go @@ -3,7 +3,8 @@ package testutil import ( "bytes" "fmt" - ibcgotesting "github.com/Canto-Network/Canto/v6/ibc/testing" + + ibcgotesting "github.com/Canto-Network/Canto/v7/ibc/testing" sdk "github.com/cosmos/cosmos-sdk/types" channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" "golang.org/x/exp/slices" diff --git a/x/onboarding/types/interfaces.go b/x/onboarding/types/interfaces.go index 353125b6..04865659 100644 --- a/x/onboarding/types/interfaces.go +++ b/x/onboarding/types/interfaces.go @@ -18,8 +18,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - coinswaptypes "github.com/Canto-Network/Canto/v6/x/coinswap/types" - erc20types "github.com/Canto-Network/Canto/v6/x/erc20/types" + coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types" + erc20types "github.com/Canto-Network/Canto/v7/x/erc20/types" ) type Erc20Keeper interface {