Small DS bugfix for ensuring legacy address present.

deeponion · Jun 16, 2021 · 2ab930f · 2ab930f
1 parent d309a70
commit 2ab930f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5837,6 +5837,7 @@ bool CAnonymousTxInfo::CanReset() const
 		int64_t now = GetTime();
 		if((now - lastActivityTime) > MAXIMUM_TRANSACTION_TIMEOUT)	
 		{
+            pCurrentAnonymousTxInfo->AddToLog("Maximum timeout exceeded, one or more of your chosen service nodes became unre, please try again.");
 			return true;
 		}
 	}

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -5610,7 +5610,10 @@ int CWallet::GetSelfAddressCount()
 	int count = 0;
     for (const std::pair<CTxDestination, CAddressBookData>& entry: mapAddressBook) 
     {
-        if (::IsMine(*this, entry.first)) 
+        txnouttype which_type;
+        std::vector<std::vector<unsigned char>> solutions_data;
+        Solver(GetScriptForDestination(entry.first), which_type, solutions_data);
+        if (::IsMine(*this, entry.first) && (which_type == TX_PUBKEY || which_type == TX_PUBKEYHASH)) 
         	count++;
     }
 	return count;