urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 20:47:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

roller-rpc: fix serializing tx for personal_sign

Browse Source
This commit is contained in:
yosoyubik 2021-11-09 19:18:10 +01:00
parent 502fd5822b
commit 084c70497d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/arvo/app/roller-rpc.hoon
View File

@ -175,9 +175,9 @@
%get-unsigned-tx `(hash-transaction id +.params chain:scry & |) %get-unsigned-tx `(hash-transaction id +.params chain:scry & |)
%get-predicted-state `(get-naive id +.params predicted:scry) %get-predicted-state `(get-naive id +.params predicted:scry)
%hash-raw-transaction `(hash-raw-transaction id +.params) %hash-raw-transaction `(hash-raw-transaction id +.params)
:: TODO: deprecated, remove :: TODO: deprecated, remove (used together with personal_sign)
:: ::
%hash-transaction `(hash-transaction id +.params chain:scry & |) %hash-transaction `(hash-transaction id +.params chain:scry | &)
== ==
-- --
:: ::

15
pkg/arvo/lib/azimuth-roll-rpc.hoon
View File

@ -620,17 +620,16 @@
~(parse error:json-rpc id) ~(parse error:json-rpc id)
=/ tx=(unit tx:naive) (build-l2-tx u.l2-tx u.from params) =/ tx=(unit tx:naive) (build-l2-tx u.l2-tx u.from params)
?~ tx ~(parse error:json-rpc id) ?~ tx ~(parse error:json-rpc id)
=/ =octs (gen-tx-octs:lib u.tx) =/ =octs
:+ %result id %. [chain-id u.nonce (gen-tx-octs:lib u.tx)]
=; =keccak
%+ hex:to-json 32
?. reverse keccak
(reverse-hash:lib keccak)
%- hash-tx:lib
%. [chain-id u.nonce octs]
?: header ?: header
unsigned-tx:lib unsigned-tx:lib
prepare-for-sig:lib prepare-for-sig:lib
:+ %result id
%- hex:to-json
?: reverse
p.octs^(rev 3 octs)
32^(hash-tx:lib octs)
:: ::
++ hash-raw-transaction ++ hash-raw-transaction
|= [id=@t params=(map @t json)] |= [id=@t params=(map @t json)]