From 21b6d4ec432c6592be0aa4368c97d35f1e7ae58d Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sat, 1 Nov 2014 15:13:18 -0700 Subject: [PATCH] Various fixes and improvements. --- arvo/jael.hoon | 19 ++++++++++++++++- arvo/kahn.hoon | 56 +++++++++++++++++++++++++------------------------- arvo/lunt.hoon | 4 ++-- 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/arvo/jael.hoon b/arvo/jael.hoon index 158e0969c..395070e1f 100644 --- a/arvo/jael.hoon +++ b/arvo/jael.hoon @@ -4,20 +4,37 @@ :: !? 164 :::: +:: %jael is logically homogeneous, but please follow these conventions: +:: +:: /cap :: foreign app keys +:: /service :: service name, eg %face +:: /appid :: your ship's app-id +:: /@uvH :: by hash +:: /@ud :: by number +:: /@tas :: by name +:: +:: /key :: foreign user secrets +:: /service :: service name, eg %face +:: /userid :: user identity + |= pit=vase => =~ :: structures |% ++ axle :: %jael state $: %0 :: + ent=@uwH :: entropy all=(map ship ,[p=@ q=safe]) :: entropy, secrets == :: +++ mast $: ent=@ + ++ mort ,[p=@da q=duct r=@] :: a mortal secret ++ gift :: out result <-$ $% [%done p=path q=@] :: key expired == :: ++ kiss :: in request ->$ - $% [%drop p=@p q=path r=@] :: discard key + $% [%kill p= + [%drop p=@p q=path r=@] :: discard key [%junk p=@] :: add entropy [%show p=@p q=path] :: read subtree [%tell p=@ q=path r=@da s=@] :: save key diff --git a/arvo/kahn.hoon b/arvo/kahn.hoon index 2790cdbf8..83ed3d62c 100644 --- a/arvo/kahn.hoon +++ b/arvo/kahn.hoon @@ -10,45 +10,45 @@ |% ++ axle :: %kahn state $: %0 :: - all=(map ship axel) :: state by owner + big=(unit ship) :: main ship, freeze + all=(unit axel) :: state once big == :: ++ axel :: all social state - $: rod=(list ship) :: ancestry upward - myn=(map ship girl) :: daughters - == + $: rod=(list ship) :: leadership upward + myn=(map ship girl) :: contacts + cir=(map ,@tas clan) :: contact groups + nac=(map narc ship) :: foreign to home + wyl=will :: cryptowill + == :: ++ axon :: all descendants - $: [%a p=hulk q=hulk r=hulk] :: zeppelin - [%b p=hulk q=hulk] :: blimp - [%c p=hulk] :: balloon - [%d p=hulk] :: bubble - [%e p=ship] :: ghost + $: [%a p=hulk q=hulk r=hulk s=hulk t=hulk] :: zeppelin + [%b p=hulk q=hulk r=hulk s=hulk] :: blimp + [%c p=hulk q=hulk r=hulk] :: balloon + [%d p=hulk q=hulk] :: drone + [%e p=hulk] :: bird == :: ++ clan :: ranked group - $: pec=rank :: membership bar + $: pec=rank :: rank conferred who=(set ship) :: members == :: ++ gift :: out result <-$ - $: [%notice p=ship q=action] - == + $: [%step p=ship q=girl] :: change contact + == :: ++ girl :: daughter record $: hop=pony :: status tip=rank :: rank - fig=(set narc) :: other identities - gor=(set ,@tas) :: memberships - out=(unit ship) :: stepmother - res=(unit ,@da) :: reserved until - == :: -++ hulk :: social state - $: rod=(list ship) :: ancestry upward - myn=(map ship girl) :: daughter status - cir=(map ,@tas clan) :: daughter groups + fig=(set narc) :: home to foreign + gor=(set ,@tas) :: in groups + out=(unit ship) :: exported to + wyl=will :: cryptowill == :: +++ hulk (map ship girl) :: social state ++ kiss :: change - $: [%reserve p=@ud q=@ud] :: reserve class/num - [%renew ~] :: self-renew - [%modify p=ship q=action] :: - [%await p=(unit trigger)] :: subscribe actions - == + $: [%lead p=(list ship)] :: set leadership + [%tact p=ship q=girl] :: set contact + [%will p=will] :: set will + == :: +++ mojo ?(%a %b %c %d %e) :: ship rank ++ trigger $: (set ship) (set clan) @@ -68,7 +68,7 @@ adopt: external to free == ++ narc path :: contact path -++ pony :: daughter status +++ pony :: contacts status $? %cold :: virginal %dead :: inoperative %fake :: virtual @@ -77,7 +77,7 @@ %left :: divorced %warm :: reserved == :: -++ rank :: privilege +++ rank :: privilege ring $? %0 :: enemy %1 :: guest %2 :: customer/vendor diff --git a/arvo/lunt.hoon b/arvo/lunt.hoon index fa0bee89c..3caf840ec 100644 --- a/arvo/lunt.hoon +++ b/arvo/lunt.hoon @@ -21,7 +21,7 @@ ++ home :: storage access $: pad=@uvH :: passcode huc=husk :: log server - sog=hulk :: + sog=hulk :: storage server == :: ++ hulk :: checkpoint service $% [%astr p=@ud q=@ud] :: S3 @@ -39,7 +39,7 @@ [%new p=brat q=@p r=home s=(list ovum)] :: create == :: ++ kiss :: request - $: [%com p=@p] :: toggle computer + $: [%com p=@p] :: toggle compute svr [%end p=brat] :: local end [%fan p=@ud] :: set local fanout [%kil ~] :: terminate ship