diff --git a/CHANGELOG.md b/CHANGELOG.md index e2b127224d..8dd0e82a51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,22 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## [v7.0.0] - 2002-08-04 + +### State Machine Breaking + +- (deps) Bump Ethermint version to [`v0.18.0`](https://github.com/evmos/ethermint/releases/tag/v0.18.0) + +## [v6.0.4] - 2002-08-03 + +### Improvements + +- (deps) [\#819](https://github.com/evmos/evmos/pull/819) Bump ibc-go version to [`v3.1.1`](https://github.com/cosmos/ibc-go/releases/tag/v3.1.1) + +### Bug Fixes + +- (app) [\#820](https://github.com/evmos/evmos/pull/820) Set fork upgrade block height for `v7.0.0` + ## [v6.0.3] - 2002-07-26 ### Bug Fixes diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 16f2c98897..cf14e9220b 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" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) // HandlerOptions defines the list of module keepers required to run the Evmos diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index d3e2b06bb5..9e6eaeb6aa 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -18,8 +18,8 @@ import ( "github.com/evmos/ethermint/encoding" evmtypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/app" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/app" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/app/ante/vesting.go b/app/ante/vesting.go index 146a931af5..d2c1ec2bf8 100644 --- a/app/ante/vesting.go +++ b/app/ante/vesting.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) // EthVestingTransactionDecorator validates if clawback vesting accounts are diff --git a/app/app.go b/app/app.go index c94ac4c80e..f916c2bf90 100644 --- a/app/app.go +++ b/app/app.go @@ -105,36 +105,37 @@ import ( feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" // unnamed import of statik for swagger UI support - _ "github.com/evmos/evmos/v6/client/docs/statik" - - "github.com/evmos/evmos/v6/app/ante" - v2 "github.com/evmos/evmos/v6/app/upgrades/v2" - v4 "github.com/evmos/evmos/v6/app/upgrades/v4" - v5 "github.com/evmos/evmos/v6/app/upgrades/v5" - v6 "github.com/evmos/evmos/v6/app/upgrades/v6" - "github.com/evmos/evmos/v6/x/claims" - claimskeeper "github.com/evmos/evmos/v6/x/claims/keeper" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" - "github.com/evmos/evmos/v6/x/epochs" - epochskeeper "github.com/evmos/evmos/v6/x/epochs/keeper" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/erc20" - erc20client "github.com/evmos/evmos/v6/x/erc20/client" - erc20keeper "github.com/evmos/evmos/v6/x/erc20/keeper" - erc20types "github.com/evmos/evmos/v6/x/erc20/types" - "github.com/evmos/evmos/v6/x/incentives" - incentivesclient "github.com/evmos/evmos/v6/x/incentives/client" - incentiveskeeper "github.com/evmos/evmos/v6/x/incentives/keeper" - incentivestypes "github.com/evmos/evmos/v6/x/incentives/types" - "github.com/evmos/evmos/v6/x/inflation" - inflationkeeper "github.com/evmos/evmos/v6/x/inflation/keeper" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" - "github.com/evmos/evmos/v6/x/recovery" - recoverykeeper "github.com/evmos/evmos/v6/x/recovery/keeper" - recoverytypes "github.com/evmos/evmos/v6/x/recovery/types" - "github.com/evmos/evmos/v6/x/vesting" - vestingkeeper "github.com/evmos/evmos/v6/x/vesting/keeper" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + _ "github.com/evmos/evmos/v7/client/docs/statik" + + "github.com/evmos/evmos/v7/app/ante" + v2 "github.com/evmos/evmos/v7/app/upgrades/v2" + v4 "github.com/evmos/evmos/v7/app/upgrades/v4" + v5 "github.com/evmos/evmos/v7/app/upgrades/v5" + v6 "github.com/evmos/evmos/v7/app/upgrades/v6" + v7 "github.com/evmos/evmos/v7/app/upgrades/v7" + "github.com/evmos/evmos/v7/x/claims" + claimskeeper "github.com/evmos/evmos/v7/x/claims/keeper" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" + "github.com/evmos/evmos/v7/x/epochs" + epochskeeper "github.com/evmos/evmos/v7/x/epochs/keeper" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/v7/x/erc20" + erc20client "github.com/evmos/evmos/v7/x/erc20/client" + erc20keeper "github.com/evmos/evmos/v7/x/erc20/keeper" + erc20types "github.com/evmos/evmos/v7/x/erc20/types" + "github.com/evmos/evmos/v7/x/incentives" + incentivesclient "github.com/evmos/evmos/v7/x/incentives/client" + incentiveskeeper "github.com/evmos/evmos/v7/x/incentives/keeper" + incentivestypes "github.com/evmos/evmos/v7/x/incentives/types" + "github.com/evmos/evmos/v7/x/inflation" + inflationkeeper "github.com/evmos/evmos/v7/x/inflation/keeper" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" + "github.com/evmos/evmos/v7/x/recovery" + recoverykeeper "github.com/evmos/evmos/v7/x/recovery/keeper" + recoverytypes "github.com/evmos/evmos/v7/x/recovery/types" + "github.com/evmos/evmos/v7/x/vesting" + vestingkeeper "github.com/evmos/evmos/v7/x/vesting/keeper" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) func init() { @@ -1054,6 +1055,17 @@ func (app *Evmos) setupUpgradeHandlers() { ), ) + // v7 upgrade handler + app.UpgradeKeeper.SetUpgradeHandler( + v7.UpgradeName, + v7.CreateUpgradeHandler( + app.mm, app.configurator, + app.BankKeeper, + app.InflationKeeper, + app.ClaimsKeeper, + ), + ) + // When a planned update height is reached, the old binary will panic // writing on disk the height and name of the update that triggered it // This will read that value, and execute the preparations for the upgrade. @@ -1077,6 +1089,8 @@ func (app *Evmos) setupUpgradeHandlers() { // no store upgrades in v5 case v6.UpgradeName: // no store upgrades in v6 + case v7.UpgradeName: + // no store upgrades in v7 } if storeUpgrades != nil { diff --git a/app/app_test.go b/app/app_test.go index ebce658055..3c2f6d4bdc 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -14,7 +14,7 @@ import ( dbm "github.com/tendermint/tm-db" "github.com/evmos/ethermint/encoding" - "github.com/evmos/evmos/v6/types" + "github.com/evmos/evmos/v7/types" ) func TestEvmosExport(t *testing.T) { diff --git a/app/forks.go b/app/forks.go index 692f87ee0d..0d1b5087eb 100644 --- a/app/forks.go +++ b/app/forks.go @@ -6,9 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - v2 "github.com/evmos/evmos/v6/app/upgrades/v2" - v4 "github.com/evmos/evmos/v6/app/upgrades/v4" - "github.com/evmos/evmos/v6/types" + v2 "github.com/evmos/evmos/v7/app/upgrades/v2" + v4 "github.com/evmos/evmos/v7/app/upgrades/v4" + v7 "github.com/evmos/evmos/v7/app/upgrades/v7" + "github.com/evmos/evmos/v7/types" ) // ScheduleForkUpgrade executes any necessary fork logic for based upon the current @@ -37,6 +38,9 @@ func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) { case v4.MainnetUpgradeHeight: upgradePlan.Name = v4.UpgradeName upgradePlan.Info = v4.UpgradeInfo + case v7.MainnetUpgradeHeight: + upgradePlan.Name = v7.UpgradeName + upgradePlan.Info = v7.UpgradeInfo default: // No-op return diff --git a/app/test_helpers.go b/app/test_helpers.go index eb74c33b64..b5e5123810 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -16,8 +16,8 @@ import ( "github.com/evmos/ethermint/encoding" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/cmd/config" - "github.com/evmos/evmos/v6/types" + "github.com/evmos/evmos/v7/cmd/config" + "github.com/evmos/evmos/v7/types" ) func init() { diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go index 07fb9f7da2..844362b9aa 100644 --- a/app/upgrades/v2/upgrades.go +++ b/app/upgrades/v2/upgrades.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" - erc20types "github.com/evmos/evmos/v6/x/erc20/types" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" + erc20types "github.com/evmos/evmos/v7/x/erc20/types" ) // CreateUpgradeHandler creates an SDK upgrade handler for v2 diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 73f7312991..0a68372756 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -8,7 +8,7 @@ import ( ibcclientkeeper "github.com/cosmos/ibc-go/v3/modules/core/02-client/keeper" ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - "github.com/evmos/evmos/v6/types" + "github.com/evmos/evmos/v7/types" ) // CreateUpgradeHandler creates an SDK upgrade handler for v4 diff --git a/app/upgrades/v4/upgrades_test.go b/app/upgrades/v4/upgrades_test.go index 320d9b0686..ba7e1c1611 100644 --- a/app/upgrades/v4/upgrades_test.go +++ b/app/upgrades/v4/upgrades_test.go @@ -19,8 +19,8 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/app" - v4 "github.com/evmos/evmos/v6/app/upgrades/v4" + "github.com/evmos/evmos/v7/app" + v4 "github.com/evmos/evmos/v7/app/upgrades/v4" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go index c086f7b2df..44414855e7 100644 --- a/app/upgrades/v5/upgrades.go +++ b/app/upgrades/v5/upgrades.go @@ -22,9 +22,9 @@ import ( feemarketv011 "github.com/evmos/ethermint/x/feemarket/migrations/v011" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/types" - claimskeeper "github.com/evmos/evmos/v6/x/claims/keeper" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/types" + claimskeeper "github.com/evmos/evmos/v7/x/claims/keeper" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" ) // TestnetDenomMetadata defines the metadata for the tEVMOS denom on testnet diff --git a/app/upgrades/v5/upgrades_test.go b/app/upgrades/v5/upgrades_test.go index 9478ad6bb7..06f06caf66 100644 --- a/app/upgrades/v5/upgrades_test.go +++ b/app/upgrades/v5/upgrades_test.go @@ -21,11 +21,11 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - "github.com/evmos/evmos/v6/app" - v5 "github.com/evmos/evmos/v6/app/upgrades/v5" - evmostypes "github.com/evmos/evmos/v6/types" - claimskeeper "github.com/evmos/evmos/v6/x/claims/keeper" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/app" + v5 "github.com/evmos/evmos/v7/app/upgrades/v5" + evmostypes "github.com/evmos/evmos/v7/types" + claimskeeper "github.com/evmos/evmos/v7/x/claims/keeper" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v6/upgrades.go b/app/upgrades/v6/upgrades.go index 5442f9f4a4..0890d72837 100644 --- a/app/upgrades/v6/upgrades.go +++ b/app/upgrades/v6/upgrades.go @@ -14,9 +14,9 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - v5 "github.com/evmos/evmos/v6/app/upgrades/v5" - "github.com/evmos/evmos/v6/types" - claimskeeper "github.com/evmos/evmos/v6/x/claims/keeper" + v5 "github.com/evmos/evmos/v7/app/upgrades/v5" + "github.com/evmos/evmos/v7/types" + claimskeeper "github.com/evmos/evmos/v7/x/claims/keeper" ) // CreateUpgradeHandler creates an SDK upgrade handler for v5 diff --git a/app/upgrades/v6/upgrades_test.go b/app/upgrades/v6/upgrades_test.go index 38daab8bcd..cfc1a40f07 100644 --- a/app/upgrades/v6/upgrades_test.go +++ b/app/upgrades/v6/upgrades_test.go @@ -17,9 +17,9 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/app" - v6 "github.com/evmos/evmos/v6/app/upgrades/v6" - evmostypes "github.com/evmos/evmos/v6/types" + "github.com/evmos/evmos/v7/app" + v6 "github.com/evmos/evmos/v7/app/upgrades/v6" + evmostypes "github.com/evmos/evmos/v7/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go new file mode 100644 index 0000000000..74fbb72c9e --- /dev/null +++ b/app/upgrades/v7/constants.go @@ -0,0 +1,22 @@ +package v7 + +const ( + // UpgradeName is the shared upgrade plan name for mainnet and testnet + UpgradeName = "v7.0.0" + // MainnetUpgradeHeight defines the Evmos mainnet block height on which the upgrade will take place + MainnetUpgradeHeight = 2_476_000 + // TestnetUpgradeHeight defines the Evmos testnet block height on which the upgrade will take place + TestnetUpgradeHeight = 2_176_500 // TODO: + // UpgradeInfo defines the binaries that will be used for the upgrade + UpgradeInfo = `'{"binaries":{"darwin/arm64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Linux_arm64.tar.gz","linux/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Linux_x86_64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Windows_x86_64.zip"}}'` + + // FaucetAddressFrom is the inaccessible secp address of the Testnet Faucet + FaucetAddressFrom = "evmos1z4ya98ga2xnffn2mhjym7tzlsm49ec23890sze" + // FaucetAddressTo is the new eth_secp address of the Testnet Faucet + FaucetAddressTo = "evmos1ujm4z5v9zkdqm70xnptr027gqu90f7lxjr0fch" + + // ContributorAddrFrom is the lost address of an early contributor + ContributorAddrFrom = "evmos1659xwt0hnu5humgek7scefhnpcm2w6hyvy4fsq" + // ContributorAddrTo is the new address of an early contributor + ContributorAddrTo = "evmos1pktlmqrz448cuazl98tqmsj4kjwpqpmaa0cjcf" +) diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go new file mode 100644 index 0000000000..71f09da0f6 --- /dev/null +++ b/app/upgrades/v7/upgrades.go @@ -0,0 +1,99 @@ +package v7 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/module" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + "github.com/evmos/evmos/v7/types" + claimskeeper "github.com/evmos/evmos/v7/x/claims/keeper" + inflationkeeper "github.com/evmos/evmos/v7/x/inflation/keeper" +) + +// CreateUpgradeHandler creates an SDK upgrade handler for v7 +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + bk bankkeeper.Keeper, + ik inflationkeeper.Keeper, + ck *claimskeeper.Keeper, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + logger := ctx.Logger().With("upgrade", UpgradeName) + + // Refs: + // - https://docs.cosmos.network/master/building-modules/upgrade.html#registering-migrations + // - https://docs.cosmos.network/master/migrations/chain-upgrade-guide-044.html#chain-upgrade + + if types.IsTestnet(ctx.ChainID()) { + logger.Debug("migrating inaccessible balance of secp faucet account...") + if err := MigrateFaucetBalances(ctx, bk); err != nil { + // log error instead of aborting the upgrade + logger.Error("FAILED TO MIGRATE FAUCET BALANCES", "error", err.Error()) + } + } + + if types.IsMainnet(ctx.ChainID()) { + logger.Debug("migrating skipped epochs value of inflation module...") + MigrateSkippedEpochs(ctx, ik) + + logger.Debug("migrating early contributor's claim record to new address...") + MigrateContributorClaim(ctx, ck) + } + + // Leave modules are as-is to avoid running InitGenesis. + logger.Debug("running module migrations ...") + return mm.RunMigrations(ctx, configurator, vm) + } +} + +// MigrateFaucetBalances transfers all balances of the inaccessible secp256k1 +// Faucet address on testnet to a eth_secp256k1 address. +func MigrateFaucetBalances(ctx sdk.Context, bk bankkeeper.Keeper) error { + from := sdk.MustAccAddressFromBech32(FaucetAddressFrom) + to := sdk.MustAccAddressFromBech32(FaucetAddressTo) + balances := bk.GetAllBalances(ctx, from) + if err := bk.SendCoins(ctx, from, to, balances); err != nil { + return sdkerrors.Wrap(err, "failed to migrate Faucet Balances") + } + return nil +} + +// MigrateSkippedEpochs migrates the number of skipped epochs to be lower +// than the previous stored value, due to an overcounting of two epochs pre v6.0.0. +// - launch date: 2022-03-02 20:00:00 +// - halt date: 2022-03-06 22:11:42 (Block 58701) +// - relaunch date: 2022-04-27 18:00:00 +// - inflation turned on: 2022-06-06 6:35:30 (skippedEpochs (incorrect) = 94 at this point) +// - counting mechanism fixed: 2022-07-04 (v6.0.0) +// = current date: 2022-07-07 13:00:00 +// - currentEpochDay = 128 +// = currentEpochWeek = 19 +// - skippedEpochs (incorrectly calculated) = 94 +// - 127 epochs have fully passed since launch +// - Of these 127 epochs, inflation has been enabled (at the end of the epoch) for 4 (pre-halt) + 31 (post-inflation-enabled) = 35 epochs +// - So the number of skippedEpochs (those with inflation disabled) should be 127 - 35 = 92 epochs, not 94 epochs +// - Can also see this by calculating number of completed epochs between halt date and date inflation turned on: 92 epochs between 3/6/2022 22:11:42, 6/6/2022 6:35:30 +// Since skippedEpochs past v6.0.0 will be counted correctly (via PR #554), then we just account for the overcounting of 2 epochs +func MigrateSkippedEpochs(ctx sdk.Context, ik inflationkeeper.Keeper) { + previousValue := ik.GetSkippedEpochs(ctx) + newValue := previousValue - uint64(2) + ik.SetSkippedEpochs(ctx, newValue) +} + +// MigrateContributorClaim migrates the claims record of a specific early +// contributor from one address to another +func MigrateContributorClaim(ctx sdk.Context, k *claimskeeper.Keeper) { + from, _ := sdk.AccAddressFromBech32(ContributorAddrFrom) + to, _ := sdk.AccAddressFromBech32(ContributorAddrTo) + + cr, found := k.GetClaimsRecord(ctx, from) + if !found { + return + } + + k.DeleteClaimsRecord(ctx, from) + k.SetClaimsRecord(ctx, to, cr) +} diff --git a/app/upgrades/v7/upgrades_test.go b/app/upgrades/v7/upgrades_test.go new file mode 100644 index 0000000000..b40237b772 --- /dev/null +++ b/app/upgrades/v7/upgrades_test.go @@ -0,0 +1,200 @@ +package v7_test + +import ( + "fmt" + "testing" + "time" + + "github.com/stretchr/testify/suite" + + "github.com/tendermint/tendermint/crypto/tmhash" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmversion "github.com/tendermint/tendermint/proto/tendermint/version" + "github.com/tendermint/tendermint/version" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/evmos/ethermint/crypto/ethsecp256k1" + feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" + + "github.com/evmos/evmos/v7/app" + v7 "github.com/evmos/evmos/v7/app/upgrades/v7" + "github.com/evmos/evmos/v7/testutil" + evmostypes "github.com/evmos/evmos/v7/types" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" +) + +type UpgradeTestSuite struct { + suite.Suite + + ctx sdk.Context + app *app.Evmos + consAddress sdk.ConsAddress +} + +func (suite *UpgradeTestSuite) SetupTest(chainID string) { + checkTx := false + + // consensus key + priv, err := ethsecp256k1.GenerateKey() + suite.Require().NoError(err) + suite.consAddress = sdk.ConsAddress(priv.PubKey().Address()) + + // NOTE: this is the new binary, not the old one. + suite.app = app.Setup(checkTx, feemarkettypes.DefaultGenesisState()) + suite.ctx = suite.app.BaseApp.NewContext(checkTx, tmproto.Header{ + Height: 1, + ChainID: chainID, + Time: time.Date(2022, 5, 9, 8, 0, 0, 0, time.UTC), + ProposerAddress: suite.consAddress.Bytes(), + + Version: tmversion.Consensus{ + Block: version.BlockProtocol, + }, + LastBlockId: tmproto.BlockID{ + Hash: tmhash.Sum([]byte("block_id")), + PartSetHeader: tmproto.PartSetHeader{ + Total: 11, + Hash: tmhash.Sum([]byte("partset_header")), + }, + }, + AppHash: tmhash.Sum([]byte("app")), + DataHash: tmhash.Sum([]byte("data")), + EvidenceHash: tmhash.Sum([]byte("evidence")), + ValidatorsHash: tmhash.Sum([]byte("validators")), + NextValidatorsHash: tmhash.Sum([]byte("next_validators")), + ConsensusHash: tmhash.Sum([]byte("consensus")), + LastResultsHash: tmhash.Sum([]byte("last_result")), + }) + + cp := suite.app.BaseApp.GetConsensusParams(suite.ctx) + suite.ctx = suite.ctx.WithConsensusParams(cp) +} + +func TestUpgradeTestSuite(t *testing.T) { + s := new(UpgradeTestSuite) + suite.Run(t, s) +} + +func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { + from := sdk.MustAccAddressFromBech32(v7.FaucetAddressFrom) + to := sdk.MustAccAddressFromBech32(v7.FaucetAddressTo) + + testCases := []struct { + name string + chainID string + expectedMigration bool + }{ + { + "Testnet - sucess", + evmostypes.TestnetChainID + "-4", + true, + }, + } + + for _, tc := range testCases { + suite.Run(fmt.Sprintf("Case %s", tc.name), func() { + suite.SetupTest(tc.chainID) // reset + + coins := sdk.NewCoins(sdk.NewCoin(suite.app.StakingKeeper.BondDenom(suite.ctx), sdk.NewInt(1000))) + err := testutil.FundAccount(suite.app.BankKeeper, suite.ctx, from, coins) + suite.Require().NoError(err) + + suite.Require().NotPanics(func() { + v7.MigrateFaucetBalances(suite.ctx, suite.app.BankKeeper) + suite.app.Commit() + }) + + balancesFrom := suite.app.BankKeeper.GetAllBalances(suite.ctx, from) + balancesTo := suite.app.BankKeeper.GetAllBalances(suite.ctx, to) + + if tc.expectedMigration { + suite.Require().True(balancesFrom.IsZero()) + suite.Require().Equal(coins, balancesTo) + } else { + suite.Require().Equal(coins, balancesFrom) + suite.Require().Nil(balancesTo) + } + }) + } +} + +func (suite *UpgradeTestSuite) TestMigrateSkippedEpochs() { + testCases := []struct { + name string + chainID string + malleate func() + expectedSkippedEpochs uint64 + }{ + { + "success", + evmostypes.MainnetChainID + "-2", + func() { + suite.app.InflationKeeper.SetSkippedEpochs(suite.ctx, uint64(94)) + }, + uint64(92), + }, + } + + for _, tc := range testCases { + suite.Run(fmt.Sprintf("Case %s", tc.name), func() { + suite.SetupTest(tc.chainID) // reset + + tc.malleate() + + suite.Require().NotPanics(func() { + v7.MigrateSkippedEpochs(suite.ctx, suite.app.InflationKeeper) + }) + + newSkippedEpochs := suite.app.InflationKeeper.GetSkippedEpochs(suite.ctx) + suite.Require().Equal(tc.expectedSkippedEpochs, newSkippedEpochs) + }) + } +} + +func (suite *UpgradeTestSuite) TestMigrateClaim() { + from, err := sdk.AccAddressFromBech32(v7.ContributorAddrFrom) + suite.Require().NoError(err) + to, err := sdk.AccAddressFromBech32(v7.ContributorAddrTo) + suite.Require().NoError(err) + cr := claimstypes.ClaimsRecord{InitialClaimableAmount: sdk.NewInt(100), ActionsCompleted: []bool{false, false, false, false}} + + testCases := []struct { + name string + malleate func() + expPass bool + }{ + { + "with claims record", + func() { + suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, from, cr) + }, + true, + }, + { + "without claims record", + func() { + }, + false, + }, + } + for _, tc := range testCases { + suite.Run(fmt.Sprintf("Case %s", tc.name), func() { + suite.SetupTest(evmostypes.TestnetChainID + "-2") // reset + + tc.malleate() + + v7.MigrateContributorClaim(suite.ctx, suite.app.ClaimsKeeper) + + _, foundFrom := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, from) + crTo, foundTo := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, to) + if tc.expPass { + suite.Require().False(foundFrom) + suite.Require().True(foundTo) + suite.Require().Equal(crTo, cr) + } else { + suite.Require().False(foundTo) + } + }) + } +} diff --git a/cmd/config/observability.go b/cmd/config/observability.go index e96e97f353..c819743f1f 100644 --- a/cmd/config/observability.go +++ b/cmd/config/observability.go @@ -5,7 +5,7 @@ func EnableObservability() error { // if true { // Temporarily disabling this until we can configure out port reuse // fast enough or enabling observability through the config. - // Please see https://github.com/evmos/evmos/v6/issues/84 + // Please see https://github.com/evmos/evmos/v7/issues/84 // return nil // } diff --git a/cmd/evmosd/cmd_test.go b/cmd/evmosd/cmd_test.go index 1ecdb74634..7acb7ea09f 100644 --- a/cmd/evmosd/cmd_test.go +++ b/cmd/evmosd/cmd_test.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" "github.com/stretchr/testify/require" - "github.com/evmos/evmos/v6/app" - evmosd "github.com/evmos/evmos/v6/cmd/evmosd" + "github.com/evmos/evmos/v7/app" + evmosd "github.com/evmos/evmos/v7/cmd/evmosd" ) func TestInitCmd(t *testing.T) { diff --git a/cmd/evmosd/genaccounts.go b/cmd/evmosd/genaccounts.go index ea142b88df..8512523710 100644 --- a/cmd/evmosd/genaccounts.go +++ b/cmd/evmosd/genaccounts.go @@ -23,10 +23,10 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - evmoskr "github.com/evmos/evmos/v6/crypto/keyring" + evmoskr "github.com/evmos/evmos/v7/crypto/keyring" - vestingcli "github.com/evmos/evmos/v6/x/vesting/client/cli" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + vestingcli "github.com/evmos/evmos/v7/x/vesting/client/cli" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) const ( diff --git a/cmd/evmosd/main.go b/cmd/evmosd/main.go index 7b9ad7a36b..7141507281 100644 --- a/cmd/evmosd/main.go +++ b/cmd/evmosd/main.go @@ -7,8 +7,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/app" - cmdcfg "github.com/evmos/evmos/v6/cmd/config" + "github.com/evmos/evmos/v7/app" + cmdcfg "github.com/evmos/evmos/v7/cmd/config" ) func main() { diff --git a/cmd/evmosd/migrate.go b/cmd/evmosd/migrate.go index 0b3d3f7a1f..600aac0b33 100644 --- a/cmd/evmosd/migrate.go +++ b/cmd/evmosd/migrate.go @@ -16,9 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/version" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - v3 "github.com/evmos/evmos/v6/app/upgrades/v3" - v5 "github.com/evmos/evmos/v6/app/upgrades/v5" - "github.com/evmos/evmos/v6/types" + v3 "github.com/evmos/evmos/v7/app/upgrades/v3" + v5 "github.com/evmos/evmos/v7/app/upgrades/v5" + "github.com/evmos/evmos/v7/types" ) // FlagGenesisTime defines the genesis time in string format diff --git a/cmd/evmosd/root.go b/cmd/evmosd/root.go index fa78be5f7c..6600c21ea1 100644 --- a/cmd/evmosd/root.go +++ b/cmd/evmosd/root.go @@ -39,9 +39,9 @@ import ( servercfg "github.com/evmos/ethermint/server/config" srvflags "github.com/evmos/ethermint/server/flags" - "github.com/evmos/evmos/v6/app" - cmdcfg "github.com/evmos/evmos/v6/cmd/config" - evmoskr "github.com/evmos/evmos/v6/crypto/keyring" + "github.com/evmos/evmos/v7/app" + cmdcfg "github.com/evmos/evmos/v7/cmd/config" + evmoskr "github.com/evmos/evmos/v7/crypto/keyring" ) const ( diff --git a/cmd/evmosd/testnet.go b/cmd/evmosd/testnet.go index 0ebe547daa..e5214157d2 100644 --- a/cmd/evmosd/testnet.go +++ b/cmd/evmosd/testnet.go @@ -43,9 +43,9 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - cmdcfg "github.com/evmos/evmos/v6/cmd/config" - evmoskr "github.com/evmos/evmos/v6/crypto/keyring" - "github.com/evmos/evmos/v6/testutil/network" + cmdcfg "github.com/evmos/evmos/v7/cmd/config" + evmoskr "github.com/evmos/evmos/v7/crypto/keyring" + "github.com/evmos/evmos/v7/testutil/network" ) var ( diff --git a/contracts/erc20.go b/contracts/erc20.go index a7902d5e74..cb558d91f6 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/x/erc20/types" ) var ( diff --git a/contracts/erc20DirectBalanceManipulation.go b/contracts/erc20DirectBalanceManipulation.go index a217ed0223..8a935a64c1 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 98cebd0f6e..93484e095a 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 a1f0f86727..99682afaa6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/evmos/evmos/v6 +module github.com/evmos/evmos/v7 go 1.18 @@ -6,9 +6,9 @@ require ( github.com/armon/go-metrics v0.4.0 github.com/cosmos/cosmos-sdk v0.45.5 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/ibc-go/v3 v3.1.0 + github.com/cosmos/ibc-go/v3 v3.1.1 github.com/ethereum/go-ethereum v1.10.16 - github.com/evmos/ethermint v0.17.2 + github.com/evmos/ethermint v0.18.0 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index 2d0e695c4a..aa390d9f87 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.1.0 h1:aVPqkrGBluz6t9+d/sLZIG/zQ9O1KJzVeR4UlL/IFTQ= -github.com/cosmos/ibc-go/v3 v3.1.0/go.mod h1:DbOlOa4yKumaHGKApKkJN90L88PCjSD9ZBdAfL9tT40= +github.com/cosmos/ibc-go/v3 v3.1.1 h1:Yodps4ezxbKS8u0TNJkdYsf+MCb0XzUuIuxIkSUMwbA= +github.com/cosmos/ibc-go/v3 v3.1.1/go.mod h1:IR1bpjywC1i0YcElPa4d2IevNUBZehKoD5bscQlbDyM= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= @@ -333,8 +333,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/ethereum/go-ethereum v1.10.16 h1:3oPrumn0bCW/idjcxMn5YYVCdK7VzJYIvwGZUGLEaoc= github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= -github.com/evmos/ethermint v0.17.2 h1:OaXQmhKyKBw7EyR6JJaA6x9cApi3krqhYcKK1VuDOgo= -github.com/evmos/ethermint v0.17.2/go.mod h1:BmXULZy8lbld5KgNE0zM4b7Dy1irPpL6nsDH11SMNzQ= +github.com/evmos/ethermint v0.18.0 h1:kGgQgVlkkXsmHmoZE6gT6UNqd++/SXvQSLQVfZ5yHE8= +github.com/evmos/ethermint v0.18.0/go.mod h1:BmXULZy8lbld5KgNE0zM4b7Dy1irPpL6nsDH11SMNzQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= diff --git a/ibc/testing/app.go b/ibc/testing/app.go index d7dc502c5a..85c7f1334f 100644 --- a/ibc/testing/app.go +++ b/ibc/testing/app.go @@ -20,7 +20,7 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v3/testing" ethermint "github.com/evmos/ethermint/types" - evmosapp "github.com/evmos/evmos/v6/app" + evmosapp "github.com/evmos/evmos/v7/app" ) var DefaultTestingAppInit func() (ibcgotesting.TestingApp, map[string]json.RawMessage) = evmosapp.SetupTestingApp diff --git a/ibc/utils.go b/ibc/utils.go index ff3964b21a..dc68009b57 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" - evmos "github.com/evmos/evmos/v6/types" + evmos "github.com/evmos/evmos/v7/types" ) // GetTransferSenderRecipient returns the sender and recipient sdk.AccAddresses diff --git a/ibc/utils_test.go b/ibc/utils_test.go index 9521d65aca..aafa6f5446 100644 --- a/ibc/utils_test.go +++ b/ibc/utils_test.go @@ -3,7 +3,7 @@ package ibc import ( "testing" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/proto/evmos/claims/v1/claims.proto b/proto/evmos/claims/v1/claims.proto index d77a95d6e2..068eb866b3 100644 --- a/proto/evmos/claims/v1/claims.proto +++ b/proto/evmos/claims/v1/claims.proto @@ -3,7 +3,7 @@ package evmos.claims.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/claims/types"; +option go_package = "github.com/evmos/evmos/v7/x/claims/types"; // Action defines the list of available actions to claim the airdrop tokens. enum Action { diff --git a/proto/evmos/claims/v1/genesis.proto b/proto/evmos/claims/v1/genesis.proto index bcf655b41d..efef2e5d50 100644 --- a/proto/evmos/claims/v1/genesis.proto +++ b/proto/evmos/claims/v1/genesis.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "evmos/claims/v1/claims.proto"; -option go_package = "github.com/evmos/evmos/v6/x/claims/types"; +option go_package = "github.com/evmos/evmos/v7/x/claims/types"; // GenesisState define the claims module's genesis state. message GenesisState { diff --git a/proto/evmos/claims/v1/query.proto b/proto/evmos/claims/v1/query.proto index 419c837942..f0de188eb0 100644 --- a/proto/evmos/claims/v1/query.proto +++ b/proto/evmos/claims/v1/query.proto @@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "evmos/claims/v1/claims.proto"; import "evmos/claims/v1/genesis.proto"; -option go_package = "github.com/evmos/evmos/v6/x/claims/types"; +option go_package = "github.com/evmos/evmos/v7/x/claims/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/epochs/v1/genesis.proto b/proto/evmos/epochs/v1/genesis.proto index d079f2806f..ad0bf048d1 100644 --- a/proto/evmos/epochs/v1/genesis.proto +++ b/proto/evmos/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/evmos/evmos/v6/x/epochs/types"; +option go_package = "github.com/evmos/evmos/v7/x/epochs/types"; message EpochInfo { string identifier = 1; diff --git a/proto/evmos/epochs/v1/query.proto b/proto/evmos/epochs/v1/query.proto index 909e68316a..f889108f33 100644 --- a/proto/evmos/epochs/v1/query.proto +++ b/proto/evmos/epochs/v1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "evmos/epochs/v1/genesis.proto"; -option go_package = "github.com/evmos/evmos/v6/x/epochs/types"; +option go_package = "github.com/evmos/evmos/v7/x/epochs/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/erc20/v1/erc20.proto b/proto/evmos/erc20/v1/erc20.proto index a8437e8a73..222bdd182e 100644 --- a/proto/evmos/erc20/v1/erc20.proto +++ b/proto/evmos/erc20/v1/erc20.proto @@ -3,7 +3,7 @@ package evmos.erc20.v1; import "gogoproto/gogo.proto"; import "cosmos/bank/v1beta1/bank.proto"; -option go_package = "github.com/evmos/evmos/v6/x/erc20/types"; +option go_package = "github.com/evmos/evmos/v7/x/erc20/types"; // Owner enumerates the ownership of a ERC20 contract. enum Owner { diff --git a/proto/evmos/erc20/v1/genesis.proto b/proto/evmos/erc20/v1/genesis.proto index fb21b45753..b03fee7ab5 100644 --- a/proto/evmos/erc20/v1/genesis.proto +++ b/proto/evmos/erc20/v1/genesis.proto @@ -4,7 +4,7 @@ package evmos.erc20.v1; import "evmos/erc20/v1/erc20.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/erc20/types"; +option go_package = "github.com/evmos/evmos/v7/x/erc20/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/evmos/erc20/v1/query.proto b/proto/evmos/erc20/v1/query.proto index acf7c8af2c..66739408d3 100644 --- a/proto/evmos/erc20/v1/query.proto +++ b/proto/evmos/erc20/v1/query.proto @@ -7,7 +7,7 @@ import "evmos/erc20/v1/erc20.proto"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/erc20/types"; +option go_package = "github.com/evmos/evmos/v7/x/erc20/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/erc20/v1/tx.proto b/proto/evmos/erc20/v1/tx.proto index 15106e9aef..bdd66b5d2f 100644 --- a/proto/evmos/erc20/v1/tx.proto +++ b/proto/evmos/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/evmos/evmos/v6/x/erc20/types"; +option go_package = "github.com/evmos/evmos/v7/x/erc20/types"; // Msg defines the erc20 Msg service. service Msg { diff --git a/proto/evmos/incentives/v1/genesis.proto b/proto/evmos/incentives/v1/genesis.proto index 44c85ebe9c..da5ca3a770 100644 --- a/proto/evmos/incentives/v1/genesis.proto +++ b/proto/evmos/incentives/v1/genesis.proto @@ -4,7 +4,7 @@ import "evmos/incentives/v1/incentives.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/incentives/types"; +option go_package = "github.com/evmos/evmos/v7/x/incentives/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/evmos/incentives/v1/incentives.proto b/proto/evmos/incentives/v1/incentives.proto index c444ea4bd9..e7a8926948 100644 --- a/proto/evmos/incentives/v1/incentives.proto +++ b/proto/evmos/incentives/v1/incentives.proto @@ -4,7 +4,7 @@ package evmos.incentives.v1; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/evmos/evmos/v6/x/incentives/types"; +option go_package = "github.com/evmos/evmos/v7/x/incentives/types"; // Incentive defines an instance that organizes distribution conditions for a // given smart contract diff --git a/proto/evmos/incentives/v1/query.proto b/proto/evmos/incentives/v1/query.proto index 42560872a3..0b3a1da448 100644 --- a/proto/evmos/incentives/v1/query.proto +++ b/proto/evmos/incentives/v1/query.proto @@ -8,7 +8,7 @@ import "evmos/incentives/v1/incentives.proto"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/incentives/types"; +option go_package = "github.com/evmos/evmos/v7/x/incentives/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/inflation/v1/genesis.proto b/proto/evmos/inflation/v1/genesis.proto index 357a1c1eeb..486a1e6100 100644 --- a/proto/evmos/inflation/v1/genesis.proto +++ b/proto/evmos/inflation/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "evmos/inflation/v1/inflation.proto"; -option go_package = "github.com/evmos/evmos/v6/x/inflation/types"; +option go_package = "github.com/evmos/evmos/v7/x/inflation/types"; // GenesisState defines the inflation module's genesis state. message GenesisState { diff --git a/proto/evmos/inflation/v1/inflation.proto b/proto/evmos/inflation/v1/inflation.proto index bf88db1f31..50eb41b3ee 100644 --- a/proto/evmos/inflation/v1/inflation.proto +++ b/proto/evmos/inflation/v1/inflation.proto @@ -3,7 +3,7 @@ package evmos.inflation.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/inflation/types"; +option go_package = "github.com/evmos/evmos/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/evmos/inflation/v1/query.proto b/proto/evmos/inflation/v1/query.proto index f59b48601b..12ba5b5ac9 100644 --- a/proto/evmos/inflation/v1/query.proto +++ b/proto/evmos/inflation/v1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; import "evmos/inflation/v1/genesis.proto"; -option go_package = "github.com/evmos/evmos/v6/x/inflation/types"; +option go_package = "github.com/evmos/evmos/v7/x/inflation/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/evmos/recovery/v1/genesis.proto b/proto/evmos/recovery/v1/genesis.proto index e47e2d08a2..1f18ca8b75 100644 --- a/proto/evmos/recovery/v1/genesis.proto +++ b/proto/evmos/recovery/v1/genesis.proto @@ -4,7 +4,7 @@ package evmos.recovery.v1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/evmos/evmos/v6/x/recovery/types"; +option go_package = "github.com/evmos/evmos/v7/x/recovery/types"; // GenesisState defines the recovery module's genesis state. message GenesisState { diff --git a/proto/evmos/recovery/v1/query.proto b/proto/evmos/recovery/v1/query.proto index 7f65f96262..f97dcc1cc6 100644 --- a/proto/evmos/recovery/v1/query.proto +++ b/proto/evmos/recovery/v1/query.proto @@ -5,7 +5,7 @@ import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; import "evmos/recovery/v1/genesis.proto"; -option go_package = "github.com/evmos/evmos/v6/x/recovery/types"; +option go_package = "github.com/evmos/evmos/v7/x/recovery/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/vesting/v1/query.proto b/proto/evmos/vesting/v1/query.proto index eea56f461a..a40379f960 100644 --- a/proto/evmos/vesting/v1/query.proto +++ b/proto/evmos/vesting/v1/query.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v6/x/vesting/types"; +option go_package = "github.com/evmos/evmos/v7/x/vesting/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/vesting/v1/tx.proto b/proto/evmos/vesting/v1/tx.proto index bf304625d7..1a2675b549 100644 --- a/proto/evmos/vesting/v1/tx.proto +++ b/proto/evmos/vesting/v1/tx.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/vesting/v1beta1/vesting.proto"; -option go_package = "github.com/evmos/evmos/v6/x/vesting/types"; +option go_package = "github.com/evmos/evmos/v7/x/vesting/types"; // Msg defines the vesting Msg service. service Msg { diff --git a/proto/evmos/vesting/v1/vesting.proto b/proto/evmos/vesting/v1/vesting.proto index e675fd3d62..c2a2dba8b2 100644 --- a/proto/evmos/vesting/v1/vesting.proto +++ b/proto/evmos/vesting/v1/vesting.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos/vesting/v1beta1/vesting.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/evmos/evmos/v6/x/vesting/types"; +option go_package = "github.com/evmos/evmos/v7/x/vesting/types"; // ClawbackVestingAccount implements the VestingAccount interface. It provides // an account that can hold contributions subject to "lockup" (like a diff --git a/testutil/fund.go b/testutil/fund.go index 8e41d10e10..52959b3c2b 100644 --- a/testutil/fund.go +++ b/testutil/fund.go @@ -3,7 +3,7 @@ package testutil import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" ) // FundAccount is a utility function that funds an account by minting and diff --git a/testutil/network/network.go b/testutil/network/network.go index 1a83209fbf..abc8716d96 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -48,7 +48,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/evmos/ethermint/crypto/hd" - "github.com/evmos/evmos/v6/app" + "github.com/evmos/evmos/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 970b479e7a..9726d19c89 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" - evmosnetwork "github.com/evmos/evmos/v6/testutil/network" + evmosnetwork "github.com/evmos/evmos/v7/testutil/network" ) type IntegrationTestSuite struct { diff --git a/testutil/network/util.go b/testutil/network/util.go index d57d9d3fae..b4025e2828 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -26,7 +26,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" "github.com/evmos/ethermint/server" evmtypes "github.com/evmos/ethermint/x/evm/types" diff --git a/x/claims/client/cli/query.go b/x/claims/client/cli/query.go index 9c669d7b72..b229061a79 100644 --- a/x/claims/client/cli/query.go +++ b/x/claims/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/claims/genesis.go b/x/claims/genesis.go index c30b9f2c2e..d9a2a776e3 100644 --- a/x/claims/genesis.go +++ b/x/claims/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/claims/keeper" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/keeper" + "github.com/evmos/evmos/v7/x/claims/types" ) // InitGenesis initializes the claim module's state from a provided genesis diff --git a/x/claims/genesis_test.go b/x/claims/genesis_test.go index 0466a5efac..96bf34ee96 100644 --- a/x/claims/genesis_test.go +++ b/x/claims/genesis_test.go @@ -15,10 +15,10 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims" + "github.com/evmos/evmos/v7/x/claims/types" ) type GenesisTestSuite struct { diff --git a/x/claims/handler.go b/x/claims/handler.go index 41ed6699dd..8e17dd7251 100644 --- a/x/claims/handler.go +++ b/x/claims/handler.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v6/x/claims/keeper" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/keeper" + "github.com/evmos/evmos/v7/x/claims/types" ) // NewHandler returns claim module messages diff --git a/x/claims/ibc_middleware.go b/x/claims/ibc_middleware.go index 7d807ce448..5b89d35149 100644 --- a/x/claims/ibc_middleware.go +++ b/x/claims/ibc_middleware.go @@ -7,8 +7,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/evmos/evmos/v6/ibc" - "github.com/evmos/evmos/v6/x/claims/keeper" + "github.com/evmos/evmos/v7/ibc" + "github.com/evmos/evmos/v7/x/claims/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/claims/keeper/abci.go b/x/claims/keeper/abci.go index 3a3b63dd21..2589ab6da2 100644 --- a/x/claims/keeper/abci.go +++ b/x/claims/keeper/abci.go @@ -7,7 +7,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // EndBlocker checks if the airdrop claiming period has ended in order to diff --git a/x/claims/keeper/abci_test.go b/x/claims/keeper/abci_test.go index c8e596aba7..6b50513aab 100644 --- a/x/claims/keeper/abci_test.go +++ b/x/claims/keeper/abci_test.go @@ -9,9 +9,9 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims/types" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims/types" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) func (suite *KeeperTestSuite) TestEndBlock() { diff --git a/x/claims/keeper/claim.go b/x/claims/keeper/claim.go index f41b1180fe..1ab6399448 100644 --- a/x/claims/keeper/claim.go +++ b/x/claims/keeper/claim.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // ClaimCoinsForAction removes the claimable amount entry from a claims record diff --git a/x/claims/keeper/claim_test.go b/x/claims/keeper/claim_test.go index f7fd321b51..e71621131d 100644 --- a/x/claims/keeper/claim_test.go +++ b/x/claims/keeper/claim_test.go @@ -14,10 +14,10 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/evmos/ethermint/tests" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v6/testutil" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/testutil" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) func (suite *KeeperTestSuite) TestGetClaimableAmountForAction() { diff --git a/x/claims/keeper/claims_records.go b/x/claims/keeper/claims_records.go index cb342c57c4..2c5fe8a8e6 100644 --- a/x/claims/keeper/claims_records.go +++ b/x/claims/keeper/claims_records.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // GetClaimsRecord returns the claims record for a specific address diff --git a/x/claims/keeper/claims_records_test.go b/x/claims/keeper/claims_records_test.go index 364aeece5b..b02fb67fcc 100644 --- a/x/claims/keeper/claims_records_test.go +++ b/x/claims/keeper/claims_records_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) func (suite *KeeperTestSuite) TestsClaimsRecords() { diff --git a/x/claims/keeper/grpc_query.go b/x/claims/keeper/grpc_query.go index bce02d6515..4f12fc56e3 100644 --- a/x/claims/keeper/grpc_query.go +++ b/x/claims/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/claims/keeper/grpc_query_test.go b/x/claims/keeper/grpc_query_test.go index 88d54154a0..83f6ada21e 100644 --- a/x/claims/keeper/grpc_query_test.go +++ b/x/claims/keeper/grpc_query_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims/types" ) func (suite *KeeperTestSuite) TestTotalUnclaimed() { diff --git a/x/claims/keeper/hooks.go b/x/claims/keeper/hooks.go index c309108d24..89ba7e9a57 100644 --- a/x/claims/keeper/hooks.go +++ b/x/claims/keeper/hooks.go @@ -13,7 +13,7 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) var ( diff --git a/x/claims/keeper/hooks_test.go b/x/claims/keeper/hooks_test.go index 3313726d00..453320b2b4 100644 --- a/x/claims/keeper/hooks_test.go +++ b/x/claims/keeper/hooks_test.go @@ -8,8 +8,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims/types" ) func (suite *KeeperTestSuite) TestAfterProposalVote() { diff --git a/x/claims/keeper/ibc_callbacks.go b/x/claims/keeper/ibc_callbacks.go index 76d29b177e..89a12c391f 100644 --- a/x/claims/keeper/ibc_callbacks.go +++ b/x/claims/keeper/ibc_callbacks.go @@ -7,9 +7,9 @@ import ( channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v3/modules/core/exported" - "github.com/evmos/evmos/v6/ibc" - evmos "github.com/evmos/evmos/v6/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/ibc" + evmos "github.com/evmos/evmos/v7/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // OnAcknowledgementPacket performs an IBC send callback. Once a user submits an diff --git a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go index 25edd58ba1..60274f0ead 100644 --- a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go +++ b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go @@ -13,10 +13,10 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v3/testing" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/app" - ibctesting "github.com/evmos/evmos/v6/ibc/testing" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/app" + ibctesting "github.com/evmos/evmos/v7/ibc/testing" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims/types" ) type IBCTestingSuite struct { diff --git a/x/claims/keeper/ibc_callbacks_test.go b/x/claims/keeper/ibc_callbacks_test.go index 56dd386043..c81c986c7f 100644 --- a/x/claims/keeper/ibc_callbacks_test.go +++ b/x/claims/keeper/ibc_callbacks_test.go @@ -14,7 +14,7 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v3/testing" ibcmock "github.com/cosmos/ibc-go/v3/testing/mock" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) var timeoutHeight = clienttypes.NewHeight(1000, 1000) diff --git a/x/claims/keeper/integration_test.go b/x/claims/keeper/integration_test.go index ed2696783a..f23a18be7f 100644 --- a/x/claims/keeper/integration_test.go +++ b/x/claims/keeper/integration_test.go @@ -23,10 +23,10 @@ import ( "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/tests" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/testutil" - incentivestypes "github.com/evmos/evmos/v6/x/incentives/types" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/testutil" + incentivestypes "github.com/evmos/evmos/v7/x/incentives/types" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" @@ -34,8 +34,8 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/evmos/ethermint/server/config" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/v7/x/claims/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/claims/keeper/invariants.go b/x/claims/keeper/invariants.go index a66bddb16b..ac9da02f8f 100644 --- a/x/claims/keeper/invariants.go +++ b/x/claims/keeper/invariants.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // RegisterInvariants registers the claims module invariants diff --git a/x/claims/keeper/invariants_test.go b/x/claims/keeper/invariants_test.go index 560f2e428d..b00b184f15 100644 --- a/x/claims/keeper/invariants_test.go +++ b/x/claims/keeper/invariants_test.go @@ -5,8 +5,8 @@ import ( "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims/types" ) func (suite *KeeperTestSuite) TestClaimsInvariant() { diff --git a/x/claims/keeper/keeper.go b/x/claims/keeper/keeper.go index a6793c541d..7561e7b5fe 100644 --- a/x/claims/keeper/keeper.go +++ b/x/claims/keeper/keeper.go @@ -11,7 +11,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // Keeper struct diff --git a/x/claims/keeper/keeper_test.go b/x/claims/keeper/keeper_test.go index ac768ac238..d27333220e 100644 --- a/x/claims/keeper/keeper_test.go +++ b/x/claims/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ethtypes "github.com/ethereum/go-ethereum/core/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/claims/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" diff --git a/x/claims/keeper/migrations.go b/x/claims/keeper/migrations.go index 26260ab4e6..d95dd4f8f1 100644 --- a/x/claims/keeper/migrations.go +++ b/x/claims/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/evmos/evmos/v6/x/claims/migrations/v2" + v2 "github.com/evmos/evmos/v7/x/claims/migrations/v2" ) var _ module.MigrationHandler = Migrator{}.Migrate1to2 diff --git a/x/claims/keeper/params.go b/x/claims/keeper/params.go index 4431800b77..d1ccf0d564 100644 --- a/x/claims/keeper/params.go +++ b/x/claims/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // GetParams returns the total set of claim parameters. diff --git a/x/claims/keeper/params_test.go b/x/claims/keeper/params_test.go index b782c59dea..282ee5b58a 100644 --- a/x/claims/keeper/params_test.go +++ b/x/claims/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/claims/migrations/v2/migration.go b/x/claims/migrations/v2/migration.go index 21ef594b55..ac1fa4e98e 100644 --- a/x/claims/migrations/v2/migration.go +++ b/x/claims/migrations/v2/migration.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v1types "github.com/evmos/evmos/v6/x/claims/migrations/v1/types" - "github.com/evmos/evmos/v6/x/claims/types" + v1types "github.com/evmos/evmos/v7/x/claims/migrations/v1/types" + "github.com/evmos/evmos/v7/x/claims/types" ) // MigrateStore adds the new parameters AuthorizedChannels and EVMChannels diff --git a/x/claims/migrations/v2/migration_test.go b/x/claims/migrations/v2/migration_test.go index 74dee7f14b..3fce669ba9 100644 --- a/x/claims/migrations/v2/migration_test.go +++ b/x/claims/migrations/v2/migration_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/evmos/ethermint/encoding" - "github.com/evmos/evmos/v6/app" - v2 "github.com/evmos/evmos/v6/x/claims/migrations/v2" - claims "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/app" + v2 "github.com/evmos/evmos/v7/x/claims/migrations/v2" + claims "github.com/evmos/evmos/v7/x/claims/types" "github.com/stretchr/testify/require" ) diff --git a/x/claims/module.go b/x/claims/module.go index 895cfef984..dcee7530fd 100644 --- a/x/claims/module.go +++ b/x/claims/module.go @@ -17,9 +17,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/evmos/evmos/v6/x/claims/client/cli" - "github.com/evmos/evmos/v6/x/claims/keeper" - "github.com/evmos/evmos/v6/x/claims/types" + "github.com/evmos/evmos/v7/x/claims/client/cli" + "github.com/evmos/evmos/v7/x/claims/keeper" + "github.com/evmos/evmos/v7/x/claims/types" ) var ( diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index 4ab248ee34..3856a7cf9b 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/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/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 3a3364f3d6..2bf316bff1 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/evmos/evmos/v6/x/epochs/keeper" - "github.com/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/v7/x/epochs/keeper" + "github.com/evmos/evmos/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 4f49bf0dbb..4f7559105b 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/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/x/epochs" - "github.com/evmos/evmos/v6/x/epochs/types" + simapp "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/x/epochs" + "github.com/evmos/evmos/v7/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index 96395b3089..e81049a3f4 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/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/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 533a3a9ac5..f6485a8eef 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/evmos/evmos/v6/x/epochs" - "github.com/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/v7/x/epochs" + "github.com/evmos/evmos/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 aacb5174a5..31e014536f 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/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/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 9b597e86be..1097a7d4b2 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/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/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 61066eb1b0..bc4cc72715 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/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/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 d47e1b3533..d114789ae6 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/v7/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochInfo() { diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go index f4eac663fd..eceffa81d4 100644 --- a/x/epochs/keeper/hooks.go +++ b/x/epochs/keeper/hooks.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/v7/x/epochs/types" ) var _ types.EpochHooks = MultiEpochHooks{} diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index 99a6de01c7..9f7abde490 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/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/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 a7ac8c9581..54bfbc201b 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -19,8 +19,8 @@ import ( evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/x/epochs/types" ) var denomMint = evm.DefaultEVMDenom diff --git a/x/epochs/module.go b/x/epochs/module.go index 6fd8bce673..366be2bfc8 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/evmos/evmos/v6/x/epochs/client/cli" - "github.com/evmos/evmos/v6/x/epochs/keeper" - "github.com/evmos/evmos/v6/x/epochs/types" + "github.com/evmos/evmos/v7/x/epochs/client/cli" + "github.com/evmos/evmos/v7/x/epochs/keeper" + "github.com/evmos/evmos/v7/x/epochs/types" ) var ( diff --git a/x/erc20/client/cli/query.go b/x/erc20/client/cli/query.go index ddf8d36c04..bc0be077d3 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 f1bb389d77..88d21994aa 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 fd73ee6756..a429c3a74e 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/evmos/evmos/v6/x/erc20/client/cli" - "github.com/evmos/evmos/v6/x/erc20/client/rest" + "github.com/evmos/evmos/v7/x/erc20/client/cli" + "github.com/evmos/evmos/v7/x/erc20/client/rest" ) var ( diff --git a/x/erc20/client/rest/rest.go b/x/erc20/client/rest/rest.go index 334b743c7c..b873c53442 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 7b66b55ebd..55c929702e 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/evmos/evmos/v6/x/erc20/keeper" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/x/erc20/keeper" + "github.com/evmos/evmos/v7/x/erc20/types" ) // InitGenesis import module genesis diff --git a/x/erc20/genesis_test.go b/x/erc20/genesis_test.go index 72a986a2bb..2a59d66bb7 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/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/x/erc20" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/x/erc20" + "github.com/evmos/evmos/v7/x/erc20/types" ) type GenesisTestSuite struct { diff --git a/x/erc20/handler.go b/x/erc20/handler.go index 0ff3f8da0f..a491f454f0 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 93ad1cd62c..aa351b6e21 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/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/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 57c51a095f..e4806459bf 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/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/v7/x/erc20/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/erc20/keeper/evm_hooks_test.go b/x/erc20/keeper/evm_hooks_test.go index 39157b628f..dd64205038 100644 --- a/x/erc20/keeper/evm_hooks_test.go +++ b/x/erc20/keeper/evm_hooks_test.go @@ -9,8 +9,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/v7/x/erc20/types" ) // ensureHooksSet tries to set the hooks on EVMKeeper, this will fail if the erc20 hook is already set diff --git a/x/erc20/keeper/evm_test.go b/x/erc20/keeper/evm_test.go index 325a454596..ce687faa05 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/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/erc20/keeper" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/v7/x/erc20/keeper" + "github.com/evmos/evmos/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 3df6e69f91..24a45bb8ba 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 cda7e23e6e..c6539e6f40 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 763382a8fe..0e2638a573 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/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/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 82c775f866..1b7c48ad9f 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 099319f852..942f74a58a 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/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/v7/x/erc20/types" ) type KeeperTestSuite struct { diff --git a/x/erc20/keeper/migrations.go b/x/erc20/keeper/migrations.go index 7d0ec4d9b4..0fd4cb0aec 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/evmos/evmos/v6/x/erc20/migrations/v2" + v2 "github.com/evmos/evmos/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 dad0c7f957..b705b314df 100644 --- a/x/erc20/keeper/mint.go +++ b/x/erc20/keeper/mint.go @@ -5,7 +5,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/x/erc20/types" ) // MintingEnabled checks that: diff --git a/x/erc20/keeper/mint_test.go b/x/erc20/keeper/mint_test.go index 27c537b201..21cd63244e 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 257a9bc1c9..aa25c35b24 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/evmos/evmos/v6/contracts" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/contracts" + "github.com/evmos/evmos/v7/x/erc20/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index f9f47a49be..4be848017e 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -11,8 +11,8 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/x/erc20/keeper" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/x/erc20/keeper" + "github.com/evmos/evmos/v7/x/erc20/types" ) func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { diff --git a/x/erc20/keeper/params.go b/x/erc20/keeper/params.go index 8a6ebbe37a..9516cddb03 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 07481ffbe5..45557c1375 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/evmos/evmos/v6/x/erc20/types" +import "github.com/evmos/evmos/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 6346d4c439..9e9cbe525f 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 e11be220fe..d69ef51cd4 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/evmos/evmos/v6/x/erc20/keeper" - "github.com/evmos/evmos/v6/x/erc20/types" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/erc20/keeper" + "github.com/evmos/evmos/v7/x/erc20/types" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" ) const ( diff --git a/x/erc20/keeper/token_pairs.go b/x/erc20/keeper/token_pairs.go index 108e5d26e7..4046f0f3fa 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 76e89002b9..56fb82d0cf 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 7b7a04ff5b..e574b6f279 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/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/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 b31815f4f4..9a6dbf4373 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/evmos/evmos/v6/app" - v2 "github.com/evmos/evmos/v6/x/erc20/migrations/v2" - erc20types "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/app" + v2 "github.com/evmos/evmos/v7/x/erc20/migrations/v2" + erc20types "github.com/evmos/evmos/v7/x/erc20/types" ) func TestUpdateParams(t *testing.T) { diff --git a/x/erc20/module.go b/x/erc20/module.go index f0bc49af0c..06e1aab77c 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/evmos/evmos/v6/x/erc20/client/cli" - "github.com/evmos/evmos/v6/x/erc20/keeper" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/x/erc20/client/cli" + "github.com/evmos/evmos/v7/x/erc20/keeper" + "github.com/evmos/evmos/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 07c5686f8c..0f2610995a 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/evmos/evmos/v6/x/erc20/keeper" - "github.com/evmos/evmos/v6/x/erc20/types" + "github.com/evmos/evmos/v7/x/erc20/keeper" + "github.com/evmos/evmos/v7/x/erc20/types" ) // NewErc20ProposalHandler creates a governance handler to manage new proposal types. diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 2ae0c7ffd6..e16fc62d12 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // GetQueryCmd returns the parent command for all incentives CLI query commands. diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index 3d14eafcd9..79cfd582de 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // NewRegisterIncentiveProposalCmd implements the command to submit a register diff --git a/x/incentives/client/proposal_handler.go b/x/incentives/client/proposal_handler.go index c705761487..2e2b109db3 100644 --- a/x/incentives/client/proposal_handler.go +++ b/x/incentives/client/proposal_handler.go @@ -3,8 +3,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/evmos/evmos/v6/x/incentives/client/cli" - "github.com/evmos/evmos/v6/x/incentives/client/rest" + "github.com/evmos/evmos/v7/x/incentives/client/cli" + "github.com/evmos/evmos/v7/x/incentives/client/rest" ) var ( diff --git a/x/incentives/client/rest/rest.go b/x/incentives/client/rest/rest.go index 6b256c8f0a..f366564bdb 100644 --- a/x/incentives/client/rest/rest.go +++ b/x/incentives/client/rest/rest.go @@ -10,7 +10,7 @@ import ( govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // RegisterIncentiveProposalRequest defines a request for a new register a diff --git a/x/incentives/genesis.go b/x/incentives/genesis.go index 3f45db5a2a..5414775099 100644 --- a/x/incentives/genesis.go +++ b/x/incentives/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/evmos/evmos/v6/x/incentives/keeper" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/keeper" + "github.com/evmos/evmos/v7/x/incentives/types" ) // InitGenesis import module genesis diff --git a/x/incentives/keeper/allocation_meters.go b/x/incentives/keeper/allocation_meters.go index bee99e7985..1084cba3be 100644 --- a/x/incentives/keeper/allocation_meters.go +++ b/x/incentives/keeper/allocation_meters.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // GetAllAllocationMeters - get all registered AllocationMeters diff --git a/x/incentives/keeper/distribution.go b/x/incentives/keeper/distribution.go index 7e313852b0..7a16b29824 100644 --- a/x/incentives/keeper/distribution.go +++ b/x/incentives/keeper/distribution.go @@ -10,7 +10,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // DistributeRewards transfers the allocated rewards to the participants of a given diff --git a/x/incentives/keeper/distribution_test.go b/x/incentives/keeper/distribution_test.go index b31439da6d..677ed70f2a 100644 --- a/x/incentives/keeper/distribution_test.go +++ b/x/incentives/keeper/distribution_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) func (suite *KeeperTestSuite) TestDistributeIncentives() { diff --git a/x/incentives/keeper/epoch_hooks.go b/x/incentives/keeper/epoch_hooks.go index 6a4cbc1f6f..9adc0ace9a 100644 --- a/x/incentives/keeper/epoch_hooks.go +++ b/x/incentives/keeper/epoch_hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" ) // BeforeEpochStart performs a no-op diff --git a/x/incentives/keeper/evm_hooks.go b/x/incentives/keeper/evm_hooks.go index 5ef67068fc..a015449078 100644 --- a/x/incentives/keeper/evm_hooks.go +++ b/x/incentives/keeper/evm_hooks.go @@ -11,7 +11,7 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/incentives/keeper/evm_hooks_test.go b/x/incentives/keeper/evm_hooks_test.go index e57e145949..07ee12fadc 100644 --- a/x/incentives/keeper/evm_hooks_test.go +++ b/x/incentives/keeper/evm_hooks_test.go @@ -14,9 +14,9 @@ import ( ethermint "github.com/evmos/ethermint/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/incentives/types" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/incentives/types" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) // ensureHooksSet tries to set the hooks on EVMKeeper, this will fail if the diff --git a/x/incentives/keeper/gas_meters.go b/x/incentives/keeper/gas_meters.go index a4fa2645e4..ce95f2e4f7 100644 --- a/x/incentives/keeper/gas_meters.go +++ b/x/incentives/keeper/gas_meters.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // GetIncentivesGasMeters - get all registered GasMeters per Incentive diff --git a/x/incentives/keeper/gas_meters_test.go b/x/incentives/keeper/gas_meters_test.go index a244f963b8..9eb8f89f21 100644 --- a/x/incentives/keeper/gas_meters_test.go +++ b/x/incentives/keeper/gas_meters_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) func (suite *KeeperTestSuite) TestGetIncentivesGasMeters() { diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index d2318fbce8..8952b6ac56 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -14,7 +14,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go index a29b32352d..dfc3c900e2 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) func (suite *KeeperTestSuite) TestIncentives() { diff --git a/x/incentives/keeper/incentives.go b/x/incentives/keeper/incentives.go index 4ef7e223e4..2d49d1fb5c 100644 --- a/x/incentives/keeper/incentives.go +++ b/x/incentives/keeper/incentives.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // GetAllIncentives - get all registered Incentives diff --git a/x/incentives/keeper/incentives_test.go b/x/incentives/keeper/incentives_test.go index 04031d720f..b73516671b 100644 --- a/x/incentives/keeper/incentives_test.go +++ b/x/incentives/keeper/incentives_test.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) func (suite *KeeperTestSuite) TestGetAllIncentives() { diff --git a/x/incentives/keeper/integration_test.go b/x/incentives/keeper/integration_test.go index f67317149b..71a3f264f3 100644 --- a/x/incentives/keeper/integration_test.go +++ b/x/incentives/keeper/integration_test.go @@ -15,7 +15,7 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) var _ = Describe("Performing EVM transactions", Ordered, func() { diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index ceb9fac251..07b353d214 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/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/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // Keeper of this module maintains collections of incentives. diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 80d67071cc..f41c21dd1c 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -36,10 +36,10 @@ import ( ethermint "github.com/evmos/ethermint/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/contracts" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/contracts" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) var ( diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index 0cc9e30862..aa4ac1b957 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // GetParams returns the total set of incentives parameters. diff --git a/x/incentives/keeper/params_test.go b/x/incentives/keeper/params_test.go index 4c54e2f71f..c084add39f 100644 --- a/x/incentives/keeper/params_test.go +++ b/x/incentives/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/evmos/evmos/v6/x/incentives/types" +import "github.com/evmos/evmos/v7/x/incentives/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.IncentivesKeeper.GetParams(suite.ctx) diff --git a/x/incentives/keeper/proposals.go b/x/incentives/keeper/proposals.go index e5f7b338e6..246c9435d6 100644 --- a/x/incentives/keeper/proposals.go +++ b/x/incentives/keeper/proposals.go @@ -5,7 +5,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) // RegisterIncentive creates an incentive for a contract diff --git a/x/incentives/keeper/proposals_test.go b/x/incentives/keeper/proposals_test.go index 29a0ccb3b9..fe65561aaf 100644 --- a/x/incentives/keeper/proposals_test.go +++ b/x/incentives/keeper/proposals_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/types" ) func (suite KeeperTestSuite) TestRegisterIncentive() { diff --git a/x/incentives/module.go b/x/incentives/module.go index 030be81756..a829895352 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/evmos/evmos/v6/x/incentives/client/cli" - "github.com/evmos/evmos/v6/x/incentives/keeper" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/client/cli" + "github.com/evmos/evmos/v7/x/incentives/keeper" + "github.com/evmos/evmos/v7/x/incentives/types" ) // type check to ensure the interface is properly implemented diff --git a/x/incentives/proposal_handler.go b/x/incentives/proposal_handler.go index 1c03a7a960..d1dcaeb7d7 100644 --- a/x/incentives/proposal_handler.go +++ b/x/incentives/proposal_handler.go @@ -8,8 +8,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v6/x/incentives/keeper" - "github.com/evmos/evmos/v6/x/incentives/types" + "github.com/evmos/evmos/v7/x/incentives/keeper" + "github.com/evmos/evmos/v7/x/incentives/types" ) // NewIncentivesProposalHandler creates a governance handler to manage new diff --git a/x/incentives/types/interfaces.go b/x/incentives/types/interfaces.go index 6e2910e273..7925ac2924 100644 --- a/x/incentives/types/interfaces.go +++ b/x/incentives/types/interfaces.go @@ -14,7 +14,7 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" ) // AccountKeeper defines the expected interface needed to retrieve account info. diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index eb1ddd2718..e48aa09244 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" ) // Parameter store key diff --git a/x/incentives/types/params_test.go b/x/incentives/types/params_test.go index 3265f0fe78..40def45071 100644 --- a/x/incentives/types/params_test.go +++ b/x/incentives/types/params_test.go @@ -9,7 +9,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" ) type ParamsTestSuite struct { diff --git a/x/inflation/client/cli/query.go b/x/inflation/client/cli/query.go index ca2473e481..4bacaa75e1 100644 --- a/x/inflation/client/cli/query.go +++ b/x/inflation/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) // GetQueryCmd returns the cli query commands for the inflation module. diff --git a/x/inflation/genesis.go b/x/inflation/genesis.go index 74badf5207..6bc851ceb3 100644 --- a/x/inflation/genesis.go +++ b/x/inflation/genesis.go @@ -2,8 +2,8 @@ package inflation import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/inflation/keeper" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/keeper" + "github.com/evmos/evmos/v7/x/inflation/types" ) // InitGenesis import module genesis diff --git a/x/inflation/keeper/epoch_info.go b/x/inflation/keeper/epoch_info.go index 348fac1978..ad87fc7e64 100644 --- a/x/inflation/keeper/epoch_info.go +++ b/x/inflation/keeper/epoch_info.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) // GetEpochIdentifier gets the epoch identifier diff --git a/x/inflation/keeper/epoch_info_test.go b/x/inflation/keeper/epoch_info_test.go index fba7c21bd8..e4590d239f 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/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/inflation/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/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 8746bb3de7..ffae570797 100644 --- a/x/inflation/keeper/epoch_mint_provisions.go +++ b/x/inflation/keeper/epoch_mint_provisions.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) // GetEpochMintProvision gets the current EpochMintProvision diff --git a/x/inflation/keeper/grpc_query.go b/x/inflation/keeper/grpc_query.go index 06cda91ed7..45799fc367 100644 --- a/x/inflation/keeper/grpc_query.go +++ b/x/inflation/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/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 ad4cb661f7..ba5426c253 100644 --- a/x/inflation/keeper/grpc_query_test.go +++ b/x/inflation/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestPeriod() { diff --git a/x/inflation/keeper/hooks.go b/x/inflation/keeper/hooks.go index 763a92e503..3ca5fe0ebc 100644 --- a/x/inflation/keeper/hooks.go +++ b/x/inflation/keeper/hooks.go @@ -6,8 +6,8 @@ import ( "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/inflation/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) // BeforeEpochStart: noop, We don't need to do anything here diff --git a/x/inflation/keeper/hooks_test.go b/x/inflation/keeper/hooks_test.go index b2bd6e9429..263a450301 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/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/inflation/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestEpochIdentifierAfterEpochEnd() { diff --git a/x/inflation/keeper/inflation.go b/x/inflation/keeper/inflation.go index 41be5a1817..e23252bc65 100644 --- a/x/inflation/keeper/inflation.go +++ b/x/inflation/keeper/inflation.go @@ -5,9 +5,9 @@ import ( ethermint "github.com/evmos/ethermint/types" - evmos "github.com/evmos/evmos/v6/types" - incentivestypes "github.com/evmos/evmos/v6/x/incentives/types" - "github.com/evmos/evmos/v6/x/inflation/types" + evmos "github.com/evmos/evmos/v7/types" + incentivestypes "github.com/evmos/evmos/v7/x/incentives/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) // 200M token at year 4 allocated to the team diff --git a/x/inflation/keeper/inflation_test.go b/x/inflation/keeper/inflation_test.go index e931615d1e..28c8ce4338 100644 --- a/x/inflation/keeper/inflation_test.go +++ b/x/inflation/keeper/inflation_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ethermint "github.com/evmos/ethermint/types" - incentivestypes "github.com/evmos/evmos/v6/x/incentives/types" - "github.com/evmos/evmos/v6/x/inflation/types" + incentivestypes "github.com/evmos/evmos/v7/x/incentives/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestMintAndAllocateInflation() { diff --git a/x/inflation/keeper/integration_test.go b/x/inflation/keeper/integration_test.go index 8bf7f225e7..a817b17a85 100644 --- a/x/inflation/keeper/integration_test.go +++ b/x/inflation/keeper/integration_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" - incentivestypes "github.com/evmos/evmos/v6/x/incentives/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + incentivestypes "github.com/evmos/evmos/v7/x/incentives/types" ) var ( diff --git a/x/inflation/keeper/keeper.go b/x/inflation/keeper/keeper.go index b52cfb5bc1..c997bb6b8e 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/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/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 104815fc1a..362b167fb0 100644 --- a/x/inflation/keeper/keeper_test.go +++ b/x/inflation/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/app" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/app" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) var denomMint = types.DefaultInflationDenom diff --git a/x/inflation/keeper/params.go b/x/inflation/keeper/params.go index f4d4ea82ae..111f734002 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/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/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 e362028a40..d86e99e5d4 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/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/inflation/keeper/periods.go b/x/inflation/keeper/periods.go index 5164fceea1..0ae65f860e 100644 --- a/x/inflation/keeper/periods.go +++ b/x/inflation/keeper/periods.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/types" ) // GetPeriod gets current period diff --git a/x/inflation/module.go b/x/inflation/module.go index e5888b27fe..77f3a96cd6 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/evmos/evmos/v6/x/inflation/client/cli" - "github.com/evmos/evmos/v6/x/inflation/keeper" - "github.com/evmos/evmos/v6/x/inflation/types" + "github.com/evmos/evmos/v7/x/inflation/client/cli" + "github.com/evmos/evmos/v7/x/inflation/keeper" + "github.com/evmos/evmos/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 c7143edac1..cc0f1c2364 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/evmos/evmos/v6/x/epochs/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" ) // NewGenesisState creates a new GenesisState object diff --git a/x/inflation/types/genesis_test.go b/x/inflation/types/genesis_test.go index b16ca5385c..a8418d43e6 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/evmos/evmos/v6/x/epochs/types" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" "github.com/stretchr/testify/suite" ) diff --git a/x/recovery/client/cli/query.go b/x/recovery/client/cli/query.go index d89c1bbffd..15a7de2694 100644 --- a/x/recovery/client/cli/query.go +++ b/x/recovery/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) // GetQueryCmd returns the parent command for all recovery CLI query commands. diff --git a/x/recovery/genesis.go b/x/recovery/genesis.go index c8ba97480c..cab665f631 100644 --- a/x/recovery/genesis.go +++ b/x/recovery/genesis.go @@ -3,8 +3,8 @@ package recovery import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/recovery/keeper" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/keeper" + "github.com/evmos/evmos/v7/x/recovery/types" ) // InitGenesis import module genesis diff --git a/x/recovery/genesis_test.go b/x/recovery/genesis_test.go index 1eaedc8b12..229deda764 100644 --- a/x/recovery/genesis_test.go +++ b/x/recovery/genesis_test.go @@ -15,9 +15,9 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/x/recovery" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/x/recovery" + "github.com/evmos/evmos/v7/x/recovery/types" ) type GenesisTestSuite struct { diff --git a/x/recovery/ibc_middleware.go b/x/recovery/ibc_middleware.go index f497cae7cd..1785ee98ed 100644 --- a/x/recovery/ibc_middleware.go +++ b/x/recovery/ibc_middleware.go @@ -7,8 +7,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/evmos/evmos/v6/ibc" - "github.com/evmos/evmos/v6/x/recovery/keeper" + "github.com/evmos/evmos/v7/ibc" + "github.com/evmos/evmos/v7/x/recovery/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/recovery/keeper/grpc_query.go b/x/recovery/keeper/grpc_query.go index 7e63178abc..071aa85c62 100644 --- a/x/recovery/keeper/grpc_query.go +++ b/x/recovery/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/recovery/keeper/grpc_query_test.go b/x/recovery/keeper/grpc_query_test.go index 1d1c9333bb..5d44bb0f65 100644 --- a/x/recovery/keeper/grpc_query_test.go +++ b/x/recovery/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) func (suite *KeeperTestSuite) TestQueryParams() { diff --git a/x/recovery/keeper/ibc_callbacks.go b/x/recovery/keeper/ibc_callbacks.go index 30681b7f14..3d33133283 100644 --- a/x/recovery/keeper/ibc_callbacks.go +++ b/x/recovery/keeper/ibc_callbacks.go @@ -16,9 +16,9 @@ import ( host "github.com/cosmos/ibc-go/v3/modules/core/24-host" "github.com/cosmos/ibc-go/v3/modules/core/exported" - "github.com/evmos/evmos/v6/ibc" - evmos "github.com/evmos/evmos/v6/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/ibc" + evmos "github.com/evmos/evmos/v7/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) // OnRecvPacket performs an IBC receive callback. It returns the tokens that diff --git a/x/recovery/keeper/ibc_callbacks_integration_suite_test.go b/x/recovery/keeper/ibc_callbacks_integration_suite_test.go index 9604eedfd5..e126bd25ea 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_suite_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_suite_test.go @@ -15,13 +15,13 @@ import ( channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" ibcgotesting "github.com/cosmos/ibc-go/v3/testing" - ibctesting "github.com/evmos/evmos/v6/ibc/testing" + ibctesting "github.com/evmos/evmos/v7/ibc/testing" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/evmos/evmos/v6/app" - claimtypes "github.com/evmos/evmos/v6/x/claims/types" - inflationtypes "github.com/evmos/evmos/v6/x/inflation/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/app" + claimtypes "github.com/evmos/evmos/v7/x/claims/types" + inflationtypes "github.com/evmos/evmos/v7/x/inflation/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) type IBCTestingSuite struct { diff --git a/x/recovery/keeper/ibc_callbacks_integration_test.go b/x/recovery/keeper/ibc_callbacks_integration_test.go index 212fe5d9ec..1d65c3c814 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/testutil" - claimtypes "github.com/evmos/evmos/v6/x/claims/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/testutil" + claimtypes "github.com/evmos/evmos/v7/x/claims/types" + "github.com/evmos/evmos/v7/x/recovery/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/x/recovery/keeper/ibc_callbacks_test.go b/x/recovery/keeper/ibc_callbacks_test.go index e34a3d9c14..43e2b26b44 100644 --- a/x/recovery/keeper/ibc_callbacks_test.go +++ b/x/recovery/keeper/ibc_callbacks_test.go @@ -8,7 +8,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" + "github.com/evmos/evmos/v7/testutil" "github.com/stretchr/testify/mock" transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" @@ -17,11 +17,11 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v3/testing" ibcmock "github.com/cosmos/ibc-go/v3/testing/mock" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" - incentivestypes "github.com/evmos/evmos/v6/x/incentives/types" - "github.com/evmos/evmos/v6/x/recovery/keeper" - "github.com/evmos/evmos/v6/x/recovery/types" - vestingtypes "github.com/evmos/evmos/v6/x/vesting/types" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" + incentivestypes "github.com/evmos/evmos/v7/x/incentives/types" + "github.com/evmos/evmos/v7/x/recovery/keeper" + "github.com/evmos/evmos/v7/x/recovery/types" + vestingtypes "github.com/evmos/evmos/v7/x/vesting/types" ) func (suite *KeeperTestSuite) TestOnRecvPacket() { diff --git a/x/recovery/keeper/keeper.go b/x/recovery/keeper/keeper.go index 0d31c40a2d..0b40cc51ae 100644 --- a/x/recovery/keeper/keeper.go +++ b/x/recovery/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/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) var _ transfertypes.ICS4Wrapper = Keeper{} diff --git a/x/recovery/keeper/keeper_test.go b/x/recovery/keeper/keeper_test.go index dbf488c3b5..d0b69a800b 100644 --- a/x/recovery/keeper/keeper_test.go +++ b/x/recovery/keeper/keeper_test.go @@ -17,9 +17,9 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/app" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/app" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) var ( diff --git a/x/recovery/keeper/params.go b/x/recovery/keeper/params.go index 39c4f11985..5ad2199315 100644 --- a/x/recovery/keeper/params.go +++ b/x/recovery/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) // GetParams returns the total set of recovery parameters. diff --git a/x/recovery/keeper/utils_test.go b/x/recovery/keeper/utils_test.go index d1f5e018ac..d7e80dae2a 100644 --- a/x/recovery/keeper/utils_test.go +++ b/x/recovery/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/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/types" ) var _ types.TransferKeeper = &MockTransferKeeper{} diff --git a/x/recovery/module.go b/x/recovery/module.go index 41f8b294ee..9c62ef4757 100644 --- a/x/recovery/module.go +++ b/x/recovery/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/evmos/evmos/v6/x/recovery/client/cli" - "github.com/evmos/evmos/v6/x/recovery/keeper" - "github.com/evmos/evmos/v6/x/recovery/types" + "github.com/evmos/evmos/v7/x/recovery/client/cli" + "github.com/evmos/evmos/v7/x/recovery/keeper" + "github.com/evmos/evmos/v7/x/recovery/types" ) // type check to ensure the interface is properly implemented diff --git a/x/recovery/types/interfaces.go b/x/recovery/types/interfaces.go index c16adac065..cd5bda61f1 100644 --- a/x/recovery/types/interfaces.go +++ b/x/recovery/types/interfaces.go @@ -10,7 +10,7 @@ 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" - claimstypes "github.com/evmos/evmos/v6/x/claims/types" + claimstypes "github.com/evmos/evmos/v7/x/claims/types" ) // BankKeeper defines the banking keeper that must be fulfilled when diff --git a/x/vesting/client/cli/query.go b/x/vesting/client/cli/query.go index 3a6f124a08..63f82d814f 100644 --- a/x/vesting/client/cli/query.go +++ b/x/vesting/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) // GetQueryCmd returns the parent command for all vesting CLI query commands. diff --git a/x/vesting/client/cli/tx.go b/x/vesting/client/cli/tx.go index 96fe29c9e2..7ba8848b13 100644 --- a/x/vesting/client/cli/tx.go +++ b/x/vesting/client/cli/tx.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) // Transaction command flags diff --git a/x/vesting/handler.go b/x/vesting/handler.go index d9524b7413..15c63fc9a6 100644 --- a/x/vesting/handler.go +++ b/x/vesting/handler.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) // NewHandler defines the vesting module handler instance diff --git a/x/vesting/keeper/grpc_query.go b/x/vesting/keeper/grpc_query.go index be297c5b13..e194bc3b80 100644 --- a/x/vesting/keeper/grpc_query.go +++ b/x/vesting/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/vesting/keeper/grpc_query_test.go b/x/vesting/keeper/grpc_query_test.go index 0e15d41e19..bc98597a57 100644 --- a/x/vesting/keeper/grpc_query_test.go +++ b/x/vesting/keeper/grpc_query_test.go @@ -7,8 +7,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/vesting/types" ) func (suite *KeeperTestSuite) TestBalances() { diff --git a/x/vesting/keeper/integration_test.go b/x/vesting/keeper/integration_test.go index 1de9c854f4..eb3e0e28b3 100644 --- a/x/vesting/keeper/integration_test.go +++ b/x/vesting/keeper/integration_test.go @@ -9,9 +9,9 @@ import ( "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/app/ante" - "github.com/evmos/evmos/v6/testutil" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/app/ante" + "github.com/evmos/evmos/v7/testutil" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" @@ -22,7 +22,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) // Clawback vesting with Cliff and Lock. In this case the cliff is reached diff --git a/x/vesting/keeper/keeper.go b/x/vesting/keeper/keeper.go index 2c5161cc5e..f021945db7 100644 --- a/x/vesting/keeper/keeper.go +++ b/x/vesting/keeper/keeper.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) // Keeper of this module maintains collections of vesting. diff --git a/x/vesting/keeper/keeper_test.go b/x/vesting/keeper/keeper_test.go index ba81c4cb2c..812db1f0ef 100644 --- a/x/vesting/keeper/keeper_test.go +++ b/x/vesting/keeper/keeper_test.go @@ -35,10 +35,10 @@ import ( ethermint "github.com/evmos/ethermint/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v6/app" - "github.com/evmos/evmos/v6/contracts" - epochstypes "github.com/evmos/evmos/v6/x/epochs/types" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/app" + "github.com/evmos/evmos/v7/contracts" + epochstypes "github.com/evmos/evmos/v7/x/epochs/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) var ( diff --git a/x/vesting/keeper/msg_server.go b/x/vesting/keeper/msg_server.go index d2340439b8..ca57d33091 100644 --- a/x/vesting/keeper/msg_server.go +++ b/x/vesting/keeper/msg_server.go @@ -13,7 +13,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/vesting/keeper/msg_server_test.go b/x/vesting/keeper/msg_server_test.go index d73a76d996..e9c10a0f52 100644 --- a/x/vesting/keeper/msg_server_test.go +++ b/x/vesting/keeper/msg_server_test.go @@ -10,8 +10,8 @@ import ( sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/testutil" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/testutil" + "github.com/evmos/evmos/v7/x/vesting/types" ) var ( diff --git a/x/vesting/module.go b/x/vesting/module.go index a268f3020b..26f85acfb4 100644 --- a/x/vesting/module.go +++ b/x/vesting/module.go @@ -18,9 +18,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/evmos/evmos/v6/x/vesting/client/cli" - "github.com/evmos/evmos/v6/x/vesting/keeper" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/client/cli" + "github.com/evmos/evmos/v7/x/vesting/keeper" + "github.com/evmos/evmos/v7/x/vesting/types" ) var ( diff --git a/x/vesting/types/clawback_vesting_account_test.go b/x/vesting/types/clawback_vesting_account_test.go index 3d17df8db4..8fe3cc92cc 100644 --- a/x/vesting/types/clawback_vesting_account_test.go +++ b/x/vesting/types/clawback_vesting_account_test.go @@ -12,7 +12,7 @@ import ( sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v6/x/vesting/types" + "github.com/evmos/evmos/v7/x/vesting/types" ) var (