3bea3fa1ef
* code migrated * signed_data ported to avoid conficting dependency * correct payload * eip712 working with evmos.me * use geth TypedData types * fix linter * minor refactor * test first try * fix test * fix tests * enforce fee delegated eip712 * verify signature refactor * SignedTypedData api refactor * add AnteHandler test for EIP712 * remove comment * code clean up * return more detailed error messages * fix linter * remove unnecesary global vars * Update app/ante/eip712.go Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> * fix pr comments * remove hardcoded value * add more tests * add changelog * use sdk errors * add MsgDelegate test Co-authored-by: Freddy Caceres <freddy.caceres@crypto.com> Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> Co-authored-by: crypto-facs <84574577+crypto-facs@users.noreply.github.com>
105 lines
4.6 KiB
Go
105 lines
4.6 KiB
Go
package ante
|
|
|
|
import (
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
|
"github.com/cosmos/cosmos-sdk/types/tx/signing"
|
|
"github.com/cosmos/cosmos-sdk/x/auth/ante"
|
|
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
|
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
|
|
|
channelkeeper "github.com/cosmos/ibc-go/v3/modules/core/04-channel/keeper"
|
|
ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante"
|
|
|
|
evmtypes "github.com/tharsis/ethermint/x/evm/types"
|
|
)
|
|
|
|
// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
|
|
// channel keeper, EVM Keeper and Fee Market Keeper.
|
|
type HandlerOptions struct {
|
|
AccountKeeper evmtypes.AccountKeeper
|
|
BankKeeper evmtypes.BankKeeper
|
|
IBCChannelKeeper channelkeeper.Keeper
|
|
FeeMarketKeeper evmtypes.FeeMarketKeeper
|
|
EvmKeeper EVMKeeper
|
|
FeegrantKeeper ante.FeegrantKeeper
|
|
SignModeHandler authsigning.SignModeHandler
|
|
SigGasConsumer func(meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params) error
|
|
}
|
|
|
|
func (options HandlerOptions) Validate() error {
|
|
if options.AccountKeeper == nil {
|
|
return sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler")
|
|
}
|
|
if options.BankKeeper == nil {
|
|
return sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for AnteHandler")
|
|
}
|
|
if options.SignModeHandler == nil {
|
|
return sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
|
|
}
|
|
if options.FeeMarketKeeper == nil {
|
|
return sdkerrors.Wrap(sdkerrors.ErrLogic, "fee market keeper is required for AnteHandler")
|
|
}
|
|
if options.EvmKeeper == nil {
|
|
return sdkerrors.Wrap(sdkerrors.ErrLogic, "evm keeper is required for AnteHandler")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
|
|
return sdk.ChainAnteDecorators(
|
|
NewEthSetUpContextDecorator(options.EvmKeeper), // outermost AnteDecorator. SetUpContext must be called first
|
|
NewEthMempoolFeeDecorator(options.EvmKeeper), // Check eth effective gas price against minimal-gas-prices
|
|
NewEthValidateBasicDecorator(options.EvmKeeper),
|
|
NewEthSigVerificationDecorator(options.EvmKeeper),
|
|
NewEthAccountVerificationDecorator(options.AccountKeeper, options.BankKeeper, options.EvmKeeper),
|
|
NewEthGasConsumeDecorator(options.EvmKeeper),
|
|
NewCanTransferDecorator(options.EvmKeeper),
|
|
NewEthIncrementSenderSequenceDecorator(options.AccountKeeper), // innermost AnteDecorator.
|
|
)
|
|
}
|
|
|
|
func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
|
|
return sdk.ChainAnteDecorators(
|
|
RejectMessagesDecorator{}, // reject MsgEthereumTxs
|
|
ante.NewSetUpContextDecorator(),
|
|
ante.NewRejectExtensionOptionsDecorator(),
|
|
ante.NewMempoolFeeDecorator(),
|
|
ante.NewValidateBasicDecorator(),
|
|
ante.NewTxTimeoutHeightDecorator(),
|
|
ante.NewValidateMemoDecorator(options.AccountKeeper),
|
|
ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
|
|
ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
|
|
// SetPubKeyDecorator must be called before all signature verification decorators
|
|
ante.NewSetPubKeyDecorator(options.AccountKeeper),
|
|
ante.NewValidateSigCountDecorator(options.AccountKeeper),
|
|
ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
|
|
ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
|
|
ante.NewIncrementSequenceDecorator(options.AccountKeeper),
|
|
ibcante.NewAnteDecorator(options.IBCChannelKeeper),
|
|
)
|
|
}
|
|
|
|
func newCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
|
|
return sdk.ChainAnteDecorators(
|
|
RejectMessagesDecorator{}, // reject MsgEthereumTxs
|
|
ante.NewSetUpContextDecorator(),
|
|
// NOTE: extensions option decorator removed
|
|
// ante.NewRejectExtensionOptionsDecorator(),
|
|
ante.NewMempoolFeeDecorator(),
|
|
ante.NewValidateBasicDecorator(),
|
|
ante.NewTxTimeoutHeightDecorator(),
|
|
ante.NewValidateMemoDecorator(options.AccountKeeper),
|
|
ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
|
|
ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
|
|
// SetPubKeyDecorator must be called before all signature verification decorators
|
|
ante.NewSetPubKeyDecorator(options.AccountKeeper),
|
|
ante.NewValidateSigCountDecorator(options.AccountKeeper),
|
|
ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
|
|
// Note: signature verification uses EIP instead of the cosmos signature validator
|
|
NewEip712SigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
|
|
ante.NewIncrementSequenceDecorator(options.AccountKeeper),
|
|
ibcante.NewAnteDecorator(options.IBCChannelKeeper),
|
|
)
|
|
}
|