Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore!: change ethermint dependency to evmos repo #512

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
switch typeURL := opts[0].GetTypeUrl(); typeURL {
case "/ethermint.evm.v1.ExtensionOptionsEthereumTx":
// handle as *evmtypes.MsgEthereumTx
anteHandler = newEthAnteHandler(options)
anteHandler = newEVMAnteHandler(options)

Check warning on line 39 in app/ante/ante.go

View check run for this annotation

Codecov / codecov/patch

app/ante/ante.go#L39

Added line #L39 was not covered by tests
case "/ethermint.types.v1.ExtensionOptionsWeb3Tx":
// handle as normal Cosmos SDK tx, except signature is checked for EIP712 representation
anteHandler = newLegacyCosmosAnteHandlerEip712(options)
Expand Down
20 changes: 17 additions & 3 deletions app/ante/ante_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,34 @@
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
ethante "github.com/evmos/ethermint/app/ante"
evmante "github.com/evmos/evmos/v12/app/ante/evm"
anteutils "github.com/evmos/evmos/v12/app/ante/utils"

vestingtypes "github.com/evmos/evmos/v12/x/vesting/types"

errorsmod "cosmossdk.io/errors"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
txfeeskeeper "github.com/osmosis-labs/osmosis/v15/x/txfees/keeper"

"github.com/cosmos/cosmos-sdk/types/tx/signing"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

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

type HandlerOptions struct {
AccountKeeper *authkeeper.AccountKeeper
BankKeeper bankkeeper.Keeper
IBCKeeper *ibckeeper.Keeper
FeeMarketKeeper ethante.FeeMarketKeeper
EvmKeeper ethante.EVMKeeper
FeeMarketKeeper evmante.FeeMarketKeeper
StakingKeeper vestingtypes.StakingKeeper
DistributionKeeper anteutils.DistributionKeeper
EvmKeeper evmante.EVMKeeper
FeegrantKeeper ante.FeegrantKeeper
TxFeesKeeper *txfeeskeeper.Keeper
SignModeHandler authsigning.SignModeHandler
MaxTxGasWanted uint64
SigGasConsumer func(meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params) error
ExtensionOptionChecker ante.ExtensionOptionChecker
}

Expand All @@ -45,5 +56,8 @@
if options.TxFeesKeeper == nil {
return errorsmod.Wrap(errortypes.ErrLogic, "tx fees keeper is required for AnteHandler")
}
if options.SigGasConsumer == nil {
return errorsmod.Wrap(errortypes.ErrLogic, "sig gas consumer is required for AnteHandler")
}

Check warning on line 61 in app/ante/ante_options.go

View check run for this annotation

Codecov / codecov/patch

app/ante/ante_options.go#L60-L61

Added lines #L60 - L61 were not covered by tests
return nil
}
295 changes: 0 additions & 295 deletions app/ante/eip712.go

This file was deleted.

Loading
Loading