move epoch to handshake_state instead of state
adapt to changed location where epoch lives