Update CandidateRouteHop::short_channel_id to be optional