firoorg · reubenyap · Nov 21, 2023 · Sep 10, 2023 · Sep 16, 2023 · Oct 18, 2023
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
@@ -110,7 +110,7 @@
     'lelantus_spend_gettransaction.py',
     'elysium_create_denomination.py',
     'elysium_property_creation_fee.py',
-    'elysium_sendmint.py',
+#    'elysium_sendmint.py',
     'elysium_sendmint_wallet_encryption.py',
     'elysium_sendspend.py',
     'elysium_sendspend_wallet_encryption.py',

diff --git a/src/batchproof_container.cpp b/src/batchproof_container.cpp
@@ -213,7 +213,7 @@ void BatchProofContainer::batch_sigma() {
                     try {
                         if (!sigmaVerifier.batch_verify(anonymity_set, serials, fPadding, setSizes, proofs))
                             return false;
-                    } catch (...) {
+                    } catch (const std::exception &) {
                         return false;
                     }
                     return true;
@@ -316,7 +316,7 @@ void BatchProofContainer::batch_lelantus() {
                     try {
                         if (!sigmaVerifier.batchverify(anonymity_set, challenges, serials, setSizes, proofs))
                             return false;
-                    } catch (...) {
+                    } catch (const std::exception &) {
                         return false;
                     }
                     return true;
@@ -431,7 +431,7 @@ void BatchProofContainer::batch_spark() {
     bool passed;
     try {
         passed = spark::SpendTransaction::verify(params, sparkTransactions, cover_sets);
-    } catch (...) {
+    } catch (const std::exception &) {
         passed = false;
     }
 

diff --git a/src/bip47/account.cpp b/src/bip47/account.cpp
@@ -254,7 +254,7 @@ bool CAccountReceiver::acceptMaskedPayload(std::vector<unsigned char> const & ma
     std::unique_ptr<lelantus::JoinSplit> jsplit;
     try {
         jsplit = lelantus::ParseLelantusJoinSplit(tx);
-    }catch (...) {
+    }catch (const std::exception &) {
         return false;
     }
     if (!jsplit)

diff --git a/src/bip47/bip47utils.cpp b/src/bip47/bip47utils.cpp
@@ -170,7 +170,7 @@ GroupElement GeFromPubkey(CPubKey const & pubKey)
     serializedGe.push_back(0x0);
     try {
         result.deserialize(&serializedGe[0]);
-    } catch (...) {
+    } catch (const std::exception &) {
         result = GroupElement();
     }
     return result;

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -425,7 +425,7 @@ class CMainParams : public CChainParams {
             GroupElement coin;
             try {
                 coin.deserialize(ParseHex(str).data());
-            } catch (...) {
+            } catch (const std::exception &) {
                 continue;
             }
             consensus.lelantusBlacklist.insert(coin);
@@ -435,7 +435,7 @@ class CMainParams : public CChainParams {
             GroupElement coin;
             try {
                 coin.deserialize(ParseHex(str).data());
-            } catch (...) {
+            } catch (const std::exception &) {
                 continue;
             }
             consensus.sigmaBlacklist.insert(coin);
@@ -728,7 +728,7 @@ class CTestNetParams : public CChainParams {
             GroupElement coin;
             try {
                 coin.deserialize(ParseHex(str).data());
-            } catch (...) {
+            } catch (const std::exception &) {
                 continue;
             }
             consensus.lelantusBlacklist.insert(coin);

diff --git a/src/elysium/elysium.cpp b/src/elysium/elysium.cpp
@@ -2329,7 +2329,7 @@ int elysium::WalletTxBuilder(
         case InputMode::SIGMA:
             try {
                 if (!pwalletMain->CommitSigmaTransaction(wtxNew, sigmaSelected, sigmaChanges)) return MP_ERR_COMMIT_TX;
-            } catch (...) {
+            } catch (const std::exception &) {
                 return MP_ERR_COMMIT_TX;
             }
             break;

diff --git a/src/elysium/rpctx.cpp b/src/elysium/rpctx.cpp
@@ -1689,7 +1689,7 @@ UniValue elysium_sendmint(const JSONRPCRequest& request)
         if (result != 0) {
             throw JSONRPCError(result, error_str(result));
         }
-    } catch (...) {
+    } catch (const std::exception &) {
         for (auto& id : ids) {
             wallet->DeleteUnconfirmedSigmaMint(id);
         }

diff --git a/src/elysium/wallet.cpp b/src/elysium/wallet.cpp
@@ -197,7 +197,7 @@ SigmaPrivateKey Wallet::GetKey(const SigmaMint &mint)
     // Try all mint wallets
     try {
         return mintWalletV1.GeneratePrivateKey(mint.seedId);
-    } catch (...) {
+    } catch (const std::exception &) {
         return mintWalletV0.GeneratePrivateKey(mint.seedId);
     }
 }

diff --git a/src/hdmint/tracker.cpp b/src/hdmint/tracker.cpp
@@ -546,7 +546,7 @@ bool CHDMintTracker::IsMempoolSpendOurs(const std::set<uint256>& setMempool, con
                 uint32_t pubcoinId;
                 try {
                     std::tie(spend, pubcoinId) = sigma::ParseSigmaSpend(txin);
-                } catch (...) {
+                } catch (const std::exception &) {
                     return false;
                 }
 
@@ -560,7 +560,7 @@ bool CHDMintTracker::IsMempoolSpendOurs(const std::set<uint256>& setMempool, con
                 std::unique_ptr<lelantus::JoinSplit> joinsplit;
                 try {
                     joinsplit = lelantus::ParseLelantusJoinSplit(tx);
-                } catch (...) {
+                } catch (const std::exception &) {
                     return false;
                 }
 

diff --git a/src/hdmint/wallet.cpp b/src/hdmint/wallet.cpp
@@ -1183,7 +1183,7 @@ bool CHDMintWallet::TxOutToPublicCoin(const CTxOut& txout, sigma::PublicCoin& pu
     secp_primitives::GroupElement publicSigma;
     try {
         publicSigma.deserialize(&coin_serialised[0]);
-    } catch (...) {
+    } catch (const std::exception &) {
         return state.DoS(100, error("TxOutToPublicCoin : deserialize failed"));
     }
 

diff --git a/src/lelantus.cpp b/src/lelantus.cpp
@@ -399,7 +399,7 @@ bool CheckLelantusJoinSplitTransaction(
             REJECT_MALFORMED,
             "CheckLelantusJoinSplitTransaction: invalid joinsplit transaction");
     }
-    catch (...) {
+    catch (const std::exception &) {
         return state.DoS(100,
                          false,
                          REJECT_MALFORMED,
@@ -441,8 +441,13 @@ bool CheckLelantusJoinSplitTransaction(
 
     for (const CTxOut &txout : tx.vout) {
         if (!txout.scriptPubKey.empty() && txout.scriptPubKey.IsLelantusJMint()) {
-            if (!CheckLelantusJMintTransaction(txout, state, hashTx, fStatefulSigmaCheck, Cout, lelantusTxInfo))
-                return false;
+            try {
+                if (!CheckLelantusJMintTransaction(txout, state, hashTx, fStatefulSigmaCheck, Cout, lelantusTxInfo))
+                    return false;
+            }
+            catch (const std::exception &x) {
+                return state.Error(x.what());
+            }
         } else if(txout.scriptPubKey.IsLelantusMint()) {
             return false; //putting regular mints at JoinSplit transactions is not allowed
         } else {
@@ -764,8 +769,13 @@ bool CheckLelantusTransaction(
     if (allowLelantus && !isVerifyDB) {
         for (const CTxOut &txout : tx.vout) {
             if (!txout.scriptPubKey.empty() && txout.scriptPubKey.IsLelantusMint()) {
-                if (!CheckLelantusMintTransaction(txout, state, hashTx, fStatefulSigmaCheck, lelantusTxInfo))
-                    return false;
+                try {
+                    if (!CheckLelantusMintTransaction(txout, state, hashTx, fStatefulSigmaCheck, lelantusTxInfo))
+                        return false;
+                }
+                catch (const std::exception &x) {
+                    return state.Error(x.what());
+                }
             }
         }
     }
@@ -786,10 +796,15 @@ bool CheckLelantusTransaction(
         }
 
         if (!isVerifyDB) {
-            if (!CheckLelantusJoinSplitTransaction(
-                tx, state, hashTx, isVerifyDB, nHeight, realHeight,
-                isCheckWallet, fStatefulSigmaCheck, sigmaTxInfo, lelantusTxInfo)) {
-                    return false;
+            try {
+                if (!CheckLelantusJoinSplitTransaction(
+                    tx, state, hashTx, isVerifyDB, nHeight, realHeight,
+                    isCheckWallet, fStatefulSigmaCheck, sigmaTxInfo, lelantusTxInfo)) {
+                        return false;
+                }
+            }
+            catch (const std::exception &x) {
+                return state.Error(x.what());
             }
         }
     }
@@ -812,7 +827,7 @@ void RemoveLelantusJoinSplitReferencingBlock(CTxMemPool& pool, CBlockIndex* bloc
                     try {
                         joinsplit = ParseLelantusJoinSplit(tx);
                     }
-                    catch (...) {
+                    catch (const std::exception &) {
                         txn_to_remove.push_back(tx);
                         break;
                     }
@@ -851,7 +866,7 @@ std::vector<Scalar> GetLelantusJoinSplitSerialNumbers(const CTransaction &tx, co
     try {
         return ParseLelantusJoinSplit(tx)->getCoinSerialNumbers();
     }
-    catch (...) {
+    catch (const std::exception &) {
         return std::vector<Scalar>();
     }
 }
@@ -863,7 +878,7 @@ std::vector<uint32_t> GetLelantusJoinSplitIds(const CTransaction &tx, const CTxI
     try {
         return ParseLelantusJoinSplit(tx)->getCoinGroupIds();
     }
-    catch (...) {
+    catch (const std::exception &) {
         return std::vector<uint32_t>();
     }
 }
@@ -1003,7 +1018,7 @@ bool GetOutPointFromBlock(COutPoint& outPoint, const GroupElement &pubCoinValue,
                 try {
                     ParseLelantusMintScript(txout.scriptPubKey, txPubCoinValue);
                 }
-                catch (...) {
+                catch (const std::exception &) {
                     continue;
                 }
                 if(pubCoinValue==txPubCoinValue){
@@ -1128,13 +1143,11 @@ void CLelantusState::Containers::RemoveMint(lelantus::PublicCoin const & pubCoin
 }
 
 void CLelantusState::Containers::AddSpend(Scalar const & serial, int coinGroupId) {
-    if (!mintMetaInfo.count(coinGroupId)) {
-        throw std::invalid_argument("group id doesn't exist");
+    if (mintMetaInfo.count(coinGroupId) > 0) {
+        usedCoinSerials[serial] = coinGroupId;
+        spendMetaInfo[coinGroupId] += 1;
+        CheckSurgeCondition();
     }
-
-    usedCoinSerials[serial] = coinGroupId;
-    spendMetaInfo[coinGroupId] += 1;
-    CheckSurgeCondition();
 }
 
 void CLelantusState::Containers::RemoveSpend(Scalar const & serial) {

diff --git a/src/liblelantus/lelantus_prover.cpp b/src/liblelantus/lelantus_prover.cpp
@@ -155,7 +155,7 @@ void LelantusProver::generate_sigma_proofs(
                 parallelTasks.emplace_back(threadPool.PostTask([&]() {
                     try {
                         prover.sigma_commit(commits, index, rA_i, rB_i, rC_i, rD_i, a_i, Tk_i, Pk_i, Yk_i, sigma_i, proof);
-                    } catch (...) {
+                    } catch (const std::exception &) {
                         return false;
                     }
                     return true;

diff --git a/src/libspark/coin.cpp b/src/libspark/coin.cpp
@@ -127,7 +127,7 @@ IdentifiedCoinData Coin::identify(const IncomingViewKey& incoming_view_key) {
 			// Decrypt recipient data
 			CDataStream stream = AEAD::decrypt_and_verify(this->K*incoming_view_key.get_s1(), "Mint coin data", this->r_);
 			stream >> r;
-		} catch (...) {
+		} catch (const std::exception &) {
 			throw std::runtime_error("Unable to identify coin");
 		}
 
@@ -142,7 +142,7 @@ IdentifiedCoinData Coin::identify(const IncomingViewKey& incoming_view_key) {
 			// Decrypt recipient data
 			CDataStream stream = AEAD::decrypt_and_verify(this->K*incoming_view_key.get_s1(), "Spend coin data", this->r_);
 			stream >> r;
-		} catch (...) {
+		} catch (const std::exception &) {
 			throw std::runtime_error("Unable to identify coin");
 		}
 

diff --git a/src/libspark/hash.cpp b/src/libspark/hash.cpp
@@ -83,7 +83,7 @@ Scalar Hash::finalize_scalar() {
             EVP_MD_CTX_free(state_finalize);
 
             return candidate;
-        } catch (...) {
+        } catch (const std::exception &) {
             counter++;
         }
     }
@@ -144,7 +144,7 @@ GroupElement Hash::finalize_group() {
             EVP_MD_CTX_free(state_finalize);
 
             return candidate;
-        } catch (...) {
+        } catch (const std::exception &) {
             counter++;
         }
     }

diff --git a/src/libspark/transcript.cpp b/src/libspark/transcript.cpp
@@ -139,7 +139,7 @@ Scalar Transcript::challenge(const std::string label) {
             EVP_MD_CTX_free(state_finalize);
 
             return candidate;
-        } catch (...) {
+        } catch (const std::exception &) {
             counter++;
         }
     }

diff --git a/src/libspark/util.cpp b/src/libspark/util.cpp
@@ -125,7 +125,7 @@ GroupElement SparkUtils::hash_generator(const std::string label) {
             EVP_MD_CTX_free(state_finalize);
 
             return candidate;
-        } catch (...) {
+        } catch (const std::exception &) {
             counter++;
         }
     }

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -244,7 +244,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
                 try {
                     nTxFee = lelantus::ParseLelantusJoinSplit(*wtx.tx)->getFee();
                 }
-                catch (...) {
+                catch (const std::exception &) {
                     //do nothing
                 }
             }

diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -65,7 +65,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
         if (isAllJoinSplitFromMe && wtx.tx->vin.size() > 0) {
             try {
                 nTxFee = lelantus::ParseLelantusJoinSplit(*wtx.tx)->getFee();
-            } catch (...) {
+            } catch (const std::exception &) {
                 // do nothing
             }
         }

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -127,7 +127,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             try {
                 jsplit = lelantus::ParseLelantusJoinSplit(tx);
             }
-            catch (...) {
+            catch (const std::exception &) {
                 continue;
             }
             in.push_back(Pair("nFees", ValueFromAmount(jsplit->getFee())));
@@ -143,7 +143,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             try {
                 sparkSpend = std::make_unique<spark::SpendTransaction>(spark::ParseSparkSpend(tx));
             }
-            catch (...) {
+            catch (const std::exception &) {
                 continue;
             }
             in.push_back(Pair("nFees", ValueFromAmount(sparkSpend->getFee())));

diff --git a/src/sigma.cpp b/src/sigma.cpp
@@ -455,8 +455,13 @@ bool CheckSigmaTransaction(
     if (allowSigma) {
         for (const CTxOut &txout : tx.vout) {
             if (!txout.scriptPubKey.empty() && txout.scriptPubKey.IsSigmaMint()) {
-                if (!CheckSigmaMintTransaction(txout, state, hashTx, fStatefulSigmaCheck, sigmaTxInfo))
-                    return false;
+                try {
+                    if (!CheckSigmaMintTransaction(txout, state, hashTx, fStatefulSigmaCheck, sigmaTxInfo))
+                        return false;
+                }
+                catch (const std::exception &x) {
+                    return state.Error(x.what());
+                }
             }
         }
     }
@@ -506,10 +511,15 @@ bool CheckSigmaTransaction(
         // Check vOut
         // Only one loop, we checked on the format before entering this case
         if (!isVerifyDB) {
-            if (!CheckSigmaSpendTransaction(
-                tx, denominations, state, hashTx, isVerifyDB, nHeight, realHeight,
-                isCheckWallet, fStatefulSigmaCheck, sigmaTxInfo)) {
-                    return false;
+            try {
+                if (!CheckSigmaSpendTransaction(
+                    tx, denominations, state, hashTx, isVerifyDB, nHeight, realHeight,
+                    isCheckWallet, fStatefulSigmaCheck, sigmaTxInfo)) {
+                        return false;
+                }
+            }
+            catch (const std::exception &x) {
+                return state.Error(x.what());
             }
         }
     }
@@ -663,7 +673,7 @@ bool GetOutPointFromBlock(COutPoint& outPoint, const GroupElement &pubCoinValue,
                                                       txout.scriptPubKey.end());
                 try {
                     txPubCoinValue.deserialize(&coin_serialised[0]);
-                } catch (...) {
+                } catch (const std::exception &) {
                     return false;
                 }
                 if(pubCoinValue==txPubCoinValue){