Light Wallet Upgrades, Ubuntu 24 Support (#1047)

* Fixes for Ubuntu 24.04 build

* LIght wallet build, now handles larger ringsize count

* Add support for verbose utxo's in getwatchonlytxes

* Increase initial sync for watchonly mode by 10x, add confirmations and timestamp, watchonly v2 database migration, enabling caching for watchonly

* Add RPC calls for watchonly address backup and restore

Author: blondfrogs

src/init.cpp

@@ -281,6 +281,19 @@ void Shutdown()
     }
 
     if (gArgs.GetBoolArg("-watchonly", false)) {
+        // Flush any cached watch-only data before shutdown (cache is always enabled)
+        LogPrintf("Flushing watch-only caches on shutdown...\n");
+
+        // Flush transaction cache
+        if (!watchonlyTxCache.FlushAll()) {
+            error("Failed to flush watch-only transaction cache on shutdown");
+        }
+
+        // Flush block cache
+        if (!watchonlyBlockCache.FlushAll()) {
+            error("Failed to flush watch-only block cache on shutdown");
+        }
+
         if (!FlushWatchOnlyAddresses()) {
             error("Fail to write watchonly addresses to database.");
         }
@@ -649,6 +662,7 @@ static void BlockNotifyCallback(bool initialSync, const CBlockIndex *pBlockIndex
 static bool fHaveGenesis = false;
 static CWaitableCriticalSection cs_GenesisWait;
 static CConditionVariable condvar_GenesisWait;
+static boost::signals2::connection genesisWaitConnection;
 
 static void BlockNotifyGenesisWait(bool, const CBlockIndex *pBlockIndex)
 {
@@ -1816,6 +1830,10 @@ bool AppInitMain()
 
     // Load watchonly addresses
     if (gArgs.GetBoolArg("-watchonly", false)) {
+        // Cache is always enabled with fixed size of 1000
+        watchonlyTxCache.nMaxCacheSize = 1000;
+        LogPrintf("Watch-only transaction cache enabled with size 1000\n");
+
         LoadWatchOnlyAddresses();
     }
 
@@ -1856,7 +1874,7 @@ bool AppInitMain()
         // Either install a handler to notify us when genesis activates, or set fHaveGenesis directly.
         // No locking, as this happens before any background thread is started.
         if (chainActive.Tip() == nullptr) {
-            uiInterface.NotifyBlockTip.connect(BlockNotifyGenesisWait);
+            genesisWaitConnection = uiInterface.NotifyBlockTip.connect(BlockNotifyGenesisWait);
         } else {
             fHaveGenesis = true;
         }
@@ -1883,7 +1901,7 @@ bool AppInitMain()
             while (!fHaveGenesis && !ShutdownRequested()) {
                 condvar_GenesisWait.wait_for(lock, std::chrono::milliseconds(500));
             }
-            uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait);
+            genesisWaitConnection.disconnect();
         }
     }
 

src/logging.cpp

@@ -127,6 +127,7 @@ const CLogCategoryDesc LogCategories[] =
     {BCLog::STAKING, "staking"},
     {BCLog::RINGCT, "ringct"},
     {BCLog::WATCHONLYDB, "watchonlydb"},
+    {BCLog::WATCHONLYIMPORT, "watchonlyimport"},
     {BCLog::ALL, "1"},
     {BCLog::ALL, "all"},
 };

src/logging.h

@@ -61,6 +61,7 @@ namespace BCLog {
         STAKING     = (1 << 26),
         RINGCT      = (1 << 27),
         WATCHONLYDB = (1 << 28),
+        WATCHONLYIMPORT = (1 << 29),
         ALL         = ~(uint32_t)0,
     };
 

src/rpc/client.cpp

@@ -236,7 +236,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "getnewaddress", 3, "bech32"},
     { "getnewaddress", 4, "makeV2"},
     { "getwatchonlytxes", 1, "starting_index"},
-    { "getwatchonlytxes", 4, "testing"},
+    { "getwatchonlytxes", 2, "batch_size"},
 
 
 

src/test/cuckoocache_tests.cpp

@@ -5,6 +5,7 @@
 #include <cuckoocache.h>
 #include <script/sigcache.h>
 #include <test/test_veil.h>
+#include <deque>
 #include <random.h>
 #include <thread>
 

src/validation.h

@@ -534,7 +534,7 @@ extern std::unique_ptr<CZerocoinDB> pzerocoinDB;
  */
 int GetSpendHeight(const CCoinsViewCache& inputs);
 
-static bool isPowTimeStampActive() { return (chainActive.Tip()->nTime >= nPowTimeStampActive); }
+inline bool isPowTimeStampActive() { return (chainActive.Tip()->nTime >= nPowTimeStampActive); }
 
 extern VersionBitsCache versionbitscache;
 

src/veil/ringct/anonwallet.cpp

@@ -365,11 +365,9 @@ isminetype AnonWallet::HaveStealthAddress(const CStealthAddress &sxAddr) const
     auto si = mapStealthAddresses.find(sxAddr.GetID());
     if (si != mapStealthAddresses.end()) {
 
-        if (mapWatchOnlyAddresses.count(si->second.ToString(true))) {
-            return ISMINE_WATCH_ONLY;
-        }
-
-        if (mapWatchOnlyAddresses.count(si->second.ToString(false))) {
+        // Check if this is a watch-only address using CKeyID (V2)
+        CKeyID keyID = si->second.scan_secret.GetPubKey().GetID();
+        if (mapWatchOnlyAddresses.count(keyID)) {
             return ISMINE_WATCH_ONLY;
         }
 

src/veil/ringct/lightwallet.cpp

@@ -1475,19 +1475,20 @@ bool LightWalletAddRealOutputs(CMutableTransaction& txNew, std::vector<CWatchOnl
 
             vSecretColumns[l] = GetRandInt(nSigRingSize);
 
-            vMI[l].resize(currentSize);
+            vMI[l].resize(nSigInputs);
 
-            for (size_t k = 0; k < vSelectedTxes.size(); ++k) {
+            size_t txOffset = currentSize - nSigInputs;
+            for (size_t k = 0; k < nSigInputs; ++k) {
                 vMI[l][k].resize(nSigRingSize);
                 for (size_t i = 0; i < nSigRingSize; ++i) {
                     if (i == vSecretColumns[l]) {
-                        const auto &coin = vSelectedTxes[k];
-                        const uint256 &txhash = vSelectedTxes[k].tx_hash;
+                        const auto &coin = vSelectedTxes[txOffset + k];
+                        const uint256 &txhash = vSelectedTxes[txOffset + k].tx_hash;
 
-                        CCmpPubKey pk = vSelectedTxes[k].ringctout.pk;
-                        memcpy(&vInputBlinds[l][k * 32], &vSelectedTxes[k].blind, 32);
+                        CCmpPubKey pk = vSelectedTxes[txOffset + k].ringctout.pk;
+                        memcpy(&vInputBlinds[l][k * 32], &vSelectedTxes[txOffset + k].blind, 32);
 
-                        int64_t index = vSelectedTxes[k].ringctIndex;
+                        int64_t index = vSelectedTxes[txOffset + k].ringctIndex;
 
                         if (setHave.count(index)) {
                             errorMsg = "Duplicate index found";