From 7c08ccf19bf0a7970f543a3756d8861f81c17197 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:00:00 +0300
Subject: [PATCH] wallet: Avoid updating `ReserveDestination::nIndex` when
 `GetReservedDestination` fails

Github-Pull: bitcoin/bitcoin#29510
Rebased-From: 367bb7a80cc71130995672c853d4a6e0134721d6
---
 src/wallet/wallet.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 0d664a45399..e6276d7f78c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2596,8 +2596,10 @@ util::Result<CTxDestination> ReserveDestination::GetReservedDestination(bool int
 
     if (nIndex == -1) {
         CKeyPool keypool;
-        auto op_address = m_spk_man->GetReservedDestination(type, internal, nIndex, keypool);
+        int64_t index;
+        auto op_address = m_spk_man->GetReservedDestination(type, internal, index, keypool);
         if (!op_address) return op_address;
+        nIndex = index;
         address = *op_address;
         fInternal = keypool.fInternal;
     }