fixing tracking_id -> eligible_public_key change