Merge #7740: fix: various fixes and improvements for v24 release

07ab48f fix(qt): don't credit OP_RETURN outputs to the wallet in received txs (Konstantin Akimov)
515ab08 fix(net): make better bounding for the oversized NOTFOUND (Konstantin Akimov)
f891d06 test: run feature_llmq_chainlocks with -spentindex (Konstantin Akimov)
cb876e4 fix: don't hold cs_main across TxToJSON in getspecialtxes (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  See each commit.

  ## What was done?
   - fix: don't hold cs_main across TxToJSON in getspecialtxes
   - test: run feature_llmq_chainlocks with -spentindex
   - fix(net): make better bounding for the oversized NOTFOUND
   - fix(qt): don't credit OP_RETURN outputs to the wallet in received txs

  ## How Has This Been Tested?
  Run unit & functional tests

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

Top commit has no ACKs.

Tree-SHA512: 86c1eceee731da934d166722721797b111f80707992c47b40befababd01993d9c0eac48452acf7b25da561fe820250dcc49acd6a01e8f5d3806ab9499d34ed35

Author: PastaPastaPasta

src/net_processing.cpp

@@ -5743,9 +5743,11 @@ void PeerManagerImpl::ProcessMessage(
         // Remove the NOTFOUND objects from the peer
         std::vector<CInv> vInv;
         vRecv >> vInv;
-        // A malicious peer can send a NOTFOUND entry per tracked announcement, so bound the
-        // message size by the announcement cap rather than the (soft) in-flight limit.
-        if (vInv.size() > MAX_PEER_OBJECT_ANNOUNCEMENTS + MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
+        // A malicious peer can send a NOTFOUND entry per tracked announcement, and every
+        // entry costs a tracker lookup under m_object_request_mutex, so bound the message
+        // by the announcement cap. That cap alone exceeds what a message can carry, so
+        // clamp it to MAX_INV_SZ, the bound INV and GETDATA already use.
+        if (vInv.size() > std::min<size_t>(MAX_INV_SZ, MAX_PEER_OBJECT_ANNOUNCEMENTS + MAX_BLOCKS_IN_TRANSIT_PER_PEER)) {
             Misbehaving(*peer, 20, strprintf("notfound message size = %u", vInv.size()));
             return;
         }

src/qt/transactionrecord.cpp

@@ -137,7 +137,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(interfaces::Nod
             else if (!wtx.is_coinbase && !is_asset_lock && IsDataScript(txout.scriptPubKey))
             {
                 TransactionRecord sub(hash, nTime);
-                sub.credit = txout.nValue;
                 sub.idx = i;
                 sub.involvesWatchAddress = false;
                 sub.strAddress = "";

src/rpc/blockchain.cpp

@@ -2485,7 +2485,6 @@ static RPCHelpMan getspecialtxes()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
     ChainstateManager& chainman = EnsureChainman(node);
-    LOCK(cs_main);
 
     const CTxMemPool& mempool = EnsureMemPool(node);
     const llmq::CInstantSendManager& isman = EnsureInstantSendManager(node);
@@ -2520,7 +2519,7 @@ static RPCHelpMan getspecialtxes()
         }
     }
 
-    const CBlockIndex* pblockindex = chainman.m_blockman.LookupBlockIndex(blockhash);
+    const CBlockIndex* pblockindex = WITH_LOCK(cs_main, return chainman.m_blockman.LookupBlockIndex(blockhash));
     if (!pblockindex) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
     }

test/functional/feature_llmq_chainlocks.py

@@ -23,7 +23,7 @@ def add_options(self, parser):
         self.add_wallet_options(parser)
 
     def set_test_params(self):
-        self.set_dash_test_params(5, 4)
+        self.set_dash_test_params(5, 4, [["-spentindex"]] * 5)
         self.delay_v20_and_mn_rr(height=200)
 
     def sleep_and_assert_no_cl(self, block_hash, sleep_time=5):