From 9dcb32d3db467b934b39014f266f6aa65e8deb9a Mon Sep 17 00:00:00 2001
From: timlucmiptev <info@timlucmiptev.space>
Date: Mon, 9 Nov 2020 14:43:30 +0200
Subject: [PATCH] type fixes in wallet-hook

---
 app/btc-wallet-hook.hoon | 22 ++++++++++------------
 sur/btc-provider.hoon    |  5 +++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/btc-wallet-hook.hoon b/app/btc-wallet-hook.hoon
index 627882cc5b..fb258698aa 100644
--- a/app/btc-wallet-hook.hoon
+++ b/app/btc-wallet-hook.hoon
@@ -83,11 +83,14 @@
 ++  on-peek   on-peek:def
 ++  on-agent
   |=  [=wire =sign:agent:gall]
-  |^  ^-  (quip card _this)
+  ^-  (quip card _this)
   ?+  -.sign  (on-agent:def wire sign)
       %watch-ack
     ?:  ?=(%set-provider -.wire)
-      handle-provider-ack
+      ?^  p.sign
+        `this(provider ~)
+        :: TODO: if positive ack: check whether it's our current provider, then set connected to true. Retry items in pend/fail. Replace '`this'
+      `this
     `this
       %fact
     =^  cards  state
@@ -99,11 +102,6 @@
       ==
     [cards this]
   ==
-  ++  handlle-provider-ack
-    ?^  p.sign
-      `this(provider ~)
-      ::    - positive ack: check whether it's our current provider, then set connected to true. Retry items in pend/fail
-  --
 ++  on-arvo   on-arvo:def
 ++  on-fail   on-fail:def
 --
@@ -113,7 +111,7 @@
   ^-  (quip card _state)
   ~&  >  comm
   `state
-::  set-provider algo:
+::  set-provider algo: 
 ::    - add provider, connected false
 ::    - on negative ack: delete the provider
 ::
@@ -137,15 +135,15 @@
       %scan-address
     ?~  provider
       ~|("provider not set" !!)
-    =/  ri=req-id  (hash-xpub:bwsl +>.req)
-    :-  ~[(get-address-info host.u.provider a.req)]
+    =/  ri=req-id:bp  (mk-req-id (hash-xpub:bwsl +>.req))
+    :-  ~[(get-address-info ri host.u.provider a.req)]
     state(pend (~(put by pend) ri +>.req))
   ==
 ::
 ++  get-address-info
-  |=  [host=ship a=address]  ^-  card
+  |=  [ri=req-id:bp host=ship a=address]  ^-  card
   :*  %pass  /[(scot %da now.bowl)]  %agent  [host %btc-provider]
-      %poke  %btc-provider-action  !>([%get-address-info a])
+      %poke  %btc-provider-action  !>([ri %get-address-info a])
   ==
 ++  mk-req-id
   |=  hash=@ux  ^-  req-id:bp
diff --git a/sur/btc-provider.hoon b/sur/btc-provider.hoon
index 168415c572..d46fa05f62 100644
--- a/sur/btc-provider.hoon
+++ b/sur/btc-provider.hoon
@@ -4,12 +4,13 @@
 +$  electrum-credentials  [rpc-url=@t]
 +$  credentials  [bc=btc-credentials ec=electrum-credentials]
 +$  host-info  [creds=credentials connected=? clients=(set ship)]
-+$  action  [req-id=@t body=action-body]
++$  req-id  @t
++$  action  [=req-id body=action-body]
 +$  action-body
   $%  [%address-info =address]
       [%ping ~]
   ==
-+$  result  [req-id=@t body=result-body]
++$  result  [=req-id body=result-body]
 +$  result-body
   $%  [%address-info a=address utxos=(set utxo) used=?]
   ==