waddrmgr: Put client request first in recovery.

wallet/wallet.go

@@ -790,16 +790,24 @@ func (w *Wallet) recovery(chainClient chain.Interface,
 		if len(recoveryBatch) == recoveryBatchSize || height == bestHeight {
 			err := walletdb.Update(w.db, func(tx walletdb.ReadWriteTx) error {
 				ns := tx.ReadWriteBucket(waddrmgrNamespaceKey)
+				err := w.recoverScopedAddresses(
+					chainClient, tx, ns, recoveryBatch,
+					recoveryMgr.State(), scopedMgrs,
+				)
+				if err != nil {
+					return err
+				}
+				// TODO: Any error here will roll back this
+				// entire tx. This may cause the in memory sync
+				// point to become desyncronized. Refactor so
+				// that that cannot happen.
 				for _, block := range blocks {
 					err := w.Manager.SetSyncedTo(ns, block)
 					if err != nil {
 						return err
 					}
 				}
-				return w.recoverScopedAddresses(
-					chainClient, tx, ns, recoveryBatch,
-					recoveryMgr.State(), scopedMgrs,
-				)
+				return nil
 			})
 			if err != nil {
 				return err