From a29a40b0d927e65506136da92edf183093bc45f5 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Thu, 18 Oct 2018 12:38:43 -0400
Subject: [PATCH] refines %sunk discontinuity notifications

still not completely correct ...
---
 sys/vane/ames.hoon | 20 +++++++++++++-------
 sys/vane/dill.hoon |  5 ++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon
index 9cbacb4faa..a30848beeb 100644
--- a/sys/vane/ames.hoon
+++ b/sys/vane/ames.hoon
@@ -1466,15 +1466,21 @@
           fox(bad (~(put in bad.fox) p.kyz))
         ::
             %sunk
-          =/  con=corn  (~(got by zac.fox) p.kyz)
-          =.  con       con(wab (~(del by wab.con) p.kyz))
-          =/  suf=sufi  (~(got by urb.ton.fox) p.kyz)
-          =.  suf       suf(hoc (~(del by hoc.suf) p.kyz))
+          ::  XX single-home properly
           ::
-          :-  ~
+          =/  our=ship
+            =/  key  ~(key by urb.ton.fox)
+            ?>(?=([@ ~ ~] key) n.key)
+          =*  who  p.kyz
+          =/  con=corn  (~(got by zac.fox) our)
+          =.  con       con(wab (~(del by wab.con) who))
+          =/  suf=sufi  (~(got by urb.ton.fox) our)
+          =.  suf       suf(hoc (~(del by hoc.suf) who))
+          ::
+          :-  [%wine [our who] " has sunk"]~
           %=  fox
-            zac      (~(put by zac.fox) p.kyz con)
-            urb.ton  (~(put by urb.ton.fox) p.kyz suf)
+            zac      (~(put by zac.fox) our con)
+            urb.ton  (~(put by urb.ton.fox) our suf)
           ==
         ::
             %wake
diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon
index 1e3e163904..b758448afd 100644
--- a/sys/vane/dill.hoon
+++ b/sys/vane/dill.hoon
@@ -158,7 +158,6 @@
                  (crud p.kyz q.kyz)
           $blew  (send %rez p.p.kyz q.p.kyz)
           $heft  heft
-          $sunk  +>
           $veer  (dump kyz)
           $vega  (dump kyz)
           $velo  (dump kyz)
@@ -540,6 +539,10 @@
     =/  not=note-dill
       ?:(?=([%crud %hax-heft ~] p.q.hic) [%heft ~] p.q.hic)
     [[u.hey.all %slip %d not]~ ..^$]
+  ::  a %sunk notification from %jail comes in on an unfamiliar duct
+  ::
+  ?:  ?=(%sunk -.q.hic)
+    [~ ..^$]
   ::
   =/  nus  (ax hen)
   ?~  nus