Auto merge of #2616 - nathan-at-least:importprivkey-shows-address.4, r=str4d

Importprivkey shows address

Scratching an itch: make `importprivkey` output the corresponding address.

Without this PR, `importprivkey` shows no output. Because we're moving towards an "address-based" RPC interface, rather than "account-based", there's a gap when using `importprivkey` because there's no way to assign it to a specific account, but also no easy way to determine the address. This change fixes that wart.

qa/pull-tester/rpc-tests.sh

@@ -34,6 +34,7 @@ testScripts=(
     'fundrawtransaction.py'
     'signrawtransactions.py'
     'walletbackup.py'
+    'key_import_export.py'
     'nodehandling.py'
     'reindex.py'
     'decodescript.py'

qa/rpc-tests/key_import_export.py

@@ -0,0 +1,112 @@
+#!/usr/bin/env python2
+# Copyright (c) 2017 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from time import sleep
+from decimal import Decimal
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal, assert_greater_than, sync_blocks, start_nodes, initialize_chain_clean, connect_nodes_bi
+
+import logging
+
+logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)
+
+
+class KeyImportExportTest (BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(4, self.options.tmpdir )
+        connect_nodes_bi(self.nodes,0,1)
+        connect_nodes_bi(self.nodes,1,2)
+        connect_nodes_bi(self.nodes,0,2)
+        connect_nodes_bi(self.nodes,0,3)
+        self.is_network_split=False
+        self.sync_all()
+
+    def run_test(self):
+        [alice, bob, charlie, miner] = self.nodes
+
+        def alice_to_bob(amount):
+            txid = alice.sendtoaddress(addr, Decimal(amount))
+            self.sync_all()
+            miner.generate(1)
+            self.sync_all()
+
+        def verify_utxos(node, amounts):
+            utxos = node.listunspent(1, 10**9, [addr])
+
+            def cmp_confirmations_high_to_low(a, b):
+                return cmp(b["confirmations"], a["confirmations"])
+
+            utxos.sort(cmp_confirmations_high_to_low)
+
+            try:
+                assert_equal(amounts, [utxo["amount"] for utxo in utxos])
+            except AssertionError:
+                logging.error(
+                    'Expected amounts: %r; utxos: %r',
+                    amounts, utxos)
+                raise
+
+        # Seed Alice with some funds
+        alice.generate(10)
+        self.sync_all()
+        miner.generate(100)
+        self.sync_all()
+
+        # Now get a pristine address for receiving transfers:
+        addr = bob.getnewaddress()
+        verify_utxos(bob, [])
+        verify_utxos(charlie, [])
+
+        # the amounts of each txn embodied which generates a single UTXO:
+        amounts = map(Decimal, ['2.3', '3.7', '0.1', '0.5', '1.0', '0.19'])
+
+        # Internal test consistency assertion:
+        assert_greater_than(
+            alice.getbalance(),
+            reduce(Decimal.__add__, amounts))
+
+        logging.info("Sending pre-export txns...")
+        for amount in amounts[0:2]:
+            alice_to_bob(amount)
+
+        logging.info("Exporting privkey from bob...")
+        privkey = bob.dumpprivkey(addr)
+
+        logging.info("Sending post-export txns...")
+        for amount in amounts[2:4]:
+            alice_to_bob(amount)
+
+        verify_utxos(bob, amounts[:4])
+        verify_utxos(charlie, [])
+
+        logging.info("Importing privkey into charlie...")
+        ipkaddr = charlie.importprivkey(privkey, '', True)
+        assert_equal(addr, ipkaddr)
+
+        # importprivkey should have rescanned, so this should pass:
+        verify_utxos(charlie, amounts[:4])
+
+        # Verify idempotent behavior:
+        ipkaddr2 = charlie.importprivkey(privkey, '', True)
+        assert_equal(addr, ipkaddr2)
+
+        # amounts should be unchanged
+        verify_utxos(charlie, amounts[:4])
+
+        logging.info("Sending post-import txns...")
+        for amount in amounts[4:]:
+            alice_to_bob(amount)
+
+        verify_utxos(bob, amounts)
+        verify_utxos(charlie, amounts)
+
+
+if __name__ == '__main__':
+    KeyImportExportTest().main()

src/wallet/rpcdump.cpp

@@ -128,8 +128,9 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
         pwalletMain->SetAddressBook(vchAddress, strLabel, "receive");
 
         // Don't throw error in case a key is already there
-        if (pwalletMain->HaveKey(vchAddress))
-            return NullUniValue;
+        if (pwalletMain->HaveKey(vchAddress)) {
+            return CBitcoinAddress(vchAddress).ToString();
+        }
 
         pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;
 
@@ -144,7 +145,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
         }
     }
 
-    return NullUniValue;
+    return CBitcoinAddress(vchAddress).ToString();
 }
 
 UniValue importaddress(const UniValue& params, bool fHelp)