diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 840c69685..297e46b25 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 f518e1b8a..072fa4fac 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 8d56d9b8e..6864a9ef2 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 ccab803d3..3d488010a 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 14da5c99b..00c710229 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 2a002cffb..bbac1d061 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 900bc67c7..71eff2868 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 5abf04535..55ce34f92 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 1b819f066..edfa45ed0 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 1adb55ed2..6b579c30b 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 17a2eb08b..fdb80311c 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 13835d601..12efafe94 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 b6d5fba29..4f9e899c0 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 104488570..e017b5b7a 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 4ae7feb88..fd9606c38 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 41017c8ec..4bd1dadd3 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 d2df9479b..493e4f258 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 9fb24742f..babbb8fe9 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 417c85e2b..dbb862609 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 d4a8791b2..ce1ef4b9a 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 c26ad3b90..747a24669 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 f41bf2f62..8b03ac88f 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 d2a48be1a..e7e4c6732 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 8d6bd992e..1d219faa6 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 5db4b9853..85744b982 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 ad20c3dba..3f0616e9f 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 16fb763b5..d9370ecdd 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 18f6b1f16..9fa7c2195 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 2d442be73..de12d84bd 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 1ee819ee0..a6c6f0f96 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 ed4386bb2..abe55d6fb 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 638cef80c..ef5b96f5c 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 6abc9cf93..b96995b33 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 6af3b1d70..1b7b29d3f 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 d5afd73b0..e34450494 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 371f6d5f5..5bc4b9a87 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 f6dc8db3a..98eb34ddd 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 38b54148a..7c04a03c2 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 dfcb6bcff..2cfe96ec5 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 609aacfd3..a1d9bab28 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 83c4e8d41..a9cd9bd68 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 333d6ae23..2de7eb0be 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 30549d67f..169230af9 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 07c266d23..1caaf1af0 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 0952d0e8e..81769cb54 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 b8f2100bf..fb5fb2661 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 e1858059e..d1c7c20e3 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 452443d9a..e7276ca3b 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 d32174483..39ae9b97b 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 965e0b91c..5b85ebc32 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 b7f6b894d..f36fe5247 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 98da07515..d554c109e 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 5c3a4ff25..ecba0e333 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 726e04a5c..d4ee3d35e 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 6bd0e4238..fc7ea892c 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 bbe14930f..48c3b7f2a 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 2ad786334..d141f817c 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 080356427..1cca3d7b1 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 fc22d6826..022971122 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 bda6ba2d1..fe715cac3 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 ae7b7e650..9b2d456f6 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 10fa35486..69344965f 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 b25a86fe9..2264bc9c7 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 67e04ef91..9a441988c 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 2c0df6623..e6042ec44 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 10dca185c..17b280e88 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 241adffd5..d00e72189 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 c9879bc15..7b2badc7f 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/coinswap/types/coinswap.pb.go b/x/coinswap/types/coinswap.pb.go index d1bcc2d50..005647a2f 100644 --- a/x/coinswap/types/coinswap.pb.go +++ b/x/coinswap/types/coinswap.pb.go @@ -202,7 +202,7 @@ var fileDescriptor_b57883b6d1fc5094 = []byte{ // 536 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xc1, 0x6f, 0x12, 0x4f, 0x14, 0xc7, 0x77, 0x81, 0x52, 0x98, 0x5f, 0x4a, 0xc3, 0xe4, 0x17, 0x83, 0x98, 0x2c, 0x84, 0xa4, - 0x86, 0x0b, 0xbb, 0xd2, 0x26, 0x1e, 0xbc, 0xb5, 0x34, 0x26, 0xc4, 0x44, 0xc9, 0x9a, 0x68, 0xa2, + 0x86, 0x0b, 0xbb, 0xd2, 0x1e, 0x4c, 0xbc, 0xb5, 0x34, 0x26, 0xc4, 0x44, 0xc9, 0x9a, 0x68, 0xa2, 0x87, 0xcd, 0x63, 0x77, 0xc4, 0xb5, 0xec, 0xce, 0x64, 0x66, 0x80, 0xed, 0x7f, 0xe1, 0xd1, 0x63, 0xcf, 0x9e, 0xfc, 0x33, 0x38, 0xf6, 0x68, 0x3c, 0x54, 0x85, 0x4b, 0xff, 0x0c, 0x33, 0x33, 0x0b, 0xf6, 0xd4, 0xb4, 0x07, 0x4f, 0xcc, 0x3c, 0xbe, 0xef, 0xfb, 0x99, 0xf7, 0xde, 0x3e, 0xd4, 0x0e, @@ -233,7 +233,7 @@ var fileDescriptor_b57883b6d1fc5094 = []byte{ 0xbf, 0x56, 0x8e, 0xfd, 0x79, 0xed, 0x58, 0x97, 0x6b, 0xc7, 0xfa, 0xbe, 0x76, 0xac, 0x77, 0x87, 0x37, 0x00, 0x03, 0xb5, 0xc0, 0xbd, 0x97, 0x44, 0x2e, 0x28, 0x3f, 0x33, 0x37, 0x6f, 0xfe, 0xd4, 0xcb, 0xfe, 0x6e, 0xbd, 0x06, 0x8e, 0xcb, 0x7a, 0x4f, 0x8f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, - 0x0d, 0x5d, 0x56, 0x1a, 0x14, 0x04, 0x00, 0x00, + 0x9a, 0xfb, 0x4b, 0xfd, 0x14, 0x04, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/coinswap/types/genesis.pb.go b/x/coinswap/types/genesis.pb.go index 65c684fa7..c1552b2ba 100644 --- a/x/coinswap/types/genesis.pb.go +++ b/x/coinswap/types/genesis.pb.go @@ -116,9 +116,9 @@ var fileDescriptor_c9ad4016b090c47e = []byte{ 0x60, 0xd4, 0x60, 0x09, 0x82, 0xf3, 0x9d, 0x7c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x28, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xdf, 0x19, - 0x64, 0x89, 0xae, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, 0x84, 0xa7, 0x5f, 0x66, 0xa6, 0x5f, + 0x64, 0x89, 0xae, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, 0x84, 0xa7, 0x5f, 0x66, 0xae, 0x5f, 0x81, 0x08, 0xb4, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x78, 0x19, 0x03, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x20, 0x0f, 0x83, 0xd9, 0x9d, 0x01, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xb7, 0xa9, 0x9e, 0x3e, 0x9d, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/coinswap/types/query.pb.go b/x/coinswap/types/query.pb.go index c5131dcb6..3747d0422 100644 --- a/x/coinswap/types/query.pb.go +++ b/x/coinswap/types/query.pb.go @@ -411,44 +411,44 @@ var fileDescriptor_670b91810fb3a899 = []byte{ // 632 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4f, 0x6f, 0xd3, 0x3e, 0x18, 0xc7, 0x9b, 0x76, 0xad, 0x36, 0xff, 0xb4, 0xe9, 0x87, 0x19, 0x90, 0x75, 0x2c, 0x8c, 0xa0, - 0x8d, 0x3f, 0x62, 0xb1, 0x3a, 0x34, 0x40, 0xe2, 0xc4, 0x86, 0x40, 0x48, 0xd3, 0x34, 0xca, 0x8d, - 0xcb, 0xe4, 0x36, 0x5e, 0x88, 0x96, 0xfa, 0xc9, 0x62, 0xb7, 0x65, 0x42, 0x5c, 0x78, 0x01, 0x08, - 0x89, 0x03, 0x47, 0x5e, 0x00, 0x6f, 0x64, 0xc7, 0x49, 0x5c, 0x38, 0x21, 0xb4, 0xf2, 0x2a, 0x38, - 0xa1, 0xd8, 0x6e, 0xd6, 0xd2, 0xa0, 0xe5, 0xe6, 0xd8, 0xdf, 0xef, 0xf3, 0x7c, 0xfc, 0xf8, 0x79, - 0x82, 0x96, 0xda, 0x94, 0x4b, 0x20, 0x6d, 0x08, 0xb9, 0xe8, 0xd3, 0x98, 0xf4, 0x1a, 0xe4, 0xb0, - 0xcb, 0x92, 0x23, 0x2f, 0x4e, 0x40, 0x02, 0xbe, 0xa0, 0x8e, 0xbd, 0xe1, 0xb1, 0xd7, 0x6b, 0xd4, - 0x9d, 0x36, 0x88, 0x0e, 0x08, 0xd2, 0xa2, 0x82, 0x91, 0x5e, 0xa3, 0xc5, 0x24, 0x6d, 0x28, 0xbf, - 0xb6, 0xd4, 0xe7, 0x03, 0x08, 0x40, 0x2d, 0x49, 0xba, 0x32, 0xbb, 0x57, 0x03, 0x80, 0x20, 0x62, - 0x84, 0xc6, 0x21, 0xa1, 0x9c, 0x83, 0xa4, 0x32, 0x04, 0x2e, 0xcc, 0xe9, 0x9d, 0xd1, 0x98, 0x2a, - 0x7f, 0x16, 0x39, 0xa6, 0x41, 0xc8, 0x95, 0xd8, 0x68, 0x97, 0x27, 0x89, 0x33, 0x3c, 0xa5, 0x70, - 0xe7, 0x11, 0x7e, 0x91, 0xc6, 0xd8, 0xa5, 0x09, 0xed, 0x88, 0x26, 0x3b, 0xec, 0x32, 0x21, 0xdd, - 0x1d, 0x74, 0x71, 0x6c, 0x57, 0xc4, 0xc0, 0x05, 0xc3, 0x0f, 0x50, 0x2d, 0x56, 0x3b, 0xb6, 0xb5, - 0x6c, 0xdd, 0xfa, 0x6f, 0x7d, 0xc1, 0x9b, 0xb8, 0xb2, 0xa7, 0x2d, 0x9b, 0x53, 0xc7, 0x3f, 0xae, - 0x95, 0x9a, 0x46, 0xee, 0x3e, 0x44, 0x0b, 0x2a, 0xde, 0x76, 0x78, 0xd8, 0x0d, 0xfd, 0x50, 0x1e, - 0xed, 0x02, 0x44, 0x26, 0x19, 0x5e, 0x44, 0x33, 0x51, 0x2c, 0xf7, 0x7c, 0xc6, 0xa1, 0xa3, 0x02, - 0xcf, 0x34, 0xa7, 0xa3, 0x58, 0x3e, 0x49, 0xbf, 0xdd, 0x97, 0xa8, 0x9e, 0xe7, 0x34, 0x40, 0x1b, - 0x68, 0x2a, 0x06, 0x88, 0x0c, 0xce, 0x62, 0x1e, 0x0e, 0x40, 0xf4, 0x9c, 0xef, 0x83, 0x01, 0x52, - 0x72, 0xd7, 0xcf, 0x0b, 0x3a, 0xbc, 0x3c, 0x7e, 0x8a, 0xd0, 0x59, 0x21, 0x4d, 0xe8, 0x55, 0x4f, - 0x57, 0xdd, 0x4b, 0xab, 0xee, 0xe9, 0x57, 0x37, 0x55, 0xf7, 0x76, 0x69, 0xc0, 0x8c, 0xb7, 0x39, - 0xe2, 0x74, 0xbf, 0x58, 0x68, 0x31, 0x37, 0x4d, 0x56, 0xcd, 0x6a, 0x4a, 0x93, 0x16, 0xb3, 0x52, - 0x8c, 0x5e, 0xeb, 0xf1, 0xb3, 0x31, 0xc0, 0xb2, 0x02, 0xbc, 0x79, 0x2e, 0xa0, 0xce, 0x3a, 0x46, - 0xf8, 0xdb, 0x42, 0xd3, 0xc3, 0x14, 0x78, 0x0e, 0x95, 0x43, 0xdf, 0xd4, 0xbf, 0x1c, 0xfa, 0x78, - 0x05, 0xcd, 0x31, 0xd1, 0x4e, 0xa0, 0xbf, 0x47, 0x7d, 0x3f, 0x61, 0x42, 0xa8, 0x4c, 0x33, 0xcd, - 0x59, 0xbd, 0xfb, 0x58, 0x6f, 0xe2, 0x47, 0x68, 0x5a, 0x48, 0xca, 0x7d, 0x9a, 0xf8, 0x76, 0x65, - 0xd8, 0x15, 0x23, 0x28, 0x43, 0x88, 0x2d, 0x08, 0xb9, 0xb9, 0x46, 0x66, 0xc0, 0x1b, 0xa8, 0x2a, - 0xe1, 0x80, 0x71, 0x7b, 0xaa, 0x98, 0x53, 0xab, 0x71, 0x03, 0x55, 0xa2, 0x58, 0xda, 0xd5, 0x62, - 0xa6, 0x54, 0x8b, 0xff, 0x47, 0x95, 0x7d, 0xc6, 0xec, 0x9a, 0xba, 0x42, 0xba, 0x5c, 0xff, 0x5a, - 0x41, 0x55, 0xf5, 0x3c, 0xb8, 0x8f, 0x6a, 0xba, 0x6b, 0xf1, 0x4a, 0xce, 0x1b, 0x4c, 0x8e, 0x47, - 0x7d, 0xf5, 0x3c, 0x99, 0xae, 0xb5, 0xeb, 0xbc, 0xff, 0xf6, 0xeb, 0x53, 0xd9, 0xc6, 0x97, 0xc9, - 0x5f, 0x73, 0xa8, 0xc7, 0x02, 0x7f, 0xb6, 0xd0, 0xec, 0x58, 0x73, 0xe0, 0xbb, 0xff, 0x8a, 0x9c, - 0x37, 0x39, 0xf5, 0xb5, 0x82, 0x6a, 0x83, 0x73, 0x5b, 0xe1, 0xdc, 0xc0, 0xd7, 0x27, 0x70, 0xd2, - 0xb6, 0x22, 0x6f, 0xb3, 0x29, 0x7c, 0x87, 0x3f, 0x58, 0x68, 0x6e, 0xbc, 0x6d, 0x71, 0xb1, 0x64, - 0x59, 0x8d, 0xbc, 0xa2, 0x72, 0x03, 0xb7, 0xa4, 0xe0, 0xae, 0xe0, 0x4b, 0xb9, 0x70, 0x9b, 0xdb, - 0xc7, 0xa7, 0x8e, 0x75, 0x72, 0xea, 0x58, 0x3f, 0x4f, 0x1d, 0xeb, 0xe3, 0xc0, 0x29, 0x9d, 0x0c, - 0x9c, 0xd2, 0xf7, 0x81, 0x53, 0x7a, 0xb5, 0x1e, 0x84, 0xf2, 0x75, 0xb7, 0xe5, 0xb5, 0xa1, 0x43, - 0xb6, 0x52, 0xeb, 0xda, 0x0e, 0x93, 0x7d, 0x48, 0x0e, 0xf4, 0x17, 0xe9, 0xdd, 0x27, 0x6f, 0xce, - 0xa2, 0xc9, 0xa3, 0x98, 0x89, 0x56, 0x4d, 0xfd, 0xfc, 0xee, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x7e, 0x04, 0xaa, 0x08, 0xd2, 0x05, 0x00, 0x00, + 0x8d, 0x3f, 0x62, 0xb1, 0x3a, 0x34, 0x0d, 0x89, 0x13, 0x1b, 0x02, 0x21, 0x4d, 0xd3, 0x28, 0x37, + 0x2e, 0x93, 0xdb, 0x78, 0x21, 0x5a, 0xea, 0x27, 0x8b, 0xdd, 0x96, 0x09, 0x71, 0xe1, 0x05, 0x20, + 0x24, 0x0e, 0x1c, 0x79, 0x01, 0xbc, 0x91, 0x1d, 0x27, 0x71, 0xe1, 0x84, 0xd0, 0xca, 0xab, 0xe0, + 0x84, 0x62, 0xbb, 0x59, 0x4b, 0x83, 0x96, 0x9b, 0x63, 0x7f, 0xbf, 0xcf, 0xf3, 0xf1, 0xe3, 0xe7, + 0x09, 0x5a, 0x6a, 0x53, 0x2e, 0x81, 0xb4, 0x21, 0xe4, 0xa2, 0x4f, 0x63, 0xd2, 0x6b, 0x90, 0xa3, + 0x2e, 0x4b, 0x8e, 0xbd, 0x38, 0x01, 0x09, 0xf8, 0x92, 0x3a, 0xf6, 0x86, 0xc7, 0x5e, 0xaf, 0x51, + 0x77, 0xda, 0x20, 0x3a, 0x20, 0x48, 0x8b, 0x0a, 0x46, 0x7a, 0x8d, 0x16, 0x93, 0xb4, 0xa1, 0xfc, + 0xda, 0x52, 0x9f, 0x0f, 0x20, 0x00, 0xb5, 0x24, 0xe9, 0xca, 0xec, 0x5e, 0x0f, 0x00, 0x82, 0x88, + 0x11, 0x1a, 0x87, 0x84, 0x72, 0x0e, 0x92, 0xca, 0x10, 0xb8, 0x30, 0xa7, 0xf7, 0x46, 0x63, 0xaa, + 0xfc, 0x59, 0xe4, 0x98, 0x06, 0x21, 0x57, 0x62, 0xa3, 0x5d, 0x9e, 0x24, 0xce, 0xf0, 0x94, 0xc2, + 0x9d, 0x47, 0xf8, 0x45, 0x1a, 0x63, 0x8f, 0x26, 0xb4, 0x23, 0x9a, 0xec, 0xa8, 0xcb, 0x84, 0x74, + 0x77, 0xd1, 0xe5, 0xb1, 0x5d, 0x11, 0x03, 0x17, 0x0c, 0x6f, 0xa2, 0x5a, 0xac, 0x76, 0x6c, 0x6b, + 0xd9, 0xba, 0xf3, 0xdf, 0xfa, 0x82, 0x37, 0x71, 0x65, 0x4f, 0x5b, 0xb6, 0xa6, 0x4e, 0x7e, 0xdc, + 0x28, 0x35, 0x8d, 0xdc, 0x7d, 0x88, 0x16, 0x54, 0xbc, 0x9d, 0xf0, 0xa8, 0x1b, 0xfa, 0xa1, 0x3c, + 0xde, 0x03, 0x88, 0x4c, 0x32, 0xbc, 0x88, 0x66, 0xa2, 0x58, 0xee, 0xfb, 0x8c, 0x43, 0x47, 0x05, + 0x9e, 0x69, 0x4e, 0x47, 0xb1, 0x7c, 0x92, 0x7e, 0xbb, 0x2f, 0x51, 0x3d, 0xcf, 0x69, 0x80, 0x36, + 0xd0, 0x54, 0x0c, 0x10, 0x19, 0x9c, 0xc5, 0x3c, 0x1c, 0x80, 0xe8, 0x39, 0x3f, 0x00, 0x03, 0xa4, + 0xe4, 0xae, 0x9f, 0x17, 0x74, 0x78, 0x79, 0xfc, 0x14, 0xa1, 0xf3, 0x42, 0x9a, 0xd0, 0xab, 0x9e, + 0xae, 0xba, 0x97, 0x56, 0xdd, 0xd3, 0xaf, 0x6e, 0xaa, 0xee, 0xed, 0xd1, 0x80, 0x19, 0x6f, 0x73, + 0xc4, 0xe9, 0x7e, 0xb1, 0xd0, 0x62, 0x6e, 0x9a, 0xac, 0x9a, 0xd5, 0x94, 0x26, 0x2d, 0x66, 0xa5, + 0x18, 0xbd, 0xd6, 0xe3, 0x67, 0x63, 0x80, 0x65, 0x05, 0x78, 0xfb, 0x42, 0x40, 0x9d, 0x75, 0x8c, + 0xf0, 0xb7, 0x85, 0xa6, 0x87, 0x29, 0xf0, 0x1c, 0x2a, 0x87, 0xbe, 0xa9, 0x7f, 0x39, 0xf4, 0xf1, + 0x0a, 0x9a, 0x63, 0xa2, 0x9d, 0x40, 0x7f, 0x9f, 0xfa, 0x7e, 0xc2, 0x84, 0x50, 0x99, 0x66, 0x9a, + 0xb3, 0x7a, 0xf7, 0xb1, 0xde, 0xc4, 0x8f, 0xd0, 0xb4, 0x90, 0x94, 0xfb, 0x34, 0xf1, 0xed, 0xca, + 0xb0, 0x2b, 0x46, 0x50, 0x86, 0x10, 0xdb, 0x10, 0x72, 0x73, 0x8d, 0xcc, 0x80, 0x37, 0x50, 0x55, + 0xc2, 0x21, 0xe3, 0xf6, 0x54, 0x31, 0xa7, 0x56, 0xe3, 0x06, 0xaa, 0x44, 0xb1, 0xb4, 0xab, 0xc5, + 0x4c, 0xa9, 0x16, 0xff, 0x8f, 0x2a, 0x07, 0x8c, 0xd9, 0x35, 0x75, 0x85, 0x74, 0xb9, 0xfe, 0xb5, + 0x82, 0xaa, 0xea, 0x79, 0x70, 0x1f, 0xd5, 0x74, 0xd7, 0xe2, 0x95, 0x9c, 0x37, 0x98, 0x1c, 0x8f, + 0xfa, 0xea, 0x45, 0x32, 0x5d, 0x6b, 0xd7, 0x79, 0xff, 0xed, 0xd7, 0xa7, 0xb2, 0x8d, 0xaf, 0x92, + 0xbf, 0xe6, 0x50, 0x8f, 0x05, 0xfe, 0x6c, 0xa1, 0xd9, 0xb1, 0xe6, 0xc0, 0xf7, 0xff, 0x15, 0x39, + 0x6f, 0x72, 0xea, 0x6b, 0x05, 0xd5, 0x06, 0xe7, 0xae, 0xc2, 0xb9, 0x85, 0x6f, 0x4e, 0xe0, 0xa4, + 0x6d, 0x45, 0xde, 0x66, 0x53, 0xf8, 0x0e, 0x7f, 0xb0, 0xd0, 0xdc, 0x78, 0xdb, 0xe2, 0x62, 0xc9, + 0xb2, 0x1a, 0x79, 0x45, 0xe5, 0x06, 0x6e, 0x49, 0xc1, 0x5d, 0xc3, 0x57, 0x72, 0xe1, 0xb6, 0x76, + 0x4e, 0xce, 0x1c, 0xeb, 0xf4, 0xcc, 0xb1, 0x7e, 0x9e, 0x39, 0xd6, 0xc7, 0x81, 0x53, 0x3a, 0x1d, + 0x38, 0xa5, 0xef, 0x03, 0xa7, 0xf4, 0x6a, 0x3d, 0x08, 0xe5, 0xeb, 0x6e, 0xcb, 0x6b, 0x43, 0x87, + 0x6c, 0xa7, 0xd6, 0xb5, 0x5d, 0x26, 0xfb, 0x90, 0x1c, 0xea, 0x2f, 0xd2, 0xdb, 0x24, 0x6f, 0xce, + 0xa3, 0xc9, 0xe3, 0x98, 0x89, 0x56, 0x4d, 0xfd, 0xfc, 0x1e, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, + 0xe9, 0xa2, 0xb7, 0xef, 0xd2, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/coinswap/types/tx.pb.go b/x/coinswap/types/tx.pb.go index c89ac0438..f4410833a 100644 --- a/x/coinswap/types/tx.pb.go +++ b/x/coinswap/types/tx.pb.go @@ -280,52 +280,52 @@ func init() { func init() { proto.RegisterFile("canto/coinswap/v1/tx.proto", fileDescriptor_003205f46878c077) } var fileDescriptor_003205f46878c077 = []byte{ - // 706 bytes of a gzipped FileDescriptorProto + // 707 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcb, 0x4e, 0xdb, 0x40, 0x14, 0x8d, 0x13, 0x40, 0x61, 0x1a, 0x20, 0x18, 0x5a, 0x8c, 0x17, 0x4e, 0x6a, 0xa9, 0x08, 0x55, - 0xc2, 0x16, 0xb4, 0xea, 0x6b, 0x55, 0x8c, 0x54, 0x09, 0xb5, 0x29, 0xc8, 0xe9, 0xaa, 0x0b, 0xac, - 0x49, 0x3c, 0x32, 0xa3, 0xe0, 0x99, 0xd4, 0x33, 0x79, 0x7d, 0x43, 0x37, 0xfd, 0x87, 0xfe, 0x0c, - 0x4b, 0x16, 0x5d, 0x54, 0x5d, 0x44, 0x2d, 0xfc, 0x01, 0x3f, 0xd0, 0x6a, 0xec, 0x89, 0xf3, 0xa2, - 0x85, 0x74, 0x95, 0x99, 0xb9, 0xe7, 0xbe, 0xce, 0xb9, 0x37, 0x06, 0x7a, 0x1d, 0x12, 0x4e, 0xed, - 0x3a, 0xc5, 0x84, 0x75, 0x60, 0xd3, 0x6e, 0xef, 0xda, 0xbc, 0x6b, 0x35, 0x23, 0xca, 0xa9, 0xba, - 0x1a, 0xdb, 0xac, 0x81, 0xcd, 0x6a, 0xef, 0xea, 0xe5, 0x69, 0x78, 0x6a, 0x8e, 0x9d, 0x74, 0xa3, - 0x4e, 0x59, 0x48, 0x99, 0x5d, 0x83, 0x0c, 0xd9, 0xed, 0xdd, 0x1a, 0xe2, 0x30, 0xc1, 0x48, 0xfb, - 0x7a, 0x40, 0x03, 0x1a, 0x1f, 0x6d, 0x71, 0x4a, 0x5e, 0xcd, 0xdf, 0x59, 0xb0, 0x52, 0x61, 0xc1, - 0xbe, 0xef, 0xbf, 0xc3, 0x9f, 0x5a, 0xd8, 0xc7, 0xbc, 0xa7, 0x1e, 0x83, 0xc5, 0x10, 0x76, 0x3d, - 0x4e, 0x1b, 0x88, 0x68, 0x4a, 0x59, 0xd9, 0xbe, 0xb7, 0xb7, 0x69, 0x25, 0xd1, 0x2d, 0x11, 0xdd, - 0x92, 0xd1, 0xad, 0x03, 0x8a, 0x89, 0xa3, 0x9d, 0xf7, 0x4b, 0x99, 0xeb, 0x7e, 0xa9, 0xd8, 0x83, - 0xe1, 0xd9, 0x2b, 0x33, 0xf5, 0x34, 0xdd, 0x7c, 0x08, 0xbb, 0x1f, 0xc4, 0x51, 0xed, 0x01, 0x15, - 0x75, 0x61, 0x9d, 0x7b, 0x8c, 0x43, 0xe2, 0xc3, 0xc8, 0xf7, 0x60, 0xc8, 0xb5, 0x6c, 0x59, 0xd9, - 0x5e, 0x74, 0xde, 0x0a, 0xff, 0x1f, 0xfd, 0xd2, 0x56, 0x80, 0xf9, 0x69, 0xab, 0x66, 0xd5, 0x69, - 0x68, 0xcb, 0x56, 0x92, 0x9f, 0x1d, 0xe6, 0x37, 0x6c, 0xde, 0x6b, 0x22, 0x66, 0x1d, 0x12, 0x7e, - 0xdd, 0x2f, 0x6d, 0x26, 0x99, 0xa6, 0x23, 0x9a, 0x6e, 0x31, 0x7e, 0xac, 0xca, 0xb7, 0xfd, 0x90, - 0xab, 0x0d, 0xb0, 0x14, 0x62, 0xe2, 0x9d, 0x0d, 0xba, 0xd3, 0x72, 0x71, 0xd6, 0x37, 0x33, 0x67, - 0x5d, 0x97, 0xfd, 0x8d, 0x06, 0x33, 0xdd, 0x42, 0x88, 0xc9, 0x90, 0x39, 0x1d, 0xe4, 0x7d, 0x04, - 0xfd, 0x33, 0x4c, 0x90, 0x36, 0x57, 0x56, 0xb6, 0x73, 0x6e, 0x7a, 0x57, 0x1f, 0x80, 0x05, 0x86, - 0x88, 0x8f, 0x22, 0x6d, 0x5e, 0x54, 0xe0, 0xca, 0x9b, 0x59, 0x05, 0x1b, 0x13, 0x02, 0xb8, 0x88, - 0x35, 0x29, 0x61, 0x48, 0x7d, 0x01, 0x40, 0x88, 0x09, 0xbf, 0xa3, 0x12, 0xee, 0xa2, 0x00, 0xc7, - 0x84, 0x9b, 0x9f, 0x73, 0x40, 0xad, 0xb0, 0xc0, 0x45, 0x21, 0x6d, 0xa3, 0x61, 0x7d, 0x0d, 0xa0, - 0x76, 0x30, 0x3f, 0xf5, 0x23, 0xd8, 0x19, 0x61, 0xe4, 0x56, 0x89, 0x1f, 0x4a, 0x89, 0x25, 0xf1, - 0xd3, 0x21, 0x4c, 0x77, 0x75, 0xf0, 0x38, 0x4c, 0xe6, 0x01, 0x51, 0x90, 0x2c, 0x3e, 0xd1, 0xda, - 0x99, 0x99, 0xf5, 0xe2, 0x90, 0xf5, 0x74, 0xaa, 0x30, 0x49, 0xa6, 0x8a, 0x81, 0xa2, 0x78, 0x1f, - 0x9b, 0xa9, 0x44, 0xdd, 0xc3, 0x99, 0xf3, 0x6c, 0x0c, 0xf3, 0x8c, 0x4f, 0xd4, 0x72, 0x88, 0xc9, - 0xe8, 0x3c, 0xfd, 0x8f, 0xc4, 0x27, 0x40, 0x9f, 0x16, 0x23, 0x55, 0xf9, 0x35, 0x58, 0x4e, 0x19, - 0x8d, 0x77, 0x5a, 0x53, 0xca, 0xb9, 0x7f, 0x2b, 0xbd, 0x34, 0x70, 0x10, 0x37, 0x66, 0x7e, 0x53, - 0x40, 0xa1, 0xc2, 0x82, 0x6a, 0x07, 0x36, 0x8f, 0x22, 0x1f, 0x45, 0xea, 0x53, 0x30, 0x8f, 0x49, - 0xb3, 0xc5, 0xa5, 0xb4, 0x9a, 0x35, 0xf5, 0x87, 0x62, 0x1d, 0x0a, 0xbb, 0x33, 0x27, 0x88, 0x72, - 0x13, 0xb0, 0xfa, 0x1c, 0x2c, 0xd0, 0x16, 0x17, 0x6e, 0xd9, 0xc1, 0x44, 0x4c, 0xb9, 0x1d, 0xc5, - 0x00, 0xe9, 0x27, 0xe1, 0x63, 0x9c, 0xe4, 0x26, 0x38, 0x79, 0x09, 0x0a, 0x98, 0x79, 0xb5, 0x56, - 0xcf, 0xa3, 0xa2, 0xb4, 0x98, 0xb3, 0xbc, 0xb3, 0x71, 0xdd, 0x2f, 0xad, 0x25, 0x94, 0x8f, 0x5a, - 0x4d, 0x17, 0x60, 0xe6, 0xb4, 0x7a, 0x71, 0x17, 0xe6, 0x7d, 0xb0, 0x26, 0xbb, 0x8a, 0x9b, 0x96, - 0x7c, 0xed, 0x7d, 0xcd, 0x82, 0x5c, 0x85, 0x05, 0xea, 0x09, 0x28, 0x8c, 0xfd, 0x6d, 0x99, 0x37, - 0x94, 0x3b, 0xb1, 0x59, 0xfa, 0xe3, 0xdb, 0x31, 0xa9, 0x2e, 0x01, 0x58, 0x99, 0xdc, 0x9f, 0x47, - 0x37, 0xbb, 0x4f, 0xc0, 0xf4, 0x9d, 0x3b, 0xc1, 0xd2, 0x44, 0x55, 0x90, 0x1f, 0x34, 0xa9, 0x96, - 0x6e, 0x76, 0x4d, 0xa5, 0xd5, 0xb7, 0xfe, 0x0e, 0x18, 0x65, 0xc9, 0x39, 0x3e, 0xff, 0x65, 0x64, - 0xce, 0x2f, 0x0d, 0xe5, 0xe2, 0xd2, 0x50, 0x7e, 0x5e, 0x1a, 0xca, 0x97, 0x2b, 0x23, 0x73, 0x71, - 0x65, 0x64, 0xbe, 0x5f, 0x19, 0x99, 0x8f, 0x7b, 0x23, 0x8b, 0x71, 0x20, 0xe2, 0xed, 0xbc, 0x47, - 0xbc, 0x43, 0xa3, 0x46, 0x72, 0xb3, 0xdb, 0xcf, 0xec, 0xee, 0xf0, 0x63, 0x13, 0x2f, 0x4a, 0x6d, - 0x21, 0xfe, 0x62, 0x3c, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0xdf, 0xc0, 0xe5, 0xb3, 0xba, 0x06, - 0x00, 0x00, + 0xc2, 0x16, 0xb4, 0x12, 0x6d, 0x57, 0xc5, 0x48, 0x95, 0x50, 0x9b, 0x82, 0x9c, 0xae, 0xba, 0xc0, + 0x9a, 0xc4, 0x23, 0x33, 0x0a, 0x9e, 0x49, 0x3d, 0x93, 0xd7, 0x37, 0x74, 0xd3, 0x7f, 0xe8, 0xcf, + 0xb0, 0x64, 0xd1, 0x45, 0xd5, 0x45, 0xd4, 0xc2, 0x1f, 0xf0, 0x03, 0xad, 0xc6, 0x9e, 0x38, 0x2f, + 0x5a, 0x48, 0x57, 0x99, 0x99, 0x7b, 0xee, 0xeb, 0x9c, 0x7b, 0x63, 0xa0, 0xd7, 0x21, 0xe1, 0xd4, + 0xae, 0x53, 0x4c, 0x58, 0x07, 0x36, 0xed, 0xf6, 0xae, 0xcd, 0xbb, 0x56, 0x33, 0xa2, 0x9c, 0xaa, + 0xab, 0xb1, 0xcd, 0x1a, 0xd8, 0xac, 0xf6, 0xae, 0x5e, 0x9e, 0x86, 0xa7, 0xe6, 0xd8, 0x49, 0x37, + 0xea, 0x94, 0x85, 0x94, 0xd9, 0x35, 0xc8, 0x90, 0xdd, 0xde, 0xad, 0x21, 0x0e, 0x13, 0x8c, 0xb4, + 0xaf, 0x07, 0x34, 0xa0, 0xf1, 0xd1, 0x16, 0xa7, 0xe4, 0xd5, 0xfc, 0x9d, 0x05, 0x2b, 0x15, 0x16, + 0x1c, 0xf8, 0xfe, 0x3b, 0xfc, 0xa9, 0x85, 0x7d, 0xcc, 0x7b, 0xea, 0x09, 0x58, 0x0c, 0x61, 0xd7, + 0xe3, 0xb4, 0x81, 0x88, 0xa6, 0x94, 0x95, 0xed, 0x07, 0x7b, 0x9b, 0x56, 0x12, 0xdd, 0x12, 0xd1, + 0x2d, 0x19, 0xdd, 0x3a, 0xa4, 0x98, 0x38, 0xda, 0x45, 0xbf, 0x94, 0xb9, 0xe9, 0x97, 0x8a, 0x3d, + 0x18, 0x9e, 0xbf, 0x32, 0x53, 0x4f, 0xd3, 0xcd, 0x87, 0xb0, 0xfb, 0x41, 0x1c, 0xd5, 0x1e, 0x50, + 0x51, 0x17, 0xd6, 0xb9, 0xc7, 0x38, 0x24, 0x3e, 0x8c, 0x7c, 0x0f, 0x86, 0x5c, 0xcb, 0x96, 0x95, + 0xed, 0x45, 0xe7, 0xad, 0xf0, 0xff, 0xd1, 0x2f, 0x6d, 0x05, 0x98, 0x9f, 0xb5, 0x6a, 0x56, 0x9d, + 0x86, 0xb6, 0x6c, 0x25, 0xf9, 0xd9, 0x61, 0x7e, 0xc3, 0xe6, 0xbd, 0x26, 0x62, 0xd6, 0x11, 0xe1, + 0x37, 0xfd, 0xd2, 0x66, 0x92, 0x69, 0x3a, 0xa2, 0xe9, 0x16, 0xe3, 0xc7, 0xaa, 0x7c, 0x3b, 0x08, + 0xb9, 0xda, 0x00, 0x4b, 0x21, 0x26, 0xde, 0xf9, 0xa0, 0x3b, 0x2d, 0x17, 0x67, 0x7d, 0x33, 0x73, + 0xd6, 0x75, 0xd9, 0xdf, 0x68, 0x30, 0xd3, 0x2d, 0x84, 0x98, 0x0c, 0x99, 0xd3, 0x41, 0xde, 0x47, + 0xd0, 0x3f, 0xc7, 0x04, 0x69, 0x73, 0x65, 0x65, 0x3b, 0xe7, 0xa6, 0x77, 0xf5, 0x11, 0x58, 0x60, + 0x88, 0xf8, 0x28, 0xd2, 0xe6, 0x45, 0x05, 0xae, 0xbc, 0x99, 0x55, 0xb0, 0x31, 0x21, 0x80, 0x8b, + 0x58, 0x93, 0x12, 0x86, 0xd4, 0x17, 0x00, 0x84, 0x98, 0xf0, 0x7b, 0x2a, 0xe1, 0x2e, 0x0a, 0x70, + 0x4c, 0xb8, 0xf9, 0x39, 0x07, 0xd4, 0x0a, 0x0b, 0x5c, 0x14, 0xd2, 0x36, 0x1a, 0xd6, 0xd7, 0x00, + 0x6a, 0x07, 0xf3, 0x33, 0x3f, 0x82, 0x9d, 0x11, 0x46, 0xee, 0x94, 0xf8, 0xb1, 0x94, 0x58, 0x12, + 0x3f, 0x1d, 0xc2, 0x74, 0x57, 0x07, 0x8f, 0xc3, 0x64, 0x1e, 0x10, 0x05, 0xc9, 0xe2, 0x13, 0xad, + 0x9d, 0x99, 0x59, 0x2f, 0x0e, 0x59, 0x4f, 0xa7, 0x0a, 0x93, 0x64, 0xaa, 0x18, 0x28, 0x8a, 0xf7, + 0xb1, 0x99, 0x4a, 0xd4, 0x3d, 0x9a, 0x39, 0xcf, 0xc6, 0x30, 0xcf, 0xf8, 0x44, 0x2d, 0x87, 0x98, + 0x8c, 0xce, 0xd3, 0xff, 0x48, 0x7c, 0x0a, 0xf4, 0x69, 0x31, 0x52, 0x95, 0x5f, 0x83, 0xe5, 0x94, + 0xd1, 0x78, 0xa7, 0x35, 0xa5, 0x9c, 0xfb, 0xb7, 0xd2, 0x4b, 0x03, 0x07, 0x71, 0x63, 0xe6, 0x37, + 0x05, 0x14, 0x2a, 0x2c, 0xa8, 0x76, 0x60, 0xf3, 0x38, 0xf2, 0x51, 0xa4, 0x3e, 0x07, 0xf3, 0x98, + 0x34, 0x5b, 0x5c, 0x4a, 0xab, 0x59, 0x53, 0x7f, 0x28, 0xd6, 0x91, 0xb0, 0x3b, 0x73, 0x82, 0x28, + 0x37, 0x01, 0xab, 0xfb, 0x60, 0x81, 0xb6, 0xb8, 0x70, 0xcb, 0x0e, 0x26, 0x62, 0xca, 0xed, 0x38, + 0x06, 0x48, 0x3f, 0x09, 0x1f, 0xe3, 0x24, 0x37, 0xc1, 0xc9, 0x4b, 0x50, 0xc0, 0xcc, 0xab, 0xb5, + 0x7a, 0x1e, 0x15, 0xa5, 0xc5, 0x9c, 0xe5, 0x9d, 0x8d, 0x9b, 0x7e, 0x69, 0x2d, 0xa1, 0x7c, 0xd4, + 0x6a, 0xba, 0x00, 0x33, 0xa7, 0xd5, 0x8b, 0xbb, 0x30, 0x1f, 0x82, 0x35, 0xd9, 0x55, 0xdc, 0xb4, + 0xe4, 0x6b, 0xef, 0x6b, 0x16, 0xe4, 0x2a, 0x2c, 0x50, 0x4f, 0x41, 0x61, 0xec, 0x6f, 0xcb, 0xbc, + 0xa5, 0xdc, 0x89, 0xcd, 0xd2, 0x9f, 0xde, 0x8d, 0x49, 0x75, 0x09, 0xc0, 0xca, 0xe4, 0xfe, 0x3c, + 0xb9, 0xdd, 0x7d, 0x02, 0xa6, 0xef, 0xdc, 0x0b, 0x96, 0x26, 0xaa, 0x82, 0xfc, 0xa0, 0x49, 0xb5, + 0x74, 0xbb, 0x6b, 0x2a, 0xad, 0xbe, 0xf5, 0x77, 0xc0, 0x28, 0x4b, 0xce, 0xc9, 0xc5, 0x2f, 0x23, + 0x73, 0x71, 0x65, 0x28, 0x97, 0x57, 0x86, 0xf2, 0xf3, 0xca, 0x50, 0xbe, 0x5c, 0x1b, 0x99, 0xcb, + 0x6b, 0x23, 0xf3, 0xfd, 0xda, 0xc8, 0x7c, 0xdc, 0x1b, 0x59, 0x8c, 0x43, 0x11, 0x6f, 0xe7, 0x3d, + 0xe2, 0x1d, 0x1a, 0x35, 0x92, 0x9b, 0xdd, 0xde, 0xb7, 0xbb, 0xc3, 0x8f, 0x4d, 0xbc, 0x28, 0xb5, + 0x85, 0xf8, 0x8b, 0xf1, 0xec, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0x66, 0xf8, 0x54, 0xba, + 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/csr/client/cli/query.go b/x/csr/client/cli/query.go index e20a15757..6a3178967 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 6e9d11dc4..c7a6243dc 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 85917ea56..2c4089e96 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 7c94dca65..0f7c8d536 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 5a5de4087..f3466c844 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 8157b85d5..7846eb3b9 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 f2d32029e..0dd39e1f8 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 74daf9f9e..c51f79afc 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 8ed6ecbdd..e29b5bbea 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 0aaba769a..44a5545b7 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 969bd1137..2961936e4 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 759b4b6d5..e17d823b3 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 01c261670..f93b9f8d0 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 c25a10b5d..b703cffd1 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 46933a03f..0b6e12a8a 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 7721d5f85..ec19f9741 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 0593d7b66..8f71699ad 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 00ffb16cc..6541425a2 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 3cad24e75..5e7799185 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 292b00a0d..cfb5b19a5 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 7a160f55d..d143d8412 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 c18e40f5a..7845ade4f 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/csr.pb.go b/x/csr/types/csr.pb.go index a06365a93..d8fd9e36f 100644 --- a/x/csr/types/csr.pb.go +++ b/x/csr/types/csr.pb.go @@ -112,9 +112,9 @@ var fileDescriptor_57c53cea3d443afa = []byte{ 0x29, 0xd9, 0xfa, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x9e, 0x79, 0x25, 0x41, 0x30, 0xed, 0x4e, 0xee, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x8b, 0x64, 0x94, 0x33, - 0xc8, 0x6b, 0xba, 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x10, 0x9e, 0x7e, 0x99, 0x99, 0x7e, + 0xc8, 0x6b, 0xba, 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x10, 0x9e, 0x7e, 0x99, 0xb9, 0x7e, 0x05, 0x38, 0x14, 0xc0, 0xa6, 0x26, 0xb1, 0x81, 0x7d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0x12, 0x6b, 0xb7, 0xf8, 0x1f, 0x01, 0x00, 0x00, + 0x8c, 0xe8, 0x6d, 0x67, 0x1f, 0x01, 0x00, 0x00, } func (m *CSR) Marshal() (dAtA []byte, err error) { diff --git a/x/csr/types/genesis.pb.go b/x/csr/types/genesis.pb.go index 3fe8c0a08..889dc9aa4 100644 --- a/x/csr/types/genesis.pb.go +++ b/x/csr/types/genesis.pb.go @@ -87,9 +87,9 @@ var fileDescriptor_4c1065f59845b427 = []byte{ 0x08, 0x82, 0xaa, 0x74, 0x72, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xdd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x67, 0x90, 0x39, 0xba, - 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x10, 0x9e, 0x7e, 0x99, 0x99, 0x7e, 0x05, 0xd8, 0x59, + 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x10, 0x9e, 0x7e, 0x99, 0xb9, 0x7e, 0x05, 0xd8, 0x59, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x37, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, - 0xc3, 0x64, 0xf9, 0xff, 0xf0, 0x00, 0x00, 0x00, + 0x5d, 0xe7, 0x23, 0x60, 0xf0, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/csr/types/genesis_test.go b/x/csr/types/genesis_test.go index 16465601b..f0ce8eae7 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/csr/types/params.pb.go b/x/csr/types/params.pb.go index bda1a285b..d49baf76f 100644 --- a/x/csr/types/params.pb.go +++ b/x/csr/types/params.pb.go @@ -94,8 +94,8 @@ var fileDescriptor_60f3e0cd3160b8d7 = []byte{ 0xe4, 0xe2, 0xa2, 0x60, 0xb0, 0x01, 0x4e, 0xee, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x8b, 0x64, 0x98, 0x33, 0xc8, 0x03, 0xba, 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, - 0xd9, 0x10, 0x9e, 0x7e, 0x99, 0x99, 0x7e, 0x05, 0xd8, 0xbb, 0x60, 0x73, 0x93, 0xd8, 0xc0, 0xfe, - 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x63, 0x53, 0x8c, 0xda, 0x08, 0x01, 0x00, 0x00, + 0xd9, 0x10, 0x9e, 0x7e, 0x99, 0xb9, 0x7e, 0x05, 0xd8, 0xbb, 0x60, 0x73, 0x93, 0xd8, 0xc0, 0xfe, + 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xd0, 0x56, 0x45, 0x08, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/csr/types/query.pb.go b/x/csr/types/query.pb.go index 77a3a9fe5..1b71cce46 100644 --- a/x/csr/types/query.pb.go +++ b/x/csr/types/query.pb.go @@ -497,45 +497,45 @@ func init() { proto.RegisterFile("canto/csr/v1/query.proto", fileDescriptor_a845 var fileDescriptor_a845ddc1dc245388 = []byte{ // 622 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x4f, 0x4f, 0x13, 0x41, - 0x18, 0xc6, 0xbb, 0x50, 0x50, 0x5e, 0x34, 0x91, 0x71, 0x05, 0xba, 0x92, 0x6d, 0x59, 0x8d, 0xd4, - 0x3f, 0xec, 0xa4, 0x35, 0xfa, 0x01, 0xda, 0x84, 0x86, 0x0b, 0xc1, 0x85, 0x13, 0xb7, 0xe9, 0x76, - 0x59, 0x1b, 0xe8, 0xce, 0xb2, 0x33, 0x2d, 0x36, 0x84, 0x8b, 0x37, 0x13, 0x0f, 0x26, 0x7e, 0x29, - 0x8e, 0x24, 0x5e, 0xf4, 0x62, 0x4c, 0xeb, 0x07, 0x31, 0x3b, 0x33, 0x2b, 0x9d, 0xda, 0x96, 0x78, - 0xeb, 0xec, 0x3c, 0xf3, 0x3c, 0xbf, 0x77, 0xe7, 0xd9, 0xc2, 0xba, 0x4f, 0x22, 0x4e, 0xb1, 0xcf, - 0x12, 0xdc, 0xab, 0xe0, 0xb3, 0x6e, 0x90, 0xf4, 0xdd, 0x38, 0xa1, 0x9c, 0xa2, 0x7b, 0x62, 0xc7, - 0xf5, 0x59, 0xe2, 0xf6, 0x2a, 0x96, 0x19, 0xd2, 0x90, 0x8a, 0x0d, 0x9c, 0xfe, 0x92, 0x1a, 0x6b, - 0x23, 0xa4, 0x34, 0x3c, 0x0d, 0x30, 0x89, 0xdb, 0x98, 0x44, 0x11, 0xe5, 0x84, 0xb7, 0x69, 0xc4, - 0xd4, 0xee, 0x0b, 0x9f, 0xb2, 0x0e, 0x65, 0xb8, 0x49, 0x58, 0x20, 0xad, 0x71, 0xaf, 0xd2, 0x0c, - 0x38, 0xa9, 0xe0, 0x98, 0x84, 0xed, 0x48, 0x88, 0x95, 0xb6, 0xa0, 0x71, 0xc4, 0x24, 0x21, 0x9d, - 0xcc, 0x66, 0x55, 0xdb, 0x4a, 0x79, 0xc4, 0x73, 0xc7, 0x04, 0xf4, 0x2e, 0x35, 0xdd, 0x17, 0x62, - 0x2f, 0x38, 0xeb, 0x06, 0x8c, 0x3b, 0xbb, 0xf0, 0x50, 0x7b, 0xca, 0x62, 0x1a, 0xb1, 0x00, 0x55, - 0x61, 0x51, 0x9a, 0xae, 0x1b, 0x25, 0xa3, 0xbc, 0x5c, 0x35, 0xdd, 0xd1, 0xf1, 0x5c, 0xa9, 0xae, - 0xe5, 0xaf, 0x7e, 0x16, 0x73, 0x9e, 0x52, 0x3a, 0x47, 0xf0, 0x40, 0x58, 0xd5, 0x0f, 0xbc, 0xcc, - 0x1e, 0xed, 0x00, 0xdc, 0xb0, 0x2b, 0xaf, 0x67, 0xae, 0x1c, 0xd4, 0x4d, 0x07, 0x75, 0xe5, 0x3b, - 0x54, 0x83, 0xba, 0xfb, 0x24, 0x0c, 0xd4, 0x59, 0x6f, 0xe4, 0xa4, 0xf3, 0xc9, 0x80, 0x95, 0x11, - 0x73, 0x45, 0xf9, 0x12, 0xf2, 0x3e, 0x4b, 0x52, 0xc6, 0xf9, 0xf2, 0x72, 0x75, 0x45, 0x67, 0xac, - 0x1f, 0x78, 0x0a, 0x50, 0x88, 0x50, 0x43, 0x43, 0x99, 0x13, 0x28, 0x5b, 0xb7, 0xa2, 0xc8, 0x24, - 0x8d, 0xe5, 0x15, 0x98, 0x19, 0x4a, 0xad, 0xbf, 0xb7, 0x73, 0x98, 0xcd, 0x6a, 0xc2, 0x42, 0x74, - 0xcc, 0x77, 0x5b, 0x62, 0xcc, 0xbc, 0x27, 0x17, 0x4e, 0x0d, 0x1e, 0x8d, 0xa9, 0x15, 0xfc, 0x73, - 0x98, 0xf7, 0x59, 0xa2, 0xde, 0xc9, 0x54, 0xf6, 0x54, 0xe3, 0xbc, 0x81, 0xc2, 0x8d, 0x47, 0x9d, - 0x46, 0x3c, 0x21, 0x3e, 0xcf, 0x62, 0xd7, 0xe1, 0x0e, 0x69, 0xb5, 0x92, 0x80, 0xc9, 0xbb, 0x5a, - 0xf2, 0xb2, 0xa5, 0xd3, 0x00, 0x6b, 0xd2, 0xb1, 0xff, 0xcf, 0x5f, 0x53, 0x33, 0x1c, 0x76, 0x93, - 0x88, 0xf1, 0xf6, 0x69, 0x76, 0x45, 0x4e, 0x15, 0x56, 0xc7, 0x37, 0x94, 0xfb, 0x54, 0xaa, 0xea, - 0x8f, 0x3c, 0x2c, 0x88, 0x43, 0xe8, 0x04, 0x16, 0x65, 0x91, 0x50, 0x49, 0x8f, 0xff, 0xb7, 0xa7, - 0xd6, 0xe6, 0x0c, 0x85, 0x8c, 0x74, 0x36, 0x3e, 0x7e, 0xfb, 0xfd, 0x75, 0x6e, 0x15, 0x99, 0x58, - 0x7e, 0x01, 0xb2, 0xfd, 0xea, 0xe3, 0x40, 0x3e, 0xe4, 0xd3, 0xee, 0x20, 0x7b, 0x82, 0xd1, 0x48, - 0x63, 0xad, 0xe2, 0xd4, 0x7d, 0x15, 0x63, 0x89, 0x18, 0x13, 0x21, 0x3d, 0x46, 0x74, 0xac, 0x07, - 0x77, 0xb3, 0x7b, 0x46, 0xce, 0x64, 0xa3, 0xd1, 0xca, 0x58, 0x4f, 0x66, 0x6a, 0x54, 0xe0, 0xa6, - 0x08, 0x7c, 0x8c, 0x0a, 0x7a, 0x60, 0x74, 0xcc, 0xf1, 0x85, 0xe8, 0xd8, 0x25, 0xfa, 0x6c, 0xc0, - 0x7d, 0xed, 0x96, 0xd1, 0xd6, 0x34, 0xe7, 0xb1, 0xfa, 0x58, 0xe5, 0xdb, 0x85, 0x8a, 0xa3, 0x2c, - 0x38, 0x1c, 0x54, 0x1a, 0x1b, 0x5c, 0xe9, 0xf0, 0x85, 0xba, 0xe1, 0x4b, 0x74, 0x0e, 0x4b, 0x7f, - 0x1b, 0x81, 0x26, 0xcd, 0x38, 0x5e, 0x24, 0xeb, 0xe9, 0x6c, 0x91, 0x22, 0x28, 0x0a, 0x82, 0x02, - 0x5a, 0xd3, 0x09, 0x78, 0x26, 0xac, 0x35, 0xae, 0x06, 0xb6, 0x71, 0x3d, 0xb0, 0x8d, 0x5f, 0x03, - 0xdb, 0xf8, 0x32, 0xb4, 0x73, 0xd7, 0x43, 0x3b, 0xf7, 0x7d, 0x68, 0xe7, 0x8e, 0xb6, 0xc3, 0x36, - 0x7f, 0xdf, 0x6d, 0xba, 0x3e, 0xed, 0xe0, 0x7a, 0x7a, 0x78, 0x7b, 0x2f, 0xe0, 0xe7, 0x34, 0x39, - 0x91, 0x2b, 0xdc, 0x7b, 0x8b, 0x3f, 0x48, 0xb3, 0x7e, 0x1c, 0xb0, 0xe6, 0xa2, 0xf8, 0xcf, 0x7c, - 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x44, 0x1c, 0x28, 0xf0, 0xf0, 0x05, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x4f, 0x13, 0x41, + 0x1c, 0xc5, 0xbb, 0x50, 0x50, 0xbe, 0x68, 0x22, 0xe3, 0x0a, 0x74, 0x25, 0xdb, 0xb2, 0x1a, 0xa9, + 0x3f, 0xd8, 0x49, 0x6b, 0x8c, 0xf7, 0x36, 0xa1, 0xe1, 0x42, 0x70, 0xe1, 0xc4, 0x6d, 0xba, 0x5d, + 0xd6, 0x06, 0xba, 0xb3, 0xec, 0x4c, 0x8b, 0x0d, 0xe1, 0xe2, 0xcd, 0xc4, 0x83, 0x89, 0xff, 0x14, + 0x47, 0x12, 0x2f, 0x7a, 0x31, 0xa6, 0xf5, 0x0f, 0x31, 0x3b, 0x33, 0x2b, 0x9d, 0xda, 0x96, 0x78, + 0xeb, 0xec, 0xbc, 0x79, 0xef, 0xf3, 0xdd, 0x79, 0x5b, 0x58, 0xf7, 0x49, 0xc4, 0x29, 0xf6, 0x59, + 0x82, 0x7b, 0x15, 0x7c, 0xd6, 0x0d, 0x92, 0xbe, 0x1b, 0x27, 0x94, 0x53, 0x74, 0x4f, 0xec, 0xb8, + 0x3e, 0x4b, 0xdc, 0x5e, 0xc5, 0x32, 0x43, 0x1a, 0x52, 0xb1, 0x81, 0xd3, 0x5f, 0x52, 0x63, 0x6d, + 0x84, 0x94, 0x86, 0xa7, 0x01, 0x26, 0x71, 0x1b, 0x93, 0x28, 0xa2, 0x9c, 0xf0, 0x36, 0x8d, 0x98, + 0xda, 0x7d, 0xe1, 0x53, 0xd6, 0xa1, 0x0c, 0x37, 0x09, 0x0b, 0xa4, 0x35, 0xee, 0x55, 0x9a, 0x01, + 0x27, 0x15, 0x1c, 0x93, 0xb0, 0x1d, 0x09, 0xb1, 0xd2, 0x16, 0x34, 0x8e, 0x98, 0x24, 0xa4, 0x93, + 0xd9, 0xac, 0x6a, 0x5b, 0x29, 0x8f, 0x78, 0xee, 0x98, 0x80, 0xde, 0xa5, 0xa6, 0xfb, 0x42, 0xec, + 0x05, 0x67, 0xdd, 0x80, 0x71, 0x67, 0x17, 0x1e, 0x6a, 0x4f, 0x59, 0x4c, 0x23, 0x16, 0xa0, 0x2a, + 0x2c, 0x4a, 0xd3, 0x75, 0xa3, 0x64, 0x94, 0x97, 0xab, 0xa6, 0x3b, 0x3a, 0x9e, 0x2b, 0xd5, 0xb5, + 0xfc, 0xd5, 0xcf, 0x62, 0xce, 0x53, 0x4a, 0xe7, 0x08, 0x1e, 0x08, 0xab, 0xfa, 0x81, 0x97, 0xd9, + 0xa3, 0x1d, 0x80, 0x1b, 0x76, 0xe5, 0xf5, 0xcc, 0x95, 0x83, 0xba, 0xe9, 0xa0, 0xae, 0x7c, 0x87, + 0x6a, 0x50, 0x77, 0x9f, 0x84, 0x81, 0x3a, 0xeb, 0x8d, 0x9c, 0x74, 0x3e, 0x19, 0xb0, 0x32, 0x62, + 0xae, 0x28, 0x5f, 0x42, 0xde, 0x67, 0x49, 0xca, 0x38, 0x5f, 0x5e, 0xae, 0xae, 0xe8, 0x8c, 0xf5, + 0x03, 0x4f, 0x01, 0x0a, 0x11, 0x6a, 0x68, 0x28, 0x73, 0x02, 0x65, 0xeb, 0x56, 0x14, 0x99, 0xa4, + 0xb1, 0xbc, 0x02, 0x33, 0x43, 0xa9, 0xf5, 0xf7, 0x76, 0x0e, 0xb3, 0x59, 0x4d, 0x58, 0x88, 0x8e, + 0xf9, 0x6e, 0x4b, 0x8c, 0x99, 0xf7, 0xe4, 0xc2, 0xa9, 0xc1, 0xa3, 0x31, 0xb5, 0x82, 0x7f, 0x0e, + 0xf3, 0x3e, 0x4b, 0xd4, 0x3b, 0x99, 0xca, 0x9e, 0x6a, 0x9c, 0x37, 0x50, 0xb8, 0xf1, 0xa8, 0xd3, + 0x88, 0x27, 0xc4, 0xe7, 0x59, 0xec, 0x3a, 0xdc, 0x21, 0xad, 0x56, 0x12, 0x30, 0x79, 0x57, 0x4b, + 0x5e, 0xb6, 0x74, 0x1a, 0x60, 0x4d, 0x3a, 0xf6, 0xff, 0xf9, 0x6b, 0x6a, 0x86, 0xc3, 0x6e, 0x12, + 0x31, 0xde, 0x3e, 0xcd, 0xae, 0xc8, 0xa9, 0xc2, 0xea, 0xf8, 0x86, 0x72, 0x9f, 0x4a, 0x55, 0xfd, + 0x91, 0x87, 0x05, 0x71, 0x08, 0x9d, 0xc0, 0xa2, 0x2c, 0x12, 0x2a, 0xe9, 0xf1, 0xff, 0xf6, 0xd4, + 0xda, 0x9c, 0xa1, 0x90, 0x91, 0xce, 0xc6, 0xc7, 0x6f, 0xbf, 0xbf, 0xce, 0xad, 0x22, 0x13, 0xcb, + 0x2f, 0x40, 0xb6, 0x5f, 0x7d, 0x1c, 0xc8, 0x87, 0x7c, 0xda, 0x1d, 0x64, 0x4f, 0x30, 0x1a, 0x69, + 0xac, 0x55, 0x9c, 0xba, 0xaf, 0x62, 0x2c, 0x11, 0x63, 0x22, 0xa4, 0xc7, 0x88, 0x8e, 0xf5, 0xe0, + 0x6e, 0x76, 0xcf, 0xc8, 0x99, 0x6c, 0x34, 0x5a, 0x19, 0xeb, 0xc9, 0x4c, 0x8d, 0x0a, 0xdc, 0x14, + 0x81, 0x8f, 0x51, 0x41, 0x0f, 0x8c, 0x8e, 0x39, 0xbe, 0x10, 0x1d, 0xbb, 0x44, 0x9f, 0x0d, 0xb8, + 0xaf, 0xdd, 0x32, 0xda, 0x9a, 0xe6, 0x3c, 0x56, 0x1f, 0xab, 0x7c, 0xbb, 0x50, 0x71, 0x94, 0x05, + 0x87, 0x83, 0x4a, 0x63, 0x83, 0x2b, 0x1d, 0xbe, 0x50, 0x37, 0x7c, 0x89, 0xce, 0x61, 0xe9, 0x6f, + 0x23, 0xd0, 0xa4, 0x19, 0xc7, 0x8b, 0x64, 0x3d, 0x9d, 0x2d, 0x52, 0x04, 0x45, 0x41, 0x50, 0x40, + 0x6b, 0x3a, 0x01, 0xcf, 0x84, 0xb5, 0xc6, 0xd5, 0xc0, 0x36, 0xae, 0x07, 0xb6, 0xf1, 0x6b, 0x60, + 0x1b, 0x5f, 0x86, 0x76, 0xee, 0x7a, 0x68, 0xe7, 0xbe, 0x0f, 0xed, 0xdc, 0xd1, 0x76, 0xd8, 0xe6, + 0xef, 0xbb, 0x4d, 0xd7, 0xa7, 0x1d, 0x5c, 0x4f, 0x0f, 0x6f, 0xef, 0x05, 0xfc, 0x9c, 0x26, 0x27, + 0x72, 0x85, 0x7b, 0x6f, 0xf1, 0x07, 0x69, 0xd6, 0x8f, 0x03, 0xd6, 0x5c, 0x14, 0xff, 0x99, 0xaf, + 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xda, 0x9f, 0xf2, 0x6f, 0xf0, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index 43f0cc510..3852a7643 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 137125f17..7f79726e6 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 8dcdc0d3a..953769071 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 0421cb69a..df1045d78 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 0567bb325..4cfb7c06c 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 d2ea91e89..288a5eda7 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 fedb00890..4d95d8bfc 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 b75afe3d9..e6546ac45 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 10b725faa..98e66f8ff 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 0867374e6..f82f90f54 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 49a2a4bc0..3155abf97 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 45bd0fb33..f55d556c0 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 c84adff83..303cb635c 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/epochs/types/genesis.pb.go b/x/epochs/types/genesis.pb.go index c48fae53e..623bad822 100644 --- a/x/epochs/types/genesis.pb.go +++ b/x/epochs/types/genesis.pb.go @@ -176,7 +176,7 @@ var fileDescriptor_215c7e170263b152 = []byte{ // 470 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x31, 0x6f, 0xd3, 0x40, 0x18, 0xcd, 0x91, 0x10, 0x9a, 0xa3, 0xa8, 0xe2, 0x54, 0xc0, 0x44, 0xaa, 0x6d, 0x99, 0x25, 0x12, - 0xe0, 0x23, 0x80, 0x10, 0x82, 0x2d, 0x05, 0x51, 0x18, 0x18, 0x1c, 0x06, 0xc4, 0x12, 0x39, 0xce, + 0xe0, 0x23, 0x80, 0x04, 0x82, 0x2d, 0x05, 0x51, 0x18, 0x18, 0x1c, 0x06, 0xc4, 0x12, 0x39, 0xce, 0xc5, 0x3e, 0x51, 0xdf, 0x59, 0xf6, 0xe7, 0x40, 0x36, 0x66, 0xa6, 0x8e, 0xfc, 0xa4, 0x8e, 0x1d, 0x99, 0x02, 0x4a, 0x36, 0xc6, 0xfe, 0x02, 0x74, 0x77, 0x76, 0x08, 0x2d, 0xa8, 0x9b, 0xef, 0xde, 0xfb, 0xde, 0xbb, 0xf7, 0xf4, 0x19, 0xef, 0x45, 0xa1, 0x00, 0x49, 0x59, 0x26, 0xa3, 0xa4, 0xa0, @@ -202,8 +202,8 @@ var fileDescriptor_215c7e170263b152 = []byte{ 0xbc, 0xb4, 0xd1, 0xc9, 0xd2, 0x46, 0x3f, 0x97, 0x36, 0x3a, 0x5a, 0xd9, 0x8d, 0x93, 0x95, 0xdd, 0xf8, 0xbe, 0xb2, 0x1b, 0x1f, 0x1e, 0xc4, 0x1c, 0x92, 0x72, 0xec, 0x47, 0x32, 0xa5, 0xfb, 0x4a, 0xed, 0xfe, 0x5b, 0x06, 0x9f, 0x64, 0xfe, 0xd1, 0x9c, 0xe8, 0xec, 0x09, 0xfd, 0x5c, 0xff, 0x15, - 0x30, 0xcf, 0x58, 0x31, 0x6e, 0xeb, 0x82, 0x1f, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x74, 0xd6, - 0x74, 0x5e, 0x32, 0x03, 0x00, 0x00, + 0x30, 0xcf, 0x58, 0x31, 0x6e, 0xeb, 0x82, 0x1f, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x53, 0xb3, + 0x51, 0xdf, 0x32, 0x03, 0x00, 0x00, } func (m *EpochInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/epochs/types/query.pb.go b/x/epochs/types/query.pb.go index 41ecee618..edef75a66 100644 --- a/x/epochs/types/query.pb.go +++ b/x/epochs/types/query.pb.go @@ -227,33 +227,33 @@ var fileDescriptor_94315a0c94d7b69f = []byte{ // 460 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6b, 0x14, 0x31, 0x14, 0xc7, 0x37, 0x5b, 0x2d, 0x98, 0x56, 0x84, 0x20, 0x76, 0x3b, 0xea, 0x74, 0x59, 0xa1, 0x5d, - 0x0b, 0x26, 0xee, 0x0a, 0x22, 0x9e, 0xa4, 0x45, 0x45, 0x0f, 0xa2, 0x73, 0xf4, 0xa2, 0xd9, 0xf1, - 0x35, 0x0d, 0xda, 0xbc, 0xe9, 0x24, 0xbb, 0xda, 0x9b, 0x78, 0x17, 0x04, 0x6f, 0xe2, 0x1f, 0xd4, - 0x63, 0xc1, 0x8b, 0x27, 0x91, 0x5d, 0xff, 0x10, 0x99, 0x24, 0xd5, 0xfd, 0x05, 0xdb, 0xdb, 0x4c, - 0xde, 0xf7, 0x7d, 0xdf, 0xe7, 0x7d, 0x13, 0x7a, 0x35, 0x97, 0xc6, 0xa1, 0x80, 0x02, 0xf3, 0x7d, - 0x2b, 0x06, 0x1d, 0x71, 0xd8, 0x87, 0xf2, 0x88, 0x17, 0x25, 0x3a, 0x64, 0x97, 0x7c, 0x91, 0x87, - 0x22, 0x1f, 0x74, 0x92, 0xcb, 0x0a, 0x15, 0xfa, 0x9a, 0xa8, 0xbe, 0x82, 0x2c, 0xb9, 0xa6, 0x10, - 0xd5, 0x3b, 0x10, 0xb2, 0xd0, 0x42, 0x1a, 0x83, 0x4e, 0x3a, 0x8d, 0xc6, 0xc6, 0xea, 0x76, 0x8e, - 0xf6, 0x00, 0xad, 0xe8, 0x49, 0x0b, 0xc1, 0x5d, 0x0c, 0x3a, 0x3d, 0x70, 0xb2, 0x23, 0x0a, 0xa9, - 0xb4, 0xf1, 0xe2, 0xa8, 0xbd, 0x3e, 0x4d, 0xa3, 0xc0, 0x80, 0xd5, 0xd1, 0xaa, 0xf5, 0x9a, 0x5e, - 0x79, 0x51, 0x19, 0x3c, 0xf4, 0xf5, 0x27, 0x66, 0x0f, 0x33, 0x38, 0xec, 0x83, 0x75, 0xec, 0x11, - 0xa5, 0xff, 0xcd, 0x1a, 0xa4, 0x49, 0xda, 0x2b, 0xdd, 0x4d, 0x1e, 0x26, 0xf3, 0x6a, 0x32, 0x0f, - 0x7b, 0xc5, 0xc9, 0xfc, 0xb9, 0x54, 0x10, 0x7b, 0xb3, 0xb1, 0xce, 0xd6, 0x77, 0x42, 0xd7, 0x66, - 0x46, 0xd8, 0x02, 0x8d, 0x05, 0x76, 0x8f, 0x2e, 0x07, 0xb0, 0x06, 0x69, 0x2e, 0xb5, 0x57, 0xba, - 0x09, 0x9f, 0x8a, 0x87, 0xfb, 0xa6, 0xaa, 0x67, 0xe7, 0xdc, 0xf1, 0xaf, 0x8d, 0x5a, 0x16, 0xf5, - 0xec, 0xf1, 0x04, 0x5d, 0xdd, 0xd3, 0x6d, 0x2d, 0xa4, 0x0b, 0x63, 0x27, 0xf0, 0xee, 0xd3, 0x86, - 0xa7, 0xdb, 0xed, 0x97, 0x25, 0x18, 0xe7, 0xe7, 0x9d, 0x46, 0x90, 0x52, 0xaa, 0xdf, 0x80, 0x71, - 0x7a, 0x4f, 0x43, 0xe9, 0x23, 0xb8, 0x90, 0x8d, 0x9d, 0xb4, 0x1e, 0xd0, 0xf5, 0x39, 0xbd, 0x71, - 0xb7, 0x1b, 0xf4, 0x62, 0x1e, 0xce, 0x5f, 0x79, 0x66, 0xdf, 0xbf, 0x94, 0xad, 0xe6, 0x63, 0xe2, - 0xee, 0xb7, 0x3a, 0x3d, 0xef, 0x2d, 0xd8, 0x47, 0x42, 0xe9, 0xbf, 0x65, 0x2d, 0xdb, 0x9a, 0x49, - 0x62, 0xfe, 0x35, 0x25, 0xed, 0xc5, 0xc2, 0x00, 0xd4, 0xda, 0xf8, 0xf4, 0xe3, 0xcf, 0xd7, 0xfa, - 0x3a, 0x5b, 0x13, 0xd3, 0x4f, 0x22, 0x66, 0xfa, 0x99, 0xd0, 0xd5, 0xf1, 0x55, 0xd8, 0xcd, 0xf9, - 0xde, 0x73, 0xa2, 0x4a, 0xb6, 0xcf, 0x22, 0x8d, 0x20, 0x9b, 0x1e, 0xa4, 0xc9, 0xd2, 0x19, 0x90, - 0x89, 0xc0, 0x76, 0x9e, 0x1e, 0x0f, 0x53, 0x72, 0x32, 0x4c, 0xc9, 0xef, 0x61, 0x4a, 0xbe, 0x8c, - 0xd2, 0xda, 0xc9, 0x28, 0xad, 0xfd, 0x1c, 0xa5, 0xb5, 0x97, 0xb7, 0x95, 0x76, 0xfb, 0xfd, 0x1e, - 0xcf, 0xf1, 0x40, 0xec, 0x56, 0x1e, 0xb7, 0x9e, 0x81, 0x7b, 0x8f, 0xe5, 0xdb, 0xf0, 0x27, 0x06, - 0x77, 0xc5, 0x87, 0x53, 0x5b, 0x77, 0x54, 0x80, 0xed, 0x2d, 0xfb, 0xe7, 0x7e, 0xe7, 0x6f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x69, 0xf0, 0x08, 0xb1, 0x9d, 0x03, 0x00, 0x00, + 0x0b, 0x26, 0xee, 0x7a, 0x50, 0x3c, 0x49, 0x8b, 0x8a, 0x1e, 0x44, 0xe7, 0xe8, 0x45, 0xb3, 0xe3, + 0x6b, 0x1a, 0xb4, 0x79, 0xd3, 0x49, 0x76, 0xb5, 0x37, 0xf1, 0x2e, 0x08, 0xde, 0xc4, 0x3f, 0xa8, + 0xc7, 0x82, 0x17, 0x4f, 0x22, 0xbb, 0xfe, 0x21, 0x32, 0x49, 0xaa, 0xfb, 0x0b, 0xb6, 0xb7, 0x99, + 0xbc, 0xef, 0xfb, 0xbe, 0xcf, 0xfb, 0x26, 0xf4, 0x6a, 0x2e, 0x8d, 0x43, 0x01, 0x05, 0xe6, 0xfb, + 0x56, 0x0c, 0x3a, 0xe2, 0xb0, 0x0f, 0xe5, 0x11, 0x2f, 0x4a, 0x74, 0xc8, 0x2e, 0xf9, 0x22, 0x0f, + 0x45, 0x3e, 0xe8, 0x24, 0x97, 0x15, 0x2a, 0xf4, 0x35, 0x51, 0x7d, 0x05, 0x59, 0x72, 0x4d, 0x21, + 0xaa, 0x77, 0x20, 0x64, 0xa1, 0x85, 0x34, 0x06, 0x9d, 0x74, 0x1a, 0x8d, 0x8d, 0xd5, 0xed, 0x1c, + 0xed, 0x01, 0x5a, 0xd1, 0x93, 0x16, 0x82, 0xbb, 0x18, 0x74, 0x7a, 0xe0, 0x64, 0x47, 0x14, 0x52, + 0x69, 0xe3, 0xc5, 0x51, 0x7b, 0x7d, 0x9a, 0x46, 0x81, 0x01, 0xab, 0xa3, 0x55, 0xeb, 0x35, 0xbd, + 0xf2, 0xa2, 0x32, 0x78, 0xe8, 0xeb, 0x4f, 0xcc, 0x1e, 0x66, 0x70, 0xd8, 0x07, 0xeb, 0xd8, 0x23, + 0x4a, 0xff, 0x9b, 0x35, 0x48, 0x93, 0xb4, 0x57, 0xba, 0x9b, 0x3c, 0x4c, 0xe6, 0xd5, 0x64, 0x1e, + 0xf6, 0x8a, 0x93, 0xf9, 0x73, 0xa9, 0x20, 0xf6, 0x66, 0x63, 0x9d, 0xad, 0xef, 0x84, 0xae, 0xcd, + 0x8c, 0xb0, 0x05, 0x1a, 0x0b, 0xec, 0x1e, 0x5d, 0x0e, 0x60, 0x0d, 0xd2, 0x5c, 0x6a, 0xaf, 0x74, + 0x13, 0x3e, 0x15, 0x0f, 0xf7, 0x4d, 0x55, 0xcf, 0xce, 0xb9, 0xe3, 0x5f, 0x1b, 0xb5, 0x2c, 0xea, + 0xd9, 0xe3, 0x09, 0xba, 0xba, 0xa7, 0xdb, 0x5a, 0x48, 0x17, 0xc6, 0x4e, 0xe0, 0xdd, 0xa7, 0x0d, + 0x4f, 0xb7, 0xdb, 0x2f, 0x4b, 0x30, 0xce, 0xcf, 0x3b, 0x8d, 0x20, 0xa5, 0x54, 0xbf, 0x01, 0xe3, + 0xf4, 0x9e, 0x86, 0xd2, 0x47, 0x70, 0x21, 0x1b, 0x3b, 0x69, 0x3d, 0xa0, 0xeb, 0x73, 0x7a, 0xe3, + 0x6e, 0x37, 0xe8, 0xc5, 0x3c, 0x9c, 0xbf, 0xf2, 0xcc, 0xbe, 0x7f, 0x29, 0x5b, 0xcd, 0xc7, 0xc4, + 0xdd, 0x6f, 0x75, 0x7a, 0xde, 0x5b, 0xb0, 0x8f, 0x84, 0xd2, 0x7f, 0xcb, 0x5a, 0xb6, 0x35, 0x93, + 0xc4, 0xfc, 0x6b, 0x4a, 0xda, 0x8b, 0x85, 0x01, 0xa8, 0xb5, 0xf1, 0xe9, 0xc7, 0x9f, 0xaf, 0xf5, + 0x75, 0xb6, 0x26, 0xa6, 0x9f, 0x44, 0xcc, 0xf4, 0x33, 0xa1, 0xab, 0xe3, 0xab, 0xb0, 0x9b, 0xf3, + 0xbd, 0xe7, 0x44, 0x95, 0x6c, 0x9f, 0x45, 0x1a, 0x41, 0x36, 0x3d, 0x48, 0x93, 0xa5, 0x33, 0x20, + 0x13, 0x81, 0xed, 0x3c, 0x3d, 0x1e, 0xa6, 0xe4, 0x64, 0x98, 0x92, 0xdf, 0xc3, 0x94, 0x7c, 0x19, + 0xa5, 0xb5, 0x93, 0x51, 0x5a, 0xfb, 0x39, 0x4a, 0x6b, 0x2f, 0x6f, 0x2b, 0xed, 0xf6, 0xfb, 0x3d, + 0x9e, 0xe3, 0x81, 0xd8, 0xad, 0x3c, 0x6e, 0x3d, 0x03, 0xf7, 0x1e, 0xcb, 0xb7, 0xe1, 0x4f, 0x0c, + 0xee, 0x8a, 0x0f, 0xa7, 0xb6, 0xee, 0xa8, 0x00, 0xdb, 0x5b, 0xf6, 0xcf, 0xfd, 0xce, 0xdf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x4e, 0x95, 0x2d, 0x30, 0x9d, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/erc20/client/cli/query.go b/x/erc20/client/cli/query.go index 2d22a6e50..2f977d60a 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 6538753c0..961896278 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 d53d7f75d..ab65b4dc7 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 e552605b0..43eb94084 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 9eb337631..785bb5864 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 23f150bcb..52f90a572 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 f5fe4b07e..02f43e92c 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 d5fe27e8a..6e06daf40 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 efd3a89f6..47c08e634 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 ad8193296..f721ab961 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 645ea7357..9abb3a236 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 6ea818c1f..edf3ba392 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 0d2c59f48..3043c3e4b 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 81293a6aa..6935408d8 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 f4e0a50a6..c74a2e04b 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 588e1cf7d..4a1f3c2be 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 21694f50e..7cd20549a 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 a6040bdb6..446615861 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 30531e82b..bc551efb0 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 328b262ab..034234459 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 926807f93..a5c1ede15 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 701c1499e..24438f2fc 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 0738ea5fc..ddc592d1e 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 e43058251..d072b1bc5 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 8caeae504..35171eaeb 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 76a8b87ac..537db758b 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 abfb2fe4e..e1ef1fe0a 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 5ca0949db..645674a4f 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 ed9f17b9d..644a0258c 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 a1b1a70e6..7402f264e 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 cfaf3de7e..8e0130ae0 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/erc20/types/erc20.pb.go b/x/erc20/types/erc20.pb.go index 57179d4ec..9c00f45ad 100644 --- a/x/erc20/types/erc20.pb.go +++ b/x/erc20/types/erc20.pb.go @@ -57,7 +57,8 @@ func (Owner) EnumDescriptor() ([]byte, []int) { } // TokenPair defines an instance that records a pairing consisting of a native -// Cosmos Coin and an ERC20 token address. +// +// Cosmos Coin and an ERC20 token address. type TokenPair struct { // address of ERC20 contract token Erc20Address string `protobuf:"bytes,1,opt,name=erc20_address,json=erc20Address,proto3" json:"erc20_address,omitempty"` @@ -340,7 +341,7 @@ var fileDescriptor_5c364669f6882b8b = []byte{ // 499 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x6b, 0x13, 0x41, 0x14, 0xc7, 0x77, 0xda, 0x54, 0xdb, 0x69, 0x1b, 0xe2, 0xd0, 0x40, 0x08, 0x74, 0x1b, 0xe2, 0x25, - 0x08, 0xee, 0x36, 0x11, 0x3c, 0x88, 0x20, 0xed, 0x76, 0x85, 0x48, 0x9b, 0x84, 0x75, 0x8b, 0xe2, + 0x08, 0xee, 0x36, 0xf1, 0x20, 0x88, 0x20, 0xed, 0x76, 0x85, 0x48, 0x9b, 0x84, 0x75, 0x8b, 0xe2, 0x25, 0xcc, 0xee, 0x0e, 0xeb, 0x92, 0x64, 0x5e, 0x98, 0x19, 0xb7, 0xf6, 0x1b, 0x78, 0xf4, 0xe2, 0x5d, 0xd0, 0x0f, 0xd3, 0x63, 0x8f, 0x9e, 0x44, 0x92, 0x8b, 0x1f, 0x43, 0x76, 0x66, 0x23, 0xe9, 0x4d, 0xf0, 0x36, 0xff, 0xff, 0x7b, 0x3b, 0xf3, 0xdb, 0xf7, 0x9f, 0xc1, 0xcd, 0x98, 0x72, 0x05, @@ -368,7 +369,7 @@ var fileDescriptor_5c364669f6882b8b = []byte{ 0x61, 0xa3, 0x5f, 0x0b, 0x1b, 0x7d, 0x5e, 0xda, 0xd6, 0xed, 0xd2, 0xb6, 0x7e, 0x2c, 0x6d, 0xeb, 0x9d, 0x9b, 0x66, 0xea, 0xfd, 0x87, 0xc8, 0x89, 0x61, 0xe6, 0x7a, 0xc5, 0x1d, 0x79, 0x3c, 0x60, 0xea, 0x0a, 0xc4, 0xc4, 0x28, 0x37, 0x7f, 0xea, 0x7e, 0x2c, 0x1f, 0x85, 0xba, 0x9e, 0x33, 0x19, - 0xdd, 0xd3, 0x97, 0xf9, 0xc9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0xf4, 0xe6, 0x56, 0x30, + 0xdd, 0xd3, 0x97, 0xf9, 0xc9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x1e, 0x95, 0xcd, 0x30, 0x03, 0x00, 0x00, } diff --git a/x/erc20/types/genesis.pb.go b/x/erc20/types/genesis.pb.go index 2d129101c..4c684ef9e 100644 --- a/x/erc20/types/genesis.pb.go +++ b/x/erc20/types/genesis.pb.go @@ -161,9 +161,9 @@ var fileDescriptor_6af5bf0eee46eaa1 = []byte{ 0x05, 0x71, 0x9d, 0x3c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x3f, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xdf, 0x19, 0xe4, 0x70, 0x5d, 0xbf, - 0xd4, 0x92, 0xf2, 0xfc, 0xa2, 0x6c, 0x08, 0x4f, 0xbf, 0xcc, 0x4c, 0xbf, 0x02, 0x1a, 0xb4, 0x25, - 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x20, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x96, - 0xc1, 0x33, 0xf6, 0xa4, 0x01, 0x00, 0x00, + 0xd4, 0x92, 0xf2, 0xfc, 0xa2, 0x6c, 0x08, 0x4f, 0xbf, 0xcc, 0x5c, 0xbf, 0x02, 0x1a, 0xb4, 0x25, + 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x20, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x42, + 0x2b, 0x40, 0x6d, 0xa4, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/erc20/types/query.pb.go b/x/erc20/types/query.pb.go index cc7848e5d..4152f3eaa 100644 --- a/x/erc20/types/query.pb.go +++ b/x/erc20/types/query.pb.go @@ -323,36 +323,36 @@ var fileDescriptor_a1d7327008f799c8 = []byte{ // 512 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x4f, 0x6b, 0x13, 0x41, 0x14, 0xcf, 0xb4, 0x36, 0x90, 0x17, 0xf0, 0x30, 0xc6, 0x18, 0x57, 0x5d, 0xcb, 0x86, 0xa6, 0x45, - 0xe9, 0x8c, 0x89, 0xe2, 0x51, 0xa4, 0x82, 0x22, 0x82, 0xc4, 0xe0, 0x41, 0xbc, 0xe8, 0x24, 0x0c, - 0xeb, 0x52, 0x33, 0xb3, 0xd9, 0x99, 0x44, 0x8b, 0x78, 0xe9, 0x45, 0xbc, 0x09, 0x7e, 0x05, 0x3f, - 0x4c, 0x8f, 0x05, 0x2f, 0x9e, 0x44, 0x12, 0x3f, 0x88, 0xec, 0xcc, 0x64, 0xd3, 0x5d, 0x4b, 0xf6, - 0xb6, 0xf3, 0xe6, 0xfd, 0xfe, 0xbd, 0x37, 0x0b, 0xde, 0x88, 0x09, 0x2d, 0x29, 0x4f, 0x46, 0xbd, - 0x3b, 0x74, 0xd6, 0xa5, 0x93, 0x29, 0x4f, 0x8e, 0x48, 0x9c, 0x48, 0x2d, 0xf1, 0x45, 0x73, 0x47, - 0xcc, 0x1d, 0x99, 0x75, 0xbd, 0x5b, 0x23, 0xa9, 0xc6, 0x52, 0xd1, 0x21, 0x53, 0xdc, 0x36, 0xd2, - 0x59, 0x77, 0xc8, 0x35, 0xeb, 0xd2, 0x98, 0x85, 0x91, 0x60, 0x3a, 0x92, 0xc2, 0x62, 0xbd, 0xeb, - 0x05, 0xde, 0x90, 0x0b, 0xae, 0x22, 0xe5, 0x6e, 0x8b, 0xaa, 0x56, 0xc2, 0x21, 0x43, 0x29, 0xc3, - 0xf7, 0x9c, 0xb2, 0x38, 0xa2, 0x4c, 0x08, 0xa9, 0x0d, 0xed, 0x12, 0xd9, 0x08, 0x65, 0x28, 0xcd, - 0x27, 0x4d, 0xbf, 0x6c, 0x35, 0x78, 0x0b, 0xcd, 0x17, 0xa9, 0x9f, 0x97, 0xf2, 0x90, 0x8b, 0x3e, - 0x8b, 0x12, 0x35, 0xe0, 0x93, 0x29, 0x57, 0x1a, 0x3f, 0x06, 0x58, 0x79, 0x6b, 0xa1, 0x6d, 0xb4, - 0x57, 0xef, 0x75, 0x88, 0x0d, 0x42, 0xd2, 0x20, 0xc4, 0x26, 0x76, 0x41, 0x48, 0x9f, 0x85, 0xdc, - 0x61, 0x07, 0x67, 0x90, 0xc1, 0x0f, 0x04, 0x57, 0xfe, 0x93, 0x50, 0xb1, 0x14, 0x8a, 0xe3, 0x87, - 0x50, 0xd7, 0x69, 0xf5, 0x4d, 0x9c, 0x96, 0x5b, 0x68, 0x7b, 0x73, 0xaf, 0xde, 0xbb, 0x4a, 0xf2, - 0xd3, 0x23, 0x19, 0xf0, 0xe0, 0xc2, 0xc9, 0xef, 0x9b, 0x95, 0x01, 0xe8, 0x8c, 0x09, 0x3f, 0xc9, - 0xb9, 0xdc, 0x30, 0x2e, 0x77, 0x4b, 0x5d, 0x5a, 0xf9, 0x9c, 0xcd, 0x7d, 0xb8, 0x9c, 0x77, 0xb9, - 0x9c, 0x43, 0x03, 0xb6, 0x8c, 0x9e, 0x19, 0x41, 0x6d, 0x60, 0x0f, 0xc1, 0xab, 0xe2, 0xdc, 0xb2, - 0x4c, 0x0f, 0x00, 0x56, 0x99, 0xdc, 0xdc, 0x4a, 0x23, 0xd5, 0xb2, 0x48, 0x41, 0x03, 0xb0, 0x61, - 0xee, 0xb3, 0x84, 0x8d, 0x97, 0xdb, 0x08, 0x9e, 0xc1, 0xa5, 0x5c, 0xd5, 0x89, 0xdd, 0x83, 0x6a, - 0x6c, 0x2a, 0x4e, 0xa8, 0x59, 0x14, 0xb2, 0xfd, 0x4e, 0xc5, 0xf5, 0xf6, 0xbe, 0x6e, 0xc2, 0x96, - 0x61, 0xc3, 0xc7, 0x08, 0x60, 0xb5, 0x17, 0xdc, 0x29, 0xc2, 0xcf, 0x7f, 0x1b, 0xde, 0x6e, 0x69, - 0x9f, 0xf5, 0x17, 0xb4, 0x8f, 0x7f, 0xfe, 0xfd, 0xbe, 0x71, 0x03, 0x5f, 0xa3, 0x85, 0x77, 0x7b, - 0x66, 0xed, 0xf8, 0x0b, 0x82, 0x5a, 0x86, 0xc5, 0x3b, 0xeb, 0xb9, 0x97, 0x16, 0x3a, 0x65, 0x6d, - 0xce, 0xc1, 0x6d, 0xe3, 0x60, 0x07, 0xb7, 0xd7, 0x38, 0xa0, 0x9f, 0xcc, 0xe1, 0x33, 0x9e, 0x40, - 0xd5, 0x0e, 0x0c, 0x07, 0xe7, 0xd2, 0xe7, 0x76, 0xe2, 0xb5, 0xd7, 0xf6, 0x38, 0x7d, 0xdf, 0xe8, - 0xb7, 0x70, 0xb3, 0xa8, 0x6f, 0x77, 0x71, 0xf0, 0xf4, 0x64, 0xee, 0xa3, 0xd3, 0xb9, 0x8f, 0xfe, - 0xcc, 0x7d, 0xf4, 0x6d, 0xe1, 0x57, 0x4e, 0x17, 0x7e, 0xe5, 0xd7, 0xc2, 0xaf, 0xbc, 0xa6, 0x61, - 0xa4, 0xdf, 0x4d, 0x87, 0x64, 0x24, 0xc7, 0xf4, 0x51, 0x8a, 0xdd, 0x7f, 0xce, 0xf5, 0x07, 0x99, - 0x1c, 0xda, 0x13, 0x9d, 0xdd, 0xa7, 0x1f, 0x1d, 0x9d, 0x3e, 0x8a, 0xb9, 0x1a, 0x56, 0xcd, 0x2f, - 0x7d, 0xf7, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x59, 0x90, 0xf9, 0x0a, 0x9a, 0x04, 0x00, 0x00, + 0xe9, 0x8c, 0x89, 0x82, 0x37, 0x91, 0x0a, 0x8a, 0x08, 0x12, 0x83, 0x07, 0xf1, 0xa2, 0x93, 0x30, + 0xac, 0x4b, 0xcd, 0xcc, 0x66, 0x67, 0x12, 0x2d, 0xe2, 0xa5, 0x17, 0xf1, 0x26, 0xf8, 0x15, 0xfc, + 0x30, 0x3d, 0x16, 0xbc, 0x78, 0x12, 0x49, 0xfc, 0x20, 0xb2, 0x33, 0x93, 0x4d, 0x77, 0x2d, 0xd9, + 0xdb, 0xce, 0x9b, 0xf7, 0xfb, 0xf7, 0xde, 0x2c, 0x78, 0x23, 0x26, 0xb4, 0xa4, 0x3c, 0x19, 0xf5, + 0xee, 0xd0, 0x59, 0x97, 0x4e, 0xa6, 0x3c, 0x39, 0x22, 0x71, 0x22, 0xb5, 0xc4, 0x17, 0xcd, 0x1d, + 0x31, 0x77, 0x64, 0xd6, 0xf5, 0x6e, 0x8d, 0xa4, 0x1a, 0x4b, 0x45, 0x87, 0x4c, 0x71, 0xdb, 0x48, + 0x67, 0xdd, 0x21, 0xd7, 0xac, 0x4b, 0x63, 0x16, 0x46, 0x82, 0xe9, 0x48, 0x0a, 0x8b, 0xf5, 0xae, + 0x17, 0x78, 0x43, 0x2e, 0xb8, 0x8a, 0x94, 0xbb, 0x2d, 0xaa, 0x5a, 0x09, 0x87, 0x0c, 0xa5, 0x0c, + 0xdf, 0x73, 0xca, 0xe2, 0x88, 0x32, 0x21, 0xa4, 0x36, 0xb4, 0x4b, 0x64, 0x23, 0x94, 0xa1, 0x34, + 0x9f, 0x34, 0xfd, 0xb2, 0xd5, 0xe0, 0x2d, 0x34, 0x5f, 0xa4, 0x7e, 0x5e, 0xca, 0x43, 0x2e, 0xfa, + 0x2c, 0x4a, 0xd4, 0x80, 0x4f, 0xa6, 0x5c, 0x69, 0xfc, 0x18, 0x60, 0xe5, 0xad, 0x85, 0xb6, 0xd1, + 0x5e, 0xbd, 0xd7, 0x21, 0x36, 0x08, 0x49, 0x83, 0x10, 0x9b, 0xd8, 0x05, 0x21, 0x7d, 0x16, 0x72, + 0x87, 0x1d, 0x9c, 0x41, 0x06, 0x3f, 0x10, 0x5c, 0xf9, 0x4f, 0x42, 0xc5, 0x52, 0x28, 0x8e, 0x1f, + 0x42, 0x5d, 0xa7, 0xd5, 0x37, 0x71, 0x5a, 0x6e, 0xa1, 0xed, 0xcd, 0xbd, 0x7a, 0xef, 0x2a, 0xc9, + 0x4f, 0x8f, 0x64, 0xc0, 0x83, 0x0b, 0x27, 0xbf, 0x6f, 0x56, 0x06, 0xa0, 0x33, 0x26, 0xfc, 0x24, + 0xe7, 0x72, 0xc3, 0xb8, 0xdc, 0x2d, 0x75, 0x69, 0xe5, 0x73, 0x36, 0xf7, 0xe1, 0x72, 0xde, 0xe5, + 0x72, 0x0e, 0x0d, 0xd8, 0x32, 0x7a, 0x66, 0x04, 0xb5, 0x81, 0x3d, 0x04, 0xaf, 0x8a, 0x73, 0xcb, + 0x32, 0x3d, 0x00, 0x58, 0x65, 0x72, 0x73, 0x2b, 0x8d, 0x54, 0xcb, 0x22, 0x05, 0x0d, 0xc0, 0x86, + 0xb9, 0xcf, 0x12, 0x36, 0x5e, 0x6e, 0x23, 0x78, 0x06, 0x97, 0x72, 0x55, 0x27, 0x76, 0x0f, 0xaa, + 0xb1, 0xa9, 0x38, 0xa1, 0x66, 0x51, 0xc8, 0xf6, 0x3b, 0x15, 0xd7, 0xdb, 0xfb, 0xba, 0x09, 0x5b, + 0x86, 0x0d, 0x1f, 0x23, 0x80, 0xd5, 0x5e, 0x70, 0xa7, 0x08, 0x3f, 0xff, 0x6d, 0x78, 0xbb, 0xa5, + 0x7d, 0xd6, 0x5f, 0xd0, 0x3e, 0xfe, 0xf9, 0xf7, 0xfb, 0xc6, 0x0d, 0x7c, 0x8d, 0x16, 0xde, 0xed, + 0x99, 0xb5, 0xe3, 0x2f, 0x08, 0x6a, 0x19, 0x16, 0xef, 0xac, 0xe7, 0x5e, 0x5a, 0xe8, 0x94, 0xb5, + 0x39, 0x07, 0xb7, 0x8d, 0x83, 0x1d, 0xdc, 0x5e, 0xe3, 0x80, 0x7e, 0x32, 0x87, 0xcf, 0x78, 0x02, + 0x55, 0x3b, 0x30, 0x1c, 0x9c, 0x4b, 0x9f, 0xdb, 0x89, 0xd7, 0x5e, 0xdb, 0xe3, 0xf4, 0x7d, 0xa3, + 0xdf, 0xc2, 0xcd, 0xa2, 0xbe, 0xdd, 0xc5, 0xc1, 0xd3, 0x93, 0xb9, 0x8f, 0x4e, 0xe7, 0x3e, 0xfa, + 0x33, 0xf7, 0xd1, 0xb7, 0x85, 0x5f, 0x39, 0x5d, 0xf8, 0x95, 0x5f, 0x0b, 0xbf, 0xf2, 0x9a, 0x86, + 0x91, 0x7e, 0x37, 0x1d, 0x92, 0x91, 0x1c, 0xd3, 0x47, 0x29, 0x76, 0xff, 0x39, 0xd7, 0x1f, 0x64, + 0x72, 0x68, 0x4f, 0x74, 0x76, 0x9f, 0x7e, 0x74, 0x74, 0xfa, 0x28, 0xe6, 0x6a, 0x58, 0x35, 0xbf, + 0xf4, 0xdd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x7a, 0x8a, 0x91, 0x9a, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/erc20/types/tx.pb.go b/x/erc20/types/tx.pb.go index f42abae3e..dce99958d 100644 --- a/x/erc20/types/tx.pb.go +++ b/x/erc20/types/tx.pb.go @@ -250,7 +250,7 @@ var fileDescriptor_3cff33f93a8dd3e5 = []byte{ // 461 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x6f, 0x13, 0x31, 0x14, 0xce, 0x25, 0x51, 0x44, 0x5d, 0xd4, 0x22, 0x0b, 0xb5, 0xe9, 0x09, 0x5d, 0x42, 0x86, 0x36, - 0x0c, 0xf5, 0x6b, 0x52, 0x89, 0x9d, 0x44, 0x20, 0x75, 0x28, 0xc3, 0x8d, 0x2c, 0x95, 0xe3, 0x58, + 0x0c, 0xf5, 0x6b, 0xd2, 0x81, 0x99, 0x44, 0x20, 0x75, 0x28, 0xc3, 0x8d, 0x2c, 0x95, 0xe3, 0x58, 0xc7, 0xa9, 0xc4, 0xef, 0x64, 0xbb, 0x47, 0xbb, 0x30, 0x74, 0x64, 0x42, 0xe2, 0xcf, 0xf0, 0x13, 0x3a, 0x56, 0x62, 0x41, 0x0c, 0x15, 0x4a, 0xf8, 0x21, 0xe8, 0xec, 0x6b, 0xe8, 0x81, 0x9a, 0x4e, 0xe7, 0xf7, 0xbe, 0xef, 0x3e, 0x7f, 0xef, 0x7b, 0x26, 0xdb, 0x82, 0x2b, 0x8b, 0x20, 0xb5, 0x18, @@ -276,7 +276,7 @@ var fileDescriptor_3cff33f93a8dd3e5 = []byte{ 0x1e, 0x05, 0xd7, 0xf3, 0x28, 0xf8, 0x35, 0x8f, 0x82, 0x2f, 0x8b, 0xa8, 0x76, 0xbd, 0x88, 0x6a, 0x3f, 0x16, 0x51, 0xed, 0x1d, 0xdc, 0xd9, 0xd2, 0xb8, 0x50, 0xd9, 0x7f, 0x2b, 0xed, 0x47, 0xd4, 0xa7, 0xbe, 0x82, 0xfc, 0x25, 0x9c, 0x97, 0xc2, 0x6e, 0x65, 0x93, 0x96, 0x7b, 0xc9, 0x87, 0x7f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x2d, 0x6f, 0x42, 0x48, 0x03, 0x00, 0x00, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x62, 0xc7, 0x1c, 0xd9, 0x48, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/govshuttle/client/cli/query.go b/x/govshuttle/client/cli/query.go index a7c74418a..d649d7fa3 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 a50534ae4..9a02f25be 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 5944cb042..9f06a3719 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 d888f5bd4..91ec5835b 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 c39a17497..ce8146fe8 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 808bc3cc5..cfd606383 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 86582d1d0..1d590b437 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 c29133c34..9d20ef5c7 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 65efce49a..934db11b5 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 b76a64d5d..d89f423b6 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 fa1f4a897..730961588 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 4d6a2d7a8..77baed455 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 3672404a4..7253f3a95 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 2d667775c..8e4d90f62 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 6c9e0ff8d..9e592b917 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 5795e7cf6..66d460c83 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 caf81399c..0fa01a228 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 16bedde13..62eaefee4 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.pb.go b/x/govshuttle/types/genesis.pb.go index 312348585..a53f33c76 100644 --- a/x/govshuttle/types/genesis.pb.go +++ b/x/govshuttle/types/genesis.pb.go @@ -87,8 +87,8 @@ var fileDescriptor_356493b1fc5972f0 = []byte{ 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x24, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xdf, 0x19, 0x64, 0x9c, 0xae, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, 0x84, - 0xa7, 0x5f, 0x66, 0xa6, 0x5f, 0x81, 0xec, 0xd0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, - 0x0b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x55, 0xdc, 0x0e, 0x17, 0x01, 0x00, 0x00, + 0xa7, 0x5f, 0x66, 0xae, 0x5f, 0x81, 0xec, 0xd0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, + 0x0b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xba, 0xa8, 0x69, 0x0f, 0x17, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/govshuttle/types/genesis_test.go b/x/govshuttle/types/genesis_test.go index 70ee0b462..91c325c14 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/govshuttle/types/govshuttle.pb.go b/x/govshuttle/types/govshuttle.pb.go index 92f6fa379..f41dd6fc6 100644 --- a/x/govshuttle/types/govshuttle.pb.go +++ b/x/govshuttle/types/govshuttle.pb.go @@ -344,7 +344,7 @@ var fileDescriptor_39f3a63fcc428040 = []byte{ // 480 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x41, 0x6b, 0xd4, 0x40, 0x14, 0xce, 0xb8, 0xe9, 0xea, 0x4e, 0x41, 0x24, 0x56, 0x19, 0x8b, 0xa4, 0x61, 0xf1, 0xb0, 0x08, - 0x9b, 0xb0, 0x2a, 0x22, 0x7b, 0x52, 0x2b, 0x42, 0xc1, 0x96, 0x12, 0x3c, 0x79, 0x91, 0xd9, 0x64, + 0x9b, 0xb0, 0x2a, 0x28, 0x7b, 0x52, 0x2b, 0x42, 0xc1, 0x96, 0x12, 0x3c, 0x79, 0x91, 0xd9, 0x64, 0x48, 0xc3, 0x26, 0x33, 0x61, 0xe6, 0x25, 0xda, 0xbb, 0x3f, 0xc0, 0xa3, 0x37, 0xfb, 0x23, 0xfc, 0x11, 0x1e, 0x8b, 0x17, 0xf5, 0x26, 0xbb, 0x17, 0x7f, 0x86, 0xcc, 0x4c, 0x76, 0x1b, 0x6b, 0x3d, 0x89, 0xa7, 0xe4, 0xfb, 0xde, 0xbc, 0xf7, 0xbe, 0xef, 0xbd, 0x19, 0x7c, 0x27, 0xa1, 0x1c, 0x44, @@ -371,7 +371,7 @@ var fileDescriptor_39f3a63fcc428040 = []byte{ 0xc1, 0xe7, 0x85, 0x8f, 0x4e, 0x17, 0x3e, 0xfa, 0xb1, 0xf0, 0xd1, 0xfb, 0xa5, 0xef, 0x9c, 0x2e, 0x7d, 0xe7, 0xdb, 0xd2, 0x77, 0x5e, 0x3d, 0xe8, 0x0c, 0x7f, 0x57, 0xef, 0x71, 0x7c, 0xc0, 0xe0, 0x8d, 0x90, 0x73, 0x8b, 0xa2, 0xe6, 0xa1, 0xdd, 0xc0, 0xea, 0x49, 0x9a, 0x45, 0xcc, 0xfa, 0xe6, - 0x15, 0xdd, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0xef, 0xce, 0x52, 0xa1, 0xb3, 0x03, 0x00, 0x00, + 0x15, 0xdd, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x33, 0xe7, 0xa0, 0xb3, 0x03, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/govshuttle/types/query.pb.go b/x/govshuttle/types/query.pb.go index 04c028728..5487175ca 100644 --- a/x/govshuttle/types/query.pb.go +++ b/x/govshuttle/types/query.pb.go @@ -124,7 +124,7 @@ var fileDescriptor_d0b63aa3df11b144 = []byte{ // 315 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x31, 0x4b, 0x03, 0x31, 0x14, 0xc7, 0xef, 0x44, 0x3b, 0x9c, 0xdb, 0xb5, 0x43, 0x39, 0x25, 0x2d, 0x45, 0xb0, 0x08, 0xe6, - 0x71, 0x55, 0x04, 0xd7, 0xba, 0x97, 0xda, 0xd1, 0x2d, 0x57, 0x42, 0x7a, 0xd8, 0xe6, 0xa5, 0x97, + 0x71, 0x55, 0x10, 0xd7, 0xba, 0x97, 0xda, 0xd1, 0x2d, 0x57, 0x42, 0x7a, 0xd8, 0xe6, 0xa5, 0x97, 0xdc, 0x69, 0x07, 0x17, 0x07, 0x67, 0xc1, 0x2f, 0xd5, 0xb1, 0xe0, 0xe2, 0x24, 0xd2, 0xfa, 0x41, 0xa4, 0x49, 0xc1, 0x4a, 0x0f, 0xdc, 0x92, 0xf7, 0x7e, 0xff, 0x97, 0xdf, 0x4b, 0xd0, 0x18, 0x32, 0x69, 0x10, 0x04, 0x16, 0x7a, 0x94, 0x1b, 0x33, 0xe6, 0x50, 0xc4, 0x30, 0xcd, 0x79, 0x36, 0xa3, @@ -141,7 +141,7 @@ var fileDescriptor_d0b63aa3df11b144 = []byte{ 0x12, 0xff, 0x75, 0x45, 0xbc, 0xc5, 0x8a, 0x78, 0x1f, 0x2b, 0xe2, 0xdd, 0x5d, 0x8a, 0xd4, 0x8c, 0xf2, 0x84, 0x0e, 0x71, 0x02, 0x37, 0xeb, 0xf4, 0x79, 0x8f, 0x9b, 0x07, 0xcc, 0xee, 0xdd, 0x0d, 0x8a, 0x2b, 0x78, 0xdc, 0x1e, 0x68, 0x66, 0x8a, 0xeb, 0xa4, 0x62, 0xff, 0xf1, 0xe2, 0x27, 0x00, - 0x00, 0xff, 0xff, 0xfc, 0x8b, 0x76, 0x76, 0x05, 0x02, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xe1, 0x76, 0xc3, 0x77, 0x05, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/govshuttle/types/tx.pb.go b/x/govshuttle/types/tx.pb.go index 096d02fff..b77a4c641 100644 --- a/x/govshuttle/types/tx.pb.go +++ b/x/govshuttle/types/tx.pb.go @@ -34,8 +34,8 @@ var fileDescriptor_d69de145343701ce = []byte{ 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x24, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xdf, 0x19, 0x64, 0x80, 0xae, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, 0x84, 0xa7, 0x5f, - 0x66, 0xa6, 0x5f, 0x81, 0x6c, 0x63, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4a, 0x63, - 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xe9, 0xb9, 0x01, 0x92, 0x00, 0x00, 0x00, + 0x66, 0xae, 0x5f, 0x81, 0x6c, 0x63, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4a, 0x63, + 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x14, 0x0c, 0x00, 0x92, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/inflation/client/cli/query.go b/x/inflation/client/cli/query.go index 20cbe2ab7..13fd81cbb 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 d09fb5a1c..3c96fdc56 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 1408294e0..a5bc5603b 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 9822d7e6e..bc4575463 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 70892a521..e6f0ac9d3 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 e562473bd..b7781afc8 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 4add8fe36..80d5aa3a9 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 bafd044e2..d6926e3be 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 d8d05aeb0..3d3bda94f 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 78034c5e9..c3c8ecc5f 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 c8f379e23..ca0d234dc 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 1f64b9081..83d2abe7a 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 a73db52d5..d0d6e6f46 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 49e631e00..ea7ba41eb 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 12ae2aeb4..81983bcf0 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 3412fc7af..3c4662dfd 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 a65f3e87c..296f174c2 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 3f3841727..e8ab07815 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 6210f9382..8411aa7dc 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 04095b2f8..7d8cb58d1 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 d5b3197b0..c60458175 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.pb.go b/x/inflation/types/genesis.pb.go index b127fcafb..bbde243d1 100644 --- a/x/inflation/types/genesis.pb.go +++ b/x/inflation/types/genesis.pb.go @@ -186,34 +186,34 @@ func init() { func init() { proto.RegisterFile("canto/inflation/v1/genesis.proto", fileDescriptor_5da850aabf0c3ac5) } var fileDescriptor_5da850aabf0c3ac5 = []byte{ - // 424 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x5d, 0x6f, 0xd3, 0x30, - 0x14, 0xad, 0xd7, 0x52, 0x51, 0x0f, 0x18, 0x58, 0x50, 0xaa, 0x4a, 0x84, 0xa8, 0x12, 0x52, 0x37, - 0x89, 0x44, 0xdb, 0x24, 0xc4, 0xf3, 0x3e, 0x84, 0xf6, 0x00, 0xaa, 0xc2, 0x1b, 0x2f, 0x96, 0x9b, - 0xdc, 0x66, 0xd6, 0x12, 0xdb, 0xb2, 0xdd, 0x32, 0xfe, 0x05, 0x7f, 0x82, 0xff, 0xb2, 0xc7, 0x3d, - 0xf2, 0x34, 0xa1, 0xf6, 0x8f, 0xa0, 0xd8, 0x21, 0xad, 0x44, 0xde, 0x7c, 0xcf, 0x39, 0xf7, 0x9c, - 0x7b, 0xaf, 0x8c, 0xc3, 0x94, 0x09, 0x2b, 0x63, 0x2e, 0x16, 0x05, 0xb3, 0x5c, 0x8a, 0x78, 0x75, - 0x1c, 0xe7, 0x20, 0xc0, 0x70, 0x13, 0x29, 0x2d, 0xad, 0x24, 0xc4, 0x29, 0xa2, 0x46, 0x11, 0xad, - 0x8e, 0xc7, 0x2f, 0x73, 0x99, 0x4b, 0x47, 0xc7, 0xd5, 0xcb, 0x2b, 0xc7, 0x93, 0x16, 0xaf, 0x6d, - 0x9b, 0xd3, 0x4c, 0x1e, 0x10, 0x7e, 0xf2, 0xc9, 0xfb, 0x7f, 0xb5, 0xcc, 0x02, 0xf9, 0x88, 0xfb, - 0x8a, 0x69, 0x56, 0x9a, 0x11, 0x0a, 0xd1, 0x74, 0xff, 0x64, 0x1c, 0xfd, 0x9f, 0x17, 0xcd, 0x9c, - 0xe2, 0xac, 0x77, 0xf7, 0xf0, 0xb6, 0x93, 0xd4, 0x7a, 0x32, 0xc4, 0x7d, 0x05, 0x9a, 0xcb, 0x6c, - 0xb4, 0x17, 0xa2, 0x69, 0x2f, 0xa9, 0x2b, 0x72, 0x88, 0x9f, 0x83, 0x92, 0xe9, 0x35, 0xe5, 0x19, - 0x08, 0xcb, 0x17, 0x1c, 0xf4, 0xa8, 0x1b, 0xa2, 0xe9, 0x20, 0x39, 0x70, 0xf8, 0x55, 0x03, 0x93, - 0x23, 0xfc, 0xc2, 0x41, 0x86, 0x2a, 0xd0, 0xb4, 0x76, 0xeb, 0x85, 0x68, 0xda, 0xad, 0xb5, 0x66, - 0x06, 0x7a, 0xe6, 0x6d, 0xdf, 0xe1, 0x67, 0xe6, 0x86, 0x2b, 0x05, 0x19, 0xf5, 0xd4, 0xe8, 0x91, - 0x8b, 0x7d, 0x5a, 0xa3, 0x97, 0x0e, 0x9c, 0xfc, 0xda, 0xc3, 0x7d, 0x3f, 0x2e, 0x79, 0x83, 0x71, - 0xc9, 0x85, 0xa5, 0x19, 0x08, 0x59, 0xba, 0xf5, 0x06, 0xc9, 0xa0, 0x42, 0x2e, 0x2a, 0x80, 0x70, - 0xfc, 0x1a, 0x6e, 0x95, 0x14, 0xd5, 0x34, 0xac, 0xa0, 0x29, 0x2b, 0xd2, 0xa5, 0x5f, 0xd9, 0x2d, - 0xb4, 0x7f, 0x72, 0xd4, 0x76, 0x8a, 0xcb, 0x6d, 0xcb, 0xf9, 0xb6, 0xa3, 0x3e, 0xcd, 0x10, 0x5a, - 0x59, 0xb2, 0xc0, 0xc3, 0xc6, 0x84, 0x66, 0xdc, 0x58, 0xcd, 0xe7, 0x4b, 0x97, 0xd4, 0x75, 0x49, - 0x87, 0x6d, 0x49, 0x57, 0xff, 0x8a, 0x8b, 0x9d, 0x86, 0x3a, 0xe8, 0x15, 0x6f, 0x23, 0xdd, 0xe9, - 0x05, 0x9b, 0x17, 0x40, 0x1b, 0xde, 0x9d, 0xf3, 0x71, 0x72, 0xe0, 0xf1, 0xc6, 0xf3, 0xec, 0xf3, - 0xdd, 0x3a, 0x40, 0xf7, 0xeb, 0x00, 0xfd, 0x59, 0x07, 0xe8, 0xe7, 0x26, 0xe8, 0xdc, 0x6f, 0x82, - 0xce, 0xef, 0x4d, 0xd0, 0xf9, 0x76, 0x9a, 0x73, 0x7b, 0xbd, 0x9c, 0x47, 0xa9, 0x2c, 0xe3, 0xf3, - 0x6a, 0xac, 0xf7, 0x5f, 0xc0, 0x7e, 0x97, 0xfa, 0xc6, 0x57, 0xf1, 0xea, 0x43, 0x7c, 0xbb, 0xf3, - 0xc9, 0xec, 0x0f, 0x05, 0x66, 0xde, 0x77, 0xdf, 0xeb, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x06, 0x8c, 0x3c, 0xd2, 0xd0, 0x02, 0x00, 0x00, + // 423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x4d, 0x6f, 0x13, 0x31, + 0x10, 0x8d, 0x9b, 0x10, 0x11, 0x17, 0x28, 0x58, 0x10, 0xa2, 0x48, 0x2c, 0xab, 0x48, 0x48, 0x69, + 0x25, 0x76, 0xd5, 0xf6, 0x00, 0xe7, 0x7e, 0x08, 0xf5, 0x00, 0x8a, 0x96, 0x1b, 0x17, 0xcb, 0xd9, + 0x9d, 0x6c, 0xad, 0xee, 0xda, 0x96, 0xed, 0x84, 0xf2, 0x2f, 0xf8, 0x13, 0xfc, 0x97, 0x1e, 0x7b, + 0xe4, 0x54, 0xa1, 0xe4, 0x8f, 0xa0, 0xb5, 0x97, 0x4d, 0x24, 0xf6, 0xe6, 0x79, 0xef, 0xcd, 0x7b, + 0x33, 0x23, 0xe3, 0x30, 0x65, 0xc2, 0xca, 0x98, 0x8b, 0x45, 0xc1, 0x2c, 0x97, 0x22, 0x5e, 0x1d, + 0xc7, 0x39, 0x08, 0x30, 0xdc, 0x44, 0x4a, 0x4b, 0x2b, 0x09, 0x71, 0x8a, 0xa8, 0x51, 0x44, 0xab, + 0xe3, 0xf1, 0xcb, 0x5c, 0xe6, 0xd2, 0xd1, 0x71, 0xf5, 0xf2, 0xca, 0xf1, 0xa4, 0xc5, 0x6b, 0xdb, + 0xe6, 0x34, 0x93, 0x07, 0x84, 0x9f, 0x7c, 0xf2, 0xfe, 0x5f, 0x2d, 0xb3, 0x40, 0x3e, 0xe2, 0xbe, + 0x62, 0x9a, 0x95, 0x66, 0x84, 0x42, 0x34, 0xdd, 0x3f, 0x19, 0x47, 0xff, 0xe7, 0x45, 0x33, 0xa7, + 0x38, 0xeb, 0xdd, 0x3d, 0xbc, 0xed, 0x24, 0xb5, 0x9e, 0x0c, 0x71, 0x5f, 0x81, 0xe6, 0x32, 0x1b, + 0xed, 0x85, 0x68, 0xda, 0x4b, 0xea, 0x8a, 0x1c, 0xe2, 0xe7, 0xa0, 0x64, 0x7a, 0x4d, 0x79, 0x06, + 0xc2, 0xf2, 0x05, 0x07, 0x3d, 0xea, 0x86, 0x68, 0x3a, 0x48, 0x0e, 0x1c, 0x7e, 0xd5, 0xc0, 0xe4, + 0x08, 0xbf, 0x70, 0x90, 0xa1, 0x0a, 0x34, 0xad, 0xdd, 0x7a, 0x21, 0x9a, 0x76, 0x6b, 0xad, 0x99, + 0x81, 0x9e, 0x79, 0xdb, 0x77, 0xf8, 0x99, 0xb9, 0xe1, 0x4a, 0x41, 0x46, 0x3d, 0x35, 0x7a, 0xe4, + 0x62, 0x9f, 0xd6, 0xe8, 0xa5, 0x03, 0x27, 0xbf, 0xf6, 0x70, 0xdf, 0x8f, 0x4b, 0xde, 0x60, 0x5c, + 0x72, 0x61, 0x69, 0x06, 0x42, 0x96, 0x6e, 0xbd, 0x41, 0x32, 0xa8, 0x90, 0x8b, 0x0a, 0x20, 0x1c, + 0xbf, 0x86, 0x5b, 0x25, 0x45, 0x35, 0x0d, 0x2b, 0x68, 0xca, 0x8a, 0x74, 0xe9, 0x57, 0x76, 0x0b, + 0xed, 0x9f, 0x1c, 0xb5, 0x9d, 0xe2, 0x72, 0xdb, 0x72, 0xbe, 0xed, 0xa8, 0x4f, 0x33, 0x84, 0x56, + 0x96, 0x2c, 0xf0, 0xb0, 0x31, 0xa1, 0x19, 0x37, 0x56, 0xf3, 0xf9, 0xd2, 0x25, 0x75, 0x5d, 0xd2, + 0x61, 0x5b, 0xd2, 0xd5, 0xbf, 0xe2, 0x62, 0xa7, 0xa1, 0x0e, 0x7a, 0xc5, 0xdb, 0x48, 0x77, 0x7a, + 0xc1, 0xe6, 0x05, 0xd0, 0x86, 0x77, 0xe7, 0x7c, 0x9c, 0x1c, 0x78, 0xbc, 0xf1, 0x3c, 0xfb, 0x7c, + 0xb7, 0x0e, 0xd0, 0xfd, 0x3a, 0x40, 0x7f, 0xd6, 0x01, 0xfa, 0xb9, 0x09, 0x3a, 0xf7, 0x9b, 0xa0, + 0xf3, 0x7b, 0x13, 0x74, 0xbe, 0x9d, 0xe6, 0xdc, 0x5e, 0x2f, 0xe7, 0x51, 0x2a, 0xcb, 0xf8, 0xbc, + 0x1a, 0xeb, 0xfd, 0x17, 0xb0, 0xdf, 0xa5, 0xbe, 0xf1, 0x55, 0xbc, 0xfa, 0x10, 0xdf, 0xee, 0x7c, + 0x32, 0xfb, 0x43, 0x81, 0x99, 0xf7, 0xdd, 0xf7, 0x3a, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x47, + 0x97, 0xb0, 0xbc, 0xd0, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/inflation/types/genesis_test.go b/x/inflation/types/genesis_test.go index fc954071f..a0dc2f753 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/inflation/types/inflation.pb.go b/x/inflation/types/inflation.pb.go index 6e4db3b4b..5431ba58d 100644 --- a/x/inflation/types/inflation.pb.go +++ b/x/inflation/types/inflation.pb.go @@ -144,7 +144,7 @@ var fileDescriptor_aa2aa1764b029465 = []byte{ // 351 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xbd, 0x4e, 0xfb, 0x30, 0x14, 0xc5, 0xe3, 0xfe, 0x3f, 0x24, 0x02, 0x14, 0x29, 0x02, 0x14, 0x31, 0xa4, 0xa8, 0x03, 0x62, - 0x69, 0xa2, 0xaa, 0x12, 0x13, 0x53, 0x5b, 0x06, 0x06, 0x10, 0x54, 0x7c, 0x48, 0x2c, 0x95, 0xe3, + 0x69, 0xa2, 0xaa, 0x03, 0x0b, 0x53, 0x5b, 0x06, 0x06, 0x10, 0x54, 0x7c, 0x48, 0x2c, 0x95, 0xe3, 0x9a, 0x60, 0x35, 0xf1, 0x8d, 0x6c, 0x27, 0x4d, 0xdf, 0x82, 0xb7, 0xa2, 0x63, 0x47, 0xc4, 0x50, 0xa1, 0xf6, 0x35, 0x18, 0x90, 0x93, 0x40, 0x3b, 0x67, 0xca, 0xbd, 0xf1, 0x39, 0x3f, 0xf9, 0x5e, 0x1f, 0xb3, 0x49, 0x30, 0x57, 0xe0, 0x31, 0xfe, 0x1c, 0x62, 0xc5, 0x80, 0x7b, 0x69, 0x7b, 0xdd, @@ -163,7 +163,7 @@ var fileDescriptor_aa2aa1764b029465 = []byte{ 0x88, 0xee, 0xd5, 0x6c, 0xe9, 0xa0, 0xf9, 0xd2, 0x41, 0x9f, 0x4b, 0x07, 0xbd, 0xae, 0x1c, 0x63, 0xbe, 0x72, 0x8c, 0xf7, 0x95, 0x63, 0x3c, 0x75, 0x36, 0x70, 0x3d, 0x9d, 0xcb, 0xd6, 0x35, 0x55, 0x13, 0x10, 0xe3, 0xa2, 0xf3, 0xd2, 0x33, 0x2f, 0xdb, 0x88, 0x73, 0xce, 0xf7, 0xff, 0xe7, 0xf1, - 0xec, 0x7c, 0x07, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xbb, 0xbe, 0xb3, 0xee, 0x02, 0x00, 0x00, + 0xec, 0x7c, 0x07, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xa0, 0x32, 0xdd, 0xee, 0x02, 0x00, 0x00, } func (m *InflationDistribution) Marshal() (dAtA []byte, err error) { diff --git a/x/inflation/types/query.pb.go b/x/inflation/types/query.pb.go index 987a0112f..ecf17fbb1 100644 --- a/x/inflation/types/query.pb.go +++ b/x/inflation/types/query.pb.go @@ -551,47 +551,47 @@ var fileDescriptor_bd7bc906141a59c4 = []byte{ // 689 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0x3f, 0x6f, 0x13, 0x31, 0x18, 0xc6, 0x63, 0x54, 0x82, 0x30, 0x6a, 0xa5, 0x9a, 0x0a, 0xc1, 0x51, 0x2e, 0xd5, 0x09, 0x4a, - 0x55, 0x14, 0x9b, 0x24, 0x12, 0x62, 0x6e, 0x60, 0x60, 0x28, 0x94, 0x54, 0x2c, 0x2c, 0xd1, 0xe5, - 0x6a, 0xae, 0x56, 0x1b, 0xdb, 0x3d, 0x3b, 0x81, 0x0e, 0x48, 0x08, 0xbe, 0x00, 0x12, 0x1b, 0x03, - 0x0b, 0x03, 0x52, 0x17, 0xbe, 0x46, 0xc7, 0x4a, 0x2c, 0x88, 0xa1, 0xa0, 0x86, 0x0f, 0x82, 0xce, - 0xe7, 0x4b, 0x93, 0xc6, 0x49, 0xdb, 0x81, 0xa9, 0x3d, 0xbf, 0xff, 0x9e, 0xf7, 0x39, 0xff, 0x2e, - 0xd0, 0x8f, 0x42, 0xae, 0x05, 0x61, 0xfc, 0xd5, 0x76, 0xa8, 0x99, 0xe0, 0xa4, 0x5b, 0x21, 0x3b, - 0x1d, 0x9a, 0xec, 0x62, 0x99, 0x08, 0x2d, 0x10, 0x32, 0x71, 0xdc, 0x8f, 0xe3, 0x6e, 0xc5, 0x9b, - 0x8b, 0x45, 0x2c, 0x4c, 0x98, 0xa4, 0xff, 0x65, 0x99, 0xde, 0x7c, 0x2c, 0x44, 0xbc, 0x4d, 0x49, - 0x28, 0x19, 0x09, 0x39, 0x17, 0xda, 0xe4, 0x2b, 0x1b, 0xf5, 0x23, 0xa1, 0xda, 0x42, 0x91, 0x56, - 0xa8, 0x28, 0xe9, 0x56, 0x5a, 0x54, 0x87, 0x15, 0x12, 0x09, 0xc6, 0x6d, 0x7c, 0xc1, 0xa1, 0x23, - 0xa6, 0x9c, 0x2a, 0x66, 0x3b, 0x04, 0x73, 0x10, 0x3d, 0x4f, 0x85, 0xad, 0xd1, 0x84, 0x89, 0x8d, - 0x06, 0xdd, 0xe9, 0x50, 0xa5, 0x83, 0x32, 0xbc, 0x3a, 0x74, 0xaa, 0xa4, 0xe0, 0x8a, 0xa2, 0x6b, - 0xb0, 0x28, 0xcd, 0xc9, 0x75, 0xb0, 0x00, 0x96, 0xa6, 0x1a, 0xf6, 0x29, 0x58, 0x80, 0xbe, 0x49, - 0x7f, 0x2c, 0x45, 0xb4, 0xb9, 0xca, 0xb8, 0x5e, 0x4b, 0x44, 0x97, 0x29, 0x26, 0x78, 0xde, 0xf0, - 0x1b, 0x80, 0xa5, 0xb1, 0x29, 0xb6, 0xfb, 0x07, 0x00, 0xe7, 0x68, 0x1a, 0x6e, 0xb6, 0x19, 0xd7, - 0x4d, 0x99, 0x27, 0x98, 0x61, 0x57, 0xaa, 0xf3, 0x38, 0x5b, 0x16, 0xa7, 0xcb, 0x62, 0xbb, 0x2c, - 0x7e, 0x44, 0xa3, 0xba, 0x60, 0x7c, 0xa5, 0xb6, 0x7f, 0x58, 0x2a, 0xec, 0xfd, 0x2e, 0xdd, 0x8b, - 0x99, 0xde, 0xec, 0xb4, 0x70, 0x24, 0xda, 0xc4, 0x9a, 0x93, 0xfd, 0x29, 0xab, 0x8d, 0x2d, 0xa2, - 0x77, 0x25, 0x55, 0x79, 0x8d, 0x6a, 0x20, 0x3a, 0xa2, 0x26, 0xb8, 0x09, 0x6f, 0x18, 0xa1, 0xeb, - 0x5b, 0x4c, 0x4a, 0xba, 0x61, 0xf4, 0xaa, 0x7c, 0x8d, 0x3a, 0xf4, 0x5c, 0x41, 0xbb, 0xc0, 0x1d, - 0x38, 0xa3, 0xb2, 0x40, 0xd3, 0x34, 0x56, 0xd6, 0xa6, 0x69, 0x35, 0x98, 0x1e, 0x94, 0xe0, 0x2d, - 0xd3, 0xa4, 0xce, 0x92, 0xa8, 0x93, 0xbe, 0x17, 0x1e, 0xaf, 0x77, 0xa4, 0xdc, 0xde, 0xcd, 0xa7, - 0x7c, 0x05, 0xd6, 0x4f, 0x47, 0x86, 0x1d, 0xf5, 0x0e, 0x40, 0x14, 0x1d, 0x47, 0x9b, 0xca, 0x84, - 0xff, 0x9f, 0x53, 0xb3, 0xd1, 0x49, 0x29, 0x7d, 0xa3, 0x9e, 0xe4, 0x97, 0xab, 0x11, 0x6a, 0x9a, - 0xaf, 0xa0, 0xac, 0x51, 0x27, 0x82, 0x56, 0xfd, 0x0b, 0x38, 0xd3, 0xbf, 0x92, 0xcd, 0x24, 0xd4, - 0xd4, 0x08, 0xbf, 0xbc, 0x82, 0x53, 0x69, 0xbf, 0x0e, 0x4b, 0x8b, 0x67, 0x93, 0xd6, 0x98, 0x66, - 0x83, 0xed, 0x8f, 0xef, 0x72, 0x98, 0x84, 0xed, 0xfe, 0x3b, 0x7b, 0x96, 0xdf, 0x65, 0x7b, 0x6a, - 0x35, 0x3c, 0x84, 0x45, 0x69, 0x4e, 0xac, 0x69, 0x1e, 0x1e, 0x65, 0x12, 0x67, 0x35, 0x2b, 0x53, - 0xa9, 0xae, 0x86, 0xcd, 0xaf, 0x7e, 0xb9, 0x04, 0x2f, 0x9a, 0x8e, 0xe8, 0x2d, 0x2c, 0x66, 0x84, - 0xa0, 0x45, 0x57, 0xf5, 0x28, 0x58, 0xde, 0xdd, 0x53, 0xf3, 0x32, 0x79, 0x41, 0xf0, 0xfe, 0xc7, - 0xdf, 0x4f, 0x17, 0xe6, 0x91, 0x47, 0x1c, 0x08, 0x67, 0xd8, 0xa1, 0xef, 0x00, 0xa2, 0x51, 0x9e, - 0x50, 0x75, 0xec, 0x8c, 0xb1, 0x7c, 0x7a, 0xb5, 0x73, 0xd5, 0x58, 0x8d, 0xf7, 0x8d, 0xc6, 0x65, - 0xb4, 0xe4, 0xd2, 0xe8, 0x22, 0x19, 0x7d, 0x06, 0x70, 0x7a, 0x88, 0x1d, 0x54, 0x1e, 0x3b, 0xd8, - 0x05, 0xa0, 0x87, 0xcf, 0x9a, 0x6e, 0x25, 0x2e, 0x1b, 0x89, 0xb7, 0x51, 0xe0, 0x92, 0x38, 0x0c, - 0x2b, 0xda, 0x03, 0x70, 0x76, 0x84, 0x38, 0x54, 0x19, 0x3b, 0x71, 0x1c, 0xbf, 0x5e, 0xf5, 0x3c, - 0x25, 0x56, 0x28, 0x36, 0x42, 0x97, 0xd0, 0xa2, 0x4b, 0xe8, 0x28, 0xe9, 0xc6, 0xc9, 0x21, 0xb8, - 0x26, 0x38, 0xe9, 0x22, 0x74, 0x82, 0x93, 0x4e, 0x66, 0x27, 0x3b, 0x39, 0x4c, 0xb3, 0xe1, 0xc2, - 0xb0, 0x32, 0x89, 0x8b, 0x41, 0x48, 0x27, 0x71, 0x31, 0x84, 0xed, 0x29, 0x5c, 0x64, 0xb8, 0xae, - 0xee, 0x1f, 0xf9, 0xe0, 0xe0, 0xc8, 0x07, 0x7f, 0x8e, 0x7c, 0xf0, 0xb1, 0xe7, 0x17, 0x0e, 0x7a, - 0x7e, 0xe1, 0x67, 0xcf, 0x2f, 0xbc, 0xac, 0x0d, 0x7c, 0x58, 0xea, 0x69, 0x7d, 0xf9, 0x29, 0xd5, - 0xaf, 0x45, 0xb2, 0x95, 0x3d, 0x91, 0xee, 0x03, 0xf2, 0x66, 0xa0, 0xa5, 0xf9, 0xd2, 0xb4, 0x8a, - 0xe6, 0x97, 0xb2, 0xf6, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xef, 0xc2, 0xb0, 0xd5, 0x07, 0x00, + 0x55, 0x14, 0x9b, 0x24, 0x03, 0xcc, 0x0d, 0x0c, 0x0c, 0x85, 0x92, 0x8a, 0x85, 0x25, 0xba, 0x5c, + 0xcd, 0xd5, 0x6a, 0x63, 0xbb, 0x67, 0x27, 0xd0, 0x01, 0x09, 0xc1, 0x17, 0x40, 0x62, 0x63, 0x60, + 0x61, 0x40, 0xea, 0xc2, 0xd7, 0xe8, 0x58, 0x89, 0x05, 0x31, 0x14, 0xd4, 0xf0, 0x41, 0xd0, 0xf9, + 0x7c, 0x69, 0xd2, 0x38, 0x69, 0x3b, 0x30, 0xb5, 0xe7, 0xf7, 0xdf, 0xf3, 0x3e, 0xe7, 0xdf, 0x05, + 0xfa, 0x51, 0xc8, 0xb5, 0x20, 0x8c, 0xbf, 0xda, 0x0e, 0x35, 0x13, 0x9c, 0x74, 0x2b, 0x64, 0xa7, + 0x43, 0x93, 0x5d, 0x2c, 0x13, 0xa1, 0x05, 0x42, 0x26, 0x8e, 0xfb, 0x71, 0xdc, 0xad, 0x78, 0x73, + 0xb1, 0x88, 0x85, 0x09, 0x93, 0xf4, 0xbf, 0x2c, 0xd3, 0x9b, 0x8f, 0x85, 0x88, 0xb7, 0x29, 0x09, + 0x25, 0x23, 0x21, 0xe7, 0x42, 0x9b, 0x7c, 0x65, 0xa3, 0x7e, 0x24, 0x54, 0x5b, 0x28, 0xd2, 0x0a, + 0x15, 0x25, 0xdd, 0x4a, 0x8b, 0xea, 0xb0, 0x42, 0x22, 0xc1, 0xb8, 0x8d, 0x2f, 0x38, 0x74, 0xc4, + 0x94, 0x53, 0xc5, 0x6c, 0x87, 0x60, 0x0e, 0xa2, 0xe7, 0xa9, 0xb0, 0x35, 0x9a, 0x30, 0xb1, 0xd1, + 0xa0, 0x3b, 0x1d, 0xaa, 0x74, 0x50, 0x86, 0x57, 0x87, 0x4e, 0x95, 0x14, 0x5c, 0x51, 0x74, 0x0d, + 0x16, 0xa5, 0x39, 0xb9, 0x0e, 0x16, 0xc0, 0xd2, 0x54, 0xc3, 0x3e, 0x05, 0x0b, 0xd0, 0x37, 0xe9, + 0x8f, 0xa5, 0x88, 0x36, 0x57, 0x19, 0xd7, 0x6b, 0x89, 0xe8, 0x32, 0xc5, 0x04, 0xcf, 0x1b, 0x7e, + 0x03, 0xb0, 0x34, 0x36, 0xc5, 0x76, 0xff, 0x00, 0xe0, 0x1c, 0x4d, 0xc3, 0xcd, 0x36, 0xe3, 0xba, + 0x29, 0xf3, 0x04, 0x33, 0xec, 0x4a, 0x75, 0x1e, 0x67, 0xcb, 0xe2, 0x74, 0x59, 0x6c, 0x97, 0xc5, + 0x8f, 0x68, 0x54, 0x17, 0x8c, 0xaf, 0xd4, 0xf6, 0x0f, 0x4b, 0x85, 0xbd, 0xdf, 0xa5, 0x7b, 0x31, + 0xd3, 0x9b, 0x9d, 0x16, 0x8e, 0x44, 0x9b, 0x58, 0x73, 0xb2, 0x3f, 0x65, 0xb5, 0xb1, 0x45, 0xf4, + 0xae, 0xa4, 0x2a, 0xaf, 0x51, 0x0d, 0x44, 0x47, 0xd4, 0x04, 0x37, 0xe1, 0x0d, 0x23, 0x74, 0x7d, + 0x8b, 0x49, 0x49, 0x37, 0x8c, 0x5e, 0x95, 0xaf, 0x51, 0x87, 0x9e, 0x2b, 0x68, 0x17, 0xb8, 0x03, + 0x67, 0x54, 0x16, 0x68, 0x9a, 0xc6, 0xca, 0xda, 0x34, 0xad, 0x06, 0xd3, 0x83, 0x12, 0xbc, 0x65, + 0x9a, 0xd4, 0x59, 0x12, 0x75, 0xd2, 0xf7, 0xc2, 0xe3, 0xf5, 0x8e, 0x94, 0xdb, 0xbb, 0xf9, 0x94, + 0xaf, 0xc0, 0xfa, 0xe9, 0xc8, 0xb0, 0xa3, 0xde, 0x01, 0x88, 0xa2, 0xe3, 0x68, 0x53, 0x99, 0xf0, + 0xff, 0x73, 0x6a, 0x36, 0x3a, 0x29, 0xa5, 0x6f, 0xd4, 0x93, 0xfc, 0x72, 0x35, 0x42, 0x4d, 0xf3, + 0x15, 0x94, 0x35, 0xea, 0x44, 0xd0, 0xaa, 0x7f, 0x01, 0x67, 0xfa, 0x57, 0xb2, 0x99, 0x84, 0x9a, + 0x1a, 0xe1, 0x97, 0x57, 0x70, 0x2a, 0xed, 0xd7, 0x61, 0x69, 0xf1, 0x6c, 0xd2, 0x1a, 0xd3, 0x6c, + 0xb0, 0xfd, 0xf1, 0x5d, 0x0e, 0x93, 0xb0, 0xdd, 0x7f, 0x67, 0xcf, 0xf2, 0xbb, 0x6c, 0x4f, 0xad, + 0x86, 0x87, 0xb0, 0x28, 0xcd, 0x89, 0x35, 0xcd, 0xc3, 0xa3, 0x4c, 0xe2, 0xac, 0x66, 0x65, 0x2a, + 0xd5, 0xd5, 0xb0, 0xf9, 0xd5, 0x2f, 0x97, 0xe0, 0x45, 0xd3, 0x11, 0xbd, 0x85, 0xc5, 0x8c, 0x10, + 0xb4, 0xe8, 0xaa, 0x1e, 0x05, 0xcb, 0xbb, 0x7b, 0x6a, 0x5e, 0x26, 0x2f, 0x08, 0xde, 0xff, 0xf8, + 0xfb, 0xe9, 0xc2, 0x3c, 0xf2, 0x88, 0x03, 0xe1, 0x0c, 0x3b, 0xf4, 0x1d, 0x40, 0x34, 0xca, 0x13, + 0xaa, 0x8e, 0x9d, 0x31, 0x96, 0x4f, 0xaf, 0x76, 0xae, 0x1a, 0xab, 0xf1, 0xbe, 0xd1, 0xb8, 0x8c, + 0x96, 0x5c, 0x1a, 0x5d, 0x24, 0xa3, 0xcf, 0x00, 0x4e, 0x0f, 0xb1, 0x83, 0xca, 0x63, 0x07, 0xbb, + 0x00, 0xf4, 0xf0, 0x59, 0xd3, 0xad, 0xc4, 0x65, 0x23, 0xf1, 0x36, 0x0a, 0x5c, 0x12, 0x87, 0x61, + 0x45, 0x7b, 0x00, 0xce, 0x8e, 0x10, 0x87, 0x2a, 0x63, 0x27, 0x8e, 0xe3, 0xd7, 0xab, 0x9e, 0xa7, + 0xc4, 0x0a, 0xc5, 0x46, 0xe8, 0x12, 0x5a, 0x74, 0x09, 0x1d, 0x25, 0xdd, 0x38, 0x39, 0x04, 0xd7, + 0x04, 0x27, 0x5d, 0x84, 0x4e, 0x70, 0xd2, 0xc9, 0xec, 0x64, 0x27, 0x87, 0x69, 0x36, 0x5c, 0x18, + 0x56, 0x26, 0x71, 0x31, 0x08, 0xe9, 0x24, 0x2e, 0x86, 0xb0, 0x3d, 0x85, 0x8b, 0x0c, 0xd7, 0xd5, + 0xfd, 0x23, 0x1f, 0x1c, 0x1c, 0xf9, 0xe0, 0xcf, 0x91, 0x0f, 0x3e, 0xf6, 0xfc, 0xc2, 0x41, 0xcf, + 0x2f, 0xfc, 0xec, 0xf9, 0x85, 0x97, 0xb5, 0x81, 0x0f, 0x4b, 0x3d, 0xad, 0x2f, 0x3f, 0xa5, 0xfa, + 0xb5, 0x48, 0xb6, 0xb2, 0x27, 0xd2, 0x7d, 0x40, 0xde, 0x0c, 0xb4, 0x34, 0x5f, 0x9a, 0x56, 0xd1, + 0xfc, 0x52, 0xd6, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xf4, 0x4e, 0xde, 0xd5, 0x07, 0x00, 0x00, } diff --git a/x/onboarding/client/cli/query.go b/x/onboarding/client/cli/query.go index 820bd417c..a5112adb2 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 124517b60..b08a7998f 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 a26967aa9..7cd912808 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 5af8f5848..32df9e274 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 26c586710..e377897ae 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 3ea85a73a..704b82340 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 a44ecd998..17f795630 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 90ee284bf..5ef388b03 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 fa0587935..68ef1fc4f 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 31cae6f6b..7ee79090a 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 fcab42f8e..cbda45002 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 8d701e7cb..28d55203b 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 e5ed1574e..9710259f3 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 91973fb1e..a0fc7abce 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 dbe01f330..d4180afd4 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 b7394b40b..32b06f9d1 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 ed77d4933..5d8b7d81f 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/genesis.pb.go b/x/onboarding/types/genesis.pb.go index 8a1ca3c41..ba0e937d9 100644 --- a/x/onboarding/types/genesis.pb.go +++ b/x/onboarding/types/genesis.pb.go @@ -137,7 +137,7 @@ var fileDescriptor_a3d6be42d72587d3 = []byte{ // 349 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x31, 0x4f, 0xc2, 0x40, 0x14, 0xc7, 0xdb, 0x40, 0x88, 0x54, 0x07, 0x29, 0x0c, 0x04, 0x93, 0x82, 0x0c, 0x86, 0xc4, 0x70, - 0x17, 0xd4, 0x98, 0xb8, 0xc2, 0x60, 0x58, 0xd0, 0x14, 0x27, 0x07, 0x9b, 0x6b, 0x7b, 0x5e, 0x1b, + 0x17, 0xd4, 0xc4, 0xb8, 0xc2, 0x60, 0x58, 0xd0, 0x14, 0x27, 0x07, 0x9b, 0x6b, 0x7b, 0x5e, 0x1b, 0xca, 0xbd, 0xa6, 0x77, 0xa5, 0xfa, 0x2d, 0xfc, 0x58, 0x8c, 0x8c, 0xc6, 0x81, 0x18, 0xf8, 0x22, 0xa6, 0x57, 0x14, 0x06, 0xa7, 0xbb, 0x77, 0xbf, 0xff, 0xfb, 0xbf, 0x97, 0xff, 0x19, 0xe7, 0x1e, 0xe1, 0x12, 0x30, 0x70, 0x17, 0x48, 0xe2, 0x87, 0x9c, 0xe1, 0xc5, 0x00, 0x33, 0xca, 0xa9, 0x08, @@ -156,7 +156,7 @@ var fileDescriptor_a3d6be42d72587d3 = []byte{ 0xe5, 0xc6, 0xd2, 0x57, 0x1b, 0x4b, 0xff, 0xde, 0x58, 0xfa, 0xc7, 0xd6, 0xd2, 0x56, 0x5b, 0x4b, 0xfb, 0xdc, 0x5a, 0xda, 0xf3, 0xcd, 0xc1, 0x1e, 0xa3, 0x3c, 0x99, 0xfe, 0x84, 0xca, 0x0c, 0x92, 0x59, 0x51, 0xe1, 0xc5, 0x2d, 0x7e, 0x3b, 0xfc, 0x3b, 0xb5, 0x99, 0x5b, 0x51, 0x61, 0x5f, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x4e, 0xa8, 0x6a, 0xdc, 0x01, 0x00, 0x00, + 0x04, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xb3, 0x1d, 0x6b, 0xdc, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/onboarding/types/interfaces.go b/x/onboarding/types/interfaces.go index 353125b64..04865659d 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 { diff --git a/x/onboarding/types/query.pb.go b/x/onboarding/types/query.pb.go index 24ebe0b7a..e55509c6a 100644 --- a/x/onboarding/types/query.pb.go +++ b/x/onboarding/types/query.pb.go @@ -137,9 +137,9 @@ var fileDescriptor_f54664b18a9ec5b6 = []byte{ 0xc7, 0x38, 0xf9, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x49, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0xbe, 0x33, 0xc8, 0x00, 0x5d, 0xbf, 0xd4, - 0x92, 0xf2, 0xfc, 0xa2, 0x6c, 0x08, 0x4f, 0xbf, 0xcc, 0x4c, 0xbf, 0x02, 0xd9, 0xcc, 0x92, 0xca, - 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x58, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x1b, - 0x81, 0xff, 0xda, 0x01, 0x00, 0x00, + 0x92, 0xf2, 0xfc, 0xa2, 0x6c, 0x08, 0x4f, 0xbf, 0xcc, 0x5c, 0xbf, 0x02, 0xd9, 0xcc, 0x92, 0xca, + 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x58, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x51, 0xe6, + 0x34, 0xfe, 0xda, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.