hush/hush3 - hush3 - Hush: Speak And Transact Freely

Author	SHA1	Message	Date
Duke Leto	980350b9b4	Stuck in the grind	3 years ago
Duke Leto	be16f80abc	Hush Full Node is now GPLv3 Any projects which want to use Hush code from now on will need to be licensed as GPLv3 or we will send the lawyers: https://www.softwarefreedom.org/ Notably, Komodo (KMD) is licensed as GPLv2 and is no longer compatible to receive code changes, without causing legal issues. MIT projects, such as Zcash, also cannot pull in changes from the Hush Full Node without permission from The Hush Developers, which may in some circumstances grant an MIT license on a case-by-case basis.	4 years ago
Duke Leto	a7f88a87aa	Update copyright URL to be https	4 years ago
jl777	e73b2055c6	Merge branch 'beta' into mergemaster # Conflicts: # src/main.cpp	6 years ago
Brad Miller	98a4f6a656	Implement note locking for z_mergetoaddress Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>	6 years ago
Jack Grigg	70420ff34f	Test calling z_mergetoaddress to merge notes while a note merge is ongoing	6 years ago
Brad Miller	4e6400bc00	Implement note locking for z_mergetoaddress Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>	6 years ago
Jack Grigg	9666cc912a	Test calling z_mergetoaddress to merge notes while a note merge is ongoing	6 years ago
Daira Hopwood	b4353db5d6	pyflakes cleanups to RPC tests after Overwinter PRs. Signed-off-by: Daira Hopwood <daira@jacaranda.org>	6 years ago
Jack Grigg	15ced9b153	wallet_mergetoaddress: Add additional syncs to prevent race conditions	6 years ago
Jack Grigg	553a5c1ab2	Gate z_mergetoaddress as an experimental feature	6 years ago
Jack Grigg	6e9c7629af	Implement z_mergetoaddress for combining UTXOs and notes Closes #2493.	7 years ago