RPC tests and more fixed

firoorg · Nov 13, 2023 · 33e39f6 · 33e39f6
1 parent defcf05
commit 33e39f6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -162,6 +162,15 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         std::pair<CAmount, CAmount> sparkBalance = _model->getSparkBalance();
         privateBalance = spark::IsSparkAllowed() ? sparkBalance : privateBalance;
 
+        if (model->getWallet()) {
+            auto allowed = lelantus::IsLelantusAllowed() || (spark::IsSparkAllowed() && model->getWallet()->sparkWallet);
+            setAnonymizeMode(allowed);
+
+            if (!allowed) {
+                ui->switchFundButton->setEnabled(false);
+            }
+        }
+
         setBalance(
             _model->getBalance(), _model->getUnconfirmedBalance(), _model->getImmatureBalance(),
             _model->getWatchBalance(), _model->getWatchUnconfirmedBalance(), _model->getWatchImmatureBalance(),
@@ -628,7 +637,8 @@ void SendCoinsDialog::updateBlocks(int count, const QDateTime& blockDate, double
         return;
     }
 
-    auto allowed = lelantus::IsLelantusAllowed() || spark::IsSparkAllowed();
+    auto allowed = lelantus::IsLelantusAllowed() || (spark::IsSparkAllowed() && model->getWallet() && model->getWallet()->sparkWallet);
+
 
     if (allowed && !ui->switchFundButton->isEnabled())
     {

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -1399,10 +1399,13 @@ std::pair<CAmount, CAmount> WalletModel::getSparkBalance()
 
 bool WalletModel::getAvailableLelantusCoins()
 {
+    if (!pwalletMain->zwallet)
+        return false;
+
     std::list<CLelantusEntry> coins = wallet->GetAvailableLelantusCoins();
-    if(coins.size() > 0) {
+    if (coins.size() > 0) {
         return true;
-    }else{
+    } else {
         return false;
     }
 } 
@@ -1411,7 +1414,7 @@ bool WalletModel::migrateLelantusToSpark()
 {
     std::string strFailReason;
     bool res = wallet->LelantusToSpark(strFailReason);
-    if(!res) {
+    if (!res) {
         Q_EMIT message(tr("Lelantus To Spark"), QString::fromStdString(strFailReason),
             CClientUIInterface::MSG_ERROR);
     }

diff --git a/src/spark/sparkwallet.cpp b/src/spark/sparkwallet.cpp
@@ -1089,7 +1089,7 @@ bool CSparkWallet::CreateSparkMintTransactions(
                             while (i < tx.vout.size()) {
                                 if (tx.vout[i].scriptPubKey.IsSparkMint()) {
                                     tx.vout[i] = txout;
-                                    CWalletDB walletdb(strWalletFile);
+                                    CWalletDB walletdb(pwalletMain->strWalletFile);
                                     CSparkOutputTx output;
                                     output.address = recipient.address;
                                     output.amount = recipient.nAmount;

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -7166,13 +7166,13 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile)
 
         // if it is first run, we need to generate the full key set for spark, if not we are loading spark wallet from db
         walletInstance->sparkWallet = std::make_unique<CSparkWallet>(pwalletMain->strWalletFile);
-    }
 
-    spark::Address address = walletInstance->sparkWallet->getDefaultAddress();
-    unsigned char network = spark::GetNetworkType();
-    if (!walletInstance->SetSparkAddressBook(address.encode(network), "", "receive")) {
-        InitError(_("Cannot write default spark address") += "\n");
-        return NULL;
+        spark::Address address = walletInstance->sparkWallet->getDefaultAddress();
+        unsigned char network = spark::GetNetworkType();
+        if (!walletInstance->SetSparkAddressBook(address.encode(network), "", "receive")) {
+            InitError(_("Cannot write default spark address") += "\n");
+            return NULL;
+        }
     }
 
     walletInstance->bip47wallet = std::make_shared<bip47::CWallet>(walletInstance->vchDefaultKey.GetHash());
@@ -7826,7 +7826,7 @@ void CWallet::HandleBip47Transaction(CWalletTx const & wtx)
 }
 
 void CWallet::HandleSparkTransaction(CWalletTx const & wtx) {
-    if (!wtx.tx->IsSparkTransaction())
+    if (!wtx.tx->IsSparkTransaction() || !sparkWallet)
         return;
 
     uint256 txHash = wtx.GetHash();
@@ -8119,6 +8119,11 @@ bool CWallet::CreateSparkMintTransactions(
 std::pair<CAmount, CAmount> CWallet::GetSparkBalance()
 {
     std::pair<CAmount, CAmount> balance = {0, 0};
+    auto sparkWallet = pwalletMain->sparkWallet.get();
+
+    if(!sparkWallet)
+        return balance;
+
     balance.first = sparkWallet->getAvailableBalance();
     balance.second = sparkWallet->getUnconfirmedBalance();
     return balance;
@@ -8130,6 +8135,9 @@ bool CWallet::IsSparkAddressMine(const std::string& address) {
 
 bool CWallet::SetSparkAddressBook(const std::string& address, const std::string& strName, const std::string& strPurpose)
 {
+    if (!sparkWallet)
+        return false;
+
     bool fUpdated = false;
     {
         LOCK(cs_wallet); // mapAddressBook