You have to now report gains separately for every self-hosted wallet and custodial account. You have to choose an ordering strategy (oldest, largest, etc...) for gains reporting, and you need to write a letter of intent stating your intent to comply and which ordering strategy you will use going forward. You don't have to send the letter of intent to the IRS; just keep it for your records, should you be audited.