Merge #7558: [RPC] Add import/removeprunedfunds rpc call

f1bb13c Added companion removeprunedfunds call. (instagibbs)
7eb7029 Add importprunedfunds rpc call (instagibbs)

2 files changed, 142 insertions, 0 deletions

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 74be96da74..10b51fef7a 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -116,6 +116,7 @@ testScripts = [
     'invalidtxrequest.py',
     'abandonconflict.py',
     'p2p-versionbits-warning.py',
+    'importprunedfunds.py',
 ]
 testScriptsExt = [
     'bip65-cltv.py',
@@ -127,6 +128,7 @@ testScriptsExt = [
     'getblocktemplate_proposals.py',
     'txn_doublespend.py',
     'txn_clone.py --mineblock',
+    'pruning.py',
     'forknotify.py',
     'invalidateblock.py',
 #    'rpcbind_test.py', #temporary, bug in libevent, see #6655
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
new file mode 100755
index 0000000000..5cbdcde9aa
--- /dev/null
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -0,0 +1,140 @@
+#!/usr/bin/env python2
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+import decimal
+
+class ImportPrunedFundsTest(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(2, self.options.tmpdir)
+        connect_nodes_bi(self.nodes,0,1)
+        self.is_network_split=False
+        self.sync_all()
+
+    def run_test (self):
+        import time
+        begintime = int(time.time())
+
+        print "Mining blocks..."
+        self.nodes[0].generate(101)
+
+        # sync
+        self.sync_all()
+        
+        # address
+        address1 = self.nodes[0].getnewaddress()
+        # pubkey
+        address2 = self.nodes[0].getnewaddress()
+        address2_pubkey = self.nodes[0].validateaddress(address2)['pubkey']                 # Using pubkey
+        # privkey
+        address3 = self.nodes[0].getnewaddress()
+        address3_privkey = self.nodes[0].dumpprivkey(address3)                              # Using privkey
+
+        #Check only one address
+        address_info = self.nodes[0].validateaddress(address1)
+        assert_equal(address_info['ismine'], True)
+
+        self.sync_all()
+
+        #Node 1 sync test
+        assert_equal(self.nodes[1].getblockcount(),101)
+
+        #Address Test - before import
+        address_info = self.nodes[1].validateaddress(address1)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+        address_info = self.nodes[1].validateaddress(address2)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+        address_info = self.nodes[1].validateaddress(address3)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+
+        #Send funds to self
+        txnid1 = self.nodes[0].sendtoaddress(address1, 0.1)
+        self.nodes[0].generate(1)
+        rawtxn1 = self.nodes[0].gettransaction(txnid1)['hex']
+        proof1 = self.nodes[0].gettxoutproof([txnid1])
+
+        txnid2 = self.nodes[0].sendtoaddress(address2, 0.05)
+        self.nodes[0].generate(1)
+        rawtxn2 = self.nodes[0].gettransaction(txnid2)['hex']
+        proof2 = self.nodes[0].gettxoutproof([txnid2])
+
+
+        txnid3 = self.nodes[0].sendtoaddress(address3, 0.025)
+        self.nodes[0].generate(1)
+        rawtxn3 = self.nodes[0].gettransaction(txnid3)['hex']
+        proof3 = self.nodes[0].gettxoutproof([txnid3])
+
+        self.sync_all()
+
+        #Import with no affiliated address
+        try:
+            result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
+        except JSONRPCException,e:
+            errorString = e.error['message']
+
+        assert('No addresses' in errorString)
+
+        balance1 = self.nodes[1].getbalance("", 0, True)
+        assert_equal(balance1, Decimal(0))
+
+        #Import with affiliated address with no rescan
+        self.nodes[1].importaddress(address2, "", False)
+        result2 = self.nodes[1].importprunedfunds(rawtxn2, proof2, "")
+        balance2 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance2, Decimal('0.05'))
+
+        #Import with private key with no rescan
+        self.nodes[1].importprivkey(address3_privkey, "", False)
+        result3 = self.nodes[1].importprunedfunds(rawtxn3, proof3, "")
+        balance3 = Decimal(self.nodes[1].getbalance("", 0, False))
+        assert_equal(balance3, Decimal('0.025'))
+        balance3 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance3, Decimal('0.075'))
+
+        #Addresses Test - after import
+        address_info = self.nodes[1].validateaddress(address1)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], False)
+        address_info = self.nodes[1].validateaddress(address2)
+        assert_equal(address_info['iswatchonly'], True)
+        assert_equal(address_info['ismine'], False)
+        address_info = self.nodes[1].validateaddress(address3)
+        assert_equal(address_info['iswatchonly'], False)
+        assert_equal(address_info['ismine'], True)
+
+        #Remove transactions
+
+        try:
+            self.nodes[1].removeprunedfunds(txnid1)
+        except JSONRPCException,e:
+            errorString = e.error['message']
+
+        assert('does not exist' in errorString)
+
+        balance1 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance1, Decimal('0.075'))
+
+
+        self.nodes[1].removeprunedfunds(txnid2)
+        balance2 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance2, Decimal('0.025'))
+
+        self.nodes[1].removeprunedfunds(txnid3)
+        balance3 = Decimal(self.nodes[1].getbalance("", 0, True))
+        assert_equal(balance3, Decimal('0.0'))
+
+if __name__ == '__main__':
+    ImportPrunedFundsTest ().main ()