fix

evmos · Jan 13, 2022 · 6fffea2 · 6fffea2
1 parent 9a32f55
commit 6fffea2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/rpc/ethereum/types/utils.go b/rpc/ethereum/types/utils.go
@@ -31,9 +31,13 @@ func RawTxToEthTx(clientCtx client.Context, txBz tmtypes.Tx) (*evmtypes.MsgEther
  return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
  }
 
- ethTx, ok := tx.(*evmtypes.MsgEthereumTx)
+ if len(tx.GetMsgs()) != 1 {
+ return nil, errors.New("not ethereum tx")
+ }
+
+ ethTx, ok := tx.GetMsgs()[0].(*evmtypes.MsgEthereumTx)
  if !ok {
- return nil, fmt.Errorf("invalid transaction type %T, expected %T", tx, evmtypes.MsgEthereumTx{})
+ return nil, fmt.Errorf("invalid msg type %T, expected %T", tx, evmtypes.MsgEthereumTx{})
  }
  return ethTx, nil
 }

diff --git a/rpc/websockets.go b/rpc/websockets.go
@@ -686,7 +686,7 @@ func (api *pubSubAPI) subscribePendingTransactions(wsConn *wsConn) (rpc.ID, erro
  ethTx, err := types.RawTxToEthTx(api.clientCtx, data.Tx)
  if err != nil {
  // not ethereum tx
- continue
+ panic("debug")
  }
 
  api.filtersMu.RLock()