Fix aqua and update for GW comet networking

pkg/arvo/app/aqua.hoon

@@ -824,15 +824,10 @@
   ?<  (~(has by lives.azi.piers) who)
   =.  lives.azi.piers  (~(put by lives.azi.piers) who [1 0])
   =.  logs.azi.piers
+    =/  [cry=@ sgn=@]  (get-public:aqua-azimuth who 1)
     %+  weld  logs.azi.piers
     :_  ~
-    %-  changed-keys:lo:aqua-azimuth
-    :*  who
-        (get-public:aqua-azimuth who 1 %crypt)
-        (get-public:aqua-azimuth who 1 %auth)
-        1
-        1
-    ==
+    (changed-keys:lo:aqua-azimuth [who cry sgn 1 1])
   (spam-logs 10)
 ::
 ++  cycle-keys
@@ -844,15 +839,10 @@
   =/  lyfe  +(lyfe.prev)
   =.  lives.azi.piers  (~(put by lives.azi.piers) who [lyfe rut.prev])
   =.  logs.azi.piers
+    =/  [cry=@ sgn=@]  (get-public:aqua-azimuth who lyfe)
     %+  weld  logs.azi.piers
     :_  ~
-    %-  changed-keys:lo:aqua-azimuth
-    :*  who
-        (get-public:aqua-azimuth who lyfe %crypt)
-        (get-public:aqua-azimuth who lyfe %auth)
-        1
-        lyfe
-    ==
+    (changed-keys:lo:aqua-azimuth [who cry sgn 1 lyfe])
   state
 ::
 ++  breach
@@ -871,56 +861,51 @@
   |=  who=ship
   ^-  dawn-event:jael
   =/  clan  (clan:title who)
-  ?>  ?=(?(%czar %king %duke %earl) clan)
-  =/  spon=(list [ship point:azimuth])
+  =/  spon=(list [ship point:jael])
     %-  flop
-    |-  ^-  (list [ship point:azimuth])
+    |-  ^-  (list [ship point:jael])
     =/  =ship  (^sein:title who)
-    =/  a-point=[^ship point:azimuth]
-      =/  spon-spon  [& (^sein:title ship)]
-      =/  life-rift  ~|([ship lives.azi.piers] (~(got by lives.azi.piers) ship))
-      =/  =life  lyfe.life-rift
-      =/  =rift  rut.life-rift
-      =/  =pass
-        %^    pass-from-eth:azimuth
-            (as-octs:mimes:html (get-public:aqua-azimuth ship life %crypt))
-          (as-octs:mimes:html (get-public:aqua-azimuth ship life %auth))
-        1
-      :^    ship
-          *[address address address address]:azimuth
-        `[life=life pass rift spon-spon ~]
-      ~
+    =/  a-point=[^ship point:jael]
+      =/  spon-spon  (^sein:title ship)
+      =/  [=life =rift]
+        (~(gut by lives.azi.piers) ship [1 0])
+      =/  =pass  pub:ex:(get-keys:aqua-azimuth ship life)
+      =/  keys
+        (~(put by *(map ^life [crypto-suite=@ud =^pass])) life [1 pass])
+      [ship rift life keys `spon-spon ~]
     ?:  ?=(%czar (clan:title ship))
       [a-point]~
     [a-point $(who ship)]
   =/  =feed:jael
-    =/  life-rift=[lyfe=life rut=rift]
-      ?:  =(%earl clan)  [1 0]
+    =/  [lyfe=life rut=rift]
+      ?:  ?=(?(%earl %pawn) clan)  [1 0]
       (~(got by lives.azi.piers) who)
-    =/  =life  lyfe.life-rift
-    [who life sec:ex:(get-keys:aqua-azimuth who life) ~]
-  :*  feed
-      spon
+    =/  kyz=(list [life ring])
+      [lyfe sec:ex:(get-keys:aqua-azimuth who lyfe)]~
+    [[%2 ~] who rut kyz]
+  :*  %1
+      feed
+      *(list [ship point:jael]) ::spon
       get-czars
-      ~[~['arvo' 'netw' 'ork']]
+      ~[/arvo/netw/ork]
       0
       `(need (de-purl:html 'http://fake.aqua.domain/'))
+      *(list (pair @tas *))
   ==
 ::
 ::  Should only do galaxies
 ::
 ++  get-czars
-  ^-  (map ship [rift life pass])
+  ^-  (map ship point:jael)
   %-  malt
   %+  murn
     ~(tap by lives.azi.piers)
   |=  [who=ship lyfe=life rut=rift]
   ?.  =(%czar (clan:title who))
     ~
-  %-  some
-  :^  who  rut  lyfe
-  %^    pass-from-eth:azimuth
-      (as-octs:mimes:html (get-public:aqua-azimuth who lyfe %crypt))
-    (as-octs:mimes:html (get-public:aqua-azimuth who lyfe %auth))
-  1
+  =/  =pass  pub:ex:(get-keys:aqua-azimuth who lyfe)
+  =/  keys
+    (~(put by *(map life [crypto-suite=@ud =^pass])) lyfe [1 pass])
+  `[who rut lyfe keys ~ ~]
+::
 --

pkg/arvo/app/azimuth.hoon

@@ -275,11 +275,12 @@
       =?  snap.poke  ?=(%0 -.snap.poke)
         snap.poke(- %1, nas (load:naive nas.snap.poke))
       ?>  ?=(%1 -.snap.poke)
-      =:  net.state   %default
+      =:  net.state   ?.(=('' url.state) net.state %default)
           nas.state   nas.snap.poke
           own.state   owners.snap.poke
           spo.state   sponsors.snap.poke
-          url.state   'http://eth-mainnet.urbit.org:8545'
+          url.state   ?.  =('' url.state)  url.state
+                      'http://eth-mainnet.urbit.org:8545'
           sap.state   snap.poke
           logs.state  ~
         ==

pkg/arvo/lib/aqua-azimuth.hoon

@@ -1,4 +1,4 @@
-/-  *aquarium
+/-  dice, *aquarium
 /+  ethereum, azimuth
 ::
 |%
@@ -14,6 +14,25 @@
   |=  [our=ship her=ship uf=unix-effect azi=az-state]
   ^-  (unit card:agent:gall)
   =,  enjs:format
+  =/  ask-load
+    %+  extract-request  uf
+    'https://bootstrap.urbit.org/mainnet.azimuth-snapshot'
+  ?^  ask-load
+    =/  events=(list aqua-event)
+      :_  ~
+      :*  %event
+          her
+          /i/http-client/0v1n.2m9vh
+          %receive
+          num.u.ask-load
+          [%start [200 ~] `(as-octs:mimes:html (jam *versioned-snap:dice)) &]
+      ==
+    %-  some
+    :*  %pass  /aqua-events
+        %agent  [our %aqua]
+        %poke  %aqua-events
+        !>(events)
+    ==
   =/  ask  (extract-request uf 'http://fake.aqua.domain/')
   ?~  ask
     ~
@@ -200,16 +219,91 @@
 ::
 ++  get-keys
   |=  [who=@p lyfe=life]
-  %+  pit:nu:cric:crypto  32
-  (can 5 [1 (scot %p who)] [1 (scot %ud lyfe)] ~)
+  ?~  cum=(~(get by comets) who)
+    %^  pit:nu:cric:crypto  32
+      (can 5 [1 (scot %p who)] [1 (scot %ud lyfe)] ~)
+    [%b ~]
+  ?.  =(lyfe 1)
+    %^  pit:nu:cric:crypto  32
+      (can 5 [1 (scot %p who)] [1 (scot %ud lyfe)] ~)
+    [%c 0xdead.beef.cafe]
+  ?:  ?=(%b suite.u.cum)
+    (pit:nu:cric:crypto 512 seed.u.cum %b ~)
+  (pit:nu:cric:crypto 512 seed.u.cum %c 0xdead.beef.cafe)
 ::
 ++  get-public
-  |=  [who=@p lyfe=life typ=?(%auth %crypt)]
-  =/  bod  (rsh 3 pub:ex:(get-keys who lyfe))
-  =+  [enc=(rsh 8 bod) aut=(end 8 bod)]
-  ?:  =(%auth typ)
-    aut
-  enc
+  |=  [who=@p lyfe=life]
+  ^-  public-keys:ames
+  ded:ex:(get-keys who lyfe)
+::  +comets: allowed comets, their +cric suite and seeds
+::    the tweak for %c comets is 0xdead.beef.cafe
+::
+++  comets
+  ^~  ^-  (map ship [suite=?(%b %c) seed=@uw])
+  %-  ~(gas by *(map ship [suite=?(%b %c) seed=@uw]))
+  ^-  (list [=ship suite=?(%b %c) seed=@uw])
+  %+  zip
+    ::  comet names
+    ^-  (list @p)
+    :~  :: marbud, %c suite
+        ~fasteg-dinhet-malrum-ransub--hocduc-digtev-radsut-marbud
+        ~daldyl-nildem-dispec-tilryx--dondus-dirmet-tintyl-marbud
+        ~dansyr-ponbec-tocfel-laddux--socnut-nisnyx-dinsut-marbud
+        :: marbud, %b suite
+        ~harrep-podpec-torsut-docnyx--mopsyx-fosdus-ladpen-marbud
+        ~liblyn-togrut-tabwel-hodbet--dovbex-parryt-mirbyt-marbud
+        ~hidreb-naptev-banben-bicrup--massup-dantus-fodwet-marbud
+        :: mardev, %c suite
+        ~molpyx-novtyc-wortyc-noswyd--taltyv-loplev-dabwen-mardev
+        ~fosnys-noctyd-talfyl-borryl--davhus-disbyn-fotnec-mardev
+        ~tonmep-tabrux-rinbep-firmur--silmex-saldef-pasfer-mardev
+        :: mardev, %b suite
+        ~holwyx-ramped-tognet-barsyn--navler-ronmeg-topbex-mardev
+        ~hacmet-doslyr-narhut-tiptec--micbyl-motnev-worsyn-mardev
+        ~ribmut-nopdul-minmet-pardeg--wisfex-rosfus-fogsyn-mardev
+    ==
+  %+  zip
+    ::  comet suites
+    ^-  (list ?(%b %c))
+    ~[%c %c %c %b %b %b %c %c %c %b %b %b]
+  ::  comet seeds
+  ^-  (list @uw)
+  :~  0w2.5sfF0.~inVv.dQ7zb.ykQSG.aX5nF.uGQsm.keVzY.6Pu1S.
+      quvGI.b0Ht2.Ctbbr.-ADfG.7yIL4.NXJ5a.lGmJZ.5wkdb.9Z775
+      0w5Disb.xWJtw.cszH3.YBTFu.9k6Nc.JjeyV.origh.VkYmT.
+      9-Obr.T3TOs.IPdWd.MmsUQ.ZZGZa.OLHMe.5azFd.l7hXr.~vuI~
+      0w1.7wOws.lF20Y.WRmex.htiLX.WrZ43.yxBCD.Ow3oE.kumTc.
+      dRou7.xGeQm.Lbbx-.6hTii.hzYgP.Z2iQ9.7YYLB.2qb1b.PDItX
+      0w3.7aZCR.XIcSt.sKqRG.AS4KD.A-FAT.bbZwc.2N4z5.pez5t.
+      aZGIz.d0Hy9.C~RPd.87GcR.LM0Jt.6oVFF.LL4v7.rzlwk.~Fm5Z
+      0w1.fuip3.x~XMr.eE02V.K4RC5.OvDaK.jug28.75z30.UY476.
+      ZlB3Q.bD78k.M8E~g.I4LRY.OytPc.XD2Bm.XDM9t.iQEhl.LNCMM
+      0w1.BHOHC.VyVuo.4kS0o.VKJNU.-zMyL.T2zJo.j1EF5.symnK.
+      yQB8T.TvCPN.Z8~P~.KS6j4.~055y.E-jBn.UhIxJ.mItiE.PmML1
+      0w3.mAqpe.eRL-v.65LTo.aHWFA.5kTRF.qQ1o-.xK2W-.tae8A.
+      FLBV~.wL3iP.A~53S.izniF.SiLrJ.DDxNO.A9Yps.QLFta.LmorX
+      0w3.L29ce.OZsch.LKI2F.f86PX.JuhkV.8gnMT.FSqcd.~MqL3.
+      v4wEj.yFnGN.DHr-Z.TiCRY.tG-7r.E1oza.pW2FM.i097b.yA~Ql
+      0w2.iUm0y.wCmrI.GrVKW.r5yu9.Stccm.3diy3.vS4r7.tV~jd.
+      -mxoM.S1nFG.soxnp.dDr6X.DUI99.4uhQO.ntSQJ.UYiQi.pMRi2
+      0w2.i8vIr.hWTd1.aC9jk.F6Y3e.r5OEr.nzm8U.KHzQN.RsEzF.
+      trAnj.MqRRu.397ik.L8o9k.RSIip.0vZ4Q.qhnSI.eXfhu.brJPS
+      0ws1~UQ.v~fJv.C5MPg.LFX3N.ZmJmu.0LeVG.lyyT7.shhvL.
+      2~det.i-jOI.OVI8v.9ldMk.16MGj.AZxso.qsTpQ.inrUz.aE1sa
+      0w~w9s8.YLtr3.bSQ8H.SIK5g.Dnh9M.aIcT2.mqIqG.geVWH.
+      lJUzq.OTuUl.oM9ww.7MwQh.pQ7Q9.NB38f.FzzKE.S7is8.~0Gg-
+  ==
+::  +zip: combine two lists into a list of cells of their elements
+::
+++  zip
+    |*  [a=(list) b=(list)]
+    ^-  (list [_?>(?=(^ a) i.a) _?>(?=(^ b) i.b)])
+    =|  out=(list [_?>(?=(^ a) i.a) _?>(?=(^ b) i.b)])
+    ?>  =((lent a) (lent b))
+    |-
+    ?~  a  (flop out)
+    ?~  b  (flop out)
+    $(out [[i.a i.b] out], a t.a, b t.b)
 ::
 ::  Generate logs
 ::

pkg/arvo/sys/vane/jael.hoon

@@ -324,7 +324,9 @@
       =.  +>.$
         ?:  =(~ srcs.tac)
           %^  poke-watch  hen  %azimuth
-          !>([%watch 'http://eth-mainnet.urbit.org:8545/' %default])
+          ?~  node.tac
+            [%watch 'http://eth-mainnet.urbit.org:8545/' %default]
+          [%watch (crip (en-purl:html u.node.tac)) %default]
         |-  ^+  +>.^$
         ?~  srcs.tac  +>.^$
         =.  +>.^$  (poke-watch hen i.srcs.tac)