Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk

This commit is contained in:
Fang 2017-10-10 11:05:09 +02:00
commit d281627d4d
4 changed files with 23 additions and 13 deletions

View File

@ -42,7 +42,7 @@
:: :: ::
:::: :: ::
:: :: ::
|= {bowl:gall helm-part} :: main helm work
|= {bowl:gall helm-part} :: main helm work
=+ sez=(fall (~(get by hoc) ost) *helm-session)
=> |% :: arvo structures
++ card ::
@ -53,7 +53,7 @@
{$nuke wire ship} ::
{$serv wire ?(desk beam)} ::
{$poke wire dock pear} ::
{$wont wire sock path *} :: send message
{$want wire sock path *} :: send message
== ::
++ move (pair bone card) :: user-level move
++ pear :: poke fruit
@ -75,10 +75,11 @@
++ poke-begin :: make/send keypair
|= hood-begin =< abet
?> ?=($~ bur)
~& [%poke-begin our his]
=+ buz=(shaz :(mix (jam ges) eny))
=+ loy=(pit:nu:crub:crypto 512 buz)
%- emit(bur `[his [0 sec:ex:loy]~])
[%wont /helm/ticket [our (sein:title his)] /a/ta his tic ges pub:ex:loy]
[%want /helm/ticket [our (sein:title his)] /a/ta his tic ges pub:ex:loy]
::
++ poke-spawn
|= {him/ship key/@pG} =< abet
@ -111,7 +112,14 @@
|= top/?(desk beam) =< abet
(emit %serv /helm/serv top)
::
++ poke-hi |=(mes/@t abet:(emit %flog /di %text "< {<src>}: {(trip mes)}"))
++ poke-hi
|= mes/@t
~| %poke-hi-fail
?: =(%fail mes)
~& %poke-hi-fail
!!
abet:(emit %flog /di %text "< {<src>}: {(trip mes)}")
::
++ poke-atom
|= ato/@
=+ len=(scow %ud (met 3 ato))

View File

@ -7,10 +7,6 @@
++ fu fu:number :: modulo (mul p q)
++ aes aes:crypto :: aes, all sizes
++ crua crua:crypto :: cryptosuite A (RSA)
++ bruw bruw:suite:crypto :: create keypair
++ haul haul:suite:crypto :: activate public key
++ weur weur:suite:crypto :: activate secret key
++ trua trua:test:crypto :: test rsa
++ crub crub:crypto :: cryptosuite B (Ed)
++ trub trub:test:crypto :: test crub
++ hmac hmac:crypto :: HMAC-SHA1
@ -54,7 +50,6 @@
++ ofis de-base64:mimes:html :: 64-bit decode
++ dray dray:wired :: load tuple into path
++ raid raid:wired :: demand path odors
++ read read:wired :: parse odored path
++ urle en-urlt:html :: URL encode
++ urld de-urlt:html :: URL decode
++ earn en-purl:html :: purl to tape

View File

@ -1142,7 +1142,7 @@
++ cook :: cook:ho:um:am
|= {cop/coop cha/path ram/(unit {ryn/lane dam/flap})}
^- {gud/? con/_+>} :: acknowledgment
:: ~& [%cook cop num cha ram]
:: ~& [%ames-cook cop cha ram]
=+ rum=(need (~(get by raz.bah) cha))
=+ lat=(~(get by mis.rum) did.rum)
?: &(?=($~ lat) ?=($~ ram))
@ -1163,6 +1163,7 @@
++ done :: done:ho:um:am
|= {cha/path num/@ud} :: complete outgoing
^- {(unit duct) _+>}
:: ~& [%ames-done cha num]
=+ rol=(need (~(get by ryl.bah) cha))
=+ rix=(~(get by san.rol) num)
?~ rix [~ +>.$]
@ -1374,7 +1375,7 @@
==
==
+>.$
(wool [/a/ping hen] /q/pi ~ |)
(wool [/a/ping hen] /a/pi ~ |)
::
++ thaw :: thaw:ho:um:am
^+ . :: wakeup bomb
@ -1638,6 +1639,7 @@
$mack ?~ +>.sih $(sih [%g %nice ~]) :: XX using old code
$(sih [%g %mean `[%mack +>+.sih]])
$unto [~ +>]
$woot [~ +>]
?($mean $nice) :: XX obsolete
?: ?=({$ye $~} tea)
[~ +>.$]
@ -1664,6 +1666,9 @@
?: ?=($crud -.kyz)
[[[hen [%slip %d %flog kyz]] ~] +>]
?: ?=($west -.kyz)
?: ?=({$pi $~} q.kyz)
:_ +>.$
[[hen %give %mack ~] ~]
?> ?=({$ta $~} q.kyz)
=+ gox=((hard {p/@p q/@pG r/gens s/pass}) r.kyz)
=+ gus=(need (~(us go ton.fox) p.p.kyz))

View File

@ -93,7 +93,7 @@
++ ames ^?
|%
:: ::
:::: ++able:behn :: (1a1) arvo moves
:::: ++able:ames :: (1a1) arvo moves
:: ::::
++ able ^?
|%
@ -114,6 +114,7 @@
++ gift :: out result <-$
$% {$hear p/lane q/@} :: receive packet
{$init p/@p} :: report install
{$mack p/(unit tang)} ::
{$mass p/mass} :: memory usage
{$send p/lane q/@} :: transmit packet
{$woot p/ship q/coop} :: reaction message
@ -127,6 +128,7 @@
$: @tas ::
$% {$crud p/@tas q/(list tank)} :: by any
{$mack p/(unit tang)} :: message ack
{$woot p/ship q/coop} :: reaction message
== == == ::
++ task :: in request ->$
$% {$barn $~} :: new unix process
@ -4334,7 +4336,7 @@
$king (end 3 1 who)
$duke (end 4 1 who)
$earl (end 5 1 who)
$pawn (end 4 1 who)
$pawn ~zod
==
:: :: ++team:title
++ team :: our / our moon