There currently isn't a remedy in place for non-violent federal felons to restore their right to lawfully bare arms up on completion of their prison sentence or term of supervision without any restrictions other than a Presidential Pardon. The issue of non-violent felons barring arms should rest with the sentencing court on a case by case basis.
Requiring non-violent felons to report and pay taxes each year but barring them from legally owning firearms disenfranchises them from the right to defend their home against unknown danger.