Merge remote-tracking branch 'origin/scry-safe-mule' into philip/mall-real

bin/brass.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6143926c8a07a3d2a38abf2be0d3d1ef46315bf1ae13b5401113082ddbe481ec
-size 12650146
+oid sha256:acd24dbae33439a2a2d6ad1658dd6a8a8aebd153ba19358340bd3a68febd3d03
+size 11104450

bin/ivory.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42ae74a4f2997ff13ec9c9c19d2019ab44852dc8c69937d70d29607c4cefdf59
-size 5882422
+oid sha256:933d3437fa16c793ebd627d6d9121c47cef7ea28320ea5c4dc2fee5e14c3fd49
+size 6114638

pkg/arvo/sys/arvo.hoon

@@ -64,7 +64,7 @@
 ++  sley  $-  {* (unit (set monk)) term beam}           ::  namespace function
           (unit (unit cage))                            ::
 ++  slyd  $-  {* (unit (set monk)) term beam}           ::  super advanced
-          (unit (unit (cask)))                          ::
+          (unit (unit (cask milt)))                     ::
 ++  slyt  $-({* *} (unit (unit)))                       ::  old namespace
 +$  vane  [=vase =worm]
 ++  vile                                                ::  reflexive constants
@@ -112,10 +112,18 @@
   ?~  dyc  ~
   ?.  ?=(^ ved)  ~
   =/  ron=@tas  u.hyr
-  =+  bed=[[u.fal u.dyc (case p.u.ved)] (flop tyl)]
-  =+  bop=(sod ref ~ ron bed)
+  =/  bed=beam
+    [[u.fal u.dyc (case p.u.ved)] (flop tyl)]
+  =/  bop=(unit (unit (cask milt)))
+    (sod ref ~ ron bed)
   ?~  bop  ~
   ?~  u.bop  [~ ~]
+  ::  XX figure out wth to do about hoon-version
+  ::
+  ?.  ?&  ?=([?(%151 %141) *] ref)
+          -:(~(nets wa *worm) +.ref -.q.u.u.bop)
+      ==
+    ~>(%slog.[0 leaf+"arvo: scry-lost"] ~)
   [~ ~ +.q.u.u.bop]
 ::  +sloy-light: minimal parsing version of sloy
 ::
@@ -135,10 +143,18 @@
   |=  [ref=* ron=@tas fal=@p dyc=@tas ved=case tyl=path]
   ::  we do not flop tyl because tyl wouldn't have been flopped by +en-beam
   ::
-  =+  bed=[[fal dyc ved] tyl]
-  =+  bop=(sod ref ~ ron bed)
+  =/  bed=beam
+    [[fal dyc ved] tyl]
+  =/  bop=(unit (unit (cask milt)))
+    (sod ref ~ ron bed)
   ?~  bop  ~
   ?~  u.bop  [~ ~]
+  ::  XX figure out wth to do about hoon-version
+  ::
+  ?.  ?&  ?=([?(%151 %141) *] ref)
+          -:(~(nets wa *worm) +.ref -.q.u.u.bop)
+      ==
+    ~>(%slog.[0 leaf+"arvo: scry-dark"] ~)
   [~ ~ +.q.u.u.bop]
 ::
 ++  symp                                                ::  symbol or empty
@@ -350,7 +366,7 @@
               ren/@t
               bed/beam
           ==
-      ^-  (unit (unit (cask)))
+      ^-  (unit (unit (cask milt)))
       ::  ~&  [%arvo-scry ren bed]
       =/  old=scry-sample
         :*  fur
@@ -360,10 +376,10 @@
             `coin`[%$ r.bed]
             (flop s.bed)
         ==
-      ^-  (unit (unit (cask)))
+      ^-  (unit (unit (cask milt)))
       =+  fun=-:(~(slap wa worm.vane) rig [%limb %scry])
       ::
-      %-  (unit (unit (cask)))
+      %-  (unit (unit (cask milt)))
       (slum q.fun old)
     ::
     ++  soar                                            ::  scrub vane
@@ -441,12 +457,12 @@
   |_  now/@da
   ++  beck
     ^-  slyd
-    |=  {* fur/(unit (set monk)) ron/term bed/beam}
-    ^-  (unit (unit (cask)))
+    |=  {typ/* fur/(unit (set monk)) ron/term bed/beam}
+    ^-  (unit (unit (cask milt)))
     =>  .(fur ?^(fur fur `[[%& p.bed] ~ ~]))            ::  XX heinous
     =+  lal=(end 3 1 ron)
     =+  ren=(@t (rsh 3 1 ron))
-    |-  ^-  (unit (unit (cask)))
+    |-  ^-  (unit (unit (cask milt)))
     ?~  vanes  ~
     ?.  =(lal label.i.vanes)  $(vanes t.vanes)
     ~|  [%failed-scry ron bed]

pkg/arvo/sys/hoon.hoon

@@ -6470,7 +6470,7 @@
 ++  mute                                                ::  untyped virtual
   |=  taq/_=>(~ ^?(|.(**)))
   ^-  (each * (list tank))
-  =+  ton=(mock [taq %9 2 %0 1] |=({* *} ~))
+  =/  ton  (mock [taq %9 2 %0 1] |=((pair) ``.*(~ [%12 1+p 1+q])))
   ?-  -.ton
     $0  [%& p.ton]
     $1  [%| (turn p.ton |=(a/* (smyt (path a))))]

pkg/arvo/sys/vane/ford.hoon

@@ -5570,7 +5570,7 @@
     %-  sloy  ^-  slyd
     ~/  %intercepted-scry
     |=  [ref=* (unit (set monk)) =term =beam]
-    ^-  (unit (unit (cask)))
+    ^-  (unit (unit (cask milt)))
     ::  if the actual scry produces a value, use that value; otherwise use local
     ::
     =/  scry-response  (scry +<.$)
@@ -5606,7 +5606,7 @@
     ?.  -:(nets:wa +.ref `type`p.q.local-cage)
       [~ ~]
     ::
-    [~ ~ `(cask)`local-cage]
+    [~ ~ local-cage]
   ::  +unblock-clients-on-duct: unblock and produce clients blocked on :build
   ::
   ++  unblock-clients-on-duct