urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move weird spelling to dead code.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-10-27 22:19:01 -07:00
parent 6461bcb4e1
commit ae3ccde24d
3 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
arvo/ames.hoon
View File

@ -79,7 +79,7 @@
== ::
++ door :: foreign contact
$: wod/road :: connection to
wyl/will :: inferred mirror
wyl/wyll :: inferred mirror
caq/clot :: symmetric key state
== ::
++ dove {p/@ud q/(map @ud @)} :: count 13-blocks
@ -113,13 +113,13 @@
++ road :: secured oneway route
$: exp/@da :: expiration date
lun/(unit lane) :: route to friend
lew/will :: will of friend
lew/wyll :: wyll of friend
== ::
++ skin ?($none $open $fast $full) :: encoding stem
++ sufi :: domestic host
$: hoy/(list ship) :: hierarchy
val/wund :: private keys
law/will :: server will
law/wyll :: server wyll
seh/(map hand {p/ship q/@da}) :: key cache
hoc/(map ship door) :: neighborhood
== ::
@ -564,9 +564,9 @@
:: section 4aA, identity logic ::
::
|%
++ grip :: extend will
|= {wet/will law/will}
^- will
++ grip :: extend wyll
|= {wet/wyll law/wyll}
^- wyll
?~ wet law
?: =(wet law) law
?^ t.wet
@ -576,7 +576,7 @@
?~ q.p.q.i.wet
?>((meld i.wet i.law) [i.wet law])
=+ rul=(sein r.p.q.i.wet)
|- ^- will
|- ^- wyll
?: ?& =(rul r.p.q.i.law)
=(p.p.q.i.law u.q.p.q.i.wet)
==
@ -584,7 +584,7 @@
?>(?=(^ t.law) $(law t.law))
::
++ meld :: verify connect
|= {new/deed old/deed}
|= {new/deyd old/deyd}
^- $&
?> (melt new old)
?> .= (shaf %meld (sham q.new))
@ -592,7 +592,7 @@
%&
::
++ melt :: proper connect
|= {new/deed old/deed}
|= {new/deyd old/deyd}
^- ?
=+ rac=(clan r.p.q.new)
?& =(r.new r.old) :: match fake
@ -608,20 +608,20 @@
==
::
++ pare :: shorten against
|= {fou/will law/will}
|= {fou/wyll law/wyll}
:: ~& [%pare-fou fou]
:: ~& [%pare-law law]
^- will
^- wyll
=+ [ouf=(flop fou) wal=(flop law)]
%- flop
|- ^- will
|- ^- wyll
?~ ouf wal
?~ wal ~
?. =(i.wal i.ouf) ouf
$(wal t.wal, ouf t.ouf)
::
++ pier !: :: initial deed
|= wed/deed
++ pier !: :: initial deyd
|= wed/deyd
^- $&
?> =+ rac=(clan r.p.q.wed)
=+ loy=(haul:test r.q.wed)
@ -633,7 +633,7 @@
%&
::
++ real :: validate
|= {mac/mace law/will}
|= {mac/mace law/wyll}
?> ?& |- ^- ?
?~ mac &
?> ?& ?=(^ law)
@ -653,9 +653,9 @@
?: (gth mar p.i.mac) ~
$(mac t.mac)
::
++ rick :: will at life
|= {mar/life lag/ship law/will}
^- (unit will)
++ rick :: wyll at life
|= {mar/life lag/ship law/wyll}
^- (unit wyll)
?~ law ~
?: =(mar p.p.q.i.law) [~ law]
?: (gth mar p.p.q.i.law) ~
@ -976,7 +976,7 @@
|_ {our/ship saf/sufi} :: per server
++ born :: born:as:go
|= {now/@da her/@p tic/@pG ges/gens pub/pass} :: register user
^- {(unit will) _+>}
^- {(unit wyll) _+>}
?. =(our (sein her)) [~ +>.$]
=+ nes=sen
=+ ryt=(end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes))))
@ -1011,7 +1011,7 @@
?~(lew.wod.dur 0 p.p.q.i.lew.wod.dur)
::
++ deng
|= law/will
|= law/wyll
%_(+> lew.wod.dur (grip law lew.wod.dur))
::
++ griz :: griz:lax:as:go
@ -1168,8 +1168,8 @@
=^ tuy +>.$
?:(=(~ lew.wod.dur) [*code +>.$] (griz now))
=+ yig=sen
:: =+ bil=`will`(pare wyl.dur law.saf) :: XX not set
=+ bil=law.saf :: XX send whole will
:: =+ bil=`wyll`(pare wyl.dur law.saf) :: XX not set
=+ bil=law.saf :: XX send whole wyll
=+ hom=(jam ham)
?: =(~ lew.wod.dur)
:- %open
@ -1231,9 +1231,9 @@
|- ^- (list ship)
(saxo our)
::
++ yew :: best will for
++ yew :: best wyll for
|= her/ship
^- will
^- wyll
=+ gel=(~(get by hoc.saf) her)
?^ gel
lew.wod.u.gel
@ -1241,7 +1241,7 @@
-- :: --as:go
::
++ ha !: :: adopt new license
|= {our/ship mac/mace wil/will}
|= {our/ship mac/mace wil/wyll}
^- town
?> !=(~ mac)
?> ?=(^ wil)
@ -1339,7 +1339,7 @@
%^ ~(ha go ton.fox)
our
`mace`[[0 rig] ~]
`will`[[(sign:as:loy *@ (shaf %self (sham syp))) syp fak] ~]
`wyll`[[(sign:as:loy *@ (shaf %self (sham syp))) syp fak] ~]
fak.ton
fak
==
@ -1356,7 +1356,7 @@
?: &(!fak !fim) !! :: not fake & bad fig
=+ mac=`mace`[[0 sec:ex:loy] ~]
=+ syp=`step`[`bray`[0 ~ her now] [%en %czar ~] pub:ex:loy]
=+ ded=`deed`[(sign:as:loy *@ (shaf %self (sham syp))) syp fak]
=+ ded=`deyd`[(sign:as:loy *@ (shaf %self (sham syp))) syp fak]
=+ buq=`buck`[mac [ded ~]]
=: ton.fox (~(ha go ton.fox) her buq)
zac.fox (~(put by zac.fox) her *corn)
@ -1588,7 +1588,7 @@
::
$full
:: ~& %chew-full
=+ mex=((hard {p/{p/life q/life} q/will r/@}) (cue msg))
=+ mex=((hard {p/{p/life q/life} q/wyll r/@}) (cue msg))
=. diz (deng:diz q.mex)
=+ wug=cluy:diz
?> =(q.p.mex p.wug)
@ -1599,7 +1599,7 @@
::
$open
:: ~& %chew-open
=+ mex=((hard {p/{$~ q/life} q/will r/@}) (cue msg))
=+ mex=((hard {p/{$~ q/life} q/wyll r/@}) (cue msg))
=. diz (deng:diz q.mex)
=+ wug=cluy:diz
?> =(q.p.mex p.wug)
@ -2151,19 +2151,19 @@
^- (unit (unit cage))
?~ tyl ~
?: ?=({$name $~} tyl)
=+ wul=$(tyl [%will ~])
``[%noun !>(?~(wul (scot %p his) (gnow his q.q.q:((hard deed) -.u.wul))))]
=+ wul=$(tyl [%wyll ~])
``[%noun !>(?~(wul (scot %p his) (gnow his q.q.q:((hard deyd) -.u.wul))))]
?: ?=({$gcos $~} tyl)
=+ wul=$(tyl [%will ~])
?~(wul ~ ``[%noun !>(`gcos`q.q.q:((hard deed) -.u.wul))])
=+ wul=$(tyl [%wyll ~])
?~(wul ~ ``[%noun !>(`gcos`q.q.q:((hard deyd) -.u.wul))])
=+ gys=(~(us go ton.fox) our)
?~ gys ~
?. =(our his)
?: ?=({$will $~} tyl)
?: ?=({$wyll $~} tyl)
=+ fod=(~(get by hoc.saf.u.gys) his)
?~ fod ~
%+ bind (rick mar his lew.wod.u.fod)
|=(a/will `[%noun !>(a)])
|=(a/wyll `[%noun !>(a)])
?: ?=({$tick $~} tyl)
?. =(our (sein his)) ~
``[%noun !>((end 6 1 (shaf %tick (mix his (shax sec:ex:q:sen:u.gys)))))]
@ -2175,8 +2175,8 @@
``[%noun !>(`buck`[u.muc u.luw])]
?: ?=({$code $~} tyl)
``[%noun !>((end 6 1 (shaf %pass (shax sec:ex:q:sen:u.gys))))]
?: ?=({$will $~} tyl)
(bind (rick mar our law.saf.u.gys) |=(a/will `[%noun !>(a)]))
?: ?=({$wyll $~} tyl)
(bind (rick mar our law.saf.u.gys) |=(a/wyll `[%noun !>(a)]))
~
::
++ temp

74
arvo/jael.hoon
View File

@ -822,10 +822,10 @@
(splice(pig (remove les.del)) mor.del)
--
:: :: ++we
:::: ## wyll^light :: wyll functions
:::: ## will^light :: will functions
:: ::::
++ we
|_ pub/wyll
|_ pub/will
:: :: ++collate:we
++ collate :: sort by version
|= com/$-({{life cert} {life cert}} ?)
@ -1187,7 +1187,7 @@
|- ^- farm
?: =(~ mor) out
::
:: nex: all wylls to add
:: nex: all wills to add
::
=/ nex
=/ rom (~(tap in mor))
@ -1197,7 +1197,7 @@
i.rom
(~(got by pug.urb) i.rom)
::
:: wit: all new ships in these wylls
:: wit: all new ships in these wills
::
=. sea (~(uni in sea) mor)
=/ wit
@ -1222,14 +1222,14 @@
|= who/ship
^- channel
::
:: pub: wyll of who
:: pub: will of who
:: exp: promises from our to who
:: imp: promises from who to our
:: out: symmetric key from our to who
:: inn: symmetric keys from who to our
::
=/ pub
^- wyll
^- will
=- ?~(- ~ u.-)
(~(get by pug.urb) who)
::
@ -1366,7 +1366,7 @@
(veil:feel rex)
:: :: ++said:su
++ said :: track cert change
|= $: :: rex: ship whose wyll has changed
|= $: :: rex: ship whose will has changed
:: vie: change authorized by
:: lyf: modified/created version
:: gan: modification
@ -1380,12 +1380,12 @@
::
=/ lip ^- farm
=- [[rex -] ~ ~]
^- wyll
^- will
=- [[lyf -] ~ ~]
^- cert
?- -.gan
::
:: add a new certificate to this wyll
:: add a new certificate to this will
:: {$step p/cert}
::
$step p.gan
@ -1404,7 +1404,7 @@
=. +>.$ ?. |(=(our rex) (~(has by cod.rel) rex)) +>.$
veal:feel
::
:: if a new deyd, reset parent
:: if a new deed, reset parent
::
=. dad.rel ?. &(=(our rex) ?=($step -.gan))
dad.rel
@ -1414,7 +1414,7 @@
::
=. +>.$ (veil:feel rex)
::
:: if we signed a wyll for someone else, send it home
:: if we signed a will for someone else, send it home
::
?: &(=([~ ~] vie) !=(our rex))
(~(home fire lip) rex)
@ -1434,8 +1434,8 @@
?~(vie ~ ?~(u.vie ~ `u.u.vie))
^- (list (set ship))
::
:: if our wyll has changed, send to parents and kids;
:: if a new deyd has been added, also to pals
:: if our will has changed, send to parents and kids;
:: if a new deed has been added, also to pals
::
?: =(our rex)
:* [dad.rel ~ ~]
@ -1588,10 +1588,10 @@
:: :: ++ex:ur
++ ex :: server engine
:: shy: private state
:: rug: domestic wyll
:: rug: domestic will
::
=| $: shy/(map ship safe)
rug/wyll
rug/will
==
=| :: rex: server ship
::
@ -1607,7 +1607,7 @@
++ able :: initialize
%_ .
shy (fall (~(get by pry) rex) *(map ship safe))
rug (fall (~(get by pug) rex) *wyll)
rug (fall (~(get by pug) rex) *will)
==
:: :: ++deal:ex:ur
++ deal :: alter rights
@ -1662,39 +1662,39 @@
:: ryt: private key as right
:: pub: public key
:: cet: unsigned certificate
:: wyl: initial wyll
:: hec: initial wyll as farm
:: wyl: initial will
:: hec: initial will as farm
::
=/ loy (pit:nu:crub 512 eny)
=* rig sec:ex:loy
=* ryt `rite`[%jewel [1 rig] ~ ~]
=* pub pub:ex:loy
=* cet `cert`[[doc pub] ~]
=* wyl `wyll`[[1 cet] ~ ~]
=* wyl `will`[[1 cet] ~ ~]
=* hec `farm`[[rex wyl] ~ ~]
=. +>.$ (deal rex [[ryt ~ ~] ~])
=. ..ex (meet [~ ~] hec)
+>.$
:: :: grow:ex:ur
++ grow :: merge wylls
++ grow :: merge wills
|= $: :: vie: data source
:: cod: merge context
:: gur: input wyll
:: gur: input will
::
vie/(unit (unit ship))
cod/farm
gur/wyll
gur/will
==
?: |(=(~ gur) =(gur rug)) ..grow
|^ ^+ ..grow
::
:: wap: ascending list of new certs
:: pre: previous deyd
:: pre: previous deed
::
=/ wap ~(forward we gur)
?~ wap ..grow
=/ pre
^- (unit deyd)
^- (unit deed)
?~ (dec p.i.wap) ~
`dat:(~(got by rug) (dec p.i.wap))
::
@ -1703,7 +1703,7 @@
|- ^+ ..grow
::
:: hub: changes
:: lub: merged deyd
:: lub: merged deed
::
=+ [hub lub]=[p q]:(grow-mate p.i.wap q.i.wap pre)
?~ t.wap ..grow
@ -1726,7 +1726,7 @@
|= {myn/mind ash/@ val/@}
^- ?
=: ..able able(rex who.myn)
gur (fall (~(get by cod) who.myn) *wyll)
gur (fall (~(get by cod) who.myn) *will)
==
(grow-lick (grow-look lyf.myn) ash val)
:: :: grow-look/ex:ur
@ -1751,13 +1751,13 @@
:: :: grow-mate/ex:ur
++ grow-mate :: merge lives
|= $: :: num: life we're merging
:: new: new deyd
:: pre: previous deyd
:: eld: old deyd
:: new: new deed
:: pre: previous deed
:: eld: old deed
::
num/@ud
new/cert
pre/(unit deyd)
pre/(unit deed)
==
=+ :* eld=`(unit cert)`(~(get by rug) num)
==
@ -1773,7 +1773,7 @@
?> ?=(^ eld)
[~ u.eld]
::
:: ash: hash of deyd content
:: ash: hash of deed content
:: def: our default parent
:: dad: our declared parent
:: mir: our rank
@ -1793,11 +1793,11 @@
::
=((clan def) (clan dad))
::
:: if we have an old deyd at this life, merge new signatures
:: if we have an old deed at this life, merge new signatures
::
?: ?=(^ eld)
::
:: deyd data must be identical
:: deed data must be identical
::
?> =(dat.new dat.u.eld)
::
@ -1825,7 +1825,7 @@
:_ p.mor
`change`[%fact rex vie num `growth`[%sign [[p q] r]:i.sow]]
::
:: non-initial deyds must be signed by previous
:: non-initial deeds must be signed by previous
::
?> ?| ?=($~ pre)
=+ laz=(~(got by syg.new) rex)
@ -1857,7 +1857,7 @@
=(~ pre)
==
::
:: the deyd is homemade or sent by owner
:: the deed is homemade or sent by owner
::
&(?=(^ vie) |(?=($~ u.vie) =(u.u.vie rex)))
::
@ -1869,12 +1869,12 @@
=- [[%fact rex p.- num %step q.-]~ q.-]
^- (pair (unit (unit ship)) cert)
::
:: the new deyd is complete; report it
:: the new deed is complete; report it
::
?: (~(has by syg.new) dad)
[vie new]
::
:: the new deyd needs a parent signature; try to add it
:: the new deed needs a parent signature; try to add it
::
:- [~ ~]
::

40
arvo/zuse.hoon
View File

@ -118,12 +118,12 @@
:: ::
:::: ### public^jael^models :: certificates
:: ::::
:: the urbit meta-certificate (++will) is a sequence
:: of certificates (++cert). each cert in a will
:: the urbit meta-certificate (++wyll) is a sequence
:: of certificates (++cert). each cert in a wyll
:: revokes and replaces the previous cert. the
:: version number of a ship is a ++life.
::
:: the deyd contains an ++arms, a definition
:: the deed contains an ++arms, a definition
:: of cosmetic identity; a semi-trusted parent,
:: which signs the initial certificate and provides
:: routing services; and a dirty bit. if the dirty
@ -137,7 +137,7 @@
dob/? :: & clean, | dirty
nym/arms :: identity strings
== ::
++ cert (tale deyd) :: signed deyd
++ cert (tale deed) :: signed deed
++ chip :: standard identity
$? $giv :: given name
$sur :: surname
@ -145,11 +145,11 @@
$mid :: middle name
== ::
++ coop (unit ares) :: e2e ack
++ deyd :: certificate deyd
++ deed :: certificate deed
$: doc/bull :: metadata
pub/pass :: public key
== ::
++ farm (map ship wyll) :: pki dump set
++ farm (map ship will) :: pki dump set
++ hand @uvH :: 128-bit hash
++ life @ud :: ship version
++ mind {who/ship lyf/life} :: key identifier
@ -160,7 +160,7 @@
$: dat/typ :: data
syg/(map ship (pair life oath)) :: signatures
== ::
++ wyll (map life cert) :: meta-certificate
++ will (map life cert) :: meta-certificate
:: ::
:::: ### promise^jael^models :: rights and promises
:: ::::
@ -223,7 +223,7 @@
:: change tasks are designed to match high-level
:: operations - for instance, we have %burn, %mint,
:: and %move, not just a single delta operation.
:: more of these operations will probably be added,
:: more of these operations wyll probably be added,
:: and invariants enforced at transaction end.
::
:: subscriptions are also user-focused - for instance,
@ -250,7 +250,7 @@
$% $: $fact :: certificate change
rex/ship :: owner
vie/(unit (unit ship)) :: made/heard from
lyf/life :: deyd added/modified
lyf/life :: deed added/modified
gan/growth :: info gained
== ::
$: $rite :: rights change
@ -264,7 +264,7 @@
inn/(map hand bill) :: inbound keys
cur/(unit life) :: their version
sax/(list ship) :: their ancestry
pub/wyll :: their public keys
pub/will :: their public keys
== ::
++ gift :: out result <-$
$? {$veil p/channel} :: secure channel
@ -274,7 +274,7 @@
== ::
++ growth :: unit of learning
$% {$sign p/mind q/@} :: add/update signature
{$step p/cert} :: add whole deyd
{$step p/cert} :: add whole deed
== ::
++ note :: out request $->
$% {$b $wait p/@da} :: wait until
@ -3690,7 +3690,7 @@
++ boat (map (pair bone wire) (trel bean ship path)) :: outgoing subs
++ boon :: fort output
$% {$beer p/ship} :: gained ownership
{$bier p/ship q/deed} :: unsigned deed
{$bier p/ship q/deyd} :: unsigned deyd
{$cake p/sock q/soap r/coop s/duct} :: e2e message result
{$coke p/sock q/soap r/cape s/duct} :: message result
{$mead p/lane q/rock} :: accept packet
@ -3715,7 +3715,7 @@
== == ::
++ bray {p/life q/(unit life) r/ship s/@da} :: our parent us now
++ brow {p/@da q/@tas} :: browser version
++ buck {p/mace q/will} :: all security data
++ buck {p/mace q/wyll} :: all security data
++ cake {p/sock q/skin r/@} :: top level packet
++ cape :: end-to-end result
$? $good :: delivered
@ -3764,7 +3764,7 @@
cip/(each @if @is) :: client IP
cum/(map @tas *) :: custom dirt
== ::
++ deed {p/@ q/step r/?} :: sig stage fake?
++ deyd {p/@ q/step r/?} :: sig stage fake?
++ dome :: project state
$: ank/ankh :: state
let/@ud :: top id
@ -3773,7 +3773,7 @@
== ::
++ dore :: foreign contact
$: wod/road :: connection to
wyl/will :: inferred mirror
wyl/wyll :: inferred mirror
caq/clot :: symmetric key state
== ::
++ dove {p/@ud q/(map @ud @)} :: count hash 13-blocks
@ -3932,7 +3932,7 @@
inn/(map hand bill:^jael) :: inbound keys
cur/(unit life) :: their version
sax/(list ship) :: their ancestry
pub/wyll:^jael :: their public keys
pub/will:^jael :: their public keys
== ::
++ plan (trel view (pair @da (unit @dr)) path) :: subscription
++ plea {p/@ud q/{p/? q/@t}} :: live prompt
@ -3975,7 +3975,7 @@
++ road :: secured oneway route
$: exp/@da :: expiration date
lun/(unit lane) :: route to friend
lew/will :: will of friend
lew/wyll :: wyll of friend
== ::
++ rock @uvO :: packet
++ rout {p/(list host) q/path r/oryx s/path} :: http route (new)
@ -3990,7 +3990,7 @@
++ sufi :: domestic host
$: hoy/(list ship) :: hierarchy
val/wund :: private keys
law/will :: server will
law/wyll :: server wyll
seh/(map hand {p/ship q/@da}) :: key cache
hoc/(map ship dore) :: neighborhood
== ::
@ -4061,10 +4061,10 @@
++ woof $@ $know :: udon transform
{$chan (list {$@(@ud {p/@ud q/@ud})})} ::
++ wund (list {p/life q/ring r/acru}) :: mace in action
++ will (list deed) :: certificate
++ wyll (list deyd) :: certificate
++ zuse %310 :: hoon+zuse kelvin
:: ::
:::: :::: this will become `%york`, vane structures.
:::: :::: this wyll become `%york`, vane structures.
:: ::
++ gift-ames :: out result <-$
$% {$drop $~} :: drop packet