From bf8467217a66b08812b184495646df1c462d7d38 Mon Sep 17 00:00:00 2001 From: sheldonleedev Date: Thu, 18 Apr 2024 12:31:10 +0800 Subject: [PATCH] chore: Remove irrelevant features --- CHANGELOG.md | 11 ++- app/ante/eth.go | 64 ++++-------- app/ante/feegrant.go | 70 ------------- proto/ethermint/evm/v1/tx.proto | 3 - x/evm/client/cli/tx.go | 13 --- x/evm/types/msg.go | 15 --- x/evm/types/tx.pb.go | 170 ++++++++++++-------------------- 7 files changed, 88 insertions(+), 258 deletions(-) delete mode 100644 app/ante/feegrant.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 54a364abbe..0272cecda8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,11 +35,18 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog -## [Unreleased] +## [v0.22.0-lorenzo-2] ### State Machine Breaking -- (deps) [\#19](https://github.com/bianjieai/ethermint/pull/19) Bump Cosmos-SDK to v0.47.3, Tendermint to CometBFT v0.37.1 +- (deps) chore: Remove irrelevant features + + +## [v0.22.0-lorenzo-1] + +### State Machine Breaking + +- (deps) Bump Cosmos-SDK to v0.47.3, Tendermint to CometBFT v0.37.1 ## [v0.22.0] - 2023-04-12 diff --git a/app/ante/eth.go b/app/ante/eth.go index 3ddaafb129..2402167be7 100644 --- a/app/ante/eth.go +++ b/app/ante/eth.go @@ -81,41 +81,21 @@ func (avd EthAccountVerificationDecorator) AnteHandle( return ctx, errorsmod.Wrap(errortypes.ErrInvalidAddress, "from address cannot be empty") } - feePayer := msgEthTx.GetFeePayer() - if !feePayer.Empty() { - feePayerAddr := common.BytesToAddress(feePayer) - feePayerAcct := avd.evmKeeper.GetAccount(ctx, feePayerAddr) - - if feePayerAcct == nil { - feePayerAcc := avd.ak.NewAccountWithAddress(ctx, feePayer) - avd.ak.SetAccount(ctx, feePayerAcc) - feePayerAcct = statedb.NewEmptyAccount() - } else if feePayerAcct.IsContract() { - return ctx, errorsmod.Wrapf(errortypes.ErrInvalidType, - "the sender's feePayer is not EOA: address %s, codeHash <%s>", - feePayerAddr, feePayerAcct.CodeHash) - } - - if err := keeper.CheckSenderBalance(sdk.NewIntFromBigInt(feePayerAcct.Balance), txData); err != nil { - return ctx, errorsmod.Wrap(err, "failed to check feePayer balance") - } - } else { - // check whether the sender address is EOA - fromAddr := common.BytesToAddress(from) - acct := avd.evmKeeper.GetAccount(ctx, fromAddr) - - if acct == nil { - acc := avd.ak.NewAccountWithAddress(ctx, from) - avd.ak.SetAccount(ctx, acc) - acct = statedb.NewEmptyAccount() - } else if acct.IsContract() { - return ctx, errorsmod.Wrapf(errortypes.ErrInvalidType, - "the sender is not EOA: address %s, codeHash <%s>", fromAddr, acct.CodeHash) - } + // check whether the sender address is EOA + fromAddr := common.BytesToAddress(from) + acct := avd.evmKeeper.GetAccount(ctx, fromAddr) + + if acct == nil { + acc := avd.ak.NewAccountWithAddress(ctx, from) + avd.ak.SetAccount(ctx, acc) + acct = statedb.NewEmptyAccount() + } else if acct.IsContract() { + return ctx, errorsmod.Wrapf(errortypes.ErrInvalidType, + "the sender is not EOA: address %s, codeHash <%s>", fromAddr, acct.CodeHash) + } - if err := keeper.CheckSenderBalance(sdkmath.NewIntFromBigInt(acct.Balance), txData); err != nil { - return ctx, errorsmod.Wrap(err, "failed to check sender balance") - } + if err := keeper.CheckSenderBalance(sdkmath.NewIntFromBigInt(acct.Balance), txData); err != nil { + return ctx, errorsmod.Wrap(err, "failed to check sender balance") } } return next(ctx, tx, simulate) @@ -211,19 +191,9 @@ func (egcd EthGasConsumeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula return ctx, errorsmod.Wrapf(err, "failed to verify the fees") } - // if fee payer is set, deduct the fees from the fee payer account - // else deduct the fees from the sender account - feePayer := msgEthTx.GetFeePayer() - if !feePayer.Empty() { - err = egcd.evmKeeper.DeductTxCostsFromUserBalance(ctx, fees, common.HexToAddress(msgEthTx.FeePayer)) - if err != nil { - return ctx, errorsmod.Wrapf(err, "failed to deduct transaction costs from user balance") - } - } else { - err = egcd.evmKeeper.DeductTxCostsFromUserBalance(ctx, fees, common.HexToAddress(msgEthTx.From)) - if err != nil { - return ctx, errorsmod.Wrapf(err, "failed to deduct transaction costs from user balance") - } + err = egcd.evmKeeper.DeductTxCostsFromUserBalance(ctx, fees, common.HexToAddress(msgEthTx.From)) + if err != nil { + return ctx, errorsmod.Wrapf(err, "failed to deduct transaction costs from user balance") } events = append(events, diff --git a/app/ante/feegrant.go b/app/ante/feegrant.go deleted file mode 100644 index 80dc9fe45f..0000000000 --- a/app/ante/feegrant.go +++ /dev/null @@ -1,70 +0,0 @@ -package ante - -import ( - "math/big" - - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ethtypes "github.com/ethereum/go-ethereum/core/types" - evmtypes "github.com/evmos/ethermint/x/evm/types" -) - -type EthFeeGrantValidator struct { - feegrantKeeper FeegrantKeeper - evmKeeper EVMKeeper -} - -// NewEthFeeGrantValidator creates a new EthFeeGrantValidator -func NewEthFeeGrantValidator(evmKeeper EVMKeeper, fk FeegrantKeeper) EthFeeGrantValidator { - return EthFeeGrantValidator{ - feegrantKeeper: fk, - evmKeeper: evmKeeper, - } -} - -func (ev EthFeeGrantValidator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { - params := ev.evmKeeper.GetParams(ctx) - ethCfg := params.ChainConfig.EthereumConfig(ev.evmKeeper.ChainID()) - blockNum := big.NewInt(ctx.BlockHeight()) - signer := ethtypes.MakeSigner(ethCfg, blockNum) - for _, msg := range tx.GetMsgs() { - msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) - if !ok { - return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)) - } - ethTx := msgEthTx.AsTransaction() - sender, err := signer.Sender(ethTx) - if err != nil { - return ctx, sdkerrors.Wrapf( - sdkerrors.ErrorInvalidSigner, - "couldn't retrieve sender address ('%s') from the ethereum transaction: %s", - msgEthTx.From, - err.Error(), - ) - } - txData, err := evmtypes.UnpackTxData(msgEthTx.Data) - if err != nil { - return ctx, sdkerrors.Wrap(err, "failed to unpack tx data") - } - feeGrantee := sender.Bytes() - feeGranteeCosmosAddr := sdk.AccAddress(feeGrantee) - feePayer := msgEthTx.GetFeePayer() - feeAmt := txData.Fee() - if feeAmt.Sign() == 0 { - return ctx, sdkerrors.Wrap(err, "failed to fee amount") - } - - fees := sdk.Coins{sdk.NewCoin(params.EvmDenom, sdk.NewIntFromBigInt(feeAmt))} - - msgs := []sdk.Msg{msg} - - if feePayer != nil { - err := ev.feegrantKeeper.UseGrantedFees(ctx, feePayer, feeGrantee, fees, msgs) - if err != nil { - return ctx, sdkerrors.Wrapf(err, - "%s(%s) not allowed to pay fees from %s", sender.Hex(), feeGranteeCosmosAddr, feePayer) - } - } - } - return next(ctx, tx, simulate) -} diff --git a/proto/ethermint/evm/v1/tx.proto b/proto/ethermint/evm/v1/tx.proto index 8e7e1b73e1..af0dfd3b8f 100644 --- a/proto/ethermint/evm/v1/tx.proto +++ b/proto/ethermint/evm/v1/tx.proto @@ -36,9 +36,6 @@ message MsgEthereumTx { // against the address derived from the signature (V, R, S) using the // secp256k1 elliptic curve string from = 4; - - // support EVM transaction can use feegrant - string fee_payer = 5; } // LegacyTx is the transaction data of regular Ethereum transactions. diff --git a/x/evm/client/cli/tx.go b/x/evm/client/cli/tx.go index 5a241853d6..dd064c988f 100644 --- a/x/evm/client/cli/tx.go +++ b/x/evm/client/cli/tx.go @@ -20,8 +20,6 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/input" @@ -79,17 +77,6 @@ func NewRawTxCmd() *cobra.Command { return err } - feePayerAddr, err := cmd.Flags().GetString(flagEVMPayer) - if err != nil { - return err - } - if len(feePayerAddr) > 0 { - if !common.IsHexAddress(feePayerAddr) { - return errors.New("feePayerAddr must be hex address") - } - msg.SetFeePayer(feePayerAddr) - } - tx, err := msg.BuildTx(clientCtx.TxConfig.NewTxBuilder(), rsp.Params.EvmDenom) if err != nil { return err diff --git a/x/evm/types/msg.go b/x/evm/types/msg.go index fbe5623769..71164c593e 100644 --- a/x/evm/types/msg.go +++ b/x/evm/types/msg.go @@ -314,21 +314,6 @@ func (msg *MsgEthereumTx) GetFrom() sdk.AccAddress { return common.HexToAddress(msg.From).Bytes() } -// GetFeePayer loads the ethereum sender address from the sigcache and returns an -// sdk.AccAddress from its bytes -func (msg *MsgEthereumTx) GetFeePayer() sdk.AccAddress { - if msg.FeePayer == "" { - return nil - } - - return common.HexToAddress(msg.FeePayer).Bytes() -} - -// SetFeePayer sets the fee payer address -func (msg *MsgEthereumTx) SetFeePayer(feePayer string) { - msg.FeePayer = feePayer -} - // AsTransaction creates an Ethereum Transaction type from the msg fields func (msg MsgEthereumTx) AsTransaction() *ethtypes.Transaction { txData, err := UnpackTxData(msg.Data) diff --git a/x/evm/types/tx.pb.go b/x/evm/types/tx.pb.go index be24c0218f..0c8e2b1911 100644 --- a/x/evm/types/tx.pb.go +++ b/x/evm/types/tx.pb.go @@ -46,8 +46,6 @@ type MsgEthereumTx struct { // against the address derived from the signature (V, R, S) using the // secp256k1 elliptic curve From string `protobuf:"bytes,4,opt,name=from,proto3" json:"from,omitempty"` - // support EVM transaction can use feegrant - FeePayer string `protobuf:"bytes,5,opt,name=fee_payer,json=feePayer,proto3" json:"fee_payer,omitempty"` } func (m *MsgEthereumTx) Reset() { *m = MsgEthereumTx{} } @@ -456,69 +454,68 @@ func init() { func init() { proto.RegisterFile("ethermint/evm/v1/tx.proto", fileDescriptor_f75ac0a12d075f21) } var fileDescriptor_f75ac0a12d075f21 = []byte{ - // 992 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x41, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xda, 0x6b, 0x7b, 0x3d, 0x36, 0xa1, 0x1a, 0xa5, 0xea, 0xda, 0x50, 0xaf, 0xb1, 0x04, - 0xb8, 0x95, 0xbc, 0xab, 0x06, 0xd4, 0x43, 0x4e, 0x8d, 0x9b, 0xb4, 0x6a, 0x95, 0x88, 0x68, 0x71, - 0x2f, 0x14, 0xc9, 0x9a, 0xec, 0x4e, 0xc6, 0x2b, 0xbc, 0x3b, 0xab, 0x9d, 0xf1, 0xca, 0x46, 0xe2, - 0xd2, 0x13, 0x47, 0x10, 0x7f, 0x80, 0x03, 0x27, 0xc4, 0x01, 0x89, 0xfe, 0x00, 0x8e, 0x15, 0xa7, - 0x0a, 0x2e, 0x88, 0x83, 0x41, 0x0e, 0x12, 0x52, 0x6e, 0xf0, 0x0b, 0xd0, 0xcc, 0xac, 0xe3, 0xb8, - 0x26, 0x2d, 0x94, 0x22, 0x4e, 0x9e, 0xb7, 0xef, 0xcd, 0x37, 0x6f, 0xde, 0xf7, 0xcd, 0x7b, 0x06, - 0x35, 0xcc, 0x07, 0x38, 0x09, 0x83, 0x88, 0x3b, 0x38, 0x0d, 0x9d, 0xf4, 0x9a, 0xc3, 0xc7, 0x76, - 0x9c, 0x50, 0x4e, 0xe1, 0x85, 0x53, 0x97, 0x8d, 0xd3, 0xd0, 0x4e, 0xaf, 0xd5, 0x2f, 0x79, 0x94, - 0x85, 0x94, 0x39, 0x21, 0x23, 0x22, 0x32, 0x64, 0x44, 0x85, 0xd6, 0x6b, 0xca, 0xd1, 0x97, 0x96, - 0xa3, 0x8c, 0xcc, 0x55, 0x5f, 0x39, 0x40, 0x80, 0x29, 0xdf, 0x06, 0xa1, 0x84, 0xaa, 0x3d, 0x62, - 0x95, 0x7d, 0x7d, 0x95, 0x50, 0x4a, 0x86, 0xd8, 0x41, 0x71, 0xe0, 0xa0, 0x28, 0xa2, 0x1c, 0xf1, - 0x80, 0x46, 0x73, 0xbc, 0x5a, 0xe6, 0x95, 0xd6, 0xe1, 0xe8, 0xc8, 0x41, 0xd1, 0x44, 0xb9, 0x5a, - 0x5f, 0x69, 0xe0, 0xa5, 0x7d, 0x46, 0x76, 0xc5, 0x81, 0x78, 0x14, 0xf6, 0xc6, 0xb0, 0x0d, 0x74, - 0x1f, 0x71, 0x64, 0x6a, 0x4d, 0xad, 0x5d, 0xd9, 0xdc, 0xb0, 0xd5, 0x5e, 0x7b, 0xbe, 0xd7, 0xde, - 0x8e, 0x26, 0xae, 0x8c, 0x80, 0x35, 0xa0, 0xb3, 0xe0, 0x43, 0x6c, 0xe6, 0x9a, 0x5a, 0x5b, 0xeb, - 0x16, 0x4e, 0xa6, 0x96, 0xd6, 0x71, 0xe5, 0x27, 0x68, 0x01, 0x7d, 0x80, 0xd8, 0xc0, 0xcc, 0x37, - 0xb5, 0x76, 0xb9, 0x5b, 0xf9, 0x63, 0x6a, 0x95, 0x92, 0x61, 0xbc, 0xd5, 0xea, 0xb4, 0x5c, 0xe9, - 0x80, 0x10, 0xe8, 0x47, 0x09, 0x0d, 0x4d, 0x5d, 0x04, 0xb8, 0x72, 0x0d, 0x5f, 0x01, 0xe5, 0x23, - 0x8c, 0xfb, 0x31, 0x9a, 0xe0, 0xc4, 0x2c, 0x48, 0x87, 0x71, 0x84, 0xf1, 0x81, 0xb0, 0xb7, 0xf4, - 0x8f, 0x3f, 0xb7, 0xd6, 0x5a, 0xdf, 0xe4, 0x80, 0xb1, 0x87, 0x09, 0xf2, 0x26, 0xbd, 0x31, 0xdc, - 0x00, 0x85, 0x88, 0x46, 0x1e, 0x96, 0xa9, 0xea, 0xae, 0x32, 0xe0, 0x6d, 0x50, 0x26, 0x48, 0x94, - 0x35, 0xf0, 0x54, 0x6a, 0xe5, 0xee, 0xd5, 0x9f, 0xa6, 0xd6, 0x1b, 0x24, 0xe0, 0x83, 0xd1, 0xa1, - 0xed, 0xd1, 0x30, 0x2b, 0x76, 0xf6, 0xd3, 0x61, 0xfe, 0x07, 0x0e, 0x9f, 0xc4, 0x98, 0xd9, 0x77, - 0x22, 0xee, 0x1a, 0x04, 0xb1, 0x03, 0xb1, 0x17, 0x36, 0x40, 0x9e, 0x20, 0x26, 0xaf, 0xa0, 0x77, - 0xab, 0xb3, 0xa9, 0x65, 0xdc, 0x46, 0x6c, 0x2f, 0x08, 0x03, 0xee, 0x0a, 0x07, 0x5c, 0x07, 0x39, - 0x4e, 0xb3, 0x0b, 0xe4, 0x38, 0x85, 0x77, 0x41, 0x21, 0x45, 0xc3, 0x11, 0x56, 0xa9, 0x77, 0xdf, - 0xfe, 0xfb, 0x87, 0xce, 0xa6, 0x56, 0x71, 0x3b, 0xa4, 0xa3, 0x88, 0xbb, 0x0a, 0x42, 0x94, 0x47, - 0x92, 0x50, 0x6c, 0x6a, 0xed, 0x6a, 0x56, 0xee, 0x2a, 0xd0, 0x52, 0xb3, 0x24, 0x3f, 0x68, 0xa9, - 0xb0, 0x12, 0xd3, 0x50, 0x56, 0x22, 0x2c, 0x66, 0x96, 0x95, 0xc5, 0xb6, 0xd6, 0x45, 0xad, 0xbe, - 0x7b, 0xd8, 0x29, 0xf6, 0xc6, 0x3b, 0x88, 0xa3, 0xd6, 0xef, 0x79, 0x50, 0xdd, 0xf6, 0x3c, 0xcc, - 0xd8, 0x5e, 0xc0, 0x78, 0x6f, 0x0c, 0xef, 0x03, 0xc3, 0x1b, 0xa0, 0x20, 0xea, 0x07, 0xbe, 0x2c, - 0x5e, 0xb9, 0x7b, 0xe3, 0x1f, 0x65, 0x5b, 0xba, 0x29, 0x76, 0xdf, 0xd9, 0x39, 0x99, 0x5a, 0x25, - 0x4f, 0x2d, 0xdd, 0x6c, 0xe1, 0x2f, 0x68, 0xc9, 0x9d, 0x4b, 0x4b, 0xfe, 0xdf, 0xd3, 0xa2, 0x3f, - 0x9d, 0x96, 0xc2, 0x2a, 0x2d, 0xc5, 0x17, 0x47, 0x4b, 0xe9, 0x0c, 0x2d, 0xf7, 0x81, 0x81, 0x64, - 0x6d, 0x31, 0x33, 0x8d, 0x66, 0xbe, 0x5d, 0xd9, 0xbc, 0x6c, 0x3f, 0xd9, 0x05, 0x6c, 0x55, 0xfd, - 0xde, 0x28, 0x1e, 0xe2, 0x6e, 0xf3, 0xd1, 0xd4, 0x5a, 0x3b, 0x99, 0x5a, 0x00, 0x9d, 0x52, 0xf2, - 0xe5, 0xcf, 0x16, 0x58, 0x10, 0xe4, 0x9e, 0x02, 0x2a, 0xce, 0xcb, 0x4b, 0x9c, 0x83, 0x25, 0xce, - 0x2b, 0xe7, 0x71, 0xfe, 0xad, 0x0e, 0xaa, 0x3b, 0x93, 0x08, 0x85, 0x81, 0x77, 0x0b, 0xe3, 0xff, - 0x87, 0xf3, 0xbb, 0xa0, 0x22, 0x38, 0xe7, 0x41, 0xdc, 0xf7, 0x50, 0xfc, 0x1c, 0xac, 0x0b, 0xc9, - 0xf4, 0x82, 0xf8, 0x26, 0x8a, 0xe7, 0x58, 0xa2, 0x41, 0x08, 0x2c, 0xfd, 0xb9, 0xb0, 0x6e, 0x61, - 0x2c, 0xb0, 0x32, 0x09, 0x15, 0x9e, 0x2e, 0xa1, 0xe2, 0xaa, 0x84, 0x4a, 0x2f, 0x4e, 0x42, 0xc6, - 0x39, 0x12, 0x2a, 0xff, 0x27, 0x12, 0x02, 0x4b, 0x12, 0xaa, 0x2c, 0x49, 0xa8, 0x7a, 0x9e, 0x84, - 0x5a, 0xa0, 0xbe, 0x3b, 0xe6, 0x38, 0x62, 0x01, 0x8d, 0xde, 0x89, 0xe5, 0x40, 0x59, 0xcc, 0x89, - 0xac, 0x21, 0x7f, 0xa1, 0x81, 0x8b, 0x4b, 0xf3, 0xc3, 0xc5, 0x2c, 0xa6, 0x11, 0x93, 0x17, 0x95, - 0x23, 0x40, 0x53, 0x1d, 0x5e, 0x76, 0xfd, 0x2b, 0x40, 0x1f, 0x52, 0xc2, 0xcc, 0x9c, 0xbc, 0xe4, - 0xc5, 0xd5, 0x4b, 0xee, 0x51, 0xe2, 0xca, 0x10, 0x78, 0x01, 0xe4, 0x13, 0xcc, 0xa5, 0x66, 0xaa, - 0xae, 0x58, 0xc2, 0x1a, 0x30, 0xd2, 0xb0, 0x8f, 0x93, 0x84, 0x26, 0x59, 0xd7, 0x2d, 0xa5, 0xe1, - 0xae, 0x30, 0x85, 0x4b, 0x88, 0x63, 0xc4, 0xb0, 0xaf, 0x58, 0x75, 0x4b, 0x04, 0xb1, 0x7b, 0x0c, - 0xfb, 0x59, 0x9a, 0x9f, 0x6a, 0xe0, 0xe5, 0x7d, 0x46, 0xee, 0xc5, 0x3e, 0xe2, 0xf8, 0x00, 0x25, - 0x28, 0x64, 0xf0, 0x3a, 0x28, 0xa3, 0x11, 0x1f, 0xd0, 0x24, 0xe0, 0x93, 0xec, 0x45, 0x98, 0xdf, - 0x3f, 0xec, 0x6c, 0x64, 0xa3, 0x78, 0xdb, 0xf7, 0x13, 0xcc, 0xd8, 0xbb, 0x3c, 0x09, 0x22, 0xe2, - 0x2e, 0x42, 0xe1, 0x75, 0x50, 0x8c, 0x25, 0x82, 0x14, 0x7b, 0x65, 0xd3, 0x5c, 0xbd, 0x86, 0x3a, - 0xa1, 0xab, 0x0b, 0x9a, 0xdc, 0x2c, 0x7a, 0x6b, 0xfd, 0xc1, 0x6f, 0x5f, 0x5f, 0x5d, 0xe0, 0xb4, - 0x6a, 0xe0, 0xd2, 0x13, 0x29, 0xcd, 0x6b, 0xb7, 0x39, 0xd3, 0x40, 0x7e, 0x9f, 0x11, 0xf8, 0x11, - 0x00, 0x67, 0x26, 0xb3, 0xb5, 0x7a, 0xd0, 0x52, 0xe9, 0xeb, 0x6f, 0x3e, 0x23, 0x60, 0x8e, 0xdf, - 0x7a, 0xfd, 0xc1, 0x0f, 0xbf, 0x7e, 0x96, 0xb3, 0x5a, 0x97, 0x9d, 0xd5, 0x7f, 0x1a, 0x59, 0x74, - 0x9f, 0x8f, 0xe1, 0xfb, 0xa0, 0xba, 0x54, 0xb1, 0xd7, 0xfe, 0x12, 0xff, 0x6c, 0x48, 0xfd, 0xca, - 0x33, 0x43, 0xe6, 0x49, 0x74, 0x6f, 0x3c, 0x9a, 0x35, 0xb4, 0xc7, 0xb3, 0x86, 0xf6, 0xcb, 0xac, - 0xa1, 0x7d, 0x72, 0xdc, 0x58, 0x7b, 0x7c, 0xdc, 0x58, 0xfb, 0xf1, 0xb8, 0xb1, 0xf6, 0xde, 0xd9, - 0xc7, 0x85, 0x53, 0xf1, 0xb6, 0x16, 0x69, 0x8e, 0x65, 0xa2, 0xf2, 0x81, 0x1d, 0x16, 0xe5, 0x9f, - 0x92, 0xb7, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xdd, 0xe9, 0x1e, 0x62, 0x91, 0x09, 0x00, 0x00, + // 975 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x8f, 0xdb, 0xc4, + 0x17, 0x8f, 0x13, 0xe7, 0xd7, 0x24, 0xdf, 0xfd, 0x56, 0xa3, 0xad, 0xea, 0x44, 0x34, 0x0e, 0x96, + 0x80, 0xb4, 0x52, 0x6c, 0x75, 0x41, 0x3d, 0xec, 0xa9, 0x9b, 0xee, 0xb6, 0x6a, 0xb5, 0x2b, 0x2a, + 0x93, 0x5e, 0x28, 0x52, 0x34, 0x6b, 0xcf, 0x4e, 0x2c, 0x62, 0x8f, 0xe5, 0x99, 0x58, 0x09, 0x12, + 0x97, 0x9e, 0xb8, 0x01, 0xe2, 0x1f, 0xe0, 0xc0, 0x89, 0x13, 0x12, 0xfd, 0x03, 0x38, 0x56, 0x9c, + 0x2a, 0xb8, 0x20, 0x0e, 0x01, 0x65, 0x91, 0x90, 0xf6, 0x06, 0x7f, 0x01, 0x9a, 0x19, 0x67, 0xb3, + 0x69, 0xd8, 0x16, 0x4a, 0x11, 0x27, 0xcf, 0x9b, 0xf7, 0xe6, 0xbd, 0x37, 0x9f, 0xcf, 0x67, 0x66, + 0x0c, 0x1a, 0x98, 0x0f, 0x71, 0x12, 0x06, 0x11, 0x77, 0x70, 0x1a, 0x3a, 0xe9, 0x35, 0x87, 0x4f, + 0xec, 0x38, 0xa1, 0x9c, 0xc2, 0x0b, 0xa7, 0x2e, 0x1b, 0xa7, 0xa1, 0x9d, 0x5e, 0x6b, 0x5e, 0xf2, + 0x28, 0x0b, 0x29, 0x73, 0x42, 0x46, 0x44, 0x64, 0xc8, 0x88, 0x0a, 0x6d, 0x36, 0x94, 0x63, 0x20, + 0x2d, 0x47, 0x19, 0x99, 0xab, 0xb9, 0x56, 0x40, 0x24, 0x53, 0xbe, 0x4d, 0x42, 0x09, 0x55, 0x6b, + 0xc4, 0x28, 0x9b, 0x7d, 0x85, 0x50, 0x4a, 0x46, 0xd8, 0x41, 0x71, 0xe0, 0xa0, 0x28, 0xa2, 0x1c, + 0xf1, 0x80, 0x46, 0x8b, 0x7c, 0x8d, 0xcc, 0x2b, 0xad, 0xc3, 0xf1, 0x91, 0x83, 0xa2, 0xa9, 0x72, + 0x59, 0x1f, 0x6b, 0xe0, 0x7f, 0x07, 0x8c, 0xec, 0x89, 0x82, 0x78, 0x1c, 0xf6, 0x27, 0xb0, 0x03, + 0x74, 0x1f, 0x71, 0x64, 0x68, 0x6d, 0xad, 0x53, 0xdb, 0xda, 0xb4, 0xd5, 0x5a, 0x7b, 0xb1, 0xd6, + 0xde, 0x89, 0xa6, 0xae, 0x8c, 0x80, 0x0d, 0xa0, 0xb3, 0xe0, 0x03, 0x6c, 0xe4, 0xdb, 0x5a, 0x47, + 0xeb, 0x15, 0x4f, 0x66, 0xa6, 0xd6, 0x75, 0xe5, 0x14, 0x34, 0x81, 0x3e, 0x44, 0x6c, 0x68, 0x14, + 0xda, 0x5a, 0xa7, 0xda, 0xab, 0xfd, 0x3e, 0x33, 0xcb, 0xc9, 0x28, 0xde, 0xb6, 0xba, 0x96, 0x2b, + 0x1d, 0x10, 0x02, 0xfd, 0x28, 0xa1, 0xa1, 0xa1, 0x8b, 0x00, 0x57, 0x8e, 0xb7, 0xf5, 0x8f, 0x3e, + 0x37, 0x73, 0xd6, 0xd7, 0x79, 0x50, 0xd9, 0xc7, 0x04, 0x79, 0xd3, 0xfe, 0x04, 0x6e, 0x82, 0x62, + 0x44, 0x23, 0x0f, 0xcb, 0x6e, 0x74, 0x57, 0x19, 0xf0, 0x36, 0xa8, 0x12, 0x24, 0x90, 0x0b, 0x3c, + 0x55, 0xbd, 0xda, 0xbb, 0xfa, 0xe3, 0xcc, 0x7c, 0x9d, 0x04, 0x7c, 0x38, 0x3e, 0xb4, 0x3d, 0x1a, + 0x66, 0x78, 0x66, 0x9f, 0x2e, 0xf3, 0xdf, 0x77, 0xf8, 0x34, 0xc6, 0xcc, 0xbe, 0x13, 0x71, 0xb7, + 0x42, 0x10, 0xbb, 0x27, 0xd6, 0xc2, 0x16, 0x28, 0x10, 0xc4, 0x64, 0x97, 0x7a, 0xaf, 0x3e, 0x9f, + 0x99, 0x95, 0xdb, 0x88, 0xed, 0x07, 0x61, 0xc0, 0x5d, 0xe1, 0x80, 0x1b, 0x20, 0xcf, 0x69, 0xd6, + 0x63, 0x9e, 0x53, 0x78, 0x17, 0x14, 0x53, 0x34, 0x1a, 0x63, 0xa3, 0x28, 0x8b, 0xbe, 0xf5, 0xd7, + 0x8b, 0xce, 0x67, 0x66, 0x69, 0x27, 0xa4, 0xe3, 0x88, 0xbb, 0x2a, 0x85, 0x40, 0x40, 0xe2, 0x5c, + 0x6a, 0x6b, 0x9d, 0x7a, 0x86, 0x68, 0x1d, 0x68, 0xa9, 0x51, 0x96, 0x13, 0x5a, 0x2a, 0xac, 0xc4, + 0xa8, 0x28, 0x2b, 0x11, 0x16, 0x33, 0xaa, 0xca, 0x62, 0xdb, 0x1b, 0x02, 0xab, 0x6f, 0x1f, 0x75, + 0x4b, 0xfd, 0xc9, 0x2e, 0xe2, 0xc8, 0xfa, 0xad, 0x00, 0xea, 0x3b, 0x9e, 0x87, 0x19, 0xdb, 0x0f, + 0x18, 0xef, 0x4f, 0xe0, 0x03, 0x50, 0xf1, 0x86, 0x28, 0x88, 0x06, 0x81, 0x2f, 0xc1, 0xab, 0xf6, + 0x6e, 0xfc, 0xad, 0x6e, 0xcb, 0x37, 0xc5, 0xea, 0x3b, 0xbb, 0x27, 0x33, 0xb3, 0xec, 0xa9, 0xa1, + 0x9b, 0x0d, 0xfc, 0x25, 0x2d, 0xf9, 0x73, 0x69, 0x29, 0xfc, 0x73, 0x5a, 0xf4, 0x67, 0xd3, 0x52, + 0x5c, 0xa7, 0xa5, 0xf4, 0xf2, 0x68, 0x29, 0x9f, 0xa1, 0xe5, 0x01, 0xa8, 0x20, 0x89, 0x2d, 0x66, + 0x46, 0xa5, 0x5d, 0xe8, 0xd4, 0xb6, 0x2e, 0xdb, 0x4f, 0x1f, 0x74, 0x5b, 0xa1, 0xdf, 0x1f, 0xc7, + 0x23, 0xdc, 0x6b, 0x3f, 0x9e, 0x99, 0xb9, 0x93, 0x99, 0x09, 0xd0, 0x29, 0x25, 0x5f, 0xfe, 0x64, + 0x82, 0x25, 0x41, 0xee, 0x69, 0x42, 0xc5, 0x79, 0x75, 0x85, 0x73, 0xb0, 0xc2, 0x79, 0xed, 0x3c, + 0xce, 0xbf, 0xd1, 0x41, 0x7d, 0x77, 0x1a, 0xa1, 0x30, 0xf0, 0x6e, 0x61, 0xfc, 0xdf, 0x70, 0x7e, + 0x17, 0xd4, 0x04, 0xe7, 0x3c, 0x88, 0x07, 0x1e, 0x8a, 0x5f, 0x80, 0x75, 0x21, 0x99, 0x7e, 0x10, + 0xdf, 0x44, 0xf1, 0x22, 0xd7, 0x11, 0xc6, 0x32, 0x97, 0xfe, 0x42, 0xb9, 0x6e, 0x61, 0x2c, 0x72, + 0x65, 0x12, 0x2a, 0x3e, 0x5b, 0x42, 0xa5, 0x75, 0x09, 0x95, 0x5f, 0x9e, 0x84, 0x2a, 0xe7, 0x48, + 0xa8, 0xfa, 0xaf, 0x48, 0x08, 0xac, 0x48, 0xa8, 0xb6, 0x22, 0xa1, 0xfa, 0x79, 0x12, 0xb2, 0x40, + 0x73, 0x6f, 0xc2, 0x71, 0xc4, 0x02, 0x1a, 0xbd, 0x1d, 0xcb, 0x37, 0x63, 0xf9, 0x14, 0x64, 0x17, + 0xf2, 0x17, 0x1a, 0xb8, 0xb8, 0xf2, 0x44, 0xb8, 0x98, 0xc5, 0x34, 0x62, 0x72, 0xa3, 0xf2, 0x96, + 0xd7, 0xd4, 0x25, 0x2e, 0x2f, 0xf6, 0x2b, 0x40, 0x1f, 0x51, 0xc2, 0x8c, 0xbc, 0xdc, 0xe4, 0xc5, + 0xf5, 0x4d, 0xee, 0x53, 0xe2, 0xca, 0x10, 0x78, 0x01, 0x14, 0x12, 0xcc, 0xa5, 0x66, 0xea, 0xae, + 0x18, 0xc2, 0x06, 0xa8, 0xa4, 0xe1, 0x00, 0x27, 0x09, 0x4d, 0xb2, 0x5b, 0xb7, 0x9c, 0x86, 0x7b, + 0xc2, 0x14, 0x2e, 0x21, 0x8e, 0x31, 0xc3, 0xbe, 0x62, 0xd5, 0x2d, 0x13, 0xc4, 0xee, 0x33, 0xec, + 0x67, 0x6d, 0x7e, 0xaa, 0x81, 0xff, 0x1f, 0x30, 0x72, 0x3f, 0xf6, 0x11, 0xc7, 0xf7, 0x50, 0x82, + 0x42, 0x06, 0xaf, 0x83, 0x2a, 0x1a, 0xf3, 0x21, 0x4d, 0x02, 0x3e, 0xcd, 0x4e, 0x84, 0xf1, 0xdd, + 0xa3, 0xee, 0x66, 0xf6, 0xda, 0xee, 0xf8, 0x7e, 0x82, 0x19, 0x7b, 0x87, 0x27, 0x41, 0x44, 0xdc, + 0x65, 0x28, 0xbc, 0x0e, 0x4a, 0xb1, 0xcc, 0x20, 0xc5, 0x5e, 0xdb, 0x32, 0xd6, 0xb7, 0xa1, 0x2a, + 0xf4, 0x74, 0x41, 0x93, 0x9b, 0x45, 0x6f, 0x6f, 0x3c, 0xfc, 0xf5, 0xab, 0xab, 0xcb, 0x3c, 0x56, + 0x03, 0x5c, 0x7a, 0xaa, 0xa5, 0x05, 0x76, 0x5b, 0x73, 0x0d, 0x14, 0x0e, 0x18, 0x81, 0x1f, 0x02, + 0x70, 0xe6, 0xf1, 0x35, 0xd7, 0x0b, 0xad, 0x40, 0xdf, 0x7c, 0xe3, 0x39, 0x01, 0x8b, 0xfc, 0xd6, + 0x6b, 0x0f, 0xbf, 0xff, 0xe5, 0xb3, 0xbc, 0x69, 0x5d, 0x76, 0xd6, 0x7f, 0x26, 0xb2, 0xe8, 0x01, + 0x9f, 0xc0, 0xf7, 0x40, 0x7d, 0x05, 0xb1, 0x57, 0xff, 0x34, 0xff, 0xd9, 0x90, 0xe6, 0x95, 0xe7, + 0x86, 0x2c, 0x9a, 0xe8, 0xdd, 0x78, 0x3c, 0x6f, 0x69, 0x4f, 0xe6, 0x2d, 0xed, 0xe7, 0x79, 0x4b, + 0xfb, 0xe4, 0xb8, 0x95, 0x7b, 0x72, 0xdc, 0xca, 0xfd, 0x70, 0xdc, 0xca, 0xbd, 0x7b, 0xf6, 0x70, + 0xe1, 0x54, 0x9c, 0xad, 0x65, 0x9b, 0x13, 0xd9, 0xa8, 0x3c, 0x60, 0x87, 0x25, 0xf9, 0xdf, 0xf1, + 0xe6, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xf3, 0xe0, 0xc6, 0x74, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -663,13 +660,6 @@ func (m *MsgEthereumTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.FeePayer) > 0 { - i -= len(m.FeePayer) - copy(dAtA[i:], m.FeePayer) - i = encodeVarintTx(dAtA, i, uint64(len(m.FeePayer))) - i-- - dAtA[i] = 0x2a - } if len(m.From) > 0 { i -= len(m.From) copy(dAtA[i:], m.From) @@ -1226,10 +1216,6 @@ func (m *MsgEthereumTx) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.FeePayer) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } return n } @@ -1595,38 +1581,6 @@ func (m *MsgEthereumTx) Unmarshal(dAtA []byte) error { } m.From = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeePayer", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FeePayer = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])