Merge remote-tracking branch 'cgyarvin/cc-release' into cc-release

This commit is contained in:
C. Guy Yarvin 2016-10-23 20:42:22 -07:00
commit b0a7810ab3
3 changed files with 913 additions and 893 deletions

View File

@ -587,7 +587,8 @@
|= {new/deed old/deed}
^- $&
?> (melt new old)
?> =((shaf %meld (sham q.new)) (need (sure:as:(haul r.q.old) *code p.new)))
?> .= (shaf %meld (sham q.new))
(need (sure:as:(haul:test r.q.old) *code p.new))
%&
::
++ melt :: proper connect
@ -623,7 +624,7 @@
|= wed/deed
^- $&
?> =+ rac=(clan r.p.q.wed)
=+ loy=(haul r.q.wed)
=+ loy=(haul:test r.q.wed)
?: &(r.wed =(rac %czar)) %&
?> =(0 p.p.q.wed)
?> =(fig:ex:loy ?+(rac !! $czar (zeno r.p.q.wed), $pawn r.p.q.wed))
@ -638,7 +639,7 @@
?> ?& ?=(^ law)
(lth p.p.q.i.law 9) :: 9-lives rule
=(p.p.q.i.law p.i.mac)
=(r.q.i.law pub:ex:(weur q.i.mac))
=(r.q.i.law pub:ex:(weur:test q.i.mac))
==
$(mac t.mac, law t.law)
==
@ -1003,7 +1004,7 @@
?. =(fak.ton r.i.lew.wod.dur) ~|([%client-wrong-fake her] !!)
:+ p.p.q.i.lew.wod.dur
q.q.i.lew.wod.dur
(haul r.q.i.lew.wod.dur)
(haul:test r.q.i.lew.wod.dur)
::
++ clon
^- life
@ -1256,7 +1257,7 @@
|- ^- (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:test q)]))
wil
~
~
@ -1322,13 +1323,13 @@
:- p
%= q
val
(turn val.q |=({p/life q/ring r/acru} [p q (weur q)]))
(turn val.q |=({p/life q/ring r/acru} [p q (weur:test q)]))
==
==
++ come :: come:am
|= {ges/(unit @t) wid/@ bur/@ fak/?} :: instantiate pawn
^- {p/{p/ship q/@uvG} q/fort}
=+ loy=(bruw wid bur)
=+ loy=(bruw:test wid bur)
=+ rig=sec:ex:loy
=+ our=`@p`fig:ex:loy
=+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy]
@ -1347,7 +1348,10 @@
|= {her/ship ger/@uw fak/?} :: instantiate emperor
^- {p/(list boon) q/fort}
~& [%czar her]
=+ loy=?:(fak (bruw 2.048 her) (bruw 2.048 ger)) :: fake uses carrier #
::
:: fake uses carrier #
::
=+ loy=?:(fak (bruw:test 2.048 her) (bruw:test 2.048 ger))
=+ fim==(fig:ex:loy (zeno her))
?: &(!fak !fim) !! :: not fake & bad fig
=+ mac=`mace`[[0 sec:ex:loy] ~]

View File

@ -1,7 +1,7 @@
!: :: /van/jael
:: :: %reference/0
!? 150
::
::::
:: %jael: secrets and promises.
::
:: todo:
@ -20,19 +20,19 @@
:: ::::
:::: # 1 :: models
:: ::::
:: the %jael state comes in two parts: absolute
:: and relative.
::
:: ++state-absolute is objective -- defined without
:: reference to our ship. if you steal someone else's
:: private keys, we have a place to put them. when
:: others make promises to us, we store them in the
:: same structures we use to make promises to others.
::
:: ++state-relative is subjective, denormalized and
:: derived. it consists of all the state we need to
:: manage subscriptions efficiently.
::::
:::: the %jael state comes in two parts: absolute
:: and relative.
::
:: ++state-absolute is objective -- defined without
:: reference to our ship. if you steal someone else's
:: private keys, we have a place to put them. when
:: others make promises to us, we store them in the
:: same structures we use to make promises to others.
::
:: ++state-relative is subjective, denormalized and
:: derived. it consists of all the state we need to
:: manage subscriptions efficiently.
::::
=> |%
++ state :: all vane state
$: ver/$0 :: vane version
@ -82,14 +82,14 @@
=> |%
:: :: ++zeno
++ zeno :: boot fingerprints
:: in ++zeno we hardcode the fingerprints of galaxies
:: and the identities of their owners. if the
:: fingerprint is 0, the galaxy can't be created.
::
:: we'll probably move at least the identity data
:: into urbit as it becomes more stable, but keeping
:: it in the source makes it very resilient.
::::
:::: in ++zeno we hardcode the fingerprints of galaxies
:: and the identities of their owners. if the
:: fingerprint is 0, the galaxy can't be created.
::
:: we'll probably move at least the identity data
:: into urbit as it becomes more stable, but keeping
:: it in the source makes it very resilient.
::::
|= who/ship
^- @
%+ snag who
@ -360,9 +360,9 @@
:::: ## 3.a :: sparse range
:: ::::
++ py
:: because when you're a star with 2^16 unissued
:: planets, a (set) is kind of lame...
::::
:::: because when you're a star with 2^16 unissued
:: planets, a (set) is kind of lame...
::::
|_ a/pile
:: :: ++dif:py
++ dif :: add/remove a->b
@ -1515,7 +1515,7 @@
:: key: generated key
:: bul: initial bull
::
=/ key (ypt:scr:number (mix our %jael-make) gen)
=/ key (ypt:scr:crypto (mix our %jael-make) gen)
=* doc `bull`[(sein our) & nym]
::
:: register generator as login secret
@ -1555,7 +1555,7 @@
:: had: key handle
:: ryt: initial right
::
=/ key (ypt:scr:number (mix our %jael-make) gen)
=/ key (ypt:scr:crypto (mix our %jael-make) gen)
=* had (shaf %hand key)
=* ryt `rite`[%urban [had (add ~m1 now) key] ~ ~]
::

File diff suppressed because it is too large Load Diff