Swapd: Revert changes to tx removal to invalidate prior states

farcaster-project · Jun 28, 2022 · 307d529 · 307d529
1 parent ce66697
commit 307d529
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/swapd/runtime.rs b/src/swapd/runtime.rs
@@ -1366,9 +1366,9 @@ impl Runtime {
                             self.send_ctl(endpoints, ServiceId::Wallet, swap_success_req.clone())?;
                             self.send_ctl(endpoints, ServiceId::Farcasterd, swap_success_req)?;
                             // remove txs from outdated states
-                            self.txs.remove(&TxLabel::Lock);
                             self.txs.remove(&TxLabel::Cancel);
                             self.txs.remove(&TxLabel::Refund);
+                            self.txs.remove(&TxLabel::Buy);
                             self.txs.remove(&TxLabel::Punish);
                         }
                     }
@@ -1712,8 +1712,6 @@ impl Runtime {
                                     swap_success_req.clone(),
                                 )?;
                                 self.send_ctl(endpoints, ServiceId::Farcasterd, swap_success_req)?;
-                                // remove txs from outdated states
-                                self.txs.remove(&TxLabel::Lock);
                                 self.txs.remove(&TxLabel::Buy);
                                 self.txs.remove(&TxLabel::Cancel);
                                 self.txs.remove(&TxLabel::Punish);
@@ -1816,7 +1814,6 @@ impl Runtime {
                                 )?;
                                 self.send_ctl(endpoints, ServiceId::Farcasterd, swap_success_req)?;
                                 // remove txs from outdated states
-                                self.txs.remove(&TxLabel::Lock);
                                 self.txs.remove(&TxLabel::Cancel);
                                 self.txs.remove(&TxLabel::Refund);
                                 self.txs.remove(&TxLabel::Buy);
@@ -1859,8 +1856,7 @@ impl Runtime {
                                     swap_success_req.clone(),
                                 )?;
                                 self.send_ctl(endpoints, ServiceId::Farcasterd, swap_success_req)?;
-                                // remove txs from outdated states
-                                self.txs.remove(&TxLabel::Lock);
+                                // remove txs to invalidate outdated states
                                 self.txs.remove(&TxLabel::Cancel);
                                 self.txs.remove(&TxLabel::Refund);
                                 self.txs.remove(&TxLabel::Buy);