Merge branch 'lf/fix-watch-ack'

pkg/arvo/lib/pull-hook.hoon

@@ -114,6 +114,15 @@
       state-3
       state-4
   ==
+::  +diplomatic: only renegotiate if versions changed
+::    
+::    If %.n please leave note as to why renegotiation necessary
+::    
+::    - Fixing incorrectly held unversioned subscriptions
+::
+++  diplomatic
+  ^-  ?
+  %.n
 ::
 ++  default
   |*  [pull-hook=* =config]
@@ -239,6 +248,7 @@
         =/  kick=(list card)
           ?:  ?&  =(min-version.config prev-min-version.old)
                   =(version.config prev-version.old)
+                  diplomatic
               ==
             ~
           (poke-self:pass kick+!>(%kick))^~
@@ -439,6 +449,7 @@
         ?~  tan  tr-core
         ?.  versioned
           (tr-ap-og:tr-cleanup |.((on-pull-nack:og rid u.tan)))
+        %-  (slog leaf+"versioned nack for {<rid>} in {<dap.bowl>}" u.tan)
         =/  pax
           (kick-mule:virt rid |.((on-pull-kick:og rid)))
         ?~  pax  tr-failed-kick
@@ -463,18 +474,18 @@
             ::  subscription
             tr-core
           (tr-suspend-pub-ver min-version.config)
-        =/  =vase
+        =/  =^cage
           (convert-to:ver cage)
         =/  =wire
           (make-wire /store)
-        =+  resources=(~(gas in *(set resource)) (resource-for-update:og vase))
+        =+  resources=(~(gas in *(set resource)) (resource-for-update:og q.cage))
         ?>  ?|  no-validate.config
             ?&  (check-src resources)
                 (~(has in resources) rid)
             ==  ==
         =/  =mark
           (append-version:ver version.config)
-        (tr-emit (~(poke-our pass wire) store-name.config mark vase))
+        (tr-emit (~(poke-our pass wire) store-name.config cage))
       --
     ::
     ++  tr-kick

pkg/arvo/lib/push-hook.hoon

@@ -73,6 +73,16 @@
       state-1
       state-2
   ==
+::  +diplomatic: only renegotiate if versions changed
+::    
+::    If %.n please leave note as to why renegotiation necessary
+::    
+::    - Fixing incorrectly held unversioned subscriptions
+::
+++  diplomatic
+  ^-  ?
+  %.n
+::
 ++  push-hook
   |*  =config
   $_  ^|
@@ -221,6 +231,7 @@
         |=  [prev-min-version=@ud prev-version=@ud]
         ?:  ?&  =(min-version.config prev-min-version)
                 =(prev-version version.config)
+                diplomatic
             ==
           ::  bail on kick if we didn't change versions
           ~
@@ -291,23 +302,21 @@
       ?.  (supported:ver mark)
         :_  this
         (fact-init-kick:io version+!>(min-version.config))
-      =/  =vase
-        (convert-to:ver mark (initial-watch:og t.t.t.t.t.t.path resource))
       :_  this
-      [%give %fact ~ mark vase]~
+      =-  [%give %fact ~ -]~
+      (convert-to:ver mark (initial-watch:og t.t.t.t.t.t.path resource))
       ::
       ++  unversioned
         ?>  ?=([%ship @ @ *] t.path)
-        ?.  =(min-version.config 0)
-           ~&  >>>  "unversioned req from: {<src.bowl>}, nooping"
-           `this
         =/  =resource
           (de-path:resource t.path)
         =/   =vase 
-          %+  convert-to:ver  update-mark.config
           (initial-watch:og t.t.t.t.path resource)
         :_  this
-        [%give %fact ~ update-mark.config vase]~
+        ?.  =(min-version.config 0)
+           ~&  >>>  "unversioned req from: {<src.bowl>}, nooping"
+           ~
+        [%give %fact ~ (convert-to:ver update-mark.config vase)]~
       --
     ::
     ++  on-agent
@@ -461,10 +470,7 @@
       |=  [fact-ver=@ud paths=(set path)]
       =/  =mark
         (append-version:ver fact-ver)
-      =/  =^cage
-        :-  mark
-        (convert-from:ver mark q.cage)
-      (fact:io cage ~(tap in paths))
+      (fact:io (convert-from:ver mark q.cage) ~(tap in paths))
     ::  TODO: deprecate
     ++  unversioned
       ?.  =(min-version.config 0)  ~
@@ -474,18 +480,15 @@
         %-  ~(gas in *(set path))
         (turn (incoming-subscriptions prefix) tail)
       ?:  =(0 ~(wyt in unversioned))  ~
-      =/  =^cage
-        :-  update-mark.config
-        (convert-from:ver update-mark.config q.cage)
-      (fact:io cage ~(tap in unversioned))^~
+      (fact:io (convert-from:ver update-mark.config q.cage) ~(tap in unversioned))^~
     --
   ::
   ++  forward-update
     |=  =cage
     ^-  (list card:agent:gall)
     =-  lis
-    =/  vas
-      (convert-to:ver cage)
+    =/  vas=vase
+      q:(convert-to:ver cage)
     %+  roll  (resource-for-update q.cage)
     |=  [rid=resource [lis=(list card:agent:gall) tf-vas=(unit vase)]]
     ^-  [(list card:agent:gall) (unit vase)]

pkg/arvo/lib/versioning.hoon

@@ -29,11 +29,12 @@
   &((gte ver min) (lte ver version))
 ::
 ++  convert-to
-  |=  =cage
-  ^-  vase
-  ?:  =(p.cage current-version)
-    q.cage
-  ((tube-to p.cage) q.cage)
+  |=  [=mark =vase]
+  ^-  cage
+  :-  current-version
+  ?:  =(mark current-version)
+    vase
+  ((tube-to mark) vase)
 ::
 ++  tube-to
   |=  =mark
@@ -44,10 +45,11 @@
   .^(tube:clay %cc (scry:io %home /[current-version]/[mark]))
 ::
 ++  convert-from
-  |=  =cage
-  ^-  vase
-  ?:  =(p.cage current-version)
-    q.cage
-  ((tube-from p.cage) q.cage)
+  |=  [=mark =vase]
+  ^-  cage
+  :-  mark
+  ?:  =(mark current-version)
+    vase
+  ((tube-from mark) vase)
 --