Deal with runaway exceptions

src/batchproof_container.cpp

@@ -208,7 +208,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;
@@ -311,7 +311,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;

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)

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;

src/chainparams.cpp

@@ -420,7 +420,7 @@ class CMainParams : public CChainParams {
  GroupElement coin;
  try {
  coin.deserialize(ParseHex(str).data());
- } catch (...) {
+ } catch (const std::exception &) {
  continue;
  }
  consensus.lelantusBlacklist.insert(coin);
@@ -430,7 +430,7 @@ class CMainParams : public CChainParams {
  GroupElement coin;
  try {
  coin.deserialize(ParseHex(str).data());
- } catch (...) {
+ } catch (const std::exception &) {
  continue;
  }
  consensus.sigmaBlacklist.insert(coin);
@@ -717,7 +717,7 @@ class CTestNetParams : public CChainParams {
  GroupElement coin;
  try {
  coin.deserialize(ParseHex(str).data());
- } catch (...) {
+ } catch (const std::exception &) {
  continue;
  }
  consensus.lelantusBlacklist.insert(coin);

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;

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);
  }

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);
  }
 }

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;
  }
 

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"));
  }
 

src/lelantus.cpp

@@ -391,7 +391,7 @@ bool CheckLelantusJoinSplitTransaction(
  REJECT_MALFORMED,
  "CheckLelantusJoinSplitTransaction: invalid joinsplit transaction");
  }
- catch (...) {
+ catch (const std::exception &) {
  return state.DoS(100,
  false,
  REJECT_MALFORMED,
@@ -433,8 +433,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 {
@@ -537,6 +542,13 @@ bool CheckLelantusJoinSplitTransaction(
  anonymity_sets[idAndHash.first] = anonymity_set;
  }
 
+ const std::vector<uint32_t>& ids = joinsplit->getCoinGroupIds();
+ for (const auto& id: ids) {
+ if (!anonymity_sets.count(id))
+ return state.DoS(100,
+ error("CheckLelantusJoinSplitTransaction: No anonymity set found."));
+ }
+
  BatchProofContainer* batchProofContainer = BatchProofContainer::get_instance();
  bool useBatching = batchProofContainer->fCollectProofs && !isVerifyDB && !isCheckWallet && lelantusTxInfo && !lelantusTxInfo->fInfoIsComplete;
 
@@ -740,8 +752,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());
+ }
  }
  }
  }
@@ -762,10 +779,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());
  }
  }
  }
@@ -788,7 +810,7 @@ void RemoveLelantusJoinSplitReferencingBlock(CTxMemPool& pool, CBlockIndex* bloc
  try {
  joinsplit = ParseLelantusJoinSplit(tx);
  }
- catch (...) {
+ catch (const std::exception &) {
  txn_to_remove.push_back(tx);
  break;
  }
@@ -827,7 +849,7 @@ std::vector<Scalar> GetLelantusJoinSplitSerialNumbers(const CTransaction &tx, co
  try {
  return ParseLelantusJoinSplit(tx)->getCoinSerialNumbers();
  }
- catch (...) {
+ catch (const std::exception &) {
  return std::vector<Scalar>();
  }
 }
@@ -839,7 +861,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>();
  }
 }
@@ -899,15 +921,17 @@ bool ConnectBlockLelantus(
  )) {
  return false;
  }
+ }
 
- if (!fJustCheck) {
+ if (!fJustCheck) {
+ BOOST_FOREACH(auto& serial, pblock->lelantusTxInfo->spentSerials) {
  pindexNew->lelantusSpentSerials.insert(serial);
  lelantusState.AddSpend(serial.first, serial.second);
  }
  }
-
- if (fJustCheck)
+ else {
  return true;
+ }
 
  const auto& params = ::Params().GetConsensus();
  CHash256 hash;
@@ -979,7 +1003,7 @@ bool GetOutPointFromBlock(COutPoint& outPoint, const GroupElement &pubCoinValue,
  try {
  ParseLelantusMintScript(txout.scriptPubKey, txPubCoinValue);
  }
- catch (...) {
+ catch (const std::exception &) {
  continue;
  }
  if(pubCoinValue==txPubCoinValue){
@@ -1098,13 +1122,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) {
@@ -1294,9 +1316,8 @@ void CLelantusState::RemoveBlock(CBlockIndex *index) {
  // roll back coin group updates
  for (auto &coins : index->lelantusMintedPubCoins)
  {
- if (coinGroups.count(coins.first) == 0) {
- throw std::invalid_argument("Group Id does not exist");
- }
+ if (coinGroups.count(coins.first) == 0)
+ continue;
 
  LelantusCoinGroupInfo& coinGroup = coinGroups[coins.first];
  auto nMintsToForget = coins.second.size();

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;

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
  }
  }

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
  }
  }

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())));

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());
  }
  }
  }
@@ -631,15 +641,17 @@ bool ConnectBlockSigma(
  )) {
  return false;
  }
+ }
 
- if (!fJustCheck) {
+ if (!fJustCheck) {
+ BOOST_FOREACH(auto& serial, pblock->sigmaTxInfo->spentSerials) {
  pindexNew->sigmaSpentSerials.insert(serial);
  sigmaState.AddSpend(serial.first, serial.second.denomination, serial.second.coinGroupId);
  }
  }
-
- if (fJustCheck)
+ else {
  return true;
+ }
 
  sigmaState.AddMintsToStateAndBlockIndex(pindexNew, pblock);
  }
@@ -663,7 +675,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){

src/test/lelantus_state_tests.cpp

@@ -187,9 +187,6 @@ BOOST_AUTO_TEST_CASE(serial_adding)
 
  BOOST_CHECK(!lelantusState->IsUsedCoinSerial(serial2));
  BOOST_CHECK(!lelantusState->IsUsedCoinSerialHash(receivedSerial, serialHash2));
-
- // add serials to group that doesn't exist, should fail
- BOOST_CHECK_THROW(lelantusState->AddSpend(Scalar(1), 100), std::invalid_argument);
 }
 
 BOOST_AUTO_TEST_CASE(mempool)