Skip to content

Commit

Permalink
chore: Bump evmos version to v9 (evmos#981)
Browse files Browse the repository at this point in the history
evmos bump Evmos version to v9
  • Loading branch information
facs95 authored Oct 18, 2022
1 parent c16b5dd commit f8e6802
Show file tree
Hide file tree
Showing 227 changed files with 419 additions and 419 deletions.
2 changes: 1 addition & 1 deletion app/ante/handler_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/x/vesting/types"
vestingtypes "github.com/evmos/evmos/v9/x/vesting/types"
)

// HandlerOptions defines the list of module keepers required to run the Evmos
Expand Down
4 changes: 2 additions & 2 deletions app/ante/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/app"
claimstypes "github.com/evmos/evmos/v8/x/claims/types"
"github.com/evmos/evmos/v9/app"
claimstypes "github.com/evmos/evmos/v9/x/claims/types"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto/tmhash"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand Down
2 changes: 1 addition & 1 deletion app/ante/vesting.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/x/vesting/types"
vestingtypes "github.com/evmos/evmos/v9/x/vesting/types"
)

// EthVestingTransactionDecorator validates if clawback vesting accounts are
Expand Down
74 changes: 37 additions & 37 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,43 +105,43 @@ import (
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"

// unnamed import of statik for swagger UI support
_ "github.com/evmos/evmos/v8/client/docs/statik"

"github.com/evmos/evmos/v8/app/ante"
v2 "github.com/evmos/evmos/v8/app/upgrades/v2"
v4 "github.com/evmos/evmos/v8/app/upgrades/v4"
v5 "github.com/evmos/evmos/v8/app/upgrades/v5"
v6 "github.com/evmos/evmos/v8/app/upgrades/v6"
v7 "github.com/evmos/evmos/v8/app/upgrades/v7"
v8 "github.com/evmos/evmos/v8/app/upgrades/v8"
v81 "github.com/evmos/evmos/v8/app/upgrades/v8_1"
v82 "github.com/evmos/evmos/v8/app/upgrades/v8_2"
"github.com/evmos/evmos/v8/x/claims"
claimskeeper "github.com/evmos/evmos/v8/x/claims/keeper"
claimstypes "github.com/evmos/evmos/v8/x/claims/types"
"github.com/evmos/evmos/v8/x/epochs"
epochskeeper "github.com/evmos/evmos/v8/x/epochs/keeper"
epochstypes "github.com/evmos/evmos/v8/x/epochs/types"
"github.com/evmos/evmos/v8/x/erc20"
erc20client "github.com/evmos/evmos/v8/x/erc20/client"
erc20keeper "github.com/evmos/evmos/v8/x/erc20/keeper"
erc20types "github.com/evmos/evmos/v8/x/erc20/types"
"github.com/evmos/evmos/v8/x/incentives"
incentivesclient "github.com/evmos/evmos/v8/x/incentives/client"
incentiveskeeper "github.com/evmos/evmos/v8/x/incentives/keeper"
incentivestypes "github.com/evmos/evmos/v8/x/incentives/types"
"github.com/evmos/evmos/v8/x/inflation"
inflationkeeper "github.com/evmos/evmos/v8/x/inflation/keeper"
inflationtypes "github.com/evmos/evmos/v8/x/inflation/types"
"github.com/evmos/evmos/v8/x/recovery"
recoverykeeper "github.com/evmos/evmos/v8/x/recovery/keeper"
recoverytypes "github.com/evmos/evmos/v8/x/recovery/types"
"github.com/evmos/evmos/v8/x/revenue"
revenuekeeper "github.com/evmos/evmos/v8/x/revenue/keeper"
revenuetypes "github.com/evmos/evmos/v8/x/revenue/types"
"github.com/evmos/evmos/v8/x/vesting"
vestingkeeper "github.com/evmos/evmos/v8/x/vesting/keeper"
vestingtypes "github.com/evmos/evmos/v8/x/vesting/types"
_ "github.com/evmos/evmos/v9/client/docs/statik"

"github.com/evmos/evmos/v9/app/ante"
v2 "github.com/evmos/evmos/v9/app/upgrades/v2"
v4 "github.com/evmos/evmos/v9/app/upgrades/v4"
v5 "github.com/evmos/evmos/v9/app/upgrades/v5"
v6 "github.com/evmos/evmos/v9/app/upgrades/v6"
v7 "github.com/evmos/evmos/v9/app/upgrades/v7"
v8 "github.com/evmos/evmos/v9/app/upgrades/v8"
v81 "github.com/evmos/evmos/v9/app/upgrades/v8_1"
v82 "github.com/evmos/evmos/v9/app/upgrades/v8_2"
"github.com/evmos/evmos/v9/x/claims"
claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper"
claimstypes "github.com/evmos/evmos/v9/x/claims/types"
"github.com/evmos/evmos/v9/x/epochs"
epochskeeper "github.com/evmos/evmos/v9/x/epochs/keeper"
epochstypes "github.com/evmos/evmos/v9/x/epochs/types"
"github.com/evmos/evmos/v9/x/erc20"
erc20client "github.com/evmos/evmos/v9/x/erc20/client"
erc20keeper "github.com/evmos/evmos/v9/x/erc20/keeper"
erc20types "github.com/evmos/evmos/v9/x/erc20/types"
"github.com/evmos/evmos/v9/x/incentives"
incentivesclient "github.com/evmos/evmos/v9/x/incentives/client"
incentiveskeeper "github.com/evmos/evmos/v9/x/incentives/keeper"
incentivestypes "github.com/evmos/evmos/v9/x/incentives/types"
"github.com/evmos/evmos/v9/x/inflation"
inflationkeeper "github.com/evmos/evmos/v9/x/inflation/keeper"
inflationtypes "github.com/evmos/evmos/v9/x/inflation/types"
"github.com/evmos/evmos/v9/x/recovery"
recoverykeeper "github.com/evmos/evmos/v9/x/recovery/keeper"
recoverytypes "github.com/evmos/evmos/v9/x/recovery/types"
"github.com/evmos/evmos/v9/x/revenue"
revenuekeeper "github.com/evmos/evmos/v9/x/revenue/keeper"
revenuetypes "github.com/evmos/evmos/v9/x/revenue/types"
"github.com/evmos/evmos/v9/x/vesting"
vestingkeeper "github.com/evmos/evmos/v9/x/vesting/keeper"
vestingtypes "github.com/evmos/evmos/v9/x/vesting/types"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
dbm "github.com/tendermint/tm-db"

"github.com/evmos/ethermint/encoding"
"github.com/evmos/evmos/v8/types"
"github.com/evmos/evmos/v9/types"
)

func TestEvmosExport(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions app/forks.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

v2 "github.com/evmos/evmos/v8/app/upgrades/v2"
v4 "github.com/evmos/evmos/v8/app/upgrades/v4"
v7 "github.com/evmos/evmos/v8/app/upgrades/v7"
v82 "github.com/evmos/evmos/v8/app/upgrades/v8_2"
"github.com/evmos/evmos/v8/types"
v2 "github.com/evmos/evmos/v9/app/upgrades/v2"
v4 "github.com/evmos/evmos/v9/app/upgrades/v4"
v7 "github.com/evmos/evmos/v9/app/upgrades/v7"
v82 "github.com/evmos/evmos/v9/app/upgrades/v8_2"
"github.com/evmos/evmos/v9/types"
)

// ScheduleForkUpgrade executes any necessary fork logic for based upon the current
Expand Down
4 changes: 2 additions & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/evmos/ethermint/encoding"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"

"github.com/evmos/evmos/v8/cmd/config"
"github.com/evmos/evmos/v8/types"
"github.com/evmos/evmos/v9/cmd/config"
"github.com/evmos/evmos/v9/types"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v2/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/x/claims/types"
erc20types "github.com/evmos/evmos/v8/x/erc20/types"
claimstypes "github.com/evmos/evmos/v9/x/claims/types"
erc20types "github.com/evmos/evmos/v9/x/erc20/types"
)

// CreateUpgradeHandler creates an SDK upgrade handler for v2
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/types"
"github.com/evmos/evmos/v9/types"
)

// CreateUpgradeHandler creates an SDK upgrade handler for v4
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/evmos/ethermint/crypto/ethsecp256k1"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"

"github.com/evmos/evmos/v8/app"
v4 "github.com/evmos/evmos/v8/app/upgrades/v4"
"github.com/evmos/evmos/v9/app"
v4 "github.com/evmos/evmos/v9/app/upgrades/v4"
)

type UpgradeTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v5/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/types"
claimskeeper "github.com/evmos/evmos/v8/x/claims/keeper"
claimstypes "github.com/evmos/evmos/v8/x/claims/types"
"github.com/evmos/evmos/v9/types"
claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper"
claimstypes "github.com/evmos/evmos/v9/x/claims/types"
)

// TestnetDenomMetadata defines the metadata for the tEVMOS denom on testnet
Expand Down
10 changes: 5 additions & 5 deletions app/upgrades/v5/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (

ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"

"github.com/evmos/evmos/v8/app"
v5 "github.com/evmos/evmos/v8/app/upgrades/v5"
evmostypes "github.com/evmos/evmos/v8/types"
claimskeeper "github.com/evmos/evmos/v8/x/claims/keeper"
claimstypes "github.com/evmos/evmos/v8/x/claims/types"
"github.com/evmos/evmos/v9/app"
v5 "github.com/evmos/evmos/v9/app/upgrades/v5"
evmostypes "github.com/evmos/evmos/v9/types"
claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper"
claimstypes "github.com/evmos/evmos/v9/x/claims/types"
)

type UpgradeTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v6/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/app/upgrades/v5"
"github.com/evmos/evmos/v8/types"
claimskeeper "github.com/evmos/evmos/v8/x/claims/keeper"
v5 "github.com/evmos/evmos/v9/app/upgrades/v5"
"github.com/evmos/evmos/v9/types"
claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper"
)

// CreateUpgradeHandler creates an SDK upgrade handler for v6
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v6/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/evmos/ethermint/crypto/ethsecp256k1"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"

"github.com/evmos/evmos/v8/app"
v6 "github.com/evmos/evmos/v8/app/upgrades/v6"
evmostypes "github.com/evmos/evmos/v8/types"
"github.com/evmos/evmos/v9/app"
v6 "github.com/evmos/evmos/v9/app/upgrades/v6"
evmostypes "github.com/evmos/evmos/v9/types"
)

type UpgradeTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v7/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/evmos/evmos/v8/types"
claimskeeper "github.com/evmos/evmos/v8/x/claims/keeper"
inflationkeeper "github.com/evmos/evmos/v8/x/inflation/keeper"
"github.com/evmos/evmos/v9/types"
claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper"
inflationkeeper "github.com/evmos/evmos/v9/x/inflation/keeper"
)

// CreateUpgradeHandler creates an SDK upgrade handler for v7
Expand Down
10 changes: 5 additions & 5 deletions app/upgrades/v7/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"github.com/evmos/ethermint/crypto/ethsecp256k1"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"

"github.com/evmos/evmos/v8/app"
v7 "github.com/evmos/evmos/v8/app/upgrades/v7"
"github.com/evmos/evmos/v8/testutil"
evmostypes "github.com/evmos/evmos/v8/types"
claimstypes "github.com/evmos/evmos/v8/x/claims/types"
"github.com/evmos/evmos/v9/app"
v7 "github.com/evmos/evmos/v9/app/upgrades/v7"
"github.com/evmos/evmos/v9/testutil"
evmostypes "github.com/evmos/evmos/v9/types"
claimstypes "github.com/evmos/evmos/v9/x/claims/types"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v8/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/evmos/ethermint/crypto/ethsecp256k1"
feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"

"github.com/evmos/evmos/v8/app"
"github.com/evmos/evmos/v9/app"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/observability.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/issues/84
// Please see https://github.com/evmos/evmos/v9/issues/84
// return nil
// }

Expand Down
4 changes: 2 additions & 2 deletions cmd/evmosd/cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
"github.com/stretchr/testify/require"

"github.com/evmos/evmos/v8/app"
evmosd "github.com/evmos/evmos/v8/cmd/evmosd"
"github.com/evmos/evmos/v9/app"
evmosd "github.com/evmos/evmos/v9/cmd/evmosd"
)

func TestInitCmd(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/evmosd/genaccounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
ethermint "github.com/evmos/ethermint/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"

evmoskr "github.com/evmos/evmos/v8/crypto/keyring"
evmoskr "github.com/evmos/evmos/v9/crypto/keyring"

vestingcli "github.com/evmos/evmos/v8/x/vesting/client/cli"
vestingtypes "github.com/evmos/evmos/v8/x/vesting/types"
vestingcli "github.com/evmos/evmos/v9/x/vesting/client/cli"
vestingtypes "github.com/evmos/evmos/v9/x/vesting/types"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/evmosd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/evmos/evmos/v8/app"
cmdcfg "github.com/evmos/evmos/v8/cmd/config"
"github.com/evmos/evmos/v9/app"
cmdcfg "github.com/evmos/evmos/v9/cmd/config"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/evmosd/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v8/app/upgrades/v3"
v5 "github.com/evmos/evmos/v8/app/upgrades/v5"
"github.com/evmos/evmos/v8/types"
v3 "github.com/evmos/evmos/v9/app/upgrades/v3"
v5 "github.com/evmos/evmos/v9/app/upgrades/v5"
"github.com/evmos/evmos/v9/types"
)

// FlagGenesisTime defines the genesis time in string format
Expand Down
6 changes: 3 additions & 3 deletions cmd/evmosd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import (
servercfg "github.com/evmos/ethermint/server/config"
srvflags "github.com/evmos/ethermint/server/flags"

"github.com/evmos/evmos/v8/app"
cmdcfg "github.com/evmos/evmos/v8/cmd/config"
evmoskr "github.com/evmos/evmos/v8/crypto/keyring"
"github.com/evmos/evmos/v9/app"
cmdcfg "github.com/evmos/evmos/v9/cmd/config"
evmoskr "github.com/evmos/evmos/v9/crypto/keyring"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/evmosd/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ import (
ethermint "github.com/evmos/ethermint/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"

cmdcfg "github.com/evmos/evmos/v8/cmd/config"
evmoskr "github.com/evmos/evmos/v8/crypto/keyring"
"github.com/evmos/evmos/v8/testutil/network"
cmdcfg "github.com/evmos/evmos/v9/cmd/config"
evmoskr "github.com/evmos/evmos/v9/crypto/keyring"
"github.com/evmos/evmos/v9/testutil/network"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion contracts/erc20.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common"
evmtypes "github.com/evmos/ethermint/x/evm/types"

"github.com/evmos/evmos/v8/x/erc20/types"
"github.com/evmos/evmos/v9/x/erc20/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion contracts/erc20DirectBalanceManipulation.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common"
evmtypes "github.com/evmos/ethermint/x/evm/types"

"github.com/evmos/evmos/v8/x/erc20/types"
"github.com/evmos/evmos/v9/x/erc20/types"
)

// This is an evil token. Whenever an A -> B transfer is called,
Expand Down
2 changes: 1 addition & 1 deletion contracts/erc20maliciousdelayed.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common"
evmtypes "github.com/evmos/ethermint/x/evm/types"

"github.com/evmos/evmos/v8/x/erc20/types"
"github.com/evmos/evmos/v9/x/erc20/types"
)

// This is an evil token. Whenever an A -> B transfer is called,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/evmos/evmos/v8
module github.com/evmos/evmos/v9

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion ibc/testing/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
ibcgotesting "github.com/cosmos/ibc-go/v3/testing"

ethermint "github.com/evmos/ethermint/types"
evmosapp "github.com/evmos/evmos/v8/app"
evmosapp "github.com/evmos/evmos/v9/app"
)

var DefaultTestingAppInit func() (ibcgotesting.TestingApp, map[string]json.RawMessage) = evmosapp.SetupTestingApp
Expand Down
Loading

0 comments on commit f8e6802

Please sign in to comment.