From 00f50013853ffd54c5de2f02b4f6fd7e04efc2d0 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Mon, 12 Dec 2022 10:09:22 +0200
Subject: [PATCH] cormorant: fix scan date of nested wallet import

---
 .../sparrow/net/cormorant/bitcoind/BitcoindClient.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java b/src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java
index 27ce78bc..0152f828 100644
--- a/src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java
+++ b/src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java
@@ -169,7 +169,7 @@ public class BitcoindClient {
                     if(childWallet.isNested()) {
                         for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
                             for(WalletNode addressNode : childWallet.getNode(keyPurpose).getChildren()) {
-                                outputDescriptors.put(OutputDescriptor.normalize(OutputDescriptor.toDescriptorString(addressNode.getAddress())), getScanDate(wallet, null));
+                                outputDescriptors.put(OutputDescriptor.normalize(OutputDescriptor.toDescriptorString(addressNode.getAddress())), getScanDate(childWallet, null));
                             }
                         }
                     }
@@ -200,7 +200,7 @@ public class BitcoindClient {
             forceRescan = true;
         }
 
-        return new ScanDate(wallet.getBirthDate(), range, forceRescan);
+        return new ScanDate(wallet.getBirthDate() == null && !wallet.isMasterWallet() ? wallet.getMasterWallet().getBirthDate() : wallet.getBirthDate(), range, forceRescan);
     }
 
     private void importDescriptors(Map<String, ScanDate> descriptors) {