Auto merge of #2797 - str4d:2493-active-merging, r=bitcartel

Implement z_mergetoaddress for combining UTXOs and notes Closes #2493.
2018-02-22 20:59:51 -08:00
parent f472edd0e2 15ced9b153
commit c5904fb2a4
14 changed files with 2168 additions and 6 deletions
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -16,6 +16,7 @@ testScripts=(
    'wallet_treestate.py'
    'wallet_protectcoinbase.py'
    'wallet_shieldcoinbase.py'
+    'wallet_mergetoaddress.py'
    'wallet.py'
    'wallet_overwintertx.py'
    'wallet_nullifiers.py'