Merge branch 'ixv/btc-filter'

pkg/arvo/app/btc-provider.hoon

@@ -85,8 +85,7 @@
   ::
   ?>  ?=([%clients *] pax)
   ?.  (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>}"
   :-  [do-ping:hc]~
   this(clients.host-info (~(put in clients.host-info) src.bowl))
@@ -195,6 +194,9 @@
       ::
         %ping
       [%get-block-info ~]
+      ::
+        %block-info
+      [%get-block-info block.act]
     ==
   [~[(req-card act ract)] state]
 ::
@@ -284,6 +286,11 @@
     ?:  =(block.host-info block.r)
       ~[(send-status [%connected network.host-info block.r fee.r])]
     ~[(send-status [%new-block network.host-info block.r fee.r blockhash.r blockfilter.r])]
+    ::
+      %block-info
+    ?>  ?=([%get-block-info *] r)
+    :_  state
+    ~[(send-update [%.y %block-info network.host-info +.r])]
   ==
 ::
 ++  send-status

pkg/arvo/app/btc-wallet.hoon

@@ -167,13 +167,20 @@
   |=  [=wire =sign:agent:gall]
   ^-  (quip card _this)
   ?+  -.sign  (on-agent:def wire sign)
+      %watch-ack
+    ?~  p.sign  `this
+    %-  (slog leaf+"connection rejected by provider ({<src.bowl>})" u.p.sign)
+    `this
+    ::
       %kick
-    ~&  >>>  "kicked from prov {<src.bowl>}"
     ?~  prov  `this
     ?:  ?&  ?=(%set-provider -.wire)
             =(host.u.prov src.bowl)
         ==
-      `this(prov ~)
+      :_  this(prov [~ src.bowl %.n])
+      :~  (watch-provider src.bowl)
+          (give-update %change-provider `[src.bowl %.n])
+      ==
     `this
     ::
       %fact
@@ -238,7 +245,6 @@
   ?>  (team:title our.bowl src.bowl)
   ?-  -.comm
       %set-provider
-    |^
     ?~  provider.comm
       ?~  prov  `state
       :_  state(prov ~)
@@ -252,20 +258,6 @@
         (watch-provider u.provider.comm)
         (give-update %change-provider `[u.provider.comm %.n])
     ==
-    ::
-    ++  watch-provider
-      |=  who=@p
-      ^-  card
-      :*  %pass  /set-provider/[(scot %p who)]  %agent  [who %btc-provider]
-          %watch  /clients
-      ==
-    ++  leave-provider
-      |=  who=@p
-      ^-  card
-      :*  %pass  /set-provider/[(scot %p who)]  %agent  [who %btc-provider]
-          %leave  ~
-      ==
-    --
   ::
       %check-provider
     =/  pax  /permitted/(scot %p provider.comm)
@@ -685,7 +677,6 @@
 ++  handle-provider-status
   |=  s=status:bp
   ^-  (quip card _state)
-  |^
   =^  cards  state
     ?~  prov  `state
     ?.  =(host.u.prov src.bowl)  `state
@@ -704,8 +695,8 @@
       (give-update %change-provider prov)
       cards
   ==
-  ::
+::
-  ++  on-connected
+++  on-connected
   |=  $:  p=provider
           =network
           block=@ud
@@ -714,43 +705,64 @@
           blockfilter=(unit hexb)
       ==
   ^-  (quip card _state)
-    :_  %_  state
+  ::  request block-info for missing blocks
+  ::  if blockhash or blockfilter are ~ request block-info for current block
+  ::
+  =|  blocks=(list @ud)
+  =/  gap  (sub block block.btc-state)
+  =?  blocks  (gth gap 1)
+    (gulf +(block.btc-state) (dec block))
+  =?  blocks  ?|(?=(~ blockhash) ?=(~ blockfilter))
+    (snoc blocks block)
+  =?  blocks  (gth gap 50)  ~
+  ::
+  =/  cards=(list card)
+    ;:  weld
+      retry-ahistorical-txs
+      (retry-pend-piym network)
+      (retry-block-info blocks)
+    ==
+  =?  cards  ?|(!connected.p (gth gap 0))
+    ;:  weld  cards
+      (retry-poym network)
+      (retry-txs network)
+      (retry-scans network)
+    ==
+  =?  cards  ?&(?=(^ blockhash) ?=(^ blockfilter) (gth gap 0))
+    (weld cards (retry-filtered-addrs network u.blockhash u.blockfilter))
+  =?  cards  (gth gap 50)
+    (weld cards (retry-addrs network))
+  :-  cards
+  %_  state
     prov  `p(connected %.y)
     btc-state  [block fee now.bowl]
   ==
-    ?:  ?|(?!(connected.p) (lth block.btc-state block))
+::
-      ;:  weld
+++  retry-block-info
-        (retry-pend-piym network)
+  |=  blocks=(list @ud)
-        (retry-poym network)
+  %+  turn  blocks
-        (retry-addrs network)
+  |=  block=@ud
-        (retry-txs network)
+  (poke-provider %block-info `block)
-        (retry-scans network)
+::
-        retry-ahistorical-txs
+++  retry-ahistorical-txs
-      ==
-    ;:  weld
-::      (retry-addrs network)
-      retry-ahistorical-txs
-      (retry-pend-piym network)
-    ==
-  ::
-  ++  retry-ahistorical-txs
   ^-  (list card)
   %+  turn  ~(tap in ahistorical-txs)
   |=  =txid
   (poke-provider [%tx-info txid])
-
+::
-  ::
+++  retry-scans
-  ++  retry-scans
   |=  =network
   ^-  (list card)
   %-  zing
   %+  murn  ~(tap by scans)
   |=  [[=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)
-  ::  +retry-addrs: get info on addresses with unconfirmed UTXOs
+::  +retry-addrs: get info on addresses with unconfirmed UTXOs
-  ::
+::
-  ++  retry-addrs
+++  retry-addrs
   |=  =network
   ^-  (list card)
   %-  zing
@@ -762,9 +774,33 @@
   %+  turn  ~(tap by wach.w)
   |=  [a=address *]
   (poke-provider [%address-info a])
-  ::  +retry-txs: get info on txs without enough confirmations
+::
+::
+++  retry-filtered-addrs
+  |=  [=network blockhash=hexb blockfilter=hexb]
+  ^-  (list card)
+  %-  zing
+  %+  murn  ~(val by walts)
+  |=  w=walt
+  ^-  (unit (list card))
+  ?.  =(network network.w)  ~
+  :-  ~
+  %+  murn
+    %~  tap  in
+    %:  all-match:bip-b158:bc
+        blockfilter
+        blockhash
       ::
-  ++  retry-txs
+        %+  turn  ~(tap by wach.w)
+        |=  [a=address *]
+        [a (to-script-pubkey:adr:bc a)]
+    ==
+  |=  [a=address spk=hexb]
+  ^-  (unit card)
+  `(poke-provider [%address-info a])
+::  +retry-txs: get info on txs without enough confirmations
+::
+++  retry-txs
   |=  =network
   ^-  (list card)
   %+  murn  ~(tap by history)
@@ -774,8 +810,8 @@
   ?.  =(network network.u.w)  ~
   ?:  (gte confs.hest confs.u.w)  ~
   `(poke-provider [%tx-info txid])
-  ::
+::
-  ++  retry-poym
+++  retry-poym
   |=  =network
   ^-  (list card)
   ?~  txbu.poym  ~
@@ -788,9 +824,9 @@
   %+  turn  txis.u.txbu.poym
   |=  =txi
   (poke-provider [%raw-tx ~(get-txid txb:bl u.txbu.poym)])
-  ::  +retry-pend-piym: check whether txids in pend-piym are in mempool
+::  +retry-pend-piym: check whether txids in pend-piym are in mempool
-  ::
+::
-  ++  retry-pend-piym
+++  retry-pend-piym
   |=  =network
   ^-  (list card)
   %+  murn  ~(tap by pend.piym)
@@ -799,7 +835,6 @@
   ?~  w  ~
   ?.  =(network network.u.w)  ~
   `(poke-provider [%tx-info txid])
-  --
 ::
 ++  handle-provider-update
   |=  upd=update:bp
@@ -833,6 +868,10 @@
     :~  (poke-internal [%fail-broadcast-tx txid.p.upd])
         (give-update %cancel-tx txid.p.upd)
     ==
+    ::
+      %block-info
+    :_  state
+    (retry-filtered-addrs network.p.upd blockhash.p.upd blockfilter.p.upd)
   ==
 ::
 ++  handle-tx-info
@@ -1082,6 +1121,19 @@
   ^-  card
   [%give %fact ~[/all] %btc-wallet-update !>(upd)]
 ::
+++  watch-provider
+  |=  who=@p
+  ^-  card
+  :*  %pass  /set-provider/[(scot %p who)]  %agent  [who %btc-provider]
+      %watch  /clients
+  ==
+++  leave-provider
+  |=  who=@p
+  ^-  card
+  :*  %pass  /set-provider/[(scot %p who)]  %agent  [who %btc-provider]
+      %leave  ~
+  ==
+::
 ++  give-initial
   ^-  card
   =^  a=(unit address)  state

pkg/arvo/lib/bip/b158.hoon

@@ -211,19 +211,20 @@
   $(last-val (add delta last-val))
 ::  +all-match: returns all target byts that match
 ::   - filter: full block filter, with leading N
-::   - k: key for siphash (end of blockhash, reversed)
 ::   - targets: scriptpubkeys to match
 ::
 ++  all-match
-  |=  [filter=hexb:bc k=byts targets=(list byts)]
+  |=  [filter=hexb:bc blockhash=hexb:bc targets=(list [address:bc byts])]
-  ^-  (set hexb:bc)
+  ^-  (set [address:bc hexb:bc])
-  %-  ~(gas in *(set hexb:bc))
+  =/  k  (to-key (trip (to-cord:hxb:bcu blockhash)))
+  %-  ~(gas in *(set [address:bc hexb:bc]))
   =/  [p=@ m=@]  [p:params m:params]
   =/  [n=@ux gcs-set=bits:bc]  (parse-filter filter)
-  =/  target-map=(map @ hexb:bc)
+  =/  target-map=(map @ [address:bc hexb:bc])
-    %-  ~(gas by *(map @ hexb:bc))
+    %-  ~(gas by *(map @ [address:bc hexb:bc]))
     %+  turn  targets
-    |=(t=hexb:bc [(to-range:hsh t (mul n m) k) t])
+    |=  [a=address:bc t=hexb:bc]
+    [(to-range:hsh t (mul n m) k) a t]
   =+  target-hs=(sort ~(tap in ~(key by target-map)) lth)
   =+  last-val=0
   =|  matches=(list @)
@@ -244,4 +245,5 @@
   =^  delta  gcs-set
     (de:gol gcs-set p)
   $(last-val (add delta last-val))
+::
 --

pkg/arvo/lib/bitcoin.hoon

@@ -3,7 +3,7 @@
 ::  expose BIP libraries
 ::
 /-  sur=bitcoin
-/+  bech32=bip-b173, pbt=bip-b174, bcu=bitcoin-utils
+/+  bech32=bip-b173, pbt=bip-b174, bcu=bitcoin-utils, bip-b158
 =,  sur
 =,  bcu
 |%

pkg/arvo/lib/btc.hoon

@@ -505,8 +505,10 @@
     (mk-url '/getblockcount' '')
     ::
       %get-block-info
+    =/  param=@t
+      ?~(block.ract '' (rsh [3 2] (scot %ui u.block.ract)))
     %-  get-request
-    (mk-url '/getblockinfo' '')
+    (mk-url '/getblockinfo/' param)
   ==
   ++  mk-url
     |=  [base=@t params=@t]

pkg/arvo/sur/btc-provider.hoon

@@ -31,6 +31,7 @@
       [%raw-tx txid=hexb]
       [%broadcast-tx rawtx=hexb]
       [%ping ~]
+      [%block-info block=(unit @ud)]
   ==
 ::
 +$  result
@@ -38,6 +39,7 @@
       [%tx-info =info:tx]
       [%raw-tx txid=hexb rawtx=hexb]
       [%broadcast-tx txid=hexb broadcast=? included=?]
+      [%block-info =network block=@ud fee=(unit sats) blockhash=hexb blockfilter=hexb]
   ==
 +$  error
   $%  [%not-connected status=@ud]
@@ -60,7 +62,7 @@
         [%get-raw-tx txid=hexb]
         [%broadcast-tx rawtx=hexb]
         [%get-block-count ~]
-        [%get-block-info ~]
+        [%get-block-info block=(unit @ud)]
     ==
   ::
   +$  result

pkg/arvo/tests/lib/bip/b158.hoon

@@ -151,9 +151,11 @@
   ::
   ++  check-all-match
     |=  v=match-vector
-    =+  k=(to-key blockhash.v)
+    =/  b=hexb  (from-cord:hxb (crip blockhash.v))
+    =/  inc=(list [address hexb])  (turn inc-spks.v |=(h=hexb [*address h]))
+    =/  exc=(list [address hexb])  (turn exc-spks.v |=(h=hexb [*address h]))
     %+  expect-eq
-      !>(`(set hexb)`(sy inc-spks.v))
+      !>(`(set [address hexb])`(sy inc))
-      !>(`(set hexb)`(all-match filter.v k (weld inc-spks.v exc-spks.v)))
+      !>(`(set [address hexb])`(all-match filter.v b (weld inc exc)))
   --
 --