It is my understanding (though I personally haven't confirmed it) that the tracing rules will still apply for the 2018 tax year. I'm still waiting for the IRS to update things on their website, as they are quite a bit easier to comprehend and interpret than is the bill passed by congress.
