mirror of
https://github.com/urbit/shrub.git
synced 2024-11-24 13:06:09 +03:00
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.
This commit is contained in:
parent
8f8e67f09f
commit
986d273b5f
@ -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=@
|
||||
|
Loading…
Reference in New Issue
Block a user