Skip to content

Commit

Permalink
chore: add v13 upgrade handler & update go.mod (#1536)
Browse files Browse the repository at this point in the history
  • Loading branch information
GAtom22 committed Apr 22, 2023
1 parent dc3b28d commit b2ef7a4
Show file tree
Hide file tree
Showing 546 changed files with 1,452 additions and 1,406 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/consensuswarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
- uses: actions/checkout@v3
- uses: orijtech/consensuswarn@main
with:
roots: 'github.com/evmos/evmos/v12/app.Evmos.DeliverTx,github.com/evmos/evmos/v12/app.Evmos.BeginBlocker,github.com/evmos/evmos/v12/app.Evmos.EndBlocker'
roots: 'github.com/evmos/evmos/v13/app.Evmos.DeliverTx,github.com/evmos/evmos/v13/app.Evmos.BeginBlocker,github.com/evmos/evmos/v13/app.Evmos.EndBlocker'
8 changes: 4 additions & 4 deletions app/ante/cosmos/authz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

cosmosante "github.com/evmos/evmos/v12/app/ante/cosmos"
testutil "github.com/evmos/evmos/v12/testutil"
utiltx "github.com/evmos/evmos/v12/testutil/tx"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
cosmosante "github.com/evmos/evmos/v13/app/ante/cosmos"
testutil "github.com/evmos/evmos/v13/testutil"
utiltx "github.com/evmos/evmos/v13/testutil/tx"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

func TestAuthzLimiterDecorator(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions app/ante/cosmos/eip712.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
ethcrypto "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/signer/core/apitypes"
"github.com/evmos/evmos/v12/crypto/ethsecp256k1"
"github.com/evmos/evmos/v12/ethereum/eip712"
"github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v13/crypto/ethsecp256k1"
"github.com/evmos/evmos/v13/ethereum/eip712"
"github.com/evmos/evmos/v13/types"

evmtypes "github.com/evmos/evmos/v12/x/evm/types"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

var evmosCodec codec.ProtoCodecMarshaler
Expand Down
2 changes: 1 addition & 1 deletion app/ante/cosmos/fees.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
anteutils "github.com/evmos/evmos/v12/app/ante/utils"
anteutils "github.com/evmos/evmos/v13/app/ante/utils"
)

// DeductFeeDecorator deducts fees from the first signer of the tx.
Expand Down
4 changes: 2 additions & 2 deletions app/ante/cosmos/fees_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
)

// This tests setup contains expensive operations.
Expand Down
8 changes: 4 additions & 4 deletions app/ante/cosmos/fees_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/feegrant"
cosmosante "github.com/evmos/evmos/v12/app/ante/cosmos"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v12/utils"
cosmosante "github.com/evmos/evmos/v13/app/ante/cosmos"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
"github.com/evmos/evmos/v13/utils"
)

type deductFeeDecoratorTestCase struct {
Expand Down
2 changes: 1 addition & 1 deletion app/ante/cosmos/min_price.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
evmante "github.com/evmos/evmos/v12/app/ante/evm"
evmante "github.com/evmos/evmos/v13/app/ante/evm"
)

// MinGasPriceDecorator will check if the transaction's fee is at least as large
Expand Down
8 changes: 4 additions & 4 deletions app/ante/cosmos/min_price_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
cosmosante "github.com/evmos/evmos/v12/app/ante/cosmos"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v12/utils"
cosmosante "github.com/evmos/evmos/v13/app/ante/cosmos"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
"github.com/evmos/evmos/v13/utils"
)

var execTypes = []struct {
Expand Down
2 changes: 1 addition & 1 deletion app/ante/cosmos/reject_msgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

// RejectMessagesDecorator prevents invalid msg types from being executed
Expand Down
24 changes: 12 additions & 12 deletions app/ante/cosmos/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ import (
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"

"github.com/evmos/evmos/v12/app"
"github.com/evmos/evmos/v12/app/ante"
evmante "github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/crypto/ethsecp256k1"
"github.com/evmos/evmos/v12/encoding"
"github.com/evmos/evmos/v12/ethereum/eip712"
"github.com/evmos/evmos/v12/testutil"
"github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v12/utils"
"github.com/evmos/evmos/v12/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v12/x/feemarket/types"
"github.com/evmos/evmos/v13/app"
"github.com/evmos/evmos/v13/app/ante"
evmante "github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/crypto/ethsecp256k1"
"github.com/evmos/evmos/v13/encoding"
"github.com/evmos/evmos/v13/ethereum/eip712"
"github.com/evmos/evmos/v13/testutil"
"github.com/evmos/evmos/v13/types"
"github.com/evmos/evmos/v13/utils"
"github.com/evmos/evmos/v13/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v13/x/feemarket/types"
)

type AnteTestSuite struct {
Expand Down
12 changes: 6 additions & 6 deletions app/ante/cosmos/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/cosmos/cosmos-sdk/x/authz"

"github.com/evmos/evmos/v12/app"
cosmosante "github.com/evmos/evmos/v12/app/ante/cosmos"
"github.com/evmos/evmos/v12/crypto/ethsecp256k1"
"github.com/evmos/evmos/v12/encoding"
testutil "github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v13/app"
cosmosante "github.com/evmos/evmos/v13/app/ante/cosmos"
"github.com/evmos/evmos/v13/crypto/ethsecp256k1"
"github.com/evmos/evmos/v13/encoding"
testutil "github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
)

func (suite *AnteTestSuite) CreateTestCosmosTxBuilder(gasPrice sdkmath.Int, denom string, msgs ...sdk.Msg) client.TxBuilder {
Expand Down
4 changes: 2 additions & 2 deletions app/ante/cosmos/vesting.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/authz"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
vestingtypes "github.com/evmos/evmos/v12/x/vesting/types"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
vestingtypes "github.com/evmos/evmos/v13/x/vesting/types"
)

// TODO: remove once Cosmos SDK is upgraded to v0.46
Expand Down
4 changes: 2 additions & 2 deletions app/ante/evm/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/ethereum/go-ethereum/core/types"
ethparams "github.com/ethereum/go-ethereum/params"
utiltx "github.com/evmos/evmos/v12/testutil/tx"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
utiltx "github.com/evmos/evmos/v13/testutil/tx"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

func (suite *AnteTestSuite) TestAnteHandler() {
Expand Down
10 changes: 5 additions & 5 deletions app/ante/evm/eth.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"

anteutils "github.com/evmos/evmos/v12/app/ante/utils"
"github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v12/x/evm/keeper"
"github.com/evmos/evmos/v12/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
anteutils "github.com/evmos/evmos/v13/app/ante/utils"
"github.com/evmos/evmos/v13/types"
"github.com/evmos/evmos/v13/x/evm/keeper"
"github.com/evmos/evmos/v13/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"

"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down
12 changes: 6 additions & 6 deletions app/ante/evm/eth_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
ethtypes "github.com/ethereum/go-ethereum/core/types"
ethante "github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/server/config"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v12/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
ethante "github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/server/config"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
"github.com/evmos/evmos/v13/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

func BenchmarkEthGasConsumeDecorator(b *testing.B) {
Expand Down
16 changes: 8 additions & 8 deletions app/ante/evm/eth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

ethante "github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/server/config"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v12/utils"
"github.com/evmos/evmos/v12/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
ethante "github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/server/config"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
"github.com/evmos/evmos/v13/types"
"github.com/evmos/evmos/v13/utils"
"github.com/evmos/evmos/v13/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"

ethtypes "github.com/ethereum/go-ethereum/core/types"
)
Expand Down
6 changes: 3 additions & 3 deletions app/ante/evm/fee_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
anteutils "github.com/evmos/evmos/v12/app/ante/utils"
evmostypes "github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v12/x/evm/types"
anteutils "github.com/evmos/evmos/v13/app/ante/utils"
evmostypes "github.com/evmos/evmos/v13/types"
"github.com/evmos/evmos/v13/x/evm/types"
)

// NewDynamicFeeChecker returns a `TxFeeChecker` that applies a dynamic fee to
Expand Down
6 changes: 3 additions & 3 deletions app/ante/evm/fee_checker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
"github.com/ethereum/go-ethereum/params"
"github.com/evmos/evmos/v12/encoding"
"github.com/evmos/evmos/v12/types"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
"github.com/evmos/evmos/v13/encoding"
"github.com/evmos/evmos/v13/types"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
)
Expand Down
2 changes: 1 addition & 1 deletion app/ante/evm/fee_market.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v13/types"
)

// GasWantedDecorator keeps track of the gasWanted amount on the current block in transient store
Expand Down
12 changes: 6 additions & 6 deletions app/ante/evm/fee_market_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
ethtypes "github.com/ethereum/go-ethereum/core/types"

"github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/testutil"
utiltx "github.com/evmos/evmos/v12/testutil/tx"
"github.com/evmos/evmos/v12/types"
"github.com/evmos/evmos/v12/utils"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
"github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/testutil"
utiltx "github.com/evmos/evmos/v13/testutil/tx"
"github.com/evmos/evmos/v13/types"
"github.com/evmos/evmos/v13/utils"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

func (suite *AnteTestSuite) TestGasWantedDecorator() {
Expand Down
2 changes: 1 addition & 1 deletion app/ante/evm/fees.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"

ethtypes "github.com/ethereum/go-ethereum/core/types"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

// EthMinGasPriceDecorator will check if the transaction's fee is at least as large
Expand Down
8 changes: 4 additions & 4 deletions app/ante/evm/fees_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
ethtypes "github.com/ethereum/go-ethereum/core/types"
evmante "github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
evmante "github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

var execTypes = []struct {
Expand Down
6 changes: 3 additions & 3 deletions app/ante/evm/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/params"

"github.com/evmos/evmos/v12/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v12/x/feemarket/types"
"github.com/evmos/evmos/v13/x/evm/statedb"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v13/x/feemarket/types"
)

// EVMKeeper defines the expected keeper interface used on the AnteHandler
Expand Down
2 changes: 1 addition & 1 deletion app/ante/evm/setup_ctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
ethtypes "github.com/ethereum/go-ethereum/core/types"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

// EthSetupContextDecorator is adapted from SetUpContextDecorator from cosmos-sdk, it ignores gas consumption
Expand Down
8 changes: 4 additions & 4 deletions app/ante/evm/setup_ctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package evm_test
import (
"math/big"

evmante "github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/testutil"
evmante "github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/testutil"

storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

func (suite *AnteTestSuite) TestEthSetupContextDecorator() {
Expand Down
14 changes: 7 additions & 7 deletions app/ante/evm/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/ethereum/go-ethereum/core/types"
"github.com/evmos/evmos/v12/app"
ante "github.com/evmos/evmos/v12/app/ante"
"github.com/evmos/evmos/v12/encoding"
"github.com/evmos/evmos/v12/ethereum/eip712"
"github.com/evmos/evmos/v12/utils"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v12/x/feemarket/types"
"github.com/evmos/evmos/v13/app"
ante "github.com/evmos/evmos/v13/app/ante"
"github.com/evmos/evmos/v13/encoding"
"github.com/evmos/evmos/v13/ethereum/eip712"
"github.com/evmos/evmos/v13/utils"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
feemarkettypes "github.com/evmos/evmos/v13/x/feemarket/types"
)

type AnteTestSuite struct {
Expand Down
8 changes: 4 additions & 4 deletions app/ante/evm/signverify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
ethtypes "github.com/ethereum/go-ethereum/core/types"
ethante "github.com/evmos/evmos/v12/app/ante/evm"
"github.com/evmos/evmos/v12/testutil"
testutiltx "github.com/evmos/evmos/v12/testutil/tx"
evmtypes "github.com/evmos/evmos/v12/x/evm/types"
ethante "github.com/evmos/evmos/v13/app/ante/evm"
"github.com/evmos/evmos/v13/testutil"
testutiltx "github.com/evmos/evmos/v13/testutil/tx"
evmtypes "github.com/evmos/evmos/v13/x/evm/types"
)

func (suite *AnteTestSuite) TestEthSigVerificationDecorator() {
Expand Down
Loading

0 comments on commit b2ef7a4

Please sign in to comment.