Merge 903fc971ed into c5e44a0435

32d55e28af test: Use the correct node for doubled keypath test (Ava Chow)

Pull request description:

  #29124 had a silent merge conflict with #32350 which resulted in it using the wrong node. Fix the test to use the correct v22 node.

ACKs for top commit:
  maflcko:
    lgtm ACK 32d55e28af
  rkrux:
    ACK 32d55e28af
  BrandonOdiwuor:
    Code Review ACK 32d55e28af

Tree-SHA512: 1e0231985beb382b16e1d608c874750423d0502388db0c8ad450b22d17f9d96f5e16a6b44948ebda5efc750f62b60d0de8dd20131f449427426a36caf374af92

cmake/script/GenerateBuildInfo.cmake

@@ -40,6 +40,22 @@ if(NOT "$ENV{BITCOIN_GENBUILD_NO_GIT}" STREQUAL "1")
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
     )
+    if(IS_INSIDE_WORK_TREE)
+      # This check ensures that we are actually part of the intended git repository, and not just getting info about some unrelated git repository that the code happens to be in a directory under
+      execute_process(
+        COMMAND ${GIT_EXECUTABLE} status --porcelain -uall --ignored cmake/script/GenerateBuildInfo.cmake
+        WORKING_DIRECTORY ${WORKING_DIR}
+        RESULT_VARIABLE SCRIPT_STATUS_EXITCODE
+        OUTPUT_VARIABLE SCRIPT_STATUS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+      )
+      if(SCRIPT_STATUS_EXITCODE)
+        set(IS_INSIDE_WORK_TREE 0)
+      elseif(SCRIPT_STATUS MATCHES "^$|\\?")
+        set(IS_INSIDE_WORK_TREE 0)
+      endif()
+    endif()
     if(IS_INSIDE_WORK_TREE)
       # Clean 'dirty' status of touched files that haven't been modified.
       execute_process(

test/functional/wallet_backwards_compatibility.py

@@ -87,7 +87,7 @@ class BackwardsCompatibilityTest(BitcoinTestFramework):
         # 0.21.x and 22.x would both produce bad derivation paths when topping up an inactive hd chain
         # Make sure that this is being automatically cleaned up by migration
         node_master = self.nodes[1]
-        node_v22 = self.nodes[self.num_nodes - 5]
+        node_v22 = self.nodes[self.num_nodes - 3]
         wallet_name = "bad_deriv_path"
         node_v22.createwallet(wallet_name=wallet_name, descriptors=False)
         bad_deriv_wallet = node_v22.get_wallet_rpc(wallet_name)