recon, Xwww aurora

IOCoin · Jan 18, 2019 · e7de3f2 · e7de3f2
1 parent a51c6be
commit e7de3f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -860,7 +860,6 @@ bool AppInit2()
         RandAddSeedPerfmon();
 
         CPubKey newDefaultKey;
-        printf("XXXX init gkfkp\n");
         if (pwalletMain->GetKeyFromPool(newDefaultKey, false)) {
             pwalletMain->SetDefaultKey(newDefaultKey);
             if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
@@ -873,6 +872,17 @@ bool AppInit2()
 
     RegisterWallet(pwalletMain);
 
+    if(GetBoolArg("-xscan"))
+    {
+      filesystem::path dc = GetDataDir() / "aliascache.dat";
+      FILE *file = fopen(dc.string().c_str(), "rb");
+      if (file) 
+      {
+        filesystem::path dc__ = GetDataDir() / "aliascache.dat.old";
+        RenameOver(dc, dc__);
+      }
+    }
+
     ln1Db = new LocatorNodeDB("cr+");
     CBlockIndex *pindexRescan = pindexBest;
     if(GetBoolArg("-rescan") || GetBoolArg("-xscan") || GetBoolArg("-upgradewallet"))
@@ -899,16 +909,7 @@ bool AppInit2()
 
         if(GetBoolArg("-xscan") || GetBoolArg("-upgradewallet"))
         {
-          filesystem::path dc = GetDataDir() / "aliascache.dat";
-          FILE *file = fopen(dc.string().c_str(), "rb");
-          if (file) 
-          {
-            filesystem::path dc__ = GetDataDir() / "aliascache.dat.old";
-            RenameOver(dc, dc__);
-            dc = filesystem::path(GetDataDir())/"aliascache.dat";
-            ln1Db = new LocatorNodeDB("cr+");
-            xsc(pindexGenesisBlock);
-          }
+          xsc(pindexGenesisBlock);
         }
     }
 

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
@@ -282,15 +282,13 @@ Array listunspent__(double p, double& iR)
         entry.push_back(Pair("scriptPubKey", HexStr(pk.begin(), pk.end())));
         entry.push_back(Pair("amount",ValueFromAmount(nValue)));
         i += ValueFromAmount(nValue).get_real();
-        printf("XXXX i %f\n", i);
         entry.push_back(Pair("confirmations",out.nDepth));
         results.push_back(entry);
         if(i - p >= 0.001)
           break;
     }
 
     iR = i;
-    printf("XXXX i %f XXXX\n", i);
     if(i - p < 0.001)
     {
       Array t;