diff --git a/sys/vane/jael.hoon b/sys/vane/jael.hoon index 8999357ca9..4395df30ad 100644 --- a/sys/vane/jael.hoon +++ b/sys/vane/jael.hoon @@ -1039,15 +1039,15 @@ :: {$hail p/safe} :: $hail - %+ cure our.tac - abet:abet:(hail:(burb p.tac) our.tac [%| p.mes]) + %+ cure p.p.tac + abet:abet:(hail:(burb q.p.tac) p.p.tac [%| p.mes]) :: :: share certificates :: {$meet p/farm} :: $meet - %+ cure our.tac - abet:(~(meet ur urb) ``p.tac p.mes) + %+ cure p.p.tac + abet:(~(meet ur urb) ``q.p.tac p.mes) :: :: cancel trackers :: [%nuke ~] @@ -2023,14 +2023,14 @@ [d %give %vent upd] :: ++ subscribe-to - |= who=@p + |= [our=ship who=ship] %+ wrap-note /vent/(scot %p who) - [%x %mess who /j %vent ~] + [%a %want [our who] /j/vent `*`[%vent ~]] :: ++ unsubscribe-from - |= who=@p + |= [our=ship who=ship] %+ wrap-note /vent/(scot %p who) - [%x %mess who /j %nuke ~] + [%a %want [our who] /j/vent `*`[%nuke ~]] :: :: ++ read @@ -2093,7 +2093,7 @@ =+ bos=(sein:title our) ?. =(our bos) ::TODO set bos as source in config - (put-move (subscribe-to bos)) + (put-move (subscribe-to our bos)) ::TODO set localhost as source in config new-filter :: @@ -2464,7 +2464,14 @@ == ^- {p/(list move) q/_..^$} =* req q.hin - ?+ req [~ ..^$] + ?- req + [%a %woot *] + ?~ q.req ~&(%coop-fine [~ ..^$]) + ?~ u.q.req ~&(%ares-fine [~ ..^$]) + ~& [%woot-bad p.u.u.q.req] + ~_ q.u.u.q.req + [~ ..^$] + :: [%e %sigh *] ~& [%got-sigh p.p.req] =^ moz eth.lex abet:(~(sigh et tea now eth.lex) p.req) diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 8308a3dca6..c4327de2e8 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -1252,7 +1252,7 @@ =, eyre $% {$b $wait p/@da} :: wait until [%e %hiss p=(unit user) q=mark r=cage] :: outbound user req - {$x $mess p/ship q/path r/*} :: send message + [%a %want p=sock q=path r=*] :: send message == :: ++ remote :: remote notification %+ each safe :: &/addition @@ -1261,7 +1261,8 @@ ++ sign :: in result $<- $% {$b $wake $~} :: wakeup [%e %sigh p=cage] :: marked http response - {$x $rest p/coop} :: message result + [%j %vent p=update:constitution:ethe] :: ethereum changes + [%a %woot p=ship q=coop] :: message result == :: ++ tally :: balance update %+ each balance :: complete @@ -1282,7 +1283,7 @@ [%vent ~] :: view ethereum state [%vest our=ship] :: view public balance [%vine ~] :: view secret history - [%west our=ship p=ship q=path r=*] :: remote request + [%west p=sack q=path r=*] :: remote request == :: ++ gilt gilt:womb --