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

Steps toward one-step bootstrap.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-04-10 19:23:29 -07:00
parent dcfd3c9b6b
commit 902fbdf95d
6 changed files with 99 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/hood.hoon
View File

@ -113,6 +113,7 @@
++ poke-helm-send-ask (wrap poke-send-ask):from-helm ++ poke-helm-send-ask (wrap poke-send-ask):from-helm
++ poke-helm-verb (wrap poke-verb):from-helm ++ poke-helm-verb (wrap poke-verb):from-helm
++ poke-helm-begin (wrap poke-begin):from-helm ++ poke-helm-begin (wrap poke-begin):from-helm
++ poke-helm-spawn (wrap poke-spawn):from-helm
++ poke-hood-sync (wrap poke-sync):from-kiln ++ poke-hood-sync (wrap poke-sync):from-kiln
++ poke-hood-init-sync (wrap poke-init-sync):from-kiln ++ poke-hood-init-sync (wrap poke-init-sync):from-kiln
++ poke-kiln-cp (wrap poke-cp):from-kiln ++ poke-kiln-cp (wrap poke-cp):from-kiln

99
arvo/ames.hoon
View File

@ -683,6 +683,8 @@
:: ::
++ sen :: current crypto ++ sen :: current crypto
^- {p/life q/acru} ^- {p/life q/acru}
?. ?=(^ law.saf)
~|(%send-cold !!)
?~(val.saf !! [p.i.val.saf r.i.val.saf]) ?~(val.saf !! [p.i.val.saf r.i.val.saf])
:: ::
++ sev :: crypto by life ++ sev :: crypto by life
@ -718,7 +720,13 @@
?:((lth her 256) ~ $(her (sein her))) ?:((lth her 256) ~ $(her (sein her)))
-- :: --as:go -- :: --as:go
:: ::
++ ha !: :: adopt new license ++ la :: hierarchy
|= our/@p
%- flop
|- ^- (list ship)
?:((lth our 256) ~ =+(seg=(sein our) [seg $(our seg)]))
::
++ ha !: :: new ship by mace
|= {our/ship mac/mace wil/will} |= {our/ship mac/mace wil/will}
^- town ^- town
?> !=(~ mac) ?> !=(~ mac)
@ -731,10 +739,7 @@
urb urb
%+ ~(put by urb.ton) %+ ~(put by urb.ton)
our our
:* %- flop :* (la our)
|- ^- (list ship)
?:((lth our 256) ~ =+(seg=(sein our) [seg $(our seg)]))
::
(turn mac |=({p/life q/ring} [p q (weur q)])) (turn mac |=({p/life q/ring} [p q (weur q)]))
wil wil
~ ~
@ -742,6 +747,33 @@
== ==
== ==
:: ::
++ hi :: new ship by code
|= {our/ship mac/mace key/code}
^- town
%_ ton
urb
%+ ~(put by urb.ton)
our
^- sufi
:* (la our)
(turn mac |=({p/life q/ring} [p q (weur q)]))
~
~
^- (map ship dore)
:_ [~ ~]
:- (sein our)
^- dore
:* *road
~
=+ had=(shaf %hand key)
:* `[had key]
~
[[had key] ~ ~]
==
==
==
==
::
++ su :: install safe ++ su :: install safe
|= new/_as |= new/_as
^- town ^- town
@ -989,12 +1021,12 @@
== ==
++ come :: come:am ++ come :: come:am
|= {ges/(unit @t) wid/@ bur/@ fak/?} :: instantiate pawn |= {ges/(unit @t) wid/@ bur/@ fak/?} :: instantiate pawn
^- {p/{p/ship q/@uvG} q/fort} ^- {p/ship q/fort}
=+ loy=(bruw wid bur) =+ loy=(bruw wid bur)
=+ rig=sec:ex:loy =+ rig=sec:ex:loy
=+ our=`@p`fig:ex:loy =+ our=`@p`fig:ex:loy
=+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy] =+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy]
:- [our pac:ex:loy] :- our
%_ fox %_ fox
ton ton
%^ ~(ha go ton.fox) %^ ~(ha go ton.fox)
@ -1014,12 +1046,36 @@
=+ mac=`mace`[[0 sec:ex:loy] ~] =+ mac=`mace`[[0 sec:ex:loy] ~]
=+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub:ex:loy] =+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub:ex:loy]
=+ ded=`deed`[(sign:as:loy *@ (shaf %self (sham syp))) syp fak] =+ ded=`deed`[(sign:as:loy *@ (shaf %self (sham syp))) syp fak]
=+ buq=`buck`[mac [ded ~]] =: ton.fox (~(ha go ton.fox) our mac [ded ~])
=: ton.fox (~(ha go ton.fox) our buq)
zac.fox (~(put by zac.fox) our *corn) zac.fox (~(put by zac.fox) our *corn)
fak.ton.fox fak fak.ton.fox fak
== ==
[[[%beer our pac:ex:loy] ~] fox] [[[%beer our] ~] fox]
::
++ dude :: dude:am
|= {our/ship key/code fak/?} ::
^- {p/(list boon) q/fort}
~& [%dude +<]
=+ loy=(bruw 2.048 (shax (mix now any.ton.fox)))
=. any.ton.fox (shax any.ton.fox)
=+ mac=`mace`[[0 sec:ex:loy] ~]
=+ ^= gec
^- gcos
=+ rac=(clan our)
?- rac
$czar [%czar ~]
$king [%king (scot %p our)]
$duke [%duke %punk %white (scot %p our)]
$earl [%earl (scot %p our)]
$pawn [%pawn ~]
==
=+ syp=`step`[`bray`[0 ~ our now] [%en gec] pub:ex:loy]
=+ ded=`deed`[0 syp fak]
=: ton.fox (~(hi go ton.fox) our mac key)
zac.fox (~(put by zac.fox) our *corn)
fak.ton.fox fak
==
[[[%bier our ded] ~] fox]
:: ::
++ gnaw :: gnaw:am ++ gnaw :: gnaw:am
|= {kay/cape ryn/lane pac/rock} :: process packet |= {kay/cape ryn/lane pac/rock} :: process packet
@ -1058,7 +1114,7 @@
=: ton.fox (~(ha go ton.fox) our buq) =: ton.fox (~(ha go ton.fox) our buq)
zac.fox (~(put by zac.fox) our *corn) zac.fox (~(put by zac.fox) our *corn)
== ==
[[[%beer our pac:ex:q:sen:(need (~(us go ton.fox) our))] ~] fox] [[[%beer our] ~] fox]
:: ::
++ kick :: kick:am ++ kick :: kick:am
|= hen/duct :: refresh net |= hen/duct :: refresh net
@ -1214,7 +1270,7 @@
=+ [mag=`hand`(end 7 1 msg) bod=(rsh 7 1 msg)] =+ [mag=`hand`(end 7 1 msg) bod=(rsh 7 1 msg)]
=+ dey=(kuch:diz mag) =+ dey=(kuch:diz mag)
?~ dey ?~ dey
:: ~& [%bad-key her mag] ~& [%bad-key her mag]
+>.$ :: ignore unknown key +>.$ :: ignore unknown key
=. puz (bilk:puz now) =. puz (bilk:puz now)
=^ key diz u.dey =^ key diz u.dey
@ -1637,13 +1693,24 @@
?- -.bon ?- -.bon
$beer $beer
:_ fox(zac (~(put by zac.fox) p.bon `corn`[hen ~ ~ ~])) :_ fox(zac (~(put by zac.fox) p.bon `corn`[hen ~ ~ ~]))
:* [hen [%slip %c %init p.bon]] :~ [hen [%slip %c %init p.bon]]
[hen [%give %init p.bon]] [hen [%give %init p.bon]]
[hen [%slip %a %kick now]] [hen [%slip %a %kick now]]
[hen [%slip %e %init p.bon]] [hen [%slip %e %init p.bon]]
[hen [%slip %g %init p.bon]] [hen [%slip %g %init p.bon]]
[hen [%slip %d %init p.bon]] :: must be after gall [hen [%slip %d %init p.bon]] :: must be after gall
~ ==
$bier
:_ fox(zac (~(put by zac.fox) p.bon `corn`[hen ~ ~ ~]))
:~ [hen [%slip %c %init p.bon]]
[hen [%give %init p.bon]]
[hen [%slip %a %kick now]]
[hen [%slip %e %init p.bon]]
[hen [%slip %g %init p.bon]]
[hen [%slip %d %init p.bon]] :: must be after gall
:+ hen
%pass
[~ %g %deal [p.bon (sein p.bon)] %hood %poke %boot !>(`deed`q.bon)]
== ==
:: ::
$cake $cake
@ -1788,6 +1855,7 @@
q.kyz q.kyz
[hen %pass pax %g %deal p.kyz %hood %poke %will !>(wyl)]~ [hen %pass pax %g %deal p.kyz %hood %poke %will !>(wyl)]~
?: ?=($funk -.kyz) ?: ?=($funk -.kyz)
~& [%ames-install-ticket +.kyz]
=+ gus=(need (~(us go ton.fox) p.kyz)) =+ gus=(need (~(us go ton.fox) p.kyz))
=. ton.fox (~(su go ton.fox) (taxi:gus q.kyz r.kyz)) =. ton.fox (~(su go ton.fox) (taxi:gus q.kyz r.kyz))
[~ +>.$] [~ +>.$]
@ -1797,6 +1865,9 @@
=+ ^= fuy =+ ^= fuy
^- {p/(list boon) q/fort} ^- {p/(list boon) q/fort}
?- -.kyz ?- -.kyz
$born
(~(dude am [now fox]) p.kyz q.kyz r.kyz)
::
$barn $barn
[~ fox(gad hen)] [~ fox(gad hen)]
$cash $cash

1
arvo/gall.hoon
View File

@ -1185,6 +1185,7 @@
$deal `%g $deal `%g
$exec `%f $exec `%f
$flog `%d $flog `%d
$funk `%a
$drop `%c $drop `%c
$info `%c $info `%c
$merg `%c $merg `%c

8
arvo/zuse.hoon
View File

@ -2392,7 +2392,8 @@
== :: == ::
++ boat (map (pair bone wire) (trel bean ship path)) :: outgoing subs ++ boat (map (pair bone wire) (trel bean ship path)) :: outgoing subs
++ boon :: fort output ++ boon :: fort output
$% {$beer p/ship q/@uvG} :: gained ownership $% {$beer p/ship} :: gained ownership
{$bier p/ship q/deed} :: unsigned deed
{$cake p/sock q/soap r/coop s/duct} :: e2e message result {$cake p/sock q/soap r/coop s/duct} :: e2e message result
{$coke p/sock q/soap r/cape s/duct} :: message result {$coke p/sock q/soap r/cape s/duct} :: message result
{$mead p/lane q/rock} :: accept packet {$mead p/lane q/rock} :: accept packet
@ -2795,10 +2796,11 @@
{$woot p/ship q/coop} :: e2e reaction message {$woot p/ship q/coop} :: e2e reaction message
== :: == ::
++ kiss-ames :: in request ->$ ++ kiss-ames :: in request ->$
$% {$barn $~} :: new unix process $% {$born p/@p q/@pG r/?} :: ticket birth
{$barn $~} :: new unix process
{$crud p/@tas q/(list tank)} :: error with trace {$crud p/@tas q/(list tank)} :: error with trace
{$cash p/@p q/buck} :: civil license {$cash p/@p q/buck} :: civil license
{$funk p/@p q/@p r/@} :: local symticket {$funk p/@p q/@p r/@} :: symtix from/to/key
{$hear p/lane q/@} :: receive packet {$hear p/lane q/@} :: receive packet
{$hole p/lane q/@} :: packet failed {$hole p/lane q/@} :: packet failed
{$junk p/@} :: entropy {$junk p/@} :: entropy

6
lib/helm.hoon
View File

@ -53,6 +53,7 @@
$% {$cash wire p/@p q/buck} :: $% {$cash wire p/@p q/buck} ::
{$conf wire dock $load ship term} :: {$conf wire dock $load ship term} ::
{$flog wire flog} :: {$flog wire flog} ::
{$funk wire @p @p @} ::
{$serv wire ?(desk beam)} :: {$serv wire ?(desk beam)} ::
{$poke wire dock pear} :: {$poke wire dock pear} ::
{$wont wire sock path *} :: send message {$wont wire sock path *} :: send message
@ -83,6 +84,11 @@
%- emit(bur `[his [0 sec:ex:loy]~]) %- emit(bur `[his [0 sec:ex:loy]~])
[%wont /helm/ticket [our (sein his)] /a/ta his tic ges pub:ex:loy] [%wont /helm/ticket [our (sein his)] /a/ta his tic ges pub:ex:loy]
:: ::
++ poke-spawn
|= {him/ship key/@pG} =< abet
%- emit
[%funk ~ our him (shax key)]
::
++ poke-init :: initialize ++ poke-init :: initialize
|= him/ship =< abet |= him/ship =< abet
(emit %flog /helm %crud %hax-init leaf+(scow %p him) ~) (emit %flog /helm %crud %hax-init leaf+(scow %p him) ~)