Merge PR: amino encode for MsgEthereumTx is not supported after venus…

… height (#1410) * RLP encode is not allowed until venus height * add optional heights paramter in sdk.TxDecoder * update rpc * update HigherThanVenus * txpool is not allowed until venus height * update global height when restarting the node * forbid amino decode for MsgEthereumTx Co-authored-by: KamiD <[email protected]>
okx · Jan 10, 2022 · cc5a5a4 · cc5a5a4
1 parent ad62817
commit cc5a5a4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/x/evm/types/utils.go b/x/evm/types/utils.go
@@ -564,9 +564,15 @@ func TxDecoder(cdc *codec.Codec) sdk.TxDecoder {
 		// are registered by MakeTxCodec
 		// TODO: switch to UnmarshalBinaryBare on SDK v0.40.0
 		if v, err := cdc.UnmarshalBinaryLengthPrefixedWithRegisteredUbmarshaller(txBytes, &tx); err == nil {
+			if _, ok := v.(MsgEthereumTx); ok && types.HigherThanVenus(height) {
+				return nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "amino decode is not allowed for MsgEthereumTx")
+			}
 			return v.(sdk.Tx), nil
 		}
 		if err = cdc.UnmarshalBinaryLengthPrefixed(txBytes, &tx); err == nil {
+			if _, ok := tx.(MsgEthereumTx); ok && types.HigherThanVenus(height) {
+				return nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "amino decode is not allowed for MsgEthereumTx")
+			}
 			return tx, nil
 		}
 		return nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, err.Error())