urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-26 21:44:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

btc: style nits, and fix watch-ack handling

Browse Source
This commit is contained in:
ixv 2021-06-17 15:53:12 -07:00
parent 0fe385df1f
commit ec8ca6f0cf
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/arvo/app/btc-provider.hoon
View File

@ -85,8 +85,7 @@
:: ::
?> ?=([%clients *] pax) ?> ?=([%clients *] pax)
?. (is-whitelisted:hc src.bowl) ?. (is-whitelisted:hc src.bowl)
~& >>> "btc-provider: blocked client {<src.bowl>}" ~|("btc-provider: blocked client {<src.bowl>}" !!)
[~[[%give %kick ~ ~]] this]
~& > "btc-provider: accepted client {<src.bowl>}" ~& > "btc-provider: accepted client {<src.bowl>}"
:- [do-ping:hc]~ :- [do-ping:hc]~
this(clients.host-info (~(put in clients.host-info) src.bowl)) this(clients.host-info (~(put in clients.host-info) src.bowl))

17
pkg/arvo/app/btc-wallet.hoon
View File

@ -167,6 +167,11 @@
|= [=wire =sign:agent:gall] |= [=wire =sign:agent:gall]
^- (quip card _this) ^- (quip card _this)
?+ -.sign (on-agent:def wire sign) ?+ -.sign (on-agent:def wire sign)
%watch-ack
?~ p.sign `this
%- (slog leaf+"connection rejected by provider ({<src.bowl>})" u.p.sign)
`this
::
%kick %kick
?~ prov `this ?~ prov `this
?: ?& ?=(%set-provider -.wire) ?: ?& ?=(%set-provider -.wire)
@ -724,13 +729,9 @@
(retry-scans network) (retry-scans network)
== ==
=? cards ?&(?=(^ blockhash) ?=(^ blockfilter) (gth gap 0)) =? cards ?&(?=(^ blockhash) ?=(^ blockfilter) (gth gap 0))
;: weld cards (weld cards (retry-filtered-addrs network u.blockhash u.blockfilter))
(retry-filtered-addrs network u.blockhash u.blockfilter)
==
=? cards (gth gap 50) =? cards (gth gap 50)
;: weld cards (weld cards (retry-addrs network))
(retry-addrs network)
==
:- cards :- cards
%_ state %_ state
prov `p(connected %.y) prov `p(connected %.y)
@ -755,7 +756,9 @@
%- zing %- zing
%+ murn ~(tap by scans) %+ murn ~(tap by scans)
|= [[=xpub:bc =chyg] =batch] |= [[=xpub:bc =chyg] =batch]
?. =(network network:(~(got by walts) xpub)) ~ =/ w (~(get by walts) xpub)
?~ w ~
?. =(network network.u.w) ~
`-:(req-scan batch xpub chyg) `-:(req-scan batch xpub chyg)
:: +retry-addrs: get info on addresses with unconfirmed UTXOs :: +retry-addrs: get info on addresses with unconfirmed UTXOs
:: ::