From 986d273b5f5ae621a78bd08df5bc3c246f28349a Mon Sep 17 00:00:00 2001 From: rabsef-bicrym <52549148+rabsef-bicrym@users.noreply.github.com> Date: Fri, 11 Mar 2022 11:10:47 -0800 Subject: [PATCH] Update /lib/ring/hoon for %jael scries. Also I took the liberty of making `build-signing-participants` use a `%lyfe` scry and remove unknowns from the set rather than crashing. This is a choice - happy to change it back the other way. --- pkg/base-dev/lib/ring.hoon | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/base-dev/lib/ring.hoon b/pkg/base-dev/lib/ring.hoon index a7be742b7..0490c7391 100644 --- a/pkg/base-dev/lib/ring.hoon +++ b/pkg/base-dev/lib/ring.hoon @@ -349,15 +349,16 @@ |= [our=@p now=@da ship=@p =life] ^- @udpoint :: - =/ d=[=^life =pass] + =/ d=[=^life =pass *] =/ scry-path=path - :~ %k + :~ %j (scot %p our) + %deed (scot %da now) (scot %p ship) (scot %ud life) == - .^([^life pass] scry-path) + .^([^life pass *] scry-path) :: we have the deed which has pass, which is several numbers +cat-ed :: together; pull out the keys :: @@ -376,15 +377,15 @@ ?~ invited [participants keys] :: - =/ =life - .^(life k+/(scot %p our)/life/(scot %da now)/(scot %p i.invited)) + =/ lyfe=(unit @ud) + .^((unit @ud) j+/(scot %p our)/lyfe/(scot %da now)/(scot %p i.invited)) :: - ?: =(life 0) + ?~ lyfe $(invited t.invited) :: - =/ pubkey=@udpoint (ship-life-to-pubid our now i.invited life) + =/ pubkey=@udpoint (ship-life-to-pubid our now i.invited u.lyfe) :: - =. participants (~(put in participants) [i.invited life]) + =. participants (~(put in participants) [i.invited u.lyfe]) =. keys (~(put in keys) pubkey) :: $(invited t.invited) @@ -436,11 +437,11 @@ :: get our ships' current life :: =/ our-life=life - .^(life %k /(scot %p our)/life/(scot %da now)/(scot %p our)) + .^(life %j /(scot %p our)/life/(scot %da now)/(scot %p our)) :: get our ships' secret keyfile ring :: =/ secret-ring=ring - .^(ring %k /(scot %p our)/vein/(scot %da now)/(scot %ud our-life)) + .^(ring %j /(scot %p our)/vein/(scot %da now)/(scot %ud our-life)) :: fetch the encoded auth seed from the ring :: =/ secret-auth-seed=@