Revert invoiceId_txid from createNewPaymentWithTransaction

It was premature to set it this way in one function because it
can currently race with simultaneous updatePaymentWithTransaction
resulting in duplicate payments.  I am fixing this correctly soon.