Commit Graph

6 Commits

Author SHA1 Message Date
Brad Miller
98a4f6a656 Implement note locking for z_mergetoaddress
Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
2018-04-10 00:44:39 -07:00
Jack Grigg
70420ff34f Test calling z_mergetoaddress to merge notes while a note merge is ongoing 2018-04-10 00:44:26 -07:00
Daira Hopwood
b4353db5d6 pyflakes cleanups to RPC tests after Overwinter PRs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2018-03-12 14:15:25 +00:00
Jack Grigg
15ced9b153 wallet_mergetoaddress: Add additional syncs to prevent race conditions 2018-02-23 04:28:04 +00:00
Jack Grigg
553a5c1ab2 Gate z_mergetoaddress as an experimental feature 2018-02-22 13:23:25 +00:00
Jack Grigg
6e9c7629af Implement z_mergetoaddress for combining UTXOs and notes
Closes #2493.
2018-02-22 13:23:18 +00:00