ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-20 15:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into philip/individual-breaches

Browse Source
This commit is contained in:
Philip Monk 2019-05-15 11:13:25 -07:00
commit 8cd261451a
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
25 changed files with 149 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/collections.hoon
View File

@ -195,9 +195,30 @@
++ peer
|= wir=wire
^- (quip move _this)
::~& peer-prize+str.sta
=/ response=streams
?+ wir
%= str.sta
env.inbox (scag 1.000 env.inbox.str.sta)
==
:: negative range from latest
::
[%primary @t ~]
=/ val=@ (slav %ud i.t.wir)
%= str.sta
env.inbox (scag val env.inbox.str.sta)
==
:: negative range from offset
::
[%primary @t @t ~]
=/ offset=@ (slav %ud i.t.wir)
=/ num=@ (slav %ud i.t.t.wir)
%= str.sta
env.inbox (swag [offset num] env.inbox.str.sta)
==
::
==
:_ this
[ost.bol %diff %collections-prize str.sta]~
[ost.bol %diff %collections-prize response]~
::
:: +reap: recieve acknowledgement for peer, retry on failure
::

4
app/test.hoon
View File

@ -60,7 +60,7 @@
%- (slog (report-error spur head.build-result.res))
=/ nex=(list ^spur)
=< p
;; ,[%success %$ %cont * p=(list ^spur)]
;; [%success %$ %cont * p=(list ^spur)]
tail.build-result.res
?~ nex ~&(%cores-tested ~)
[ost (build-core nex)]~
@ -90,7 +90,7 @@
%- (slog (report-error /[ren]/ren head.build-result.res))
=/ nex=(list term)
=< p
;; ,[%success %$ %cont * p=(list term)]
;; [%success %$ %cont * p=(list term)]
tail.build-result.res
?~ nex ~&(%rens-tested ~)
[ost (build-rend nex)]~

4
lib/collections.hoon
View File

@ -310,7 +310,7 @@
|= [seg=@ta out=term]
%^ cat 3
?:(=(%$ out) out (cat 3 out '-'))
((hard @tas) seg)
;;(@tas seg)
[our nam]
::
:: +allowed-by: checks if ship :who is allowed by the permission rules in :dic
@ -402,7 +402,7 @@
=/ entries=wain
%+ turn ~(tap by a)
|= b=[knot cord]
=/ c=[term cord] ((hard ,[term cord]) b)
=/ c=[term cord] ;;([term cord] b)
(crip " [{<-.c>} {<+.c>}]")
::
?~ entries ~

2
lib/hall-legacy.hoon
View File

@ -144,7 +144,7 @@
%- of :~
name+(ot nom+so mon+tors ~)
text+(cu to-wain:format so)
tank+(ot dat+(cu (hard (list tank)) blob) ~)
tank+(ot dat+(cu (list tank) blob) ~)
==
::
++ blob (cu cue (su fel:de-base64:mimes:html))

4
lib/hood/helm.hoon
View File

@ -40,7 +40,7 @@
$% [%bonk wire ~] ::
{$conf wire dock $load ship term} ::
{$flog wire flog:dill} ::
[%mint wire our=ship p=ship q=safe:rights:jael]
[%mint wire p=ship q=safe:rights:jael]
{$nuke wire ship} ::
{$serv wire ?(desk beam)} ::
{$poke wire dock pear} ::
@ -87,7 +87,7 @@
:: our new private key, as a +tree of +rite
::
=/ rit (sy [%jewel (my [lyf.u.sed key.u.sed] ~)] ~)
(emit %mint / our our rit)
(emit %mint / our rit)
::
++ poke-nuke :: initialize
|= him/ship =< abet

4
lib/hood/kiln.hoon
View File

@ -408,7 +408,7 @@
(render "on sync" sud her syd)
~
start-sync
=. let ?. ?=($w p.p.u.rot) let ud:((hard cass:clay) q.q.r.u.rot)
=. let ?. ?=($w p.p.u.rot) let ud:;;(cass:clay q.q.r.u.rot)
=/ =wire /kiln/sync/[syd]/(scot %p her)/[sud]
:: germ: merge mode for sync merges
::
@ -641,7 +641,7 @@
?. ?=($path p.pax)
~| "strange path mark: {<p.pax>}"
!!
[((hard path) q.q.pax) ?:(?=($null p.dif) ~ `[%dif dif])]
[;;(path q.q.pax) ?:(?=($null p.dif) ~ `[%dif dif])]
:: ~& > kiln-made+[(turn can head) syd=syd +<.abet]
=+ notated=(skid can |=({path a/(unit miso)} ?=(^ a)))
=+ annotated=(turn `(list (pair path *))`-.notated head)

3
lib/oauth1.hoon
View File

@ -86,7 +86,8 @@
^- {key/@t sec/@t ~}
?. =(~ `@`key)
~| %oauth-bad-keys
((hard {key/@t sec/@t ~}) (to-wain:format key))
;; {key/@t sec/@t ~}
(to-wain:format key)
%+ mean-wall %oauth-no-keys
"""
Run |init-oauth1 {<`path`dom>}

3
lib/oauth2.hoon
View File

@ -74,7 +74,8 @@
^- {cid/@t cis/@t ~}
?. =(~ `@`key)
~| %oauth-bad-keys
((hard {cid/@t cis/@t ~}) (to-wain key))
;; {cid/@t cis/@t ~}
(to-wain key)
%+ mean-wall %oauth-no-keys
"""
Run |init-oauth2 {<`path`dom>}

5
lib/test/runner.hoon
View File

@ -55,8 +55,9 @@
^- test-func
::
|.
^- tang
((hard tang) .*(test-core nock.run-arm))
;; tang
.* test-core
nock.run-arm
:: +has-test-prefix: does the arm define a test we should run?
::
++ has-test-prefix

4
mar/collections/action.hoon
View File

@ -18,7 +18,7 @@
++ noun action:collections
++ json
|= jon=^json
%- (hard action:collections)
;; action:collections
=< (action jon)
|%
++ action
@ -68,7 +68,7 @@
|= jon=^json
^- (set whom:clay)
=/ x ((ar:dejs (su:dejs fed:ag)) jon)
%- (hard (set whom:clay))
;; (set whom:clay)
%- ~(run in (sy x))
|=(w=@ [& w])
--

10
ren/collections/elem.hoon
View File

@ -30,7 +30,7 @@
;div.row
;div.flex-col-2;
;div.flex-col-x
;div.collection-index
;div
;+ (meta-to-elem itm sho)
;+ (collection-to-elem col.itm)
==
@ -46,7 +46,7 @@
;div.row
;div.flex-col-2;
;div.flex-col-x
;div.collection-index
;div
;+ (meta-to-elem itm sho)
;+ (collection-post ~ (flop s.bem.gas))
==
@ -63,7 +63,7 @@
;div.row
;div.flex-col-2;
;div.flex-col-x
;div.collection-index
;div
;+ (meta-to-elem itm sho)
;+ (both-to-elem col.itm raw.itm)
==
@ -75,7 +75,7 @@
;div.row
;div.flex-col-2;
;div.flex-col-x
;div.collection-index
;div
;+ (meta-to-elem itm sho)
;+ (collection-post `raw.itm (flop s.bem.gas))
==
@ -150,7 +150,7 @@
=urb-component "Sigil"
=urb-ship "{(trip author)}"
=urb-size "18"
=urb-suffix "true";
=urb-prefix "true";
;div
;a.vanilla.text-mono.text-small.text-700.mr-4
=href "/~~/{(trip host)}/==/web/landscape/profile"

20
sys/arvo.hoon
View File

@ -591,7 +591,7 @@
::
++ poke |= * :: 47
^- [(list ovum) *]
=> .(+< ((hard ,[now=@da ovo=ovum]) +<))
=> .(+< ;;([now=@da ovo=ovum] +<))
^- [(list ovum) *]
=. +>.$
?+ -.q.ovo
@ -652,23 +652,23 @@
=< :: Arvo structural interface
::
|%
++ come |= {@ @ @ (list ovum) vise pone} :: 4
^- {(list ovum) _+>}
++ come |= [@ @ @ (list ovum) vise pone] :: 4
^- [(list ovum) _+>]
~& %hoon-come
=^ rey +>+ (^come +<)
[rey +>.$]
::
++ load |= {@ @ @ (list ovum) vase pane} :: 10
^- {(list ovum) _+>}
++ load |= [@ @ @ (list ovum) vase pane] :: 10
^- [(list ovum) _+>]
~& %hoon-load
=^ rey +>+ (^load +<)
[rey +>.$]
::
++ peek |=(* (^peek ((hard {@da path}) +<))) :: 46
++ peek |=(* (^peek ;;([@da path] +<))) :: 46
::
++ poke |= * :: 47
^- [(list ovum) *]
=> .(+< ((hard ,[now=@da ovo=ovum]) +<))
=> .(+< ;;([now=@da ovo=ovum] +<))
=^ ova +>+.$ (^poke now ovo)
=| out=(list ovum)
|- ^- [(list ovum) *]
@ -678,7 +678,7 @@
::
?: ?=(%lyra -.q.i.ova)
%+ fall
(vega now t.ova ({@ @} +.q.i.ova))
(vega now t.ova ;;([@ @] +.q.i.ova))
[~ +>.^$]
:: iterate over effects, handling those on arvo proper
:: and passing the rest through as output
@ -687,7 +687,7 @@
=? out ?=(^ vov) [+.vov out]
$(ova t.ova)
::
++ wish |=(* (^wish ((hard @ta) +<))) :: 22
++ wish |=(* (^wish ;;(@ta +<))) :: 22
--
:: Arvo implementation core
::
@ -894,7 +894,7 @@
::
++ veer
|= [who=ship now=@da fav=curd]
=> .(fav ((hard {$veer lal/@ta pax/path txt/@t}) fav))
=> .(fav ;;({$veer lal/@ta pax/path txt/@t} fav))
=- ?:(?=(%| -.res) ((slog p.res) +>.$) p.res)
^= res %- mule |.
?: =(%$ lal.fav)

63
sys/hoon.hoon
View File

@ -256,13 +256,6 @@
--
::
++ fore |*(a/$-(* *) |*(b/$-(* *) (pair a b))) :: pair before
++ hard :: force remold
|* han/$-(* *)
|= fud/* ^- han
~_ leaf+"hard"
=+ gol=(han fud)
?>(=(gol fud) gol)
::
::
++ head |*(^ ,:+<-) :: get head
++ same |*(* +<) :: identity
@ -6696,7 +6689,7 @@
{$mcnt p/hoon} :: ;/ [%$ [%$ p ~] ~]
{$mcgl p/spec q/hoon r/hoon s/hoon} :: ;< bind
{$mcsg p/hoon q/(list hoon)} :: ;~ kleisli arrow
{$mcmc p/hoon q/hoon} :: ;; normalize
{$mcmc p/spec q/hoon} :: ;; normalize
:: :::::: compositions
{$tsbr p/spec q/hoon} :: =| push bunt
{$tscl p/(list (pair wing hoon)) q/hoon} :: =: q w/ p changes
@ -8808,17 +8801,7 @@
== ::
::
{$mcmc *} :: ;;
:+ %tsbn [%ktts %v %$ 1] :: => v=.
:+ %tsls :+ %ktts %a :: =+ ^= a
[%tsbn [%limb %v] p.gen] :: =>(v {p.gen})
:+ %tsls [%ktts %b [%tsbn [%limb %v] q.gen]] :: =+ b==>(v {q.gen})
:+ %tsls :: =+ c=(a b)
[%ktts %c [%cncl [%limb %a] [%limb %b] ~]] ::
:+ %wtbn :: ?>(=(`*`c `*`b) c)
:+ %dtts ::
[%kthp [%base %noun] [%limb %c]] ::
[%kthp [%base %noun] [%limb %b]] ::
[%limb %c] ::
[%cnhp ~(factory ax fab p.gen) q.gen]
::
{$tsbr *}
[%tsls ~(example ax fab p.gen) q.gen]
@ -11215,7 +11198,7 @@
$type
=+ tyr=|.((dial dole))
=+ vol=tyr(sut lum)
=+ cis=((hard tank) .*(vol [%9 2 %0 1]))
=+ cis=;;(tank .*(vol [%9 2 %0 1]))
:^ ~ %palm
[~ ~ ~ ~]
[[%leaf '#' 't' '/' ~] cis ~]
@ -11227,7 +11210,7 @@
|- ^- (list tank)
?~ lum ~
?@ lum !!
[[%leaf (trip ((hard @) -.lum))] $(lum +.lum)]
[[%leaf (trip ;;(@ -.lum))] $(lum +.lum)]
::
$wool
:- ~
@ -14050,8 +14033,8 @@
[%mcnt *] (rune ';/' ~ ~ (hoons ~[p]:x))
[%mcgl *] (rune ';<' ~ ~ (spec p.x) (hoons ~[q r s]:x))
[%mcsg *] (rune ';~' `'==' ~ (hoons [p q]:x))
[%mcmc *] (rune ';;' ~ ~ (hoons ~[p q]:x))
[%tsbr *] (rune ';;' ~ ~ ~[(spec p.x) (hn q.x)])
[%mcmc *] (rune ';;' ~ ~ ~[(spec p.x) (hn q.x)])
[%tsbr *] (rune '=|' ~ ~ ~[(spec p.x) (hn q.x)])
[%tscl *] (tiscol-to-plum p.x q.x)
[%tsnt *] (rune '=/' ~ ~ (skin p.x) (hn q.x) (hn r.x) ~)
[%tsmc *] (rune '=;' ~ ~ [(skin p.x) (hoons ~[q r]:x)])
@ -14555,20 +14538,20 @@
|= [p=xpat n=*]
^- plum
?- p
%hoon (hoon-to-plum 999 ((hard hoon) n))
%json (json-to-plum ((hard json) n))
%manx (manx-to-plum ((hard manx) n))
%nock (nock-to-plum ((hard nock) n))
%path (path-to-plum ((hard path) n))
%plum ((hard plum) n)
%skin (skin-to-plum ((hard skin) n))
%spec (spec-to-plum ((hard spec) n))
%tape (tape-to-plum ((hard tape) n))
%tour (tour-to-plum ((hard tour) n))
%hoon (hoon-to-plum 999 ;;(hoon n))
%json (json-to-plum ;;(json n))
%manx (manx-to-plum ;;(manx n))
%nock (nock-to-plum ;;(nock n))
%path (path-to-plum ;;(path n))
%plum ;;(plum n)
%skin (skin-to-plum ;;(skin n))
%spec (spec-to-plum ;;(spec n))
%tape (tape-to-plum ;;(tape n))
%tour (tour-to-plum ;;(tour n))
%type =/ ttp type-to-plum
((hard plum) .*(ttp(+< n) [9 2 0 1]))
;;(plum .*(ttp(+< n) [9 2 0 1]))
%vase =/ vtp vase-to-plum
=/ =plum ((hard plum) .*(vtp(+< n) [9 2 0 1]))
=/ =plum ;;(plum .*(vtp(+< n) [9 2 0 1]))
(rune '!>' ~ ~ ~[plum])
[%gate *] (render-gate sample.p product.p)
[%gear *] '%gear' :: XX TODO
@ -15994,9 +15977,13 @@
::
(stag %code (ifix [tec tec] (calf tec)))
::
:: ++arm
:: ++arm, +-arm, +$arm, +*arm, ++arm:core, ...
::
(stag %code ;~(plug lus lus low (star ;~(pose nud low hep))))
%+ stag %code
;~ plug
lus ;~(pose lus hep bus tar)
low (star ;~(pose nud low hep col))
==
::
:: [arbitrary *content*](url)
::
@ -16659,7 +16646,7 @@
['/' (rune net %mcnt expa)]
['<' (rune gal %mcgl exp1)]
['~' (rune sig %mcsg expi)]
[';' (rune mic %mcmc expb)]
[';' (rune mic %mcmc exqc)]
==
==
:- '='

12
sys/vane/ames.hoon
View File

@ -908,7 +908,7 @@
%none
:: ~& %chew-none
=. puz (bilk:puz now)
(chow ((hard meal) (cue msg)))
(chow ;;(meal (cue msg)))
::
%fast
:: ~& %chew-fast
@ -919,24 +919,24 @@
?~ dey +>.$
=. puz (bilk:puz now)
=^ key diz u.dey
(chow(aut sin) ((hard meal) (cue (dy:cub:sen:gus key bod))))
(chow(aut sin) ;;(meal (cue (dy:cub:sen:gus key bod))))
::
%full
:: ~& %chew-full
=/ mex ((hard full:pact) (cue msg))
=/ mex ;;(full:pact (cue msg))
=. diz (deng law.mex)
=/ wug cluy:diz
?> =(lyf.wug from.lyf.mex)
=/ gey (sev:gus to.lyf.mex)
=/ sem (need (tear:as:q.gey pub:ex:cub.wug txt.mex))
=/ mes ((hard (pair @ @)) (cue sem))
=/ mes ;;((pair @ @) (cue sem))
=. diz (wasc:diz p.mes)
=. puz (bilk:puz now)
(west(msg q.mes))
::
%open
:: ~& %chew-open
=/ mex ((hard open:pact) (cue msg))
=/ mex ;;(open:pact (cue msg))
=. diz (deng law.mex)
=/ wug cluy:diz
?> =(lyf.wug from.lyf.mex)
@ -1269,7 +1269,7 @@
=/ task=task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
=. any.ton.fox eny
=^ duy ..knob (knob hen task)
[duy ..^$]

2
sys/vane/behn.hoon
View File

@ -230,7 +230,7 @@
=/ =task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
::
=/ event-core (per-event [our now hen] state)
::

73
sys/vane/clay.hoon
View File

@ -603,7 +603,7 @@
^- (pair path cage)
?> ?=($ins -.mis)
=+ =>((flop pax) ?~(. %$ i))
[pax - [%atom %t ~] ((hard @t) +>.q.q.p.mis)]
[pax - [%atom %t ~] ;;(@t +>.q.q.p.mis)]
::
=/ mim
:: add the new files to the new mime cache
@ -618,7 +618,7 @@
?> ?=($ins -.mis)
?. ?=($mime p.p.mis)
~
`[pax ((hard mime) q.q.p.mis)]
`[pax ;;(mime q.q.p.mis)]
::
^- (list (pair path mime))
%+ murn ink.nuz
@ -626,7 +626,7 @@
^- (unit (pair path mime))
?> ?=($ins -.mis)
?> ?=($mime p.p.mis)
`[pax ((hard mime) q.q.p.mis)]
`[pax ;;(mime q.q.p.mis)]
::
^- (list (pair path mime))
%+ murn mut.nuz
@ -635,7 +635,7 @@
?> ?=($mut -.mis)
?. ?=($mime p.p.mis)
~
`[pax ((hard mime) q.q.p.mis)]
`[pax ;;(mime q.q.p.mis)]
==
::
;< ins=(list (pair path cage)) bind:m (calc-inserts wen ins.nuz)
@ -672,7 +672,7 @@
|= {pax/cage cay/cage}
?. ?=($path p.pax)
~|(%clay-take-inserting-strange-path-mark !!)
[((hard path) q.q.pax) cay]
[;;(path q.q.pax) cay]
::
:: Build the list of diffs by apply the given diffs to the existing
:: data.
@ -706,7 +706,7 @@
^- (pair path (pair lobe cage))
?. ?=($path p.pax)
~|(%clay-take-diffing-strange-path-mark !!)
=+ paf=((hard path) q.q.pax)
=+ paf=;;(path q.q.pax)
[paf (page-to-lobe:sutil [p q.q]:cay) (~(got by dig) paf)]
::
:: Build the list of mutations by casting to the correct mark and
@ -738,7 +738,7 @@
|= {pax/cage cay/cage}
?. ?=($path p.pax)
~|(%castify-bad-path-mark !!)
[((hard path) q.q.pax) cay]
[;;(path q.q.pax) cay]
:_ :+ ~ %done
^- (map path lobe)
%- malt
@ -767,7 +767,7 @@
~|(%clay-take-mutating-strange-path-mark !!)
?: ?=($null p.cay)
~
=+ paf=((hard path) q.q.pax)
=+ paf=;;(path q.q.pax)
`[paf (~(got by hashes) paf) cay]
::
:: Collect the relevant data from dok and run +execute-changes to
@ -830,7 +830,7 @@
|= {pax/cage cay/cage}
?. ?=($path-hash p.pax)
~|(%patch-bad-path-mark !!)
[-< -> +]:[((hard {path lobe}) q.q.pax) cay]
[-< -> +]:[;;({path lobe} q.q.pax) cay]
=. ank.dom (map-to-ankh:sutil (malt cat))
(pure:m this-cor)
::
@ -875,16 +875,16 @@
(clad-fail %ergo-fail-incomplete leaf+"clay ergo incomplete" tang.res)
?. ?=([%complete %success *] res)
(clad-fail %ergo-fail leaf+"clay ergo failed" message.build-result.res)
=/ changes (map path (unit mime))
=/ changes=(map path (unit mime))
%- malt ^- mode
%+ turn (made-result-to-cages:util res)
|= [pax=cage mim=cage]
?. ?=($path p.pax)
~|(%ergo-bad-path-mark !!)
:- ((hard path) q.q.pax)
:- ;;(path q.q.pax)
?. ?=($mime p.mim)
~
`((hard mime) q.q.mim)
`;;(mime q.q.mim)
=+ must=(must-ergo:util our syd mon (turn ~(tap by changes) head))
^- form:m
|= clad-input
@ -1045,14 +1045,13 @@
=. ran r
?~ rot
(error:he cas %bad-fetch-ali ~)
=+ ^= ali-dome
%. q.q.r.u.rot
%- hard
$: ank=*
let=@ud
hit=(map @ud tako)
lab=(map @tas @ud)
==
=/ ali-dome
;; $: ank=*
let=@ud
hit=(map @ud tako)
lab=(map @tas @ud)
==
q.q.r.u.rot
?: =(0 let.ali-dome)
(error:he cas %no-ali-disc ~)
=/ tak (~(get by hit.ali-dome) let.ali-dome)
@ -1592,8 +1591,8 @@
?. ?=($path p.pax)
[%ergo >[%expected-path got=p.pax]< ~]
=* mim q.i.p.tay
=+ mit=?.(?=($mime p.mim) ~ `((hard mime) q.q.mim))
$(p.tay t.p.tay, nac :_(nac [((hard path) q.q.pax) mit]))
=+ mit=?.(?=($mime p.mim) ~ `;;(mime q.q.mim))
$(p.tay t.p.tay, nac :_(nac [;;(path q.q.pax) mit]))
?: ?=([@ *] tan) (error:he cas tan)
=/ can=(map path (unit mime)) (malt tan)
?~ hez
@ -1816,7 +1815,7 @@
=* pax p.i.tay
?. ?=($path p.pax)
(mule |.(`~`~|([%expected-path got=p.pax] !!)))
$(tay t.tay, can (~(put by can) ((hard path) q.q.pax) q.i.tay))
$(tay t.tay, can (~(put by can) ;;(path q.q.pax) q.i.tay))
::
:: Useful functions which operate on a dome and a rang.
::
@ -2113,11 +2112,11 @@
|- ^- @t :: (urge cord) would be faster
=+ bol=(lobe-to-blob u.lob)
?: ?=($direct -.bol)
((hard @t) q.q.bol)
;;(@t q.q.bol)
?> ?=($delta -.bol)
=+ txt=$(u.lob q.q.bol)
?> ?=($txt-diff p.r.bol)
=+ dif=((hard (urge cord)) q.r.bol)
=+ dif=;;((urge cord) q.r.bol)
=, format
=+ pac=(of-wain (lurk:differ (to-wain (cat 3 txt '\0a')) dif))
(end 3 (dec (met 3 pac)) pac)
@ -2838,10 +2837,10 @@
|= {pax/cage mim/cage}
?. ?=($path p.pax)
~|(%ergo-bad-path-mark !!)
:- ((hard path) q.q.pax)
:- ;;(path q.q.pax)
?. ?=($mime p.mim)
~
`((hard mime) q.q.mim)
`;;(mime q.q.mim)
=+ mus=(must-ergo:util our syd mon (turn ~(tap by can) head))
%- emil
%+ turn ~(tap by mus)
@ -2922,9 +2921,9 @@
:+ ~
p.r.u.rut
?+ p.r.u.rut ~| %strange-w-over-nextwork !!
$cass !>(((hard cass) q.r.u.rut))
$cass !>(;;(cass q.r.u.rut))
$null [[%atom %n ~] ~]
$nako !>(~|([%harding [&1 &2 &3]:q.r.u.rut] ((hard nako) q.r.u.rut)))
$nako !>(~|([%molding [&1 &2 &3]:q.r.u.rut] ;;(nako q.r.u.rut)))
==
?. ?=($nako p.r.u.rut) [?>(?=(^ ref) .)]:wake
=+ rav=`rave`q.u.ruv
@ -2934,7 +2933,7 @@
=+ nex=(~(get by haw.u.ref) nez)
?~ nex +>+.^$
?~ u.nex +>+.^$ :: should never happen
=. nak.u.ref `((hard nako) q.q.u.u.nex)
=. nak.u.ref `;;(nako q.q.u.u.nex)
=. +>+.^$
?: =(0 let.dom)
=< ?>(?=(^ ref) .)
@ -2956,7 +2955,7 @@
haw.u.ref
%+ ~(put by haw.u.ref)
[p.p.u.rut q.p.u.rut q.u.rut]
`[p.r.u.rut !>(((hard arch) q.r.u.rut))]
`[p.r.u.rut !>(;;(arch q.r.u.rut))]
==
::
$z
@ -3121,7 +3120,7 @@
?. ?=($blob p.bob)
~| %plop-not-blob
!!
=+ bol=((hard blob) q.q.bob)
=+ bol=;;(blob q.q.bob)
?- -.bol
$delta [-.bol p.bol q.bol p.cay q.q.cay]
$direct [-.bol p.bol p.cay q.q.cay]
@ -3763,7 +3762,7 @@
=/ req=task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
::
:: only one of these should be going at once, so queue
::
@ -4068,7 +4067,7 @@
=* wer wer.req
=* pax pax.req
?: ?=({%question *} pax)
=+ ryf=((hard riff) res.req)
=+ ryf=;;(riff res.req)
:_ ..^$
:~ [hen %give %mack ~]
=/ =wire
@ -4080,7 +4079,7 @@
=+ inx=(slav %ud i.t.t.pax)
=^ mos ruf
=/ den ((de our now ski hen ruf) wer syd)
abet:(take-foreign-update:den inx ((hard (unit rand)) res.req))
abet:(take-foreign-update:den inx ;;((unit rand) res.req))
[[[hen %give %mack ~] mos] ..^$]
::
%wegh
@ -4162,7 +4161,7 @@
:* hen %slip %b %drip !>
:* %writ ~
^- {care case @tas}
[i.t.tea ((hard case) +>:(slay i.t.t.tea)) i.t.t.t.tea]
[i.t.tea ;;(case +>:(slay i.t.t.tea)) i.t.t.t.tea]
::
`path`t.t.t.t.tea
`cage`(result-to-cage:ford build-result.result.q.hin)
@ -4199,7 +4198,7 @@
?> ?=({@ @ @ @ @ *} t.tea)
=+ her=(slav %p i.t.t.tea)
=+ syd=(slav %tas i.t.t.t.tea)
=+ car=((hard care) i.t.t.t.t.tea)
=+ car=;;(care i.t.t.t.t.tea)
=+ ^- cas/case
=+ (slay i.t.t.t.t.t.tea)
?> ?=({~ %$ case} -)

4
sys/vane/dill.hoon
View File

@ -415,7 +415,7 @@
$reap ?~ p.p.+>.sih
+>.$
(dump:(crud %reap u.p.p.+>.sih) %logo ~)
$diff pump:(from ((hard dill-blit) q:`vase`+>+>.sih))
$diff pump:(from ;;(dill-blit q:`vase`+>+>.sih))
==
::
{$c $note *}
@ -501,7 +501,7 @@
=/ task=task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
:: the boot event passes thru %dill for initial duct distribution
::
?: ?=(%boot -.task)

12
sys/vane/eyre.hoon
View File

@ -1063,7 +1063,7 @@
(fail-turbo 404 message.build-result.result.sih)
=/ cay=cage (result-to-cage:ford build-result.result.sih)
?: ?=($red-quri p.cay)
=+ url=(apex:en-purl ((hard quri) q.q.cay))
=+ url=(apex:en-purl ;;(quri q.q.cay))
(give-thou 307 [location+(crip url)]~ ~)
:: (give-html:abet 200 ~ (redir:xml url))
?. ?=($mime p.cay)
@ -1073,7 +1073,7 @@
::
(exec-turbo-live tee-ses [%cast [p q]:bek %mime [%$ cay]])
=+ cug=?~(ses ~ cug:(~(got by wup) u.ses))
=+ ((hard {mit/mite rez/octs}) q.q.cay)
=+ ;;({mit/mite rez/octs} q.q.cay)
:: TODO: This used to use dep for etag control.
::
:: =+ dep=(crip "W/{(en-json %s (scot %uv p.sih))}")
@ -1089,7 +1089,7 @@
?: =('~' p.tee)
(eyre-them tee q.cay)
=+ usr=(slav %ta p.tee)
=+ ((hard {pul/purl ^}) q.q.cay)
=+ ;;({pul/purl ^} q.q.cay)
?. ?=(%& -.r.p.pul)
~& [%auth-lost usr (head:en-purl p.pul)]
(eyre-them tee q.cay)
@ -1479,7 +1479,7 @@
=* pef i.t.q.pok
=+ but=t.t.q.pok :: XX =*
?+ pef ~|(pfix-lost+`path`/~/[pef] !!)
$debug ((hard perk) [%bugs but])
$debug ;;(perk [%bugs but])
$away [%away ~]
$ac
?~ but ~|(no-host+`path`/~/[pef] !!)
@ -1509,7 +1509,7 @@
$on
:- %poll
?^ but [(raid but %uv ~)]~
=+ dep=((hard (list {@ ~})) quy)
=+ dep=;;((list {@ ~}) quy)
=< ?~(. !! .)
(turn dep |=({a/@tas ~} (slav %uv a)))
::
@ -2328,7 +2328,7 @@
=/ task=task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
::
^+ [*(list move) ..^$]
?: ?=($wegh -.task)

6
sys/vane/ford.hoon
View File

@ -2655,7 +2655,7 @@
(return-result %success %call [type.u.slit-result p.val])
::
%1
=/ blocked-paths=(list path) ((hard (list path)) p.val)
=/ blocked-paths=(list path) ;;((list path) p.val)
(blocked-paths-to-receipt %call blocked-paths)
::
%2
@ -4776,7 +4776,7 @@
(return-result %success %ride [type.u.slim-result p.val])
::
%1
=/ blocked-paths=(list path) ((hard (list path)) p.val)
=/ blocked-paths=(list path) ;;((list path) p.val)
(blocked-paths-to-receipt %ride blocked-paths)
::
%2
@ -6144,7 +6144,7 @@
=/ task=task:able
?. ?=(%soft -.wrapped-task)
wrapped-task
((hard task:able) p.wrapped-task)
;;(task:able p.wrapped-task)
:: we wrap +per-event with a call that binds our event args
::
=* this-event (per-event [our duct now scry-gate] state.ax)

6
sys/vane/gall.hoon
View File

@ -1304,7 +1304,7 @@
~% %gall-call +> ~
|= {hen/duct hic/(hypo (hobo task:able))}
^+ [*(list move) ..^$]
=> .(q.hic ?.(?=($soft -.q.hic) q.hic ((hard task:able) p.q.hic)))
=> .(q.hic ?.(?=($soft -.q.hic) q.hic ;;(task:able p.q.hic)))
?- -.q.hic
$conf
?. =(our p.p.q.hic)
@ -1331,10 +1331,10 @@
=* dap i.t.q.q.hic
=* him p.q.hic
?: ?=($ge i.q.q.hic)
=+ mes=((hard {@ud rook}) r.q.hic)
=+ mes=;;({@ud rook} r.q.hic)
=< mo-abet
(mo-gawk:(mo-abed:mo hen) him dap mes)
=+ mes=((hard {@ud roon}) r.q.hic)
=+ mes=;;({@ud roon} r.q.hic)
=< mo-abet
(mo-gawd:(mo-abed:mo hen) him dap mes)
::

2
sys/vane/jael.hoon
View File

@ -1943,7 +1943,7 @@
~& [%yikes cuz]
+>.$
?> ?=(%httr mar)
=+ raw-rep=~|(res ((hard httr:eyre) q.res))
=+ raw-rep=~|(res ;;(httr:eyre q.res))
=+ rep=(httr-to-rpc-response raw-rep)
?: ?=(%fail -.rep)
?: =(405 p.hit.rep)

8
sys/vane/xmas.hoon
View File

@ -453,23 +453,23 @@
[~ & (maul clr)]
::
$full
=+ mex=((hard {p/{p/life q/life} q/gree r/@}) (cue msg))
=+ mex=;;({p/{p/life q/life} q/gree r/@} (cue msg))
=+ rig=(~(got by wyr) p.p.mex)
=+ pas=(whom q.p.mex q.mex)
=+ mes=(need (tear:as:(nol:nu:crub:crypto rig) pas r.mex))
=+ [key out]=((hard (pair @ux @ux)) (cue mes))
=+ [key out]=;;((pair @ux @ux) (cue mes))
:- :~ [%link ~2018.1.1 key]
[%meet q.mex]
==
[& (maul out)]
::
$open
=+ mex=((hard {p/{$~ q/life} q/gree r/@}) (cue msg))
=+ mex=;;({p/{$~ q/life} q/gree r/@} (cue msg))
=+ pas=(whom q.p.mex q.mex)
=+ out=(need (sure:as:(com:nu:crub:crypto pas) r.mex))
[[%meet q.mex]~ & (maul r.mex)]
==
++ maul |=(@ `meal`((hard meal) (cue +<))) :: unpack message
++ maul |=(@ `meal`;;(meal (cue +<))) :: unpack message
++ whom :: select public key
|= {lyf/life gyr/gree}
^- pass

8
sys/zuse.hoon
View File

@ -3467,7 +3467,7 @@
++ sure ::
|= txt=@
^- (unit @ux)
=+ ((hard {sig/@ msg/@}) (cue txt))
=+ ;;({sig/@ msg/@} (cue txt))
?. (veri:ed sig msg sgn.pub) ~
(some msg)
:: :: ++seal:as:crub:
@ -3488,7 +3488,7 @@
?> =('b' (end 3 1 bpk))
=+ pk=(rsh 8 1 (rsh 3 1 bpk))
=+ shar=(shax (shar:ed pk cry.u.sek))
=+ ((hard {iv/@ len/@ cph/@}) (cue txt))
=+ ;;({iv/@ len/@ cph/@} (cue txt))
=+ try=(~(de siva:aes shar ~) iv len cph)
?~ try ~
(sure:as:(com:nu:crub bpk) u.try)
@ -3497,7 +3497,7 @@
++ de :: decrypt
|= {key/@J txt/@}
^- (unit @ux)
=+ ((hard {iv/@ len/@ cph/@}) (cue txt))
=+ ;;({iv/@ len/@ cph/@} (cue txt))
%^ ~(de sivc:aes (shaz key) ~)
iv
len
@ -6358,7 +6358,7 @@
|= {bem/beam ced/noun:cred quy/quer}
^- epic
=+ qix=|-(`quay`?~(quy quy [[p q]:quy $(quy t.quy)]))
[(malt qix) ((hard cred) ced) bem]
[(malt qix) ;;(cred ced) bem]
-- ::eyre
:: ::
:::: ++wired :: wire formatting

2
web/landscape/css/index.css
View File

File diff suppressed because one or more lines are too long

2
web/landscape/js/index-min.js vendored
View File

File diff suppressed because one or more lines are too long