From 345177cfc1085ee49e862760df8c03b8f6206923 Mon Sep 17 00:00:00 2001
From: Eirik0 <eirik@z.cash>
Date: Tue, 30 Apr 2019 09:52:53 -0600
Subject: [PATCH] Do not look at vin/vout when determining migration txs and
 other cleanup

---
 qa/rpc-tests/sprout_sapling_migration.py | 16 ++++++++--------
 src/wallet/rpcwallet.cpp                 |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/qa/rpc-tests/sprout_sapling_migration.py b/qa/rpc-tests/sprout_sapling_migration.py
index fd81c5730..5f47d7796 100755
--- a/qa/rpc-tests/sprout_sapling_migration.py
+++ b/qa/rpc-tests/sprout_sapling_migration.py
@@ -64,7 +64,7 @@ class SproutSaplingMigration(BitcoinTestFramework):
 
         # Migrate
         node.z_setmigration(True)
-        print "Mining to block 494 % 500..."
+        print("Mining to block 494 % 500...")
         node.generate(392)  # 102 % 500 -> 494 % 500
         self.sync_all()
 
@@ -77,13 +77,13 @@ class SproutSaplingMigration(BitcoinTestFramework):
 
         # At 495 % 500 we should have an async operation
         operationstatus = node.z_getoperationstatus()
-        print "migration operation: {}".format(operationstatus)
+        print("migration operation: {}".format(operationstatus))
         assert_equal(1, len(operationstatus), "num async operations at 495  % 500")
         assert_equal('saplingmigration', operationstatus[0]['method'])
         assert_equal(target_height, operationstatus[0]['target_height'])
 
         result = wait_and_assert_operationid_status_result(node, operationstatus[0]['id'])
-        print "result: {}".format(result)
+        print("result: {}".format(result))
         assert_equal('saplingmigration', result['method'])
         assert_equal(target_height, result['target_height'])
         assert_equal(1, result['result']['num_tx_created'])
@@ -113,7 +113,7 @@ class SproutSaplingMigration(BitcoinTestFramework):
         # At 0 % 500 funds will have moved
         sprout_balance = node.z_getbalance(sproutAddr)
         sapling_balance = node.z_getbalance(saplingAddr)
-        print "sprout balance: {}, sapling balance: {}".format(sprout_balance, sapling_balance)
+        print("sprout balance: {}, sapling balance: {}".format(sprout_balance, sapling_balance))
         assert_true(sprout_balance < Decimal('10'), "Should have less Sprout funds")
         assert_true(sapling_balance > Decimal('0'), "Should have more Sapling funds")
         assert_true(sprout_balance + sapling_balance, Decimal('9.9999'))
@@ -142,8 +142,8 @@ class SproutSaplingMigration(BitcoinTestFramework):
         check_migration_status(self.nodes[0], False, SAPLING_ADDR, False, False, False, 0, 0)
 
         # 1. Test using self.nodes[0] which has the parameter
-        print "Running test using '-migrationdestaddress'..."
-        print "Mining blocks..."
+        print("Running test using '-migrationdestaddress'...")
+        print("Mining blocks...")
         self.nodes[0].generate(101)
         self.sync_all()
         tAddr = get_coinbase_address(self.nodes[0])
@@ -158,9 +158,9 @@ class SproutSaplingMigration(BitcoinTestFramework):
         self.nodes[0].z_setmigration(False)
 
         # 2. Test using self.nodes[1] which will use the default Sapling address
-        print "Running test using default Sapling address..."
+        print("Running test using default Sapling address...")
         # Mine more blocks so we start at 102 % 500
-        print "Mining blocks..."
+        print("Mining blocks...")
         self.nodes[1].generate(91)  # 511 -> 602
         self.sync_all()
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 651c1e328..f8f008666 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3949,7 +3949,7 @@ UniValue z_getmigrationstatus(const UniValue& params, bool fHelp) {
             "  \"unfinalized_migrated_amount\": nnn.n,     (numeric) The total amount of unfinalized " + CURRENCY_UNIT + " \n"
             "  \"finalized_migrated_amount\": nnn.n,       (numeric) The total amount of finalized " + CURRENCY_UNIT + " \n"
             "  \"finalized_migration_transactions\": nnn,  (numeric) The number of migration transactions involving this wallet\n"
-            "  \"time_started\": ttt,                      (numeric, optional) The block time of the first migration transaction\n"
+            "  \"time_started\": ttt,                      (numeric, optional) The block time of the first migration transaction as a Unix timestamp\n"
             "  \"migration_txids\": [txids]                (json array of strings) An array of all migration txids involving this wallet\n"
             "}\n"
         );
@@ -3989,8 +3989,7 @@ UniValue z_getmigrationstatus(const UniValue& params, bool fHelp) {
         // * one or more Sprout JoinSplits with nonzero vpub_new field; and
         // * no Sapling Spends, and;
         // * one or more Sapling Outputs.
-        if (tx.vjoinsplit.size() > 0 && tx.vShieldedSpend.empty() && tx.vShieldedOutput.size() > 0 &&
-            tx.vin.empty() && tx.vout.empty()) {
+        if (tx.vjoinsplit.size() > 0 && tx.vShieldedSpend.empty() && tx.vShieldedOutput.size() > 0) {
             bool nonZeroVPubNew = false;
             for (const auto& js : tx.vjoinsplit) {
                 if (js.vpub_new > 0) {