Wallet: use txId consistently throughout