Rename currentTx to decoratedTx and used it everywhere