refactor: address code review feedback

- Add null check for pindex->pprev in BlockDisconnected
- Add address type validation in AddressIndex iterator loops
- Add outputIndex >= 0 validation in getspentinfo RPC
- Add EXCLUSIVE_LOCKS_REQUIRED(::cs_main) to MigrateOldIndexData
- Use const reference for SpentIndex::GetSpentInfo key parameter
- Move m_db to private section in AddressIndex
- Add missing <memory> include in addressindex.h
- Fix unused variable warning (use _ placeholder)
- Fix docstring in feature_spentindex.py
- Add .cpp patterns to non-backported.txt

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: UdjinM6

src/index/addressindex.cpp

@@ -60,7 +60,8 @@ bool AddressIndex::DB::ReadAddressIndex(const uint160& address_hash, const Addre
 
     while (pcursor->Valid()) {
         std::pair<uint8_t, CAddressIndexKey> key;
-        if (pcursor->GetKey(key) && key.first == DB_ADDRESSINDEX && key.second.m_address_bytes == address_hash) {
+        if (pcursor->GetKey(key) && key.first == DB_ADDRESSINDEX &&
+            key.second.m_address_type == type && key.second.m_address_bytes == address_hash) {
             if (end > 0 && key.second.m_block_height > end) {
                 break;
             }
@@ -89,7 +90,8 @@ bool AddressIndex::DB::ReadAddressUnspentIndex(const uint160& address_hash, cons
 
     while (pcursor->Valid()) {
         std::pair<uint8_t, CAddressUnspentKey> key;
-        if (pcursor->GetKey(key) && key.first == DB_ADDRESSUNSPENTINDEX && key.second.m_address_bytes == address_hash) {
+        if (pcursor->GetKey(key) && key.first == DB_ADDRESSUNSPENTINDEX &&
+            key.second.m_address_type == type && key.second.m_address_bytes == address_hash) {
             CAddressUnspentValue value;
             if (pcursor->GetValue(value)) {
                 entries.emplace_back(key.second, value);
@@ -116,7 +118,7 @@ bool AddressIndex::DB::EraseAddressIndex(const std::vector<CAddressIndexEntry>&
 {
     CDBBatch batch(*this);
 
-    for (const auto& [key, value] : entries) {
+    for (const auto& [key, _] : entries) {
         batch.Erase(std::make_pair(DB_ADDRESSINDEX, key));
     }
 
@@ -381,7 +383,7 @@ void AddressIndex::BlockDisconnected(const std::shared_ptr<const CBlock>& block,
     const CBlockIndex* best_block_index = CurrentIndex();
 
     // Only rewind if we have this block indexed
-    if (best_block_index && best_block_index->nHeight >= pindex->nHeight) {
+    if (best_block_index && best_block_index->nHeight >= pindex->nHeight && pindex->pprev) {
         if (!Rewind(best_block_index, pindex->pprev)) {
             error("%s: Failed to rewind %s to previous block after disconnect",
                  __func__, GetName());

src/index/addressindex.h

@@ -8,6 +8,7 @@
 #include <index/addressindex_types.h>
 #include <index/base.h>
 
+#include <memory>
 #include <vector>
 
 static constexpr bool DEFAULT_ADDRESSINDEX{false};
@@ -24,8 +25,11 @@ class AddressIndex final : public BaseIndex
 {
 protected:
     class DB;
+
+private:
     const std::unique_ptr<DB> m_db;
 
+protected:
     class DB : public BaseIndex::DB
     {
     public:

src/index/spentindex.cpp

@@ -152,7 +152,7 @@ void SpentIndex::BlockDisconnected(const std::shared_ptr<const CBlock>& block, c
     const CBlockIndex* best_block_index = CurrentIndex();
 
     // Only rewind if we have this block indexed
-    if (best_block_index && best_block_index->nHeight >= pindex->nHeight) {
+    if (best_block_index && best_block_index->nHeight >= pindex->nHeight && pindex->pprev) {
         if (!Rewind(best_block_index, pindex->pprev)) {
             error("%s: Failed to rewind %s to previous block after disconnect",
                  __func__, GetName());
@@ -162,7 +162,7 @@ void SpentIndex::BlockDisconnected(const std::shared_ptr<const CBlock>& block, c
 
 BaseIndex::DB& SpentIndex::GetDB() const { return *m_db; }
 
-bool SpentIndex::GetSpentInfo(CSpentIndexKey& key, CSpentIndexValue& value) const
+bool SpentIndex::GetSpentInfo(const CSpentIndexKey& key, CSpentIndexValue& value) const
 {
     if (!BlockUntilSyncedToCurrentChain()) {
         return false;

src/index/spentindex.h

@@ -73,7 +73,7 @@ class SpentIndex final : public BaseIndex
     virtual ~SpentIndex() override;
 
     /// Retrieve spent information for a specific output
-    bool GetSpentInfo(CSpentIndexKey& key, CSpentIndexValue& value) const;
+    bool GetSpentInfo(const CSpentIndexKey& key, CSpentIndexValue& value) const;
 };
 
 /// Global SpentIndex instance

src/index/timestampindex.cpp

@@ -93,8 +93,8 @@ void TimestampIndex::BlockDisconnected(const std::shared_ptr<const CBlock>& bloc
     // to remove this block's data
     const CBlockIndex* best_block_index = CurrentIndex();
 
-    // Only rewind if we have this block indexed
-    if (best_block_index && best_block_index->nHeight >= pindex->nHeight) {
+    // Only rewind if we have this block indexed and it's not the genesis block
+    if (best_block_index && best_block_index->nHeight >= pindex->nHeight && pindex->pprev) {
         if (!Rewind(best_block_index, pindex->pprev)) {
             error("%s: Failed to rewind %s to previous block after disconnect",
                  __func__, GetName());

src/rpc/node.cpp

@@ -811,6 +811,10 @@ static RPCHelpMan getspentinfo()
     uint256 txid = ParseHashV(txidValue, "txid");
     int outputIndex = indexValue.getInt<int>();
 
+    if (outputIndex < 0) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid index (must be non-negative)");
+    }
+
     if (!g_spentindex) {
         throw JSONRPCError(RPC_MISC_ERROR, "Spent index is not enabled. Start with -spentindex to enable.");
     }

src/txdb.h

@@ -94,7 +94,7 @@ class CBlockTreeDB : public CDBWrapper
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     /// Migrate old synchronous index data to new async index databases
-    bool MigrateOldIndexData();
+    bool MigrateOldIndexData() EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 };
 
 #endif // BITCOIN_TXDB_H

test/functional/feature_spentindex.py

@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #
-# Test addressindex generation and fetching
+# Test spentindex generation and fetching
 #
 
 from decimal import Decimal

test/util/data/non-backported.txt

@@ -18,8 +18,11 @@ src/evo/*.cpp
 src/evo/*.h
 src/governance/*.cpp
 src/governance/*.h
+src/index/addres*.cpp
 src/index/addres*.h
+src/index/spent*.cpp
 src/index/spent*.h
+src/index/timestamp*.cpp
 src/index/timestamp*.h
 src/instantsend/*.cpp
 src/instantsend/*.h