ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 11:40:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jb/motion' into jb/motion-merge

Browse Source 
* jb/motion:
  pill: solid
  zuse: remove %crud from vane-task
  arvo: full vane names in $sign
  aqua: build again (still broken)
  arvo: reform of the scry reform
This commit is contained in:
Joe Bryan 2020-12-07 18:51:58 -08:00
commit aaf506ce8a
25 changed files with 258 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/solid.pill
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e8841895a2f0d02693518c8d10f8bf64611fa719beec33769b3ebf824dd5f546 oid sha256:89f7f770f5ba2075d4de2bb496da96043dafdc37dab26a4e439a6b70dcf08312
size 7672426 size 7829586

25
pkg/arvo/app/aqua.hoon
View File

@ -27,24 +27,22 @@
=> $~ |% => $~ |%
+$ versioned-state +$ versioned-state
$% state-0 $% state-0
state-1
== ==
+$ state-0 +$ state-0
$: %0 $: %0
pil=pill
assembled=*
tym=@da
fleet-snaps=(map term (map ship pier))
piers=(map ship pier)
==
+$ state-1
$: %1
pil=pill pil=pill
assembled=* assembled=*
tym=@da tym=@da
fleet-snaps=(map term fleet) fleet-snaps=(map term fleet)
piers=fleet piers=fleet
== ==
:: XX temporarily shadowed, fix and remove
::
+$ pill
$: boot-ova=*
kernel-ova=(list unix-event)
userspace-ova=(list unix-event)
==
:: ::
+$ fleet [ships=(map ship pier) azi=az-state] +$ fleet [ships=(map ship pier) azi=az-state]
+$ pier +$ pier
@ -55,7 +53,7 @@
== ==
-- --
:: ::
=| state-1 =| state-0
=* state - =* state -
=< =<
%- agent:dbug %- agent:dbug
@ -79,13 +77,6 @@
:: wipe fleets and piers rather than give them falsely nulled azimuth state :: wipe fleets and piers rather than give them falsely nulled azimuth state
:: ::
%0 %0
%_ $
-.old %1
fleet-snaps.old *(map term fleet)
piers.old *fleet
==
::
%1
[cards this(state old)] [cards this(state old)]
== ==
:: ::

2
pkg/arvo/app/chat-hook.hoon
View File

@ -370,7 +370,7 @@
=/ nack-count=@ud (slav %ud i.t.wire) =/ nack-count=@ud (slav %ud i.t.wire)
=/ who=@p (slav %p i.t.t.wire) =/ who=@p (slav %p i.t.t.wire)
=/ pax t.t.t.wire =/ pax t.t.t.wire
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behns %wake *] sign-arvo)
~? ?=(^ error.sign-arvo) ~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway" "behn errored in backoff timers, continuing anyway"
:_ this :_ this

2
pkg/arvo/app/contact-hook.hoon
View File

@ -195,7 +195,7 @@
=/ nack-count=@ud (slav %ud i.t.wire) =/ nack-count=@ud (slav %ud i.t.wire)
=/ who=@p (slav %p i.t.t.wire) =/ who=@p (slav %p i.t.t.wire)
=/ pax t.t.t.wire =/ pax t.t.t.wire
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo) ~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway" "behn errored in backoff timers, continuing anyway"
:_ this :_ this

2
pkg/arvo/app/dbug.hoon
View File

@ -66,7 +66,7 @@
++ on-arvo ++ on-arvo
|= [=wire =sign-arvo] |= [=wire =sign-arvo]
^- (quip card _this) ^- (quip card _this)
?. ?=([%e %bound *] sign-arvo) ?. ?=([%eyre %bound *] sign-arvo)
(on-arvo:def wire sign-arvo) (on-arvo:def wire sign-arvo)
~? !accepted.sign-arvo ~? !accepted.sign-arvo
[dap.bowl "bind rejected!" binding.sign-arvo] [dap.bowl "bind rejected!" binding.sign-arvo]

2
pkg/arvo/app/graph-store.hoon
View File

@ -946,7 +946,7 @@
[%try-rejoin @ *] [%try-rejoin @ *]
=/ rid=resource:store (de-path:res t.t.wire) =/ rid=resource:store (de-path:res t.t.wire)
=/ nack-count (slav %ud i.t.wire) =/ nack-count (slav %ud i.t.wire)
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo) ~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway" "behn errored in backoff timers, continuing anyway"
=/ new=^wire [%try-rejoin (scot %ud +(nack-count)) t.t.wire] =/ new=^wire [%try-rejoin (scot %ud +(nack-count)) t.t.wire]

2
pkg/arvo/app/group-store.hoon
View File

@ -244,7 +244,7 @@
(on-arvo:def wire sign-arvo) (on-arvo:def wire sign-arvo)
=/ =resource (de-path:resource t.t.wire) =/ =resource (de-path:resource t.t.wire)
=/ nack-count=@ud (slav %ud i.t.wire) =/ nack-count=@ud (slav %ud i.t.wire)
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo) ~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway" "behn errored in backoff timers, continuing anyway"
:_ this :_ this

2
pkg/arvo/app/hark-store.hoon
View File

@ -258,7 +258,7 @@
^- (quip card _this) ^- (quip card _this)
?. ?=([%autoseen ~] wire) ?. ?=([%autoseen ~] wire)
(on-arvo:def wire sign-arvo) (on-arvo:def wire sign-arvo)
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behn %wake *] sign-arvo)
:_ this(last-seen now.bowl) :_ this(last-seen now.bowl)
~[autoseen-timer:ha] ~[autoseen-timer:ha]
:: ::

4
pkg/arvo/app/herm.hoon
View File

@ -65,7 +65,7 @@
:: pass on dill blits for the session :: pass on dill blits for the session
:: ::
[%view %$ ~] [%view %$ ~]
?. ?=([%d %blit *] sign-arvo) ?. ?=([%dill %blit *] sign-arvo)
~| [%unexpected-sign [- +<]:sign-arvo] ~| [%unexpected-sign [- +<]:sign-arvo]
!! !!
:_ this :_ this
@ -78,7 +78,7 @@
[%tube @ @ ~] [%tube @ @ ~]
=* from i.t.wire =* from i.t.wire
=* to i.t.t.wire =* to i.t.t.wire
?. ?=([%c %writ *] sign-arvo) ?. ?=([%clay %writ *] sign-arvo)
~| [%unexpected-sign [- +<]:sign-arvo] ~| [%unexpected-sign [- +<]:sign-arvo]
!! !!
:_ this :_ this

4
pkg/arvo/app/language-server.hoon
View File

@ -100,8 +100,8 @@
^- (quip card _this) ^- (quip card _this)
=^ cards state =^ cards state
?+ sign-arvo (on-arvo:def wire sign-arvo) ?+ sign-arvo (on-arvo:def wire sign-arvo)
[%e %bound *] `state [%eyre %bound *] `state
[%c *] (handle-build:lsp wire +.sign-arvo) [%clay *] (handle-build:lsp wire +.sign-arvo)
== ==
[cards this] [cards this]
:: ::

2
pkg/arvo/app/metadata-hook.hoon
View File

@ -67,7 +67,7 @@
=/ nack-count=@ud (slav %ud i.t.wire) =/ nack-count=@ud (slav %ud i.t.wire)
=/ who=@p (slav %p i.t.t.wire) =/ who=@p (slav %p i.t.t.wire)
=/ pax t.t.t.wire =/ pax t.t.t.wire
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behn %wake *] sign-arvo)
~? ?=(^ error.sign-arvo) ~? ?=(^ error.sign-arvo)
"behn errored in backoff timers, continuing anyway" "behn errored in backoff timers, continuing anyway"
:_ this :_ this

2
pkg/arvo/app/spider.hoon
View File

@ -362,7 +362,7 @@
=. starting.state =. starting.state
(~(jab by starting.state) yarn |=([=trying =vase] [%none vase])) (~(jab by starting.state) yarn |=([=trying =vase] [%none vase]))
~| sign+[- +<]:sign-arvo ~| sign+[- +<]:sign-arvo
?> ?=([?(%b %c) %writ *] sign-arvo) ?> ?=([?(%behn %clay) %writ *] sign-arvo)
=/ =riot:clay p.sign-arvo =/ =riot:clay p.sign-arvo
?~ riot ?~ riot
(thread-fail-not-running tid %build-thread-error *tang) (thread-fail-not-running tid %build-thread-error *tang)

12
pkg/arvo/lib/strandio.hoon
View File

@ -173,7 +173,7 @@
|= tin=strand-input:strand |= tin=strand-input:strand
?+ in.tin `[%skip ~] ?+ in.tin `[%skip ~]
~ `[%wait ~] ~ `[%wait ~]
[~ %sign [%wait @ ~] %b %wake *] [~ %sign [%wait @ ~] %behn %wake *]
?. |(?=(~ until) =(`u.until (slaw %da i.t.wire.u.in.tin))) ?. |(?=(~ until) =(`u.until (slaw %da i.t.wire.u.in.tin)))
`[%skip ~] `[%skip ~]
?~ error.sign-arvo.u.in.tin ?~ error.sign-arvo.u.in.tin
@ -340,7 +340,7 @@
;< ~ bind:m (send-raw-card card) ;< ~ bind:m (send-raw-card card)
|= tin=strand-input:strand |= tin=strand-input:strand
=* loop $ =* loop $
?: ?& ?=([~ %sign [%timeout @ ~] %b %wake *] in.tin) ?: ?& ?=([~ %sign [%timeout @ ~] %behn %wake *] in.tin)
=((scot %da when) i.t.wire.u.in.tin) =((scot %da when) i.t.wire.u.in.tin)
== ==
`[%fail %timeout ~] `[%fail %timeout ~]
@ -370,7 +370,7 @@
|= tin=strand-input:strand |= tin=strand-input:strand
?+ in.tin `[%skip ~] ?+ in.tin `[%skip ~]
~ `[%wait ~] ~ `[%wait ~]
[~ %sign [%request ~] %i %http-response %finished *] [~ %sign [%request ~] %iris %http-response %finished *]
`[%done client-response.sign-arvo.u.in.tin] `[%done client-response.sign-arvo.u.in.tin]
== ==
:: ::
@ -395,9 +395,9 @@
|= tin=strand-input:strand |= tin=strand-input:strand
?+ in.tin `[%skip ~] ?+ in.tin `[%skip ~]
~ `[%wait ~] ~ `[%wait ~]
[~ %sign [%request ~] %i %http-response %cancel *] [~ %sign [%request ~] %iris %http-response %cancel *]
`[%done ~] `[%done ~]
[~ %sign [%request ~] %i %http-response %finished *] [~ %sign [%request ~] %iris %http-response %finished *]
`[%done `client-response.sign-arvo.u.in.tin] `[%done `client-response.sign-arvo.u.in.tin]
== ==
:: ::
@ -516,7 +516,7 @@
|= tin=strand-input:strand |= tin=strand-input:strand
?+ in.tin `[%skip ~] ?+ in.tin `[%skip ~]
~ `[%wait ~] ~ `[%wait ~]
[~ %sign * ?(%b %c) %writ *] [~ %sign * ?(%behn %clay) %writ *]
?. =(wire wire.u.in.tin) ?. =(wire wire.u.in.tin)
`[%skip ~] `[%skip ~]
`[%done +>.sign-arvo.u.in.tin] `[%done +>.sign-arvo.u.in.tin]

124
pkg/arvo/sys/arvo.hoon
View File

@ -99,7 +99,9 @@
:: $roof: namespace :: $roof: namespace
:: $rook: meta-namespace (super advanced) :: $rook: meta-namespace (super advanced)
:: +room: generic namespace :: +room: generic namespace
:: +roon: partial namespace
:: $root: raw namespace :: $root: raw namespace
:: $view: namespace perspective
:: +wind: kernel action builder :: +wind: kernel action builder
:: $wire: event pretext :: $wire: event pretext
:: +wite: kernel action/error builder :: +wite: kernel action/error builder
@ -125,13 +127,18 @@
|$ [a] |$ [a]
$~ =>(~ |~(* ~)) $~ =>(~ |~(* ~))
$- $: lyc=gang :: leakset $- $: lyc=gang :: leakset
cyr=term :: perspective vis=view :: perspective
bem=beam :: path bem=beam :: path
== :: == ::
%- unit :: ~: unknown %- unit :: ~: unknown
%- unit :: ~ ~: invalid %- unit :: ~ ~: invalid
(cask a) (cask a)
+$ roon :: partial namespace
$~ =>(~ |~(* ~))
$- [lyc=gang car=term bem=beam]
(unit (unit cage))
+$ root $-(^ (unit (unit))) +$ root $-(^ (unit (unit)))
+$ view $@(term [way=term car=term])
:: ::
++ wind ++ wind
|$ :: a: forward |$ :: a: forward
@ -314,6 +321,27 @@
?. ?=([%$ case] u.ved) ~ ?. ?=([%$ case] u.ved) ~
`(unit beam)`[~ [`ship`u.who `desk`u.des `case`p.u.ved] t.t.t.p] `(unit beam)`[~ [`ship`u.who `desk`u.des `case`p.u.ved] t.t.t.p]
:: ::
++ en-omen
|= [vis=view bem=beam]
^- path
:_ (en-beam bem)
?@ vis vis
~(rent co [%many $/tas/way.vis $/tas/car.vis ~])
::
++ de-omen
|= pax=path
^- (unit [vis=view bem=beam])
?~ pax ~
?~ bem=(de-beam t.pax) ~
?: ((sane %tas) i.pax)
`[i.pax u.bem]
=/ lot=(unit coin) (rush i.pax ;~(pfix dot perd:so))
?. ?& ?=(^ lot)
?=([%many [%$ %tas @] [%$ %tas @] ~] u.lot)
==
~
`[[q.p.i q.p.i.t]:p.u.lot u.bem]
::
++ look ++ look
~/ %look ~/ %look
|= [rof=roof lyc=gang] |= [rof=roof lyc=gang]
@ -321,11 +349,8 @@
~/ %in ~/ %in
|= [ref=* raw=*] |= [ref=* raw=*]
?~ pax=((soft path) raw) ~ ?~ pax=((soft path) raw) ~
?~ u.pax ~ ?~ mon=(de-omen u.pax) ~
=* cyr i.u.pax ?~ dat=(rof lyc u.mon) ~
?~ bem=(de-beam t.u.pax) ~
?. ((sane %tas) cyr) ~
?~ dat=(rof lyc cyr u.bem) ~
?~ u.dat [~ ~] ?~ u.dat [~ ~]
=* vax q.u.u.dat =* vax q.u.u.dat
?. ?& ?=(^ ref) ?. ?& ?=(^ ref)
@ -983,9 +1008,9 @@
++ smit ++ smit
|= [cap=tape sub=vase pax=path txt=@t] |= [cap=tape sub=vase pax=path txt=@t]
^- vase ^- vase
~> %slog.[0 leaf+"{cap}: {(scow p+(mug txt))}"] ~> %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"]
%- road |. %- road |.
~_ leaf/cap ~_ leaf/"{cap}: build failed"
(slap sub (rain pax txt)) (slap sub (rain pax txt))
:: ::
++ create ++ create
@ -1022,7 +1047,7 @@
:: ::
++ peek ++ peek
^- rook ^- rook
|= [lyc=gang cyr=term bem=beam] |= [lyc=gang vis=view bem=beam]
^- (unit (unit (cask meta))) ^- (unit (unit (cask meta)))
:: namespace reads receive no entropy :: namespace reads receive no entropy
:: ::
@ -1034,7 +1059,7 @@
~> %mean.'peek: pull failed' ~> %mean.'peek: pull failed'
(~(slap wa sac) rig [%limb %scry]) (~(slap wa sac) rig [%limb %scry])
:: ::
=/ mas=[gang term beam] [lyc cyr bem] =/ mas=[gang view beam] [lyc vis bem]
:: ::
=^ pro sac =^ pro sac
~> %mean.'peek: call failed' ~> %mean.'peek: call failed'
@ -1227,7 +1252,7 @@
:: ::
~? !lac.fad ~? !lac.fad
:- (runt [(lent bars.gem) '|'] "") :- (runt [(lent bars.gem) '|'] "")
[%slip vane.gem (symp +>-.task) duct] [%slip [vane.gem vane] (symp +>-.task) duct]
:: ::
(call duct vane task) (call duct vane task)
:: ::
@ -1275,56 +1300,63 @@
== ==
:: ::
=/ von =/ von
%+ turn (sort ~(tap by van.mod) |=([[a=@tas *] [b=@tas *]] (aor a b)))
(sort ~(tap by van.mod) |=([[a=@tas *] [b=@tas *]] (aor a b)))
|=([lal=@tas =vane] (cat 3 %vane- lal)^vane)
:: ::
:~ :+ %reports %| :~ :+ %reports %|
%+ turn von
=/ bem=beam [[our %home da+now] /whey] =/ bem=beam [[our %home da+now] /whey]
|= [lal=@tas =vane] %+ turn von
=/ met (peek ~ (rsh [3 5] lal) bem) |= [nam=term =vane]
=/ met (peek [~ ~] nam bem)
~| mass/nam
?> &(?=(^ met) ?=(^ u.met)) :: XX make optional ?> &(?=(^ met) ?=(^ u.met)) :: XX make optional
lal^|+;;((list mass) q.q.u.u.met) nam^|+;;((list mass) q.q.u.u.met)
:: ::
:+ %caches %| :+ %caches %|
%+ turn von %+ turn von
|=([lal=@tas =vane] lal^&+worm.vane) |=([nam=term =vane] nam^&+worm.vane)
:: ::
:+ %dregs %| :+ %dregs %|
%+ turn von %+ turn von
|=([lal=@tas =vane] lal^&+vase.vane) |=([nam=term =vane] nam^&+vase.vane)
== ==
:: +peek: read from the entire namespace :: +peek: read from the entire namespace
:: ::
++ peek ++ peek
^- rook ^- rook
|= [lyc=gang cyr=term bem=beam] |= [lyc=gang vis=view bem=beam]
^- (unit (unit (cask meta))) ^- (unit (unit (cask meta)))
:: vane and care may be concatenated
:: ::
?: ?=(%$ cyr) =/ [way=term car=term]
(peek:pith lyc %$ bem) ?^ vis vis
?. =(2 (met 3 vis))
[vis %$]
[(end 3 vis) (rsh 3 vis)]
:: ::
:: vane and care are concatenated ?: ?=(%$ way)
(peek:pith lyc car bem)
:: ::
=/ way=term (grow (end 3 cyr)) =. way (grow way)
=/ car=term (rsh 3 cyr) ?~ van=(~(get by van.mod) way)
?. (~(has by van.mod) way)
~ ~
(peek:(plow way) lyc car bem) %. [lyc car bem]
peek:spin:(~(plow va [vil u.van]) now peek)
:: +call: advance to target :: +call: advance to target
:: ::
++ call ++ call
|= [=duct way=term task=maze] |= [=duct way=term task=maze]
^+ this ^+ this
?: ?=(%$ way) ?: ?=(%$ way)
~> %mean.'arvo: call:pith failed'
%- call:pith
~> %mean.'call: bad waif' ~> %mean.'call: bad waif'
(call:pith ;;(waif:pith q.p.task)) ;;(waif q.p.task)
:: ::
=. way (grow way)
%+ push [way duct bars.gem] %+ push [way duct bars.gem]
~| bar-stack=`(list ^duct)`[duct bars.gem] ~| bar-stack=`(list ^duct)`[duct bars.gem]
%. task %. task
call:(spin:(plow (grow way)) duct eny dud) call:(spin:(plow way) duct eny dud)
:: +take: retreat along call-stack :: +take: retreat along call-stack
:: ::
++ take ++ take
@ -1336,9 +1368,9 @@
:: ::
?> ?=(~ duct) ?> ?=(~ duct)
(xeno:pith wire ;;(card q.p.gift)) (xeno:pith wire ;;(card q.p.gift))
::
:: the caller was a vane :: the caller was a vane
:: ::
=. way (grow way)
%+ push [way duct bars.gem] %+ push [way duct bars.gem]
:: ::
:: cons source onto .gift to make a $sign :: cons source onto .gift to make a $sign
@ -1346,7 +1378,7 @@
~| wire=wire ~| wire=wire
~| bar-stack=`(list ^duct)`[duct bars.gem] ~| bar-stack=`(list ^duct)`[duct bars.gem]
%. [wire [vane.gem gift]] %. [wire [vane.gem gift]]
take:(spin:(plow (grow way)) duct eny dud) take:(spin:(plow way) duct eny dud)
:: +push: finalize an individual step :: +push: finalize an individual step
:: ::
++ push ++ push
@ -1354,7 +1386,7 @@
^+ this ^+ this
=^ moz sac =^ moz sac
(~(refine-moves me sac vil) zom) (~(refine-moves me sac vil) zom)
=. van.mod (~(put by van.mod) (grow vane.gum) [vax sac]) =. van.mod (~(put by van.mod) vane.gum [vax sac])
(emit `plan`[`germ`gum `(list move)`moz]) (emit `plan`[`germ`gum `(list move)`moz])
:: +plow: operate on a vane, in time and space :: +plow: operate on a vane, in time and space
:: ::
@ -1465,7 +1497,7 @@
== ==
:: ::
++ peek ++ peek
^- roof ^- roon
|= [lyc=gang car=term bem=beam] |= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
?. ?| =(our p.bem) ?. ?| =(our p.bem)
@ -1702,28 +1734,24 @@
|= $: lyc=gang |= $: lyc=gang
$= nom $= nom
%+ each path %+ each path
$% [%once cyr=term syd=desk tyl=spur] $% [%once vis=view syd=desk tyl=spur]
[%beam cyr=term bem=beam] [%beam vis=view bem=beam]
== ==
== ==
^- (unit (cask)) ^- (unit (cask))
=/ hap=(unit [pat=? cyr=term bem=beam]) =/ hap=(unit [pat=? vis=view bem=beam])
?- nom ?- nom
[%& *] ?~ p.nom ~ [%& *] ?~(mon=(de-omen p.nom) ~ `[| u.mon])
?~ bem=(de-beam t.p.nom) ~ [%| %beam *] `[| vis bem]:p.nom
`[| i.p.nom u.bem] [%| %once *] `[& vis.p.nom [our syd.p.nom da/now] tyl.p.nom]
::
[%| %beam *] `[| cyr bem]:p.nom
::
[%| %once *] `[& cyr.p.nom [our syd.p.nom da/now] tyl.p.nom]
== ==
:: ::
?~ hap ~ ?~ hap ~
=/ pro (~(peek le:part [pit vil] sol) lyc [cyr bem]:u.hap) =/ pro (~(peek le:part [pit vil] sol) lyc [vis bem]:u.hap)
?: |(?=(~ pro) ?=(~ u.pro)) ~ ?: |(?=(~ pro) ?=(~ u.pro)) ~
=/ dat=(cask) [p q.q]:u.u.pro =/ dat=(cask) [p q.q]:u.u.pro
?. pat.u.hap `dat ?. pat.u.hap `dat
`[%omen [cyr.u.hap (en-beam bem.u.hap)] dat] `[%omen (en-omen [vis bem]:u.hap) dat]
:: ::
:: +poke: external apply :: +poke: external apply
:: ::
@ -1789,9 +1817,9 @@
++ smit ++ smit
|= [cap=tape sub=(trap vase) pax=path txt=@t] |= [cap=tape sub=(trap vase) pax=path txt=@t]
^- (trap vase) ^- (trap vase)
~> %slog.[0 leaf+"{cap}: {(scow p+(mug txt))}"] ~> %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"]
%- road |. %- road |.
~_ leaf/cap ~_ leaf/"{cap}: build failed"
(swat sub (rain pax txt)) (swat sub (rain pax txt))
-- --
:: ::

53
pkg/arvo/sys/vane/ames.hoon
View File

@ -633,11 +633,11 @@
:: $sign: response from other vane :: $sign: response from other vane
:: ::
+$ sign +$ sign
$~ [%b %wake ~] $~ [%behn %wake ~]
$% $: %b $% $: %behn
$% [%wake error=(unit tang)] $% $>(%wake gift:behn)
== == == ==
$: %j $: %jael
$% [%private-keys =life vein=(map life ring)] $% [%private-keys =life vein=(map life ring)]
[%public-keys =public-keys-result] [%public-keys =public-keys-result]
[%turf turfs=(list turf)] [%turf turfs=(list turf)]
@ -737,14 +737,10 @@
:: ::
=/ =task ((harden task) wrapped-task) =/ =task ((harden task) wrapped-task)
:: ::
:: error notifications "downcast" to %crud or %hole :: reject larval error notifications
:: ::
=? task ?=(^ dud) ?^ dud
?- -.task ~|(%ames-larval-call-dud (mean tang.u.dud))
%crud ~|(%crud-in-crud !!)
%hear [%hole [lane blob]:task]
* [%crud -.task tang.u.dud]
==
:: ::
:: %born: set .unix-duct and start draining .queued-events :: %born: set .unix-duct and start draining .queued-events
:: ::
@ -782,7 +778,7 @@
[~ larval-gate] [~ larval-gate]
:: larval event drainage timer; pop and process a queued event :: larval event drainage timer; pop and process a queued event
:: ::
?. ?=([%b %wake *] sign) ?. ?=([%behn %wake *] sign)
~> %slog.0^leaf/"ames: larva: strange sign" ~> %slog.0^leaf/"ames: larva: strange sign"
[~ larval-gate] [~ larval-gate]
:: if crashed, print, dequeue, and set next drainage timer :: if crashed, print, dequeue, and set next drainage timer
@ -867,26 +863,22 @@
^- [(list move) _ames-gate] ^- [(list move) _ames-gate]
:: ::
=/ =task ((harden task) wrapped-task) =/ =task ((harden task) wrapped-task)
::
:: error notifications "downcast" to %crud or %hole
::
=? task ?=(^ dud)
?- -.task
%crud ~|(%crud-in-crud !!)
%hear [%hole [lane blob]:task]
* [%crud -.task tang.u.dud]
==
::
=/ event-core (per-event [now eny rof] duct ames-state) =/ event-core (per-event [now eny rof] duct ames-state)
:: ::
=^ moves ames-state =^ moves ames-state
=< abet =< abet
:: handle error notifications
::
?^ dud
?+ -.task
(on-crud:event-core -.task tang.u.dud)
%hear (on-hole:event-core [lane blob]:task)
==
::
?- -.task ?- -.task
%born on-born:event-core %born on-born:event-core
%crud (on-crud:event-core [p q]:task)
%hear (on-hear:event-core [lane blob]:task) %hear (on-hear:event-core [lane blob]:task)
%heed (on-heed:event-core ship.task) %heed (on-heed:event-core ship.task)
%hole (on-hole:event-core [lane blob]:task)
%init on-init:event-core %init on-init:event-core
%jilt (on-jilt:event-core ship.task) %jilt (on-jilt:event-core ship.task)
%sift (on-sift:event-core ships.task) %sift (on-sift:event-core ships.task)
@ -915,11 +907,11 @@
[@ %done *] (on-take-done:event-core wire error.sign) [@ %done *] (on-take-done:event-core wire error.sign)
[@ %boon *] (on-take-boon:event-core wire payload.sign) [@ %boon *] (on-take-boon:event-core wire payload.sign)
:: ::
[%b %wake *] (on-take-wake:event-core wire error.sign) [%behn %wake *] (on-take-wake:event-core wire error.sign)
:: ::
[%j %turf *] (on-take-turf:event-core turfs.sign) [%jael %turf *] (on-take-turf:event-core turfs.sign)
[%j %private-keys *] (on-priv:event-core [life vein]:sign) [%jael %private-keys *] (on-priv:event-core [life vein]:sign)
[%j %public-keys *] (on-publ:event-core wire public-keys-result.sign) [%jael %public-keys *] (on-publ:event-core wire public-keys-result.sign)
== ==
:: ::
[moves ames-gate] [moves ames-gate]
@ -935,9 +927,10 @@
:: +scry: dereference namespace :: +scry: dereference namespace
:: ::
++ scry ++ scry
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=* why=shop &/p.bem =* why=shop &/p.bem
=* syd q.bem =* syd q.bem
=* lot=coin $/r.bem =* lot=coin $/r.bem

24
pkg/arvo/sys/vane/behn.hoon
View File

@ -15,8 +15,8 @@
$>(%flog task:dill) :: log output $>(%flog task:dill) :: log output
== == :: == == ::
+$ sign +$ sign
$~ [%b %wake ~] $~ [%behn %wake ~]
$% [%b $>(%wake gift)] $% [%behn $>(%wake gift)]
== ==
:: ::
+$ behn-state +$ behn-state
@ -269,20 +269,17 @@
^- [(list move) _behn-gate] ^- [(list move) _behn-gate]
:: ::
=/ =task ((harden task) wrapped-task) =/ =task ((harden task) wrapped-task)
::
:: error notifications "downcast" to %crud
::
=? task ?=(^ dud)
~| %crud-in-crud
?< ?=(%crud -.task)
[%crud -.task tang.u.dud]
::
=/ event-core (per-event [now hen] state) =/ event-core (per-event [now hen] state)
:: ::
=^ moves state =^ moves state
::
:: handle error notifications
::
?^ dud
(crud:event-core -.task tang.u.dud)
::
?- -.task ?- -.task
%born born:event-core %born born:event-core
%crud (crud:event-core [p q]:task)
%rest (rest:event-core date=p.task) %rest (rest:event-core date=p.task)
%drip (drip:event-core move=p.task) %drip (drip:event-core move=p.task)
%huck (huck:event-core syn.task) %huck (huck:event-core syn.task)
@ -304,9 +301,10 @@
:: which might or might not show up in the product :: which might or might not show up in the product
:: ::
++ scry ++ scry
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=* why=shop &/p.bem =* why=shop &/p.bem
=* syd q.bem =* syd q.bem
=* lot=coin $/r.bem =* lot=coin $/r.bem

55
pkg/arvo/sys/vane/clay.hoon
View File

@ -282,21 +282,21 @@
$: rus=(map desk rede) :: neighbor desks $: rus=(map desk rede) :: neighbor desks
== ==
:: ::
+$ move [p=duct q=(wind note gift)] :: local move +$ move [p=duct q=(wind note gift)] :: local move
+$ note :: out request $-> +$ note :: out request $->
$~ [%b %wait *@da] :: $~ [%b %wait *@da] ::
$% $: %$ :: to arvo $% $: %$ :: to arvo
$>(%what waif) :: $>(%what waif) ::
== :: == ::
$: %a :: to %ames $: %a :: to %ames
$>(%plea task:ames) :: $>(%plea task:ames) ::
== :: == ::
$: %b :: to %behn $: %b :: to %behn
$> $? %drip :: $> $? %drip ::
%rest :: %rest ::
%wait :: %wait ::
== :: == ::
task:behn :: task:behn ::
== :: == ::
$: %c :: to %clay $: %c :: to %clay
$> $? %info :: internal edit $> $? %info :: internal edit
@ -305,43 +305,40 @@
%warp :: %warp ::
%werp :: %werp ::
== :: == ::
task :: task ::
== :: == ::
$: %d :: to %dill $: %d :: to %dill
$>(%flog task:dill) :: $>(%flog task:dill) ::
== :: == ::
$: %g :: to %gall $: %g :: to %gall
$>(%deal task:gall) :: $>(%deal task:gall) ::
== :: == ::
$: %j :: by %jael $: %j :: by %jael
$>(%public-keys task:jael) :: $>(%public-keys task:jael) ::
== == :: == == ::
+$ riot (unit rant) :: response+complete +$ riot (unit rant) :: response+complete
+$ sign :: in result $<- +$ sign :: in result $<-
$~ [%b %wake ~] :: $~ [%behn %wake ~] ::
$% $: %a :: by %ames $% $: %ames ::
$> $? %boon :: response $> $? %boon :: response
%done :: (n)ack %done :: (n)ack
%lost :: lost boon %lost :: lost boon
== :: == ::
gift:ames :: gift:ames ::
== :: == ::
$: %b :: by %behn $: %behn ::
$% $>(%wake gift:behn) :: timer activate $% $>(%wake gift:behn) :: timer activate
$>(%writ gift) :: XX %slip $>(%writ gift) :: XX %slip
== == :: == == ::
$: %c :: by %clay $: %clay ::
$> $? %mere :: $> $? %mere ::
%note :: %note ::
%writ :: %writ ::
== :: == ::
gift :: gift ::
== :: == ::
$: %j :: by %jael $: %jael ::
$>(%public-keys gift:jael) :: $>(%public-keys gift:jael) ::
== ::
$: @tas :: by any
$>(%crud vane-task) :: XX strange
== == :: == == ::
-- => -- =>
~% %clay-utilities ..part ~ ~% %clay-utilities ..part ~
@ -3888,12 +3885,10 @@
:: ::
=/ req=task ((harden task) wrapped-task) =/ req=task ((harden task) wrapped-task)
:: ::
:: error notifications "downcast" to %crud :: XX handle error notifications
:: ::
=? req ?=(^ dud) ?^ dud
~| %crud-in-crud [[[hen %slip %d %flog %crud [-.req tang.u.dud]] ~] ..^$]
?< ?=(%crud -.req)
[%crud -.req tang.u.dud]
:: ::
?- -.req ?- -.req
%boat %boat
@ -3938,9 +3933,6 @@
|= [p=path r=rule] |= [p=path r=rule]
(~(has in who.r) |+nom.req) (~(has in who.r) |+nom.req)
-- --
::
%crud
[[[hen %slip %d %flog req] ~] ..^$]
:: ::
%drop %drop
~& %clay-idle ~& %clay-idle
@ -4125,9 +4117,10 @@
..^$(ruf +.old) ..^$(ruf +.old)
:: ::
++ scry :: inspect ++ scry :: inspect
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=/ why=shop &/p.bem =/ why=shop &/p.bem
=* syd q.bem =* syd q.bem
=/ lot=coin $/r.bem =/ lot=coin $/r.bem
@ -4296,8 +4289,6 @@
:: ::
?- -.+.hin ?- -.+.hin
%public-keys ~|([%public-keys-raw tea] !!) %public-keys ~|([%public-keys-raw tea] !!)
%crud
[[[hen %slip %d %flog +.hin] ~] ..^$]
:: ::
%mere %mere
?: ?=(%& -.p.+.hin) ?: ?=(%& -.p.+.hin)

47
pkg/arvo/sys/vane/dill.hoon
View File

@ -30,7 +30,7 @@
+$ mess :: +$ mess ::
$% [%dill-belt p=(hypo dill-belt)] :: $% [%dill-belt p=(hypo dill-belt)] ::
== :: == ::
+$ move [p=duct q=(wind note gift)] :: local move +$ move [p=duct q=(wind note gift)] :: local move
+$ note :: out request $-> +$ note :: out request $->
$~ [%d %verb ~] :: $~ [%d %verb ~] ::
$% $: %$ :: $% $: %$ ::
@ -41,7 +41,7 @@
%perm :: change permissions %perm :: change permissions
%warp :: wait for clay hack %warp :: wait for clay hack
== :: == ::
task:clay :: task:clay ::
== :: == ::
$: %d :: $: %d ::
$> $? %crud :: $> $? %crud ::
@ -49,42 +49,42 @@
%text :: %text ::
%verb :: %verb ::
== :: == ::
task:dill :: task:dill ::
== :: == ::
$: %g :: $: %g ::
$> $? %conf :: $> $? %conf ::
%deal :: %deal ::
%goad :: %goad ::
== :: == ::
task:gall :: task:gall ::
== :: == ::
$: %j :: $: %j ::
$> $? %dawn :: $> $? %dawn ::
%fake :: %fake ::
== :: == ::
task:jael :: task:jael ::
== == :: == == ::
+$ sign :: in result $<- +$ sign :: in result $<-
$~ [%d %blit ~] :: $~ [%dill %blit ~] ::
$% $: %b :: $% $: %behn ::
$% $>(%writ gift:clay) :: XX %slip $% $>(%writ gift:clay) :: XX %slip
$>(%mere gift:clay) :: XX %slip $>(%mere gift:clay) :: XX %slip
== == :: == == ::
$: %c :: $: %clay ::
$> $? %mere :: $> $? %mere ::
%note :: %note ::
%writ :: %writ ::
== :: == ::
gift:clay :: gift:clay ::
== :: == ::
$: %d :: $: %dill ::
$>(%blit gift:dill) :: $>(%blit gift:dill) ::
== :: == ::
$: %g :: $: %gall ::
$> $? %onto :: $> $? %onto ::
%unto :: %unto ::
== :: == ::
gift:gall :: gift:gall ::
== == :: == == ::
:::::::: :: dill tiles :::::::: :: dill tiles
-- --
@ -255,14 +255,14 @@
|= [tea=wire sih=sign] |= [tea=wire sih=sign]
^+ +> ^+ +>
?- sih ?- sih
[%g %onto *] [%gall %onto *]
:: ~& [%take-gall-onto +>.sih] :: ~& [%take-gall-onto +>.sih]
?- -.+>.sih ?- -.+>.sih
%| (crud %onto p.p.+>.sih) %| (crud %onto p.p.+>.sih)
%& (done %blit [%lin (tuba "{<p.p.sih>}")]~) %& (done %blit [%lin (tuba "{<p.p.sih>}")]~)
== ==
:: ::
[%g %unto *] [%gall %unto *]
:: ~& [%take-gall-unto +>.sih] :: ~& [%take-gall-unto +>.sih]
?- -.+>.sih ?- -.+>.sih
%poke-ack ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih)) %poke-ack ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih))
@ -273,18 +273,18 @@
%fact (from ;;(dill-blit q:`vase`+>+>.sih)) %fact (from ;;(dill-blit q:`vase`+>+>.sih))
== ==
:: ::
[%c %note *] [%clay %note *]
(from %out (tuba p.sih ' ' ~(ram re q.sih))) (from %out (tuba p.sih ' ' ~(ram re q.sih)))
:: ::
[?(%b %c) %writ *] [?(%behn %clay) %writ *]
init init
:: ::
[?(%b %c) %mere *] [?(%behn %clay) %mere *]
?: ?=(%& -.p.sih) ?: ?=(%& -.p.sih)
mere mere
(mean >%dill-mere-fail< >p.p.p.sih< q.p.p.sih) (mean >%dill-mere-fail< >p.p.p.sih< q.p.p.sih)
:: ::
[%d %blit *] [%dill %blit *]
(done +.sih) (done +.sih)
== ==
-- --
@ -399,9 +399,10 @@
..^$(all old) ..^$(all old)
:: ::
++ scry ++ scry
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=* why=shop &/p.bem =* why=shop &/p.bem
=* syd q.bem =* syd q.bem
=* lot=coin $/r.bem =* lot=coin $/r.bem

48
pkg/arvo/sys/vane/eyre.hoon
View File

@ -47,18 +47,10 @@
:: +sign: private response from another vane to eyre :: +sign: private response from another vane to eyre
:: ::
+$ sign +$ sign
$% :: %b: from behn $% $: %behn
::
$: %b
::
::
$% [%wake error=(unit tang)] $% [%wake error=(unit tang)]
== == == ==
:: %g: from gall $: %gall
::
$: %g
::
::
gift:gall gift:gall
:: $>(%unto gift:gall) :: $>(%unto gift:gall)
== == == ==
@ -2107,18 +2099,11 @@
:: ::
=/ task=task ((harden task) wrapped-task) =/ task=task ((harden task) wrapped-task)
:: ::
:: error notifications "downcast" to %crud :: XX handle error notifications
:: ::
=? task ?=(^ dud) ?^ dud
~| %crud-in-crud
?< ?=(%crud -.task)
[%crud -.task tang.u.dud]
::
:: %crud: notifies us of an event failure
::
?: ?=(%crud -.task)
=/ moves=(list move) =/ moves=(list move)
[[duct %slip %d %flog task] ~] [[duct %slip %d %flog %crud [-.task tang.u.dud]] ~]
[moves http-server-gate] [moves http-server-gate]
:: %init: tells us what our ship name is :: %init: tells us what our ship name is
:: ::
@ -2317,7 +2302,7 @@
~|(%eyre-take-dud (mean tang.u.dud)) ~|(%eyre-take-dud (mean tang.u.dud))
=> %= . => %= .
sign sign
?: ?=(%g -.sign) ?: ?=(%gall -.sign)
?> ?=(%unto +<.sign) ?> ?=(%unto +<.sign)
sign sign
sign sign
@ -2340,7 +2325,7 @@
:: ::
++ run-app-request ++ run-app-request
:: ::
?> ?=([%g %unto *] sign) ?> ?=([%gall %unto *] sign)
:: ::
:: ::
?> ?=([%poke-ack *] p.sign) ?> ?=([%poke-ack *] p.sign)
@ -2363,7 +2348,7 @@
=/ event-args [[eny duct now rof] server-state.ax] =/ event-args [[eny duct now rof] server-state.ax]
:: ::
?> ?=([@ *] t.wire) ?> ?=([@ *] t.wire)
?: ?=([%g %unto %watch-ack *] sign) ?: ?=([%gall %unto %watch-ack *] sign)
?~ p.p.sign ?~ p.p.sign
:: received a positive acknowledgment: take no action :: received a positive acknowledgment: take no action
:: ::
@ -2375,13 +2360,13 @@
=^ moves server-state.ax (handle-gall-error u.p.p.sign) =^ moves server-state.ax (handle-gall-error u.p.p.sign)
[moves http-server-gate] [moves http-server-gate]
:: ::
?: ?=([%g %unto %kick ~] sign) ?: ?=([%gall %unto %kick ~] sign)
=/ handle-response handle-response:(per-server-event event-args) =/ handle-response handle-response:(per-server-event event-args)
=^ moves server-state.ax =^ moves server-state.ax
(handle-response %continue ~ &) (handle-response %continue ~ &)
[moves http-server-gate] [moves http-server-gate]
:: ::
?> ?=([%g %unto %fact *] sign) ?> ?=([%gall %unto %fact *] sign)
=/ =mark p.cage.p.sign =/ =mark p.cage.p.sign
=/ =vase q.cage.p.sign =/ =vase q.cage.p.sign
?. ?= ?(%http-response-header %http-response-data %http-response-cancel) ?. ?= ?(%http-response-header %http-response-data %http-response-cancel)
@ -2414,7 +2399,7 @@
~|([%bad-channel-wire wire] !!) ~|([%bad-channel-wire wire] !!)
:: ::
%timeout %timeout
?> ?=([%b %wake *] sign) ?> ?=([%behn %wake *] sign)
?^ error.sign ?^ error.sign
[[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate] [[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate]
=/ discard-channel =/ discard-channel
@ -2431,7 +2416,7 @@
[moves http-server-gate] [moves http-server-gate]
:: ::
?(%poke %subscription) ?(%poke %subscription)
?> ?=([%g %unto *] sign) ?> ?=([%gall %unto *] sign)
~| wire ~| wire
?> ?=([@ @ @t @ *] wire) ?> ?=([@ @ @t @ *] wire)
=* channel-id i.t.t.wire =* channel-id i.t.t.wire
@ -2448,7 +2433,7 @@
:: ::
++ sessions ++ sessions
:: ::
?> ?=([%b %wake *] sign) ?> ?=([%behn %wake *] sign)
:: ::
?^ error.sign ?^ error.sign
[[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate] [[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate]
@ -2473,7 +2458,7 @@
(min next expiry-time) (min next expiry-time)
:: ::
++ acme-ack ++ acme-ack
?> ?=([%g %unto *] sign) ?> ?=([%gall %unto *] sign)
:: ::
?> ?=([%poke-ack *] p.sign) ?> ?=([%poke-ack *] p.sign)
?~ p.p.sign ?~ p.p.sign
@ -2498,9 +2483,10 @@
:: +scry: request a path in the urbit namespace :: +scry: request a path in the urbit namespace
:: ::
++ scry ++ scry
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=* why=shop &/p.bem =* why=shop &/p.bem
=* syd q.bem =* syd q.bem
=/ lot=coin $/r.bem =/ lot=coin $/r.bem

29
pkg/arvo/sys/vane/gall.hoon
View File

@ -1,3 +1,4 @@
!:
:: :: %gall, agent execution :: :: %gall, agent execution
!? 163 !? 163
:: ::
@ -506,7 +507,7 @@
++ mo-handle-sys-era ++ mo-handle-sys-era
|= [=path =sign-arvo] |= [=path =sign-arvo]
^+ mo-core ^+ mo-core
?> ?=([%j %public-keys *] sign-arvo) ?> ?=([%jael %public-keys *] sign-arvo)
?> ?=([%era ~] path) ?> ?=([%era ~] path)
?. ?=(%breach -.public-keys-result.sign-arvo) ?. ?=(%breach -.public-keys-result.sign-arvo)
mo-core mo-core
@ -521,7 +522,7 @@
=/ [dap=term her=@ta desk=@ta dat=@ta ~] t.path =/ [dap=term her=@ta desk=@ta dat=@ta ~] t.path
=/ tim (slav da+dat) =/ tim (slav da+dat)
=/ =beak [(slav %p her) desk da+tim] =/ =beak [(slav %p her) desk da+tim]
?> ?=([?(%b %c) %writ *] sign-arvo) ?> ?=([?(%behn %clay) %writ *] sign-arvo)
|^ ^+ mo-core |^ ^+ mo-core
?~ p.sign-arvo ?~ p.sign-arvo
(fail leaf+"gall: failed to build agent {<dap>}" ~) (fail leaf+"gall: failed to build agent {<dap>}" ~)
@ -548,7 +549,7 @@
|= [=path =sign-arvo] |= [=path =sign-arvo]
^+ mo-core ^+ mo-core
?> ?=([%lyv ~] path) ?> ?=([%lyv ~] path)
?> ?=([?(%b %c) %wris *] sign-arvo) ?> ?=([?(%behn %clay) %wris *] sign-arvo)
=/ bek=beak [our %home p.sign-arvo] =/ bek=beak [our %home p.sign-arvo]
=/ nex=(list [=care:clay =^path]) ~(tap in q.sign-arvo) =/ nex=(list [=care:clay =^path]) ~(tap in q.sign-arvo)
~> %slog.[0 leaf+"gall: reloading agents"] ~> %slog.[0 leaf+"gall: reloading agents"]
@ -575,7 +576,7 @@
^+ mo-core ^+ mo-core
:: ::
?> ?=([%lag ~] path) ?> ?=([%lag ~] path)
?> ?=([%a %clog *] sign-arvo) ?> ?=([%ames %clog *] sign-arvo)
:: ::
=/ agents=(list term) ~(tap in ~(key by yokes.state)) =/ agents=(list term) ~(tap in ~(key by yokes.state))
|- ^+ mo-core |- ^+ mo-core
@ -598,7 +599,7 @@
=/ him (slav %p i.t.path) =/ him (slav %p i.t.path)
=/ dap i.t.t.path =/ dap i.t.t.path
:: ::
?> ?=([?(%g %b) %unto *] sign-arvo) ?> ?=([?(%gall %behn) %unto *] sign-arvo)
=/ =sign:agent +>.sign-arvo =/ =sign:agent +>.sign-arvo
:: ::
?- -.sign ?- -.sign
@ -631,7 +632,7 @@
=/ foreign-agent i.t.t.wire =/ foreign-agent i.t.t.wire
:: ::
?+ sign-arvo !! ?+ sign-arvo !!
[%a %done *] [%ames %done *]
=^ remote-request outstanding.state =^ remote-request outstanding.state
?~ t.t.t.wire ?~ t.t.t.wire
=/ full-wire sys+wire =/ full-wire sys+wire
@ -664,7 +665,7 @@
%missing (mo-give:(mo-give %unto %watch-ack err) %unto %poke-ack err) %missing (mo-give:(mo-give %unto %watch-ack err) %unto %poke-ack err)
== ==
:: ::
[%a %boon *] [%ames %boon *]
?^ t.t.t.wire ?^ t.t.t.wire
:: kill subscriptions which use the old wire format :: kill subscriptions which use the old wire format
:: ::
@ -672,7 +673,7 @@
=/ =ames-response ;;(ames-response payload.sign-arvo) =/ =ames-response ;;(ames-response payload.sign-arvo)
(mo-handle-ames-response ames-response) (mo-handle-ames-response ames-response)
:: ::
[%a %lost *] [%ames %lost *]
:: note this should only happen on reverse bones, so only facts :: note this should only happen on reverse bones, so only facts
:: and kicks :: and kicks
:: ::
@ -709,7 +710,7 @@
?. =(nonce.u.yoke i.t.path) ?. =(nonce.u.yoke i.t.path)
%- (slog leaf+"gall: got old {<+<.sign-arvo>} for {<dap>}" ~) %- (slog leaf+"gall: got old {<+<.sign-arvo>} for {<dap>}" ~)
mo-core mo-core
?. ?=([?(%g %b) %unto *] sign-arvo) ?. ?=([?(%gall %behn) %unto *] sign-arvo)
?: ?=(%| -.agent.u.yoke) ?: ?=(%| -.agent.u.yoke)
%- (slog leaf+"gall: {<dap>} dozing, dropping {<+<.sign-arvo>}" ~) %- (slog leaf+"gall: {<dap>} dozing, dropping {<+<.sign-arvo>}" ~)
mo-core mo-core
@ -760,7 +761,7 @@
=/ card =/ card
?: ?=(%& -.blocker) ?: ?=(%& -.blocker)
[%slip %g %deal sock dap p.blocker] [%slip %g %deal sock dap p.blocker]
[%pass /clear-huck %b %huck %g %unto p.blocker] [%pass /clear-huck %b %huck `sign-arvo`[%gall %unto p.blocker]]
[duct card] [duct card]
$(moves [move moves]) $(moves [move moves])
:: +mo-filter-queue: remove all blocked tasks from ship. :: +mo-filter-queue: remove all blocked tasks from ship.
@ -1525,7 +1526,7 @@
=. ap-core =. ap-core
(ap-pass wire %agent dock %leave ~) (ap-pass wire %agent dock %leave ~)
=/ way [%out (scot %p p.dock) q.dock wire] =/ way [%out (scot %p p.dock) q.dock wire]
(ap-pass way %arvo %b %huck `sign-arvo`[%g %unto %kick ~]) (ap-pass way %arvo %b %huck `sign-arvo`[%gall %unto %kick ~])
:: +ap-mule: run virtualized with intercepted scry, preserving type :: +ap-mule: run virtualized with intercepted scry, preserving type
:: ::
:: Compare +mute and +mule. Those pass through scry, which :: Compare +mute and +mule. Those pass through scry, which
@ -1706,9 +1707,9 @@
:: ::
++ scry ++ scry
~/ %gall-scry ~/ %gall-scry
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang care=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* care cyr
=/ =shop &/p.bem =/ =shop &/p.bem
=* dap q.bem =* dap q.bem
=/ =coin $/r.bem =/ =coin $/r.bem
@ -1778,7 +1779,7 @@
~| [%gall-take-failed wire] ~| [%gall-take-failed wire]
?> ?=([?(%sys %use) *] wire) ?> ?=([?(%sys %use) *] wire)
=< mo-abet =< mo-abet
%. [t.wire ?:(?=([%b %heck *] syn) syn.syn syn)] %. [t.wire ?:(?=([%behn %heck *] syn) syn.syn syn)]
?- i.wire ?- i.wire
%sys mo-handle-sys:(mo-abed:mo duct) %sys mo-handle-sys:(mo-abed:mo duct)
%use mo-handle-use:(mo-abed:mo duct) %use mo-handle-use:(mo-abed:mo duct)

18
pkg/arvo/sys/vane/iris.hoon
View File

@ -308,18 +308,11 @@
:: ::
=/ task=task ((harden task) wrapped-task) =/ task=task ((harden task) wrapped-task)
:: ::
:: error notifications "downcast" to %crud :: XX handle error notifications
:: ::
=? task ?=(^ dud) ?^ dud
~| %crud-in-crud
?< ?=(%crud -.task)
[%crud -.task tang.u.dud]
::
:: %crud: notifies us of an event failure
::
?: ?=(%crud -.task)
=/ moves=(list move) =/ moves=(list move)
[[duct %slip %d %flog task] ~] [[duct %slip %d %flog %crud [-.task tang.u.dud]] ~]
[moves light-gate] [moves light-gate]
:: %trim: in response to memory pressure :: %trim: in response to memory pressure
:: ::
@ -390,9 +383,10 @@
:: +scry: request a path in the urbit namespace :: +scry: request a path in the urbit namespace
:: ::
++ scry ++ scry
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=* why=shop &/p.bem =* why=shop &/p.bem
=* syd q.bem =* syd q.bem
=* lot=coin $/r.bem =* lot=coin $/r.bem

39
pkg/arvo/sys/vane/jael.hoon
View File

@ -78,16 +78,16 @@
+$ note :: out request $-> +$ note :: out request $->
$~ [%a %plea *ship *plea:ames] :: $~ [%a %plea *ship *plea:ames] ::
$% $: %a :: to %ames $% $: %a :: to %ames
$>(%plea task:ames) :: send request message $>(%plea task:ames) :: send request message
== :: == ::
$: %b :: to %behn $: %b :: to %behn
$>(%wait task:behn) :: set timer $>(%wait task:behn) :: set timer
== :: == ::
$: %e :: to %eyre $: %e :: to %eyre
[%code-changed ~] :: notify code changed [%code-changed ~] :: notify code changed
== :: == ::
$: %g :: to %gall $: %g :: to %gall
$>(%deal task:gall) :: talk to app $>(%deal task:gall) :: talk to app
== :: == ::
$: %j :: to self $: %j :: to self
$>(%listen task) :: set ethereum source $>(%listen task) :: set ethereum source
@ -97,16 +97,16 @@
== == == :: == == == ::
:: :: :: ::
+$ sign :: in result $<- +$ sign :: in result $<-
$~ [%a %done ~] :: $~ [%behn %wake ~] ::
$% $: %a :: $% $: %ames ::
$% $>(%boon gift:ames) :: message response $% $>(%boon gift:ames) :: message response
$>(%done gift:ames) :: message (n)ack $>(%done gift:ames) :: message (n)ack
$>(%lost gift:ames) :: lost boon $>(%lost gift:ames) :: lost boon
== == :: == == ::
$: %b :: $: %behn ::
$>(%wake gift:behn) :: $>(%wake gift:behn) ::
== :: == ::
$: %g :: $: %gall ::
$> $? %onto :: $> $? %onto ::
%unto :: %unto ::
== :: == ::
@ -527,25 +527,25 @@
|= [tea=wire hen=duct hin=sign] |= [tea=wire hen=duct hin=sign]
^+ +> ^+ +>
?- hin ?- hin
[%a %done *] [%ames %done *]
?~ error.hin +>.$ ?~ error.hin +>.$
~& [%done-bad tag.u.error.hin] ~& [%done-bad tag.u.error.hin]
%- (slog tang.u.error.hin) %- (slog tang.u.error.hin)
::TODO fail:et ::TODO fail:et
+>.$ +>.$
:: ::
[%a %boon *] [%ames %boon *]
=+ ;; [%public-keys-result =public-keys-result] payload.hin =+ ;; [%public-keys-result =public-keys-result] payload.hin
%- curd =< abet %- curd =< abet
(public-keys:~(feel su hen now pki etn) pos.zim.pki public-keys-result) (public-keys:~(feel su hen now pki etn) pos.zim.pki public-keys-result)
:: ::
[%a %lost *] [%ames %lost *]
:: TODO: better error handling :: TODO: better error handling
:: ::
~| %jael-ames-lost ~| %jael-ames-lost
!! !!
:: ::
[%b %wake *] [%behn %wake *]
?^ error.hin ?^ error.hin
%- %+ slog %- %+ slog
leaf+"jael unable to resubscribe, run :azimuth-tracker|listen" leaf+"jael unable to resubscribe, run :azimuth-tracker|listen"
@ -558,11 +558,11 @@
%- curd =< abet %- curd =< abet
(sources:~(feel su hen now pki etn) ships source) (sources:~(feel su hen now pki etn) ships source)
:: ::
[%g %onto *] [%gall %onto *]
~& [%jael-onto tea hin] ~& [%jael-onto tea hin]
+>.$ +>.$
:: ::
[%g %unto *] [%gall %unto *]
?- +>-.hin ?- +>-.hin
%kick ~|([%jael-unexpected-quit tea hin] !!) %kick ~|([%jael-unexpected-quit tea hin] !!)
%poke-ack %poke-ack
@ -1006,9 +1006,10 @@
..^$(lex old) ..^$(lex old)
:: :: ++scry :: :: ++scry
++ scry :: inspect ++ scry :: inspect
|= [lyc=gang cyr=term bem=beam] ^- roon
|= [lyc=gang car=term bem=beam]
^- (unit (unit cage)) ^- (unit (unit cage))
=* ren cyr =* ren car
=* why=shop &/p.bem =* why=shop &/p.bem
=* syd q.bem =* syd q.bem
=* lot=coin $/r.bem =* lot=coin $/r.bem

42
pkg/arvo/sys/zuse.hoon
View File

@ -165,9 +165,6 @@
$% :: i/o device replaced (reset state) $% :: i/o device replaced (reset state)
:: ::
[%born ~] [%born ~]
:: error report
::
[%crud p=@tas q=(list tank)]
:: boot completed (XX legacy) :: boot completed (XX legacy)
:: ::
[%init ~] [%init ~]
@ -380,7 +377,6 @@
:: Messaging Tasks :: Messaging Tasks
:: ::
:: %hear: packet from unix :: %hear: packet from unix
:: %hole: report that packet handling crashed
:: %heed: track peer's responsiveness; gives %clog if slow :: %heed: track peer's responsiveness; gives %clog if slow
:: %jilt: stop tracking peer's responsiveness :: %jilt: stop tracking peer's responsiveness
:: %plea: request to send message :: %plea: request to send message
@ -388,7 +384,6 @@
:: System and Lifecycle Tasks :: System and Lifecycle Tasks
:: ::
:: %born: process restart notification :: %born: process restart notification
:: %crud: crash report
:: %init: vane boot :: %init: vane boot
:: %sift: limit verbosity to .ships :: %sift: limit verbosity to .ships
:: %spew: set verbosity toggles :: %spew: set verbosity toggles
@ -397,13 +392,11 @@
:: ::
+$ task +$ task
$% [%hear =lane =blob] $% [%hear =lane =blob]
[%hole =lane =blob]
[%heed =ship] [%heed =ship]
[%jilt =ship] [%jilt =ship]
$>(%plea vane-task) $>(%plea vane-task)
:: ::
$>(%born vane-task) $>(%born vane-task)
$>(%crud vane-task)
$>(%init vane-task) $>(%init vane-task)
[%sift ships=(list ship)] [%sift ships=(list ship)]
[%spew veb=(list verb)] [%spew veb=(list verb)]
@ -753,7 +746,6 @@
+$ task :: in request ->$ +$ task :: in request ->$
$~ [%vega ~] :: $~ [%vega ~] ::
$% $>(%born vane-task) :: new unix process $% $>(%born vane-task) :: new unix process
$>(%crud vane-task) :: error with trace
[%rest p=@da] :: cancel alarm [%rest p=@da] :: cancel alarm
[%drip p=vase] :: give in next event [%drip p=vase] :: give in next event
[%huck syn=sign-arvo] :: give back [%huck syn=sign-arvo] :: give back
@ -789,7 +781,6 @@
[%cred nom=@ta cew=crew] :: set permission group [%cred nom=@ta cew=crew] :: set permission group
[%crew ~] :: permission groups [%crew ~] :: permission groups
[%crow nom=@ta] :: group usage [%crow nom=@ta] :: group usage
$>(%crud vane-task) :: error with trace
[%drop des=desk] :: cancel pending merge [%drop des=desk] :: cancel pending merge
[%info des=desk dit=nori] :: internal edit [%info des=desk dit=nori] :: internal edit
$>(%init vane-task) :: report install $>(%init vane-task) :: report install
@ -1058,7 +1049,7 @@
[%blew p=blew] :: terminal config [%blew p=blew] :: terminal config
[%boot lit=? p=*] :: weird %dill boot [%boot lit=? p=*] :: weird %dill boot
[%crop p=@ud] :: trim kernel state [%crop p=@ud] :: trim kernel state
$>(%crud vane-task) :: error with trace [%crud p=@tas q=(list tank)] :: print error
[%flee session=~] :: unwatch session [%flee session=~] :: unwatch session
[%flog p=flog] :: wrapped error [%flog p=flog] :: wrapped error
[%flow p=@tas q=(list gill:gall)] :: terminal config [%flow p=@tas q=(list gill:gall)] :: terminal config
@ -1164,10 +1155,7 @@
:: ::
+$ task +$ task
$~ [%vega ~] $~ [%vega ~]
$% :: event failure notification $% :: initializes ourselves with an identity
::
$>(%crud vane-task)
:: initializes ourselves with an identity
:: ::
$>(%init vane-task) $>(%init vane-task)
:: new unix process :: new unix process
@ -1787,10 +1775,7 @@
:: ::
+$ task +$ task
$~ [%vega ~] $~ [%vega ~]
$% :: event failure notification $% :: system started up; reset open connections
::
$>(%crud vane-task)
:: system started up; reset open connections
:: ::
$>(%born vane-task) $>(%born vane-task)
:: trim state (in response to memory pressure) :: trim state (in response to memory pressure)
@ -2123,9 +2108,11 @@
[%j task:jael] [%j task:jael]
[@tas %meta vase] [@tas %meta vase]
== ==
:: full vane names are required in vanes
::
+$ sign-arvo :: in result $<- +$ sign-arvo :: in result $<-
$% [%a gift:ames] $% [%ames gift:ames]
$: %b $: %behn
$% gift:behn $% gift:behn
$>(%wris gift:clay) $>(%wris gift:clay)
$>(%writ gift:clay) $>(%writ gift:clay)
@ -2133,12 +2120,12 @@
$>(%unto gift:gall) $>(%unto gift:gall)
== ==
== ==
[%c gift:clay] [%clay gift:clay]
[%d gift:dill] [%dill gift:dill]
[%e gift:eyre] [%eyre gift:eyre]
[%g gift:gall] [%gall gift:gall]
[%i gift:iris] [%iris gift:iris]
[%j gift:jael] [%jael gift:jael]
== ==
:: $unix-task: input from unix :: $unix-task: input from unix
:: ::
@ -2159,9 +2146,6 @@
:: %eyre: cancel request :: %eyre: cancel request
:: ::
[%cancel-request ~] [%cancel-request ~]
:: any vane: error report
::
$>(%crud vane-task)
:: %dill: reset terminal configuration :: %dill: reset terminal configuration
:: ::
$>(%hail task:dill) $>(%hail task:dill)

2
pkg/arvo/ted/aqua/behn.hoon
View File

@ -102,7 +102,7 @@
:: ::
++ handle-arvo-response ++ handle-arvo-response
|= [=wire =sign-arvo] |= [=wire =sign-arvo]
?> ?=([%b %wake *] sign-arvo) ?> ?=([%behn %wake *] sign-arvo)
?> ?=([@ *] wire) ?> ?=([@ *] wire)
=/ who (,@p (slav %p i.wire)) =/ who (,@p (slav %p i.wire))
=^ cards piers =^ cards piers

2
pkg/arvo/ted/aqua/eyre.hoon
View File

@ -118,7 +118,7 @@
++ handle-arvo-response ++ handle-arvo-response
|= [=wire =sign-arvo] |= [=wire =sign-arvo]
^- (quip card:agent:gall _this) ^- (quip card:agent:gall _this)
?> ?=([%i %http-response %finished *] sign-arvo) ?> ?=([%iris %http-response %finished *] sign-arvo)
?> ?=([@ *] wire) ?> ?=([@ *] wire)
=/ who (,@p (slav %p i.wire)) =/ who (,@p (slav %p i.wire))
=/ =httr:eyre =/ =httr:eyre