rename assets resource to exchange_assets resource so there's no conflicts
Merge branch 'solvency-proof'