ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-19 12:51:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'philip/naive' of ssh://github.com/urbit/urbit into philip/naive

Browse Source
This commit is contained in:
Philip Monk 2021-05-20 12:46:19 -10:00
commit eb68a42b0d
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/arvo/lib/naive.hoon
View File

@ -163,6 +163,7 @@
:: ::
++ diff ++ diff
$% [%nonce =ship =proxy =nonce] $% [%nonce =ship =proxy =nonce]
[%tx =raw-tx err=(unit @tas)]
[%operator owner=address operator=address approved=?] [%operator owner=address operator=address approved=?]
[%dns domains=(list @t)] [%dns domains=(list @t)]
$: %point =ship $: %point =ship
@ -616,17 +617,20 @@
:: ::
?. (verify-sig-and-nonce verifier chain-t state i.roll) ?. (verify-sig-and-nonce verifier chain-t state i.roll)
%+ debug %l2-sig-failed %+ debug %l2-sig-failed
$(roll t.roll) =^ effects state $(roll t.roll)
:_ state
[[%tx i.roll `%sig-or-nonce-failed] effects]
:: Increment nonce, even if it later fails :: Increment nonce, even if it later fails
:: ::
=^ effects-1 points.state (increment-nonce state from.tx.i.roll) =^ effects-1 points.state (increment-nonce state from.tx.i.roll)
:: Process tx :: Process tx
:: ::
=^ effects-2 state =^ effects-2 state
=/ tx-result=(unit [effects ^state]) (receive-tx state tx.i.roll) =/ tx-result=(unit [=effects =^state]) (receive-tx state tx.i.roll)
?~ tx-result ?~ tx-result
(debug %l2-tx-failed `state) %+ debug %l2-tx-failed
u.tx-result [[%tx i.roll `%tx-failed]~ state]
[[[%tx i.roll ~] effects.u.tx-result] state.u.tx-result]
=^ effects-3 state $(roll t.roll) =^ effects-3 state $(roll t.roll)
[:(welp effects-1 effects-2 effects-3) state] [:(welp effects-1 effects-2 effects-3) state]
:: ::