From 91714f55793d932a9b50ec3d856348743bf6a310 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Fri, 27 Aug 2021 18:06:53 +0300
Subject: [PATCH] lull,dill,gall,kiln: move %pyre to :agent:gall

---
 pkg/arvo/lib/hood/kiln.hoon | 2 +-
 pkg/arvo/sur/hood.hoon      | 1 +
 pkg/arvo/sys/lull.hoon      | 7 ++++---
 pkg/arvo/sys/vane/dill.hoon | 1 -
 pkg/arvo/sys/vane/gall.hoon | 6 ++++++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index 354fa9a6be..1d6276943d 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -296,7 +296,7 @@
     --
   ++  pass
     |%
-    ++  pyre  |=(=tang [%pass /kiln/vats %arvo %d %pyre tang])
+    ++  pyre  |=(=tang [%pass /kiln/vats %pyre tang])
     ++  find      (warp %find [%sing %y ud+1 /])
     ++  sync-da   (warp %sync [%sing %w da+now /])
     ++  sync-ud   (warp %sync [%sing %w ud+aeon.rak /])
diff --git a/pkg/arvo/sur/hood.hoon b/pkg/arvo/sur/hood.hoon
index a8019692d8..9567038070 100644
--- a/pkg/arvo/sur/hood.hoon
+++ b/pkg/arvo/sur/hood.hoon
@@ -64,6 +64,7 @@
       leaf/"base hash:   {?.(=(1 (lent meb)) <meb> <(head meb)>)}"
       leaf/"%cz hash:    {<hash>}"
       leaf/"source ship: {<ship.arak>}"
+      leaf/"source desk: {<desk.arak>}"
       leaf/"source aeon: {<aeon.arak>}"
       leaf/"status:      {sat}"
       leaf/"force on:    {?:(=(~ add.rein.arak) "~" <add.rein.arak>)}"
diff --git a/pkg/arvo/sys/lull.hoon b/pkg/arvo/sys/lull.hoon
index 6646e45f72..14d4b5b579 100644
--- a/pkg/arvo/sys/lull.hoon
+++ b/pkg/arvo/sys/lull.hoon
@@ -1057,7 +1057,6 @@
         [%meld ~]                                       ::  unify memory
         [%noop ~]                                       ::  no operation
         [%pack ~]                                       ::  compact memory
-        [%pyre =tang]                                   ::  kill this event
         [%talk p=tank]                                  ::
         [%text p=tape]                                  ::
         [%view session=~]                               ::  watch session blits
@@ -1679,6 +1678,7 @@
   +$  neat
     $%  [%arvo =note-arvo]
         [%agent [=ship name=term] =deal]
+        [%pyre =tang]
     ==
   +$  deal
     $%  [%raw-poke =mark =noun]
@@ -1697,8 +1697,9 @@
     +$  step  (quip card form)
     +$  card  (wind note gift)
     +$  note
-      $%  [%arvo =note-arvo]
-          [%agent [=ship name=term] =task]
+      $%  [%agent [=ship name=term] =task]
+          [%arvo note-arvo]
+          [%pyre =tang]
       ==
     +$  task
       $%  [%watch =path]
diff --git a/pkg/arvo/sys/vane/dill.hoon b/pkg/arvo/sys/vane/dill.hoon
index 07f91527ae..c5e35569f1 100644
--- a/pkg/arvo/sys/vane/dill.hoon
+++ b/pkg/arvo/sys/vane/dill.hoon
@@ -112,7 +112,6 @@
           %heft  (pass /whey %$ whey/~)
           %meld  (dump kyz)
           %pack  (dump kyz)
-          %pyre  (mean 'dill: %pyre' tang.kyz)
           %crop  (dump trim+p.kyz)
           %verb  (pass /verb %$ kyz)
         ::
diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon
index e956995164..75f9b80dc1 100644
--- a/pkg/arvo/sys/vane/gall.hoon
+++ b/pkg/arvo/sys/vane/gall.hoon
@@ -1110,6 +1110,12 @@
         =/  =duct  system-duct.state
         =/  =wire  p.card
         =/  =neet  q.card
+        ?:  ?=(%pyre -.neet)
+          %:  mean
+            leaf/"gall: %pyre from {<agent-name>}, killing event"
+            leaf/"wire: {<wire>}"
+            tang.neet
+          ==
         =.  wire
           ?-  -.neet
             %agent  [%out (scot %p ship.neet) name.neet wire]