From 1678d45876889ad8747560f5032058227510fbcf Mon Sep 17 00:00:00 2001 From: fang Date: Wed, 5 May 2021 20:59:48 +0200 Subject: [PATCH] naive: emit effects for processed txs As a transaction receipt of sort, to inform of transaction success or failure. --- pkg/arvo/lib/naive.hoon | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/arvo/lib/naive.hoon b/pkg/arvo/lib/naive.hoon index 010627eab..f4d7ade71 100644 --- a/pkg/arvo/lib/naive.hoon +++ b/pkg/arvo/lib/naive.hoon @@ -156,6 +156,7 @@ :: ++ diff $% [%nonce =ship =proxy =nonce] + [%tx =raw-tx err=(unit @tas)] [%operator owner=address operator=address approved=?] [%dns domains=(list @t)] $: %point =ship @@ -609,17 +610,20 @@ :: ?. (verify-sig-and-nonce verifier chain-t state i.roll) %+ 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 :: =^ effects-1 points.state (increment-nonce state from.tx.i.roll) :: Process tx :: =^ 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 - (debug %l2-tx-failed `state) - u.tx-result + %+ debug %l2-tx-failed + [[%tx i.roll `%tx-failed]~ state] + [[[%tx i.roll ~] effects.u.tx-result] state.u.tx-result] =^ effects-3 state $(roll t.roll) [:(welp effects-1 effects-2 effects-3) state] ::