From cb44dccafa448335a359063c5584a7bfbe427840 Mon Sep 17 00:00:00 2001 From: yosoyubik Date: Tue, 7 Sep 2021 12:58:25 +0200 Subject: [PATCH] azimuth-roll-rpc: update point:to-json --- pkg/arvo/lib/azimuth-roll-rpc.hoon | 21 +++++++++++++-------- pkg/arvo/sur/dice.hoon | 2 -- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkg/arvo/lib/azimuth-roll-rpc.hoon b/pkg/arvo/lib/azimuth-roll-rpc.hoon index 70c6615dcc..04c8081fd6 100644 --- a/pkg/arvo/lib/azimuth-roll-rpc.hoon +++ b/pkg/arvo/lib/azimuth-roll-rpc.hoon @@ -290,25 +290,30 @@ :- 'network' %- pairs =* net net.point - :* ['rift' (numb rift.net)] + :* ['rift' s+(json-number rift.net)] :: - =, mimes:html :- 'keys' %- pairs - :~ ['life' (numb life.keys.net)] - ['suite' (numb suite.keys.net)] - ['auth' (hex (as-octs auth.keys.net))] - ['crypt' (hex (as-octs crypt.keys.net))] + :~ ['life' s+(json-number life.keys.net)] + ['suite' s+(json-number suite.keys.net)] + ['auth' (hex 32 auth.keys.net)] + ['crypt' (hex 32 crypt.keys.net)] == :: :- 'sponsor' %- pairs - ~[['has' b+has.sponsor.net] ['who' (ship who.sponsor.net)]] + ~[['has' b+has.sponsor.net] ['who' (numb `@ud`who.sponsor.net)]] :: ?~ escape.net ~ - ['escape' (ship u.escape.net)]~ + ['escape' (numb `@ud`u.escape.net)]~ == == :: + ++ json-number + |= num=@ + ^- @t + =/ jon=json (numb num) + ?>(?=([%n *] jon) p.jon) + :: ++ points |= points=(list [@p point:naive]) ^- json diff --git a/pkg/arvo/sur/dice.hoon b/pkg/arvo/sur/dice.hoon index 995a98f22f..3f33fc536d 100644 --- a/pkg/arvo/sur/dice.hoon +++ b/pkg/arvo/sur/dice.hoon @@ -48,8 +48,6 @@ [%tx =address:ethereum =roller-tx] == :: -:: TODO: add submission time? -:: +$ roller-tx [=ship =status hash=keccak =time type=l2-tx] :: +$ pend-tx [force=? =address:naive =time =raw-tx:naive]