Fix: merge swaps

atomex-protocol · Jan 20, 2022 · f03b1b7 · f03b1b7
1 parent f8f4458
commit f03b1b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cmd/watch_tower/swap.go b/cmd/watch_tower/swap.go
@@ -29,3 +29,11 @@ func (swap *Swap) Leg() *tools.Leg {
 	}
 	return nil
 }
+
+func (swap *Swap) merge(update tools.Swap) {
+	if update.HashedSecret.String() != swap.HashedSecret.String() || update.Status < swap.Status {
+		return
+	}
+
+	swap.Swap = update
+}
diff --git a/cmd/watch_tower/watch_tower.go b/cmd/watch_tower/watch_tower.go
@@ -103,7 +103,7 @@ func (wt *WatchTower) listen(ctx context.Context) {
 				s = &Swap{swap, 0}
 				wt.swaps[swap.HashedSecret] = s
 			} else {
-				s.Swap = swap
+				s.merge(swap)
 			}
 
 			if err := wt.onSwap(ctx, s); err != nil {