From c2d77a5d4788e4e974b427d21b7181b80856618a Mon Sep 17 00:00:00 2001 From: fang Date: Tue, 9 Aug 2022 21:21:10 +0200 Subject: [PATCH] gall: in/exclude the nonce from the wire as needed +ap-nuke was not including the nonce, but should. +ap-handle-peers was potentially including a zero nonce. (The latter shouldn't have been possible, but there's a bug in +load where sub-nonce.yoke gets initialized as 0 instead of 1.) --- pkg/arvo/sys/vane/gall.hoon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon index 75cf93a932..728b0cff12 100644 --- a/pkg/arvo/sys/vane/gall.hoon +++ b/pkg/arvo/sys/vane/gall.hoon @@ -1204,8 +1204,8 @@ ~ [%give %kick ~(tap in inbound-paths) ~]~ %+ turn ~(tap by boat.yoke) - |= [[=wire =ship =term] ? =path] - [%pass wire %agent [ship term] %leave ~] + |= [[=wire =dock] ? =path] + [%pass (ap-nonce-wire wire dock) %agent dock %leave ~] =^ maybe-tang ap-core (ap-ingest ~ |.([will *agent])) ap-core :: +ap-from-internal: internal move to move. @@ -1891,7 +1891,7 @@ (ap-error %watch-not-unique tang) :: reentrant, maybe bad? $(moves t.moves) :: - =. p.move.move + =? p.move.move !=(0 sub-nonce.yoke) (weld sys-wire [(scot %ud sub-nonce.yoke) sub-wire]) %_ $ moves t.moves