From b7cae58244de0d1fbb8d69c6911ed0f1e7b6f7ee Mon Sep 17 00:00:00 2001
From: TheCharlatan <seb.kung@gmail.com>
Date: Wed, 22 Jun 2022 01:01:40 +0200
Subject: [PATCH] Swapd: Correct checkpoint data after rebase

---
 src/swapd/runtime.rs       | 12 ++++++------
 src/swapd/syncer_client.rs |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/swapd/runtime.rs b/src/swapd/runtime.rs
index 2e5c4529b..9ed2f310a 100644
--- a/src/swapd/runtime.rs
+++ b/src/swapd/runtime.rs
@@ -2243,12 +2243,12 @@ impl Runtime {
                             Request::SyncerTask(task),
                         )?;
                     }
-                    if xmr_addr_addendum.is_some() {
-                        let XmrAddressAddendum {
-                            view_key,
-                            spend_key,
-                            from_height,
-                        } = xmr_addr_addendum.expect("checked");
+                    if let Some(XmrAddressAddendum {
+                        view_key,
+                        spend_key,
+                        from_height,
+                    }) = xmr_addr_addendum
+                    {
                         let task = self.syncer_state.watch_addr_xmr(
                             spend_key,
                             view_key,
diff --git a/src/swapd/syncer_client.rs b/src/swapd/syncer_client.rs
index a632aa6e1..289fd6822 100644
--- a/src/swapd/syncer_client.rs
+++ b/src/swapd/syncer_client.rs
@@ -86,6 +86,7 @@ impl SyncerState {
     pub fn watch_tx_btc(&mut self, txid: Txid, tx_label: TxLabel) -> Task {
         let id = self.tasks.new_taskid();
         self.tasks.watched_txs.insert(id, tx_label);
+        self.tasks.txids.insert(tx_label, txid);
         info!(
             "{} | Watching {} transaction ({})",
             self.swap_id.bright_blue_italic(),