fix +moon

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25a2e5d6f7df8419dd4aabac909bb14c96220bda6f74814c5c6e5eb76fb3977f
-size 9565804
+oid sha256:1d7b93b3e2d91180d638d1723b36a8ba402ee710c0974fb0f3976c437f72adf1
+size 9634917

pkg/arvo/app/ph.hoon

@@ -125,6 +125,32 @@
         ~&  >  %bud-done
         (send-hi ~bud ~dev)
       (pure:m ~)
+    ::
+      :+  %moon-az
+        ~[~bud ~marbud ~linnup-torsyx ~linnup-torsyx-linnup-torsyx]
+      =.  eth-node  (spawn:eth-node ~dev)
+      ;<  [eth-node=_eth-node ~]  bind:m
+        %+  (wrap-philter ,_eth-node ,~)
+          router:eth-node
+        ;<  ~  bind:m  (raw-ship ~bud `(dawn:eth-node ~bud))
+        ~&  >  'BUD DONE'
+        ;<  ~  bind:m  (raw-ship ~dev `(dawn:eth-node ~dev))
+        ~&  >  'DEV DONE'
+        (send-hi ~bud ~dev)
+      ~&  >  'HI DONE'
+      ;<  eth-node=_eth-node  bind:m
+        (breach-and-hear:eth-node our.hid ~dev ~bud)
+      ~&  >  'BREACH DONE'
+      ;<  [eth-node=_eth-node ~]  bind:m
+        %+  (wrap-philter ,_eth-node ,~)
+          router:eth-node
+        ;<  ~  bind:m  (send-hi-not-responding ~bud ~dev)
+        ~&  >  'HI NOT RESPONDING DONE'
+        ;<  ~  bind:m  (raw-ship ~dev `(dawn:eth-node ~dev))
+        ~&  >  'REBOOT DEV DONE'
+        (wait-for-dojo ~bud "hi ~dev successful")
+      ~&  >  'DONE'
+      (pure:m ~)
     ::
       :+  %breach-hi
         ~[~bud ~dev]

pkg/arvo/gen/moon.hoon

@@ -28,11 +28,8 @@
   %-  produce
   :-  %tang  :_  ~
   leaf+"can't create keys for {(scow %p mon)}, which belongs to {(scow %p seg)}"
-=/  cub=acru:ames  (pit:nu:crub:crypto 512 eny)
-=/  lyf=life  .^(@ud j+/(scot %p our)/life/(scot %da now)/(scot %p our))
-=/  sig=oath:pki:jael
-  .^(@ j+/(scot %p our)/earl/(scot %da now)/(scot %p mon)/(scot %ud lyf)/(scot %ux pub:ex:cub))
-=/  sed=seed:able:jael
-  [mon lyf sec:ex:cub `sig]
+=/  lyf=life  .^(@ud k+/(scot %p our)/life/(scot %da now)/(scot %p our))
+=/  sed=seed:able:kale
+  .^(seed:able:kale k+/(scot %p our)/earl/(scot %da now)/(scot %p mon)/(scot %ud lyf))
 %+  print    leaf+"moon: {(scow %p mon)}"
-%-  produce  [%atom (scot %uw (jam sed))]
+%-  produce  [%atom (scot %uw (jam sed))]

pkg/arvo/sys/vane/kale.hoon

@@ -747,6 +747,8 @@
         ?.  =(our spon.i.moonl)
           =.  ..feed  (sources:feel ships.i.moonl [%& spon.i.moonl])
           $(moonl t.moonl)
+        ::  Our moon
+        ::
         =/  sec  (~(got by jaw.own.pki) lyf.own.pki)
         =/  points=(map ship point)
           =/  our-moonl  ~(tap in ships.i.moonl)
@@ -754,7 +756,7 @@
           |-  ^-  (list [ship point])
           ?~  our-moonl
             ~
-          =/  moon-sec  (shaf %earl (sham our lyf.own.pki i.our-moonl))
+          =/  moon-sec  (shaf %earl (sham our lyf.own.pki sec i.our-moonl))
           =/  cub  (nol:nu:crub:crypto moon-sec)
           =/  =pass  pub:ex:cub
           :-  [i.our-moonl 1 1 (malt [1 1 pass] ~) `our]
@@ -952,12 +954,12 @@
 ++  load                                                ::  upgrade
   |=  $:  ::  old: previous state
           ::
-          old/*
-          ::  old/state
+          ::  old/*
+          old/state
       ==
   ^+  ..^$
-  ..^$
-  ::  ..^$(lex old)
+  ::  ..^$
+  ..^$(lex old)
 ::                                                      ::  ++scry
 ++  scry                                                ::  inspect
   |=  $:  ::  fur: event security
@@ -1071,15 +1073,13 @@
     !>  `deed:ames`[u.lyf pass.u.pas ~]
   ::
       %earl
-    ?.  ?=([@ @ @ ~] tyl)  [~ ~]
+    ?.  ?=([@ @ ~] tyl)  [~ ~]
     ?.  =([%& our] why)
       [~ ~]
     =/  who  (slaw %p i.tyl)
     =/  lyf  (slaw %ud i.t.tyl)
-    =/  pub  (slaw %ux i.t.t.tyl)
     ?~  who  [~ ~]
     ?~  lyf  [~ ~]
-    ?~  pub  [~ ~]
     ?:  (gth u.lyf lyf.own.pki.lex)
       ~
     ?:  (lth u.lyf lyf.own.pki.lex)
@@ -1087,9 +1087,10 @@
     :: XX check that who/lyf hasn't been booted
     ::
     =/  sec  (~(got by jaw.own.pki.lex) u.lyf)
-    =/  cub  (nol:nu:crub:crypto sec)
-    =/  sig  (sign:as:cub (shaf %earl (sham u.who u.lyf u.pub)))
-    ``[%atom !>(sig)]
+    =/  moon-sec  (shaf %earl (sham our u.lyf sec u.who))
+    =/  cub  (pit:nu:crub:crypto 128 moon-sec)
+    =/  =seed  [u.who 1 sec:ex:cub ~]
+    ``[%seed !>(seed)]
   ::
       %sein
     ?.  ?=([@ ~] tyl)  [~ ~]

pkg/arvo/sys/zuse.hoon

@@ -7097,7 +7097,7 @@
   ++  sein                                              ::  autoboss
     |=  [our=ship now=@da who=ship]
     .^  ship
-        %j
+        %k
         /(scot %p our)/sein/(scot %da now)/(scot %p who)
     ==
   ::                                                    ::  ++team:title