[CBR-466] fix address reported as unused during restoration

Author: kderme

wallet-new/src/Cardano/Wallet/Kernel/DB/HdWallet.hs

@@ -55,6 +55,7 @@ module Cardano.Wallet.Kernel.DB.HdWallet (
   , hdAccountName
   , hdAccountState
   , hdAccountStateCurrent
+  , hdAccountStateCurrentCombined
   , hdAccountStateUpToDate
   , hdAccountRestorationState
     -- *** Account state: up to date
@@ -475,6 +476,16 @@ hdAccountStateCurrent g = to $ \case
     HdAccountStateIncomplete st ->
       st ^. hdIncompleteCurrent   . unCheckpoints . _Wrapped . SNE.head . g
 
+hdAccountStateCurrentCombined :: (a -> a -> a)
+                              -> (forall c. IsCheckpoint c => Getter c a)
+                              -> Getter HdAccountState a
+hdAccountStateCurrentCombined combine g = to $ \case
+    HdAccountStateUpToDate st ->
+      st ^. hdUpToDateCheckpoints . unCheckpoints . _Wrapped . SNE.head . g
+    HdAccountStateIncomplete st ->
+      combine (st ^. hdIncompleteCurrent    . unCheckpoints . _Wrapped . SNE.head . g)
+              (st ^. hdIncompleteHistorical . unCheckpoints . _Wrapped . SNE.head . g)
+
 {-------------------------------------------------------------------------------
   Predicates and tests
 -------------------------------------------------------------------------------}

wallet-new/src/Cardano/Wallet/WalletLayer/Kernel/Conv.hs

@@ -200,7 +200,7 @@ toAddress acc hdAddress =
                      (V1 addressOwnership)
   where
     cardanoAddress   = hdAddress ^. HD.hdAddressAddress . fromDb
-    addressMeta      = acc ^. HD.hdAccountState . HD.hdAccountStateCurrent (cpAddressMeta cardanoAddress)
+    addressMeta      = acc ^. HD.hdAccountState . HD.hdAccountStateCurrentCombined (<>) (cpAddressMeta cardanoAddress)
     -- NOTE
     -- In this particular case, the address had to be known by us. As a matter
     -- of fact, to construct a 'WalletAddress', we have to be aware of pieces