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

Make jael compile.

Browse Source 
At the cost of stubbed out ++table arms.
This commit is contained in:
Fang 2018-05-09 17:23:25 +02:00
parent 447a510ef8
commit a21a8b1224
2 changed files with 55 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
sys/vane/jael.hoon
View File

@ -52,7 +52,7 @@
det/channel :: channel state det/channel :: channel state
== :: == ::
$= rel :: neighborhood $= rel :: neighborhood
$: dad/_our :: parent $: dad/ship :: parent
cod/farm :: dependencies cod/farm :: dependencies
pyr/(set ship) :: peers pyr/(set ship) :: peers
kyz/(set ship) :: children kyz/(set ship) :: children
@ -605,11 +605,11 @@
?~(les ~ `[nut les]) ?~(les ~ `[nut les])
:: :: ++table:dif:ry :: :: ++table:dif:ry
++ table :: diff map ++ table :: diff map
|* {nut/@tas new/(map) old/(map)} |* {nut/@tas new/(map) old/(map)} !!
^- (pair (unit rite) (unit rite)) :: ^- (pair (unit rite) (unit rite))
=/ ped (~(dep by old) new) :: =/ ped (~(dep by old) new)
:- ?~(p.ped ~ `[nut p.ped]) :: :- ?~(p.ped ~ `[nut p.ped])
?~(q.ped ~ `[nut q.ped]) :: ?~(q.ped ~ `[nut q.ped])
-- ::dif -- ::dif
:: :: ++sub:ry :: :: ++sub:ry
++ sub :: l - r ++ sub :: l - r
@ -663,11 +663,11 @@
(~(uni in old) new) (~(uni in old) new)
:: :: ++table:uni:ry :: :: ++table:uni:ry
++ table :: union map ++ table :: union map
|* {new/(map) old/(map)} |* {new/(map) old/(map)} !!
^+ new :: ^+ new
%- (~(uno by old) new) :: %- (~(uno by old) new)
|= (trel _p.-<.new _q.->.new _q.->.new) :: |= (trel _p.-<.new _q.->.new _q.->.new)
?>(=(q r) r) :: ?>(=(q r) r)
-- ::uni -- ::uni
-- ::ry -- ::ry
:: :: ++up :: :: ++up
@ -782,7 +782,7 @@
[%apple (~(run by p.rys) |=(@ (mug +<)))] [%apple (~(run by p.rys) |=(@ (mug +<)))]
:: ::
$final $final
[%final (~(run by p.rys) |=(@ (mug +<)))] [%final (mug p.rys)]
:: ::
$login $login
[%login ~] [%login ~]
@ -915,40 +915,49 @@
:: {$burn p/ship q/safe} :: {$burn p/ship q/safe}
:: ::
$burn $burn
(cure abet:abet:(deal:(burb our) p.tac [~ q.tac])) %+ cure our.tac
abet:abet:(deal:(burb our.tac) p.tac [~ q.tac])
:: ::
:: remote update :: remote update
:: {$hail p/ship q/remote} :: {$hail p/ship q/remote}
:: ::
$hail $hail
(cure abet:abet:(hail:(burb p.tac) our q.tac)) %+ cure our.tac
abet:abet:(hail:(burb p.tac) our.tac q.tac)
:: ::
:: initialize vane :: initialize vane
:: {$init p/code q/arms} :: {$init p/code q/arms}
:: ::
$init $init
(cure abet:abet:(make:(burb our) now.sys eny.sys p.tac q.tac)) %+ cure our.tac
abet:(make:(burb our.tac) our.tac now.sys eny.sys p.tac q.tac)
:: ::
:: create promises :: create promises
:: {$mint p/ship q/safe} :: {$mint p/ship q/safe}
:: ::
$mint $mint
(cure abet:abet:(deal:(burb our) p.tac [q.tac ~])) %+ cure our.tac
abet:abet:(deal:(burb our.tac) p.tac [q.tac ~])
:: ::
:: move promises :: move promises
:: {$move p/ship q/ship r/safe} :: {$move p/ship q/ship r/safe}
:: ::
$move $move
=. +> (cure abet:abet:(deal:(burb our) p.tac [~ r.tac])) =. +>
=. +> (cure abet:abet:(deal:(burb our) q.tac [r.tac ~])) %+ cure our.tac
abet:abet:(deal:(burb our.tac) p.tac [~ r.tac])
=. +>
%+ cure our.tac
abet:abet:(deal:(burb our.tac) q.tac [r.tac ~])
+> +>
:: ::
:: public-key update :: public-key update
:: {$meet p/(unit (unit ship)) q/farm} :: {$meet p/(unit (unit ship)) q/farm}
:: ::
$meet $meet
(cure abet:(~(meet ur urb) p.tac q.tac)) %+ cure our.tac
abet:(~(meet ur urb) p.tac q.tac)
:: ::
:: cancel all trackers from duct :: cancel all trackers from duct
:: {$nuke $~} :: {$nuke $~}
@ -967,25 +976,26 @@
:: {$next p/bull} :: {$next p/bull}
:: ::
$next $next
(cure abet:abet:(next:(burb our) eny.sys p.tac)) %+ cure our.tac
abet:abet:(next:(burb our.tac) eny.sys p.tac)
:: ::
:: open secure channel :: open secure channel
:: {$veil p/ship} :: {$veil p/ship}
:: ::
$veil $veil
(curd abet:(~(veil ~(feed su urb sub) hen) p.tac)) (curd abet:(~(veil ~(feed su our.tac urb sub) hen) p.tac))
:: ::
:: watch private keys :: watch private keys
:: {$vein $~} :: {$vein $~}
:: ::
$vein $vein
(curd abet:~(vein ~(feed su urb sub) hen)) (curd abet:~(vein ~(feed su our.tac urb sub) hen))
:: ::
:: monitor assets :: monitor assets
:: {$vest $~} :: {$vest $~}
:: ::
$vest $vest
(curd abet:~(vest ~(feed su urb sub) hen)) (curd abet:~(vest ~(feed su our.tac urb sub) hen))
:: ::
:: monitor all :: monitor all
:: {$vine $~} :: {$vine $~}
@ -1005,13 +1015,15 @@
:: {$hail p/safe} :: {$hail p/safe}
:: ::
$hail $hail
(cure abet:abet:(hail:(burb p.tac) our [%| p.mes])) %+ cure our.tac
abet:abet:(hail:(burb p.tac) our.tac [%| p.mes])
:: ::
:: share certificates :: share certificates
:: {$meet p/farm} :: {$meet p/farm}
:: ::
$meet $meet
(cure abet:(~(meet ur urb) ``p.tac p.mes)) %+ cure our.tac
abet:(~(meet ur urb) ``p.tac p.mes)
== ==
== ==
:: :: ++curd:of :: :: ++curd:of
@ -1020,9 +1032,9 @@
+>(sub sub, moz (weld (flop moz) ^moz)) +>(sub sub, moz (weld (flop moz) ^moz))
:: :: ++cure:of :: :: ++cure:of
++ cure :: absolute edits ++ cure :: absolute edits
|= {hab/(list change) urb/state-absolute} |= {our/ship hab/(list change) urb/state-absolute}
^+ +> ^+ +>
(curd(urb urb) abet:(~(apex su urb sub) hab)) (curd(urb urb) abet:(~(apex su our urb sub) hab))
-- --
:: :: ++su :: :: ++su
:::: ## relative^heavy :: subjective engine :::: ## relative^heavy :: subjective engine
@ -1043,15 +1055,16 @@
:: ++form:su generates the actual report data. :: ++form:su generates the actual report data.
:: ::
=| moz/(list move) =| moz/(list move)
=| $: state-absolute =| $: our/ship
state-absolute
state-relative state-relative
== ==
:: moz: moves in reverse order :: moz: moves in reverse order
:: urb: absolute urbit state :: urb: absolute urbit state
:: sub: relative urbit state :: sub: relative urbit state
:: ::
=* urb -< =* urb ->-
=* sub -> =* sub ->+
|% |%
:: :: ++abet:su :: :: ++abet:su
++ abet :: resolve ++ abet :: resolve
@ -1510,6 +1523,7 @@
:: gen: bootstrap ticket :: gen: bootstrap ticket
:: nym: self-description :: nym: self-description
:: ::
our/ship ::TODO "absolutely verboten"
now/@da now/@da
eny/@e eny/@e
gen/@pG gen/@pG
@ -1887,52 +1901,6 @@
new(syg (~(put by syg.new) dad [p.pev val])) new(syg (~(put by syg.new) dad [p.pev val]))
-- -- -- --
-- --
++ neon
|= our/ship
^- (vane task gift sign note state state)
=| lex/state
|%
++ load |=(state +>)
++ stay lex
++ plow
=| $: now/@da
eny/@e
sky/roof
==
|%
++ doze ~
++ peek
|= $: lyc/(unit (set ship))
car/term
bem/beam
==
^- (unit (unit (cask vase)))
::
:: XX: needs review
::
?. &(=(p.bem our) =(r.bem `case`[%da now])) ~
%- some
?. =(%$ car) ~
%+ bind (~(scry of [now eny] lex) q.bem s.bem)
|=(a/gilt [-.a (slot 3 (spec !>(a)))])
::
++ spin
=| $: hen/duct
moz/(list (pair duct (wind note gift)))
==
|%
++ call
|= tac/task
^+ +>
=^ did lex abet:(~(call of [now eny] lex) hen tac)
+>.$(moz (weld moz did))
::
++ take
|= {tea/wire hin/sign}
+>
--
--
--
-- --
:: :::: :: ::::
:::: # vane :: interface :::: # vane :: interface

22
sys/zuse.hoon
View File

@ -984,19 +984,19 @@
action :: change action :: change
:: ::
+= task :: in request ->$ += task :: in request ->$
$% [%burn p=ship q=safe] :: destroy rights $% [%burn our=ship p=ship q=safe] :: destroy rights
[%hail p=ship q=remote] :: remote update [%hail our=ship p=ship q=remote] :: remote update
[%init p=@pG q=arms] :: initialize urbit [%init our=ship p=@pG q=arms] :: initialize urbit
[%meet p=(unit (unit ship)) q=farm] :: integrate pki from [%meet our=ship p=(unit (unit ship)) q=farm] :: integrate pki from
[%mint p=ship q=safe] :: create rights [%mint our=ship p=ship q=safe] :: create rights
[%move p=ship q=ship r=safe] :: transfer from=to [%move our=ship p=ship q=ship r=safe] :: transfer from=to
[%next p=bull] :: update private key [%next our=ship p=bull] :: update private key
[%nuke ~] :: cancel tracker from [%nuke ~] :: cancel tracker from
[%veil p=ship] :: view secret channel [%veil our=ship p=ship] :: view secret channel
[%vein ~] :: view signing keys [%vein our=ship] :: view signing keys
[%vest ~] :: view public balance [%vest our=ship] :: view public balance
[%vine ~] :: view secret history [%vine ~] :: view secret history
[%west p=ship q=path r=*] :: remote request [%west our=ship p=ship q=path r=*] :: remote request
== :: == ::
++ gilt gilt:womb ++ gilt gilt:womb
-- --