From 05304146a7fdba2ead51684422739d9d8ee29e37 Mon Sep 17 00:00:00 2001
From: ~wicrum-wicrun <99811688+wicrum-wicrun@users.noreply.github.com>
Date: Mon, 24 Apr 2023 21:53:52 +0200
Subject: [PATCH] gall,eyre,dojo,azimuth,dbug: gall claims the `[%$ *]`
 namespace

---
 pkg/arvo/app/azimuth.hoon     |  2 +-
 pkg/arvo/app/dbug.hoon        |  2 +-
 pkg/arvo/app/dojo.hoon        |  2 +-
 pkg/arvo/gen/gall-nonces.hoon |  2 +-
 pkg/arvo/sys/vane/eyre.hoon   |  2 +-
 pkg/arvo/sys/vane/gall.hoon   | 20 ++++++++++----------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/arvo/app/azimuth.hoon b/pkg/arvo/app/azimuth.hoon
index 25486f863..10a554f98 100644
--- a/pkg/arvo/app/azimuth.hoon
+++ b/pkg/arvo/app/azimuth.hoon
@@ -263,7 +263,7 @@
         ::  ~&  >>  %no-logs-in-azimuth-state
         number.id.sap.state
       =+  [our=(scot %p our.bowl) now=(scot %da now.bowl)]
-      =+  .^(dudes=(set [dude:gall ?]) %ge our %base now /)
+      =+  .^(dudes=(set [dude:gall ?]) %ge our %base now /$)
       =/  running=?  (~(has in dudes) [%eth-watcher &])
       =/  installed=?
         |((~(has in dudes) [%eth-watcher &]) (~(has in dudes) [%eth-watcher |]))
diff --git a/pkg/arvo/app/dbug.hoon b/pkg/arvo/app/dbug.hoon
index 13d144f66..4e632946e 100644
--- a/pkg/arvo/app/dbug.hoon
+++ b/pkg/arvo/app/dbug.hoon
@@ -433,7 +433,7 @@
     ^-  (list dude:gall)
     =-  (turn ~(tap in -) head)
     ;;  (set [dude:gall ?])  ::TODO  for some reason we need this?
-    (scry (set [dude:gall ?]) %ge desk /)
+    (scry (set [dude:gall ?]) %ge desk /$)
   ::
   ++  running
     |=  app=term
diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
index 74ab72e8b..86a8328d6 100644
--- a/pkg/arvo/app/dojo.hoon
+++ b/pkg/arvo/app/dojo.hoon
@@ -129,7 +129,7 @@
     =/  =desk
       ::TODO  maybe should recognize if the user specified a desk explicitly.
       ::      currently eats the :app|desk#gen case.
-      =+  gop=(en-beam dir(q q.gol, s /))
+      =+  gop=(en-beam dir(q q.gol, s /$))
       ?.  .^(? %gu gop)
         q.dir
       .^(desk %gd gop)
diff --git a/pkg/arvo/gen/gall-nonces.hoon b/pkg/arvo/gen/gall-nonces.hoon
index d0bdd1ee9..6566e5016 100644
--- a/pkg/arvo/gen/gall-nonces.hoon
+++ b/pkg/arvo/gen/gall-nonces.hoon
@@ -6,5 +6,5 @@
 ^-  (list [dude:gall @ud])
 %+  sort
   %~  tap  by
-  .^((map dude:gall @ud) %gf /(scot %p p.bec)//(scot %da now))
+  .^((map dude:gall @ud) %gf /(scot %p p.bec)//(scot %da now)/$)
 |=([[* a=@ud] [* b=@ud]] (lth a b))
diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon
index 818ddc634..420a9a1a6 100644
--- a/pkg/arvo/sys/vane/eyre.hoon
+++ b/pkg/arvo/sys/vane/eyre.hoon
@@ -1792,7 +1792,7 @@
       ?~  sub
         ((trace 0 |.("no subscription for request-id {(trip request-id)}")) ~)
       =/  des=(unit (unit cage))
-        (rof ~ %gd [our app.u.sub da+now] ~)
+        (rof ~ %gd [our app.u.sub da+now] /$)
       ?.  ?=([~ ~ *] des)
         ((trace 0 |.("no desk for app {<app.u.sub>}")) ~)
       `!<(=desk q.u.u.des)
diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon
index da52758c8..a2b1b5ede 100644
--- a/pkg/arvo/sys/vane/gall.hoon
+++ b/pkg/arvo/sys/vane/gall.hoon
@@ -2057,6 +2057,16 @@
       ==
     ~
   ::
+  ?.  ?=([%$ *] path)  ::  [%$ *] is for the vane, all else is for the agent
+    ?.  ?&  =(our ship)
+            =([%$ %da now] coin)
+        ==                           ~
+    ?.  (~(has by yokes.state) dap)  [~ ~]
+    ?.  ?=(^ path)                   ~
+    =/  =routes  [~ ship]
+    (mo-peek:mo & dap routes care path)
+  ::
+  =>  .(path t.path)
   ?:  &(=(care %$) =(path /whey))
     =/  blocked
       =/  queued  (~(run by blocked.state) |=((qeu blocked-move) [%.y +<]))
@@ -2152,16 +2162,6 @@
     ?~  las=(ram:on-path fan.u.ski)     [~ ~]
     ``case/!>(ud/key.u.las)
   ::
-  ?.  ?=([%$ *] path)  ::  [%$ *] is for the vane, all else is for the agent
-    ?.  ?&  =(our ship)
-            =([%$ %da now] coin)
-        ==                           ~
-    ?.  (~(has by yokes.state) dap)  [~ ~]
-    ?.  ?=(^ path)                   ~
-    =/  =routes  [~ ship]
-    (mo-peek:mo & dap routes care path)
-  ::
-  =>  .(path t.path)
   ?:  ?=(%x care)
     ?.  =(p.bem our)  ~
     ?~  yok=(~(get by yokes.state) q.bem)  ~