mirror of
https://github.com/urbit/shrub.git
synced 2024-12-25 21:12:56 +03:00
scan-progress added
This commit is contained in:
parent
d9e224f6ff
commit
dc93c735c1
@ -210,7 +210,8 @@
|
||||
[(silt (gulf 0 endpoint)) endpoint %.n]
|
||||
=^ cards0 state (req-scan:hc b xpub %0)
|
||||
=^ cards1 state (req-scan:hc b xpub %1)
|
||||
[(weld cards0 cards1) state]
|
||||
:_ state
|
||||
[(scan-progress:hc xpub) (weld cards0 cards1)]
|
||||
--
|
||||
::
|
||||
%delete-wallet
|
||||
@ -602,7 +603,7 @@
|
||||
(turn inputs.ti |=(i=val:tx [i `payer]))
|
||||
%+ turn outputs.ti
|
||||
|= o=val:tx
|
||||
?: =(pos.o vout)
|
||||
?: =(pos.o vout)
|
||||
:: check whether this is the output that went to payee
|
||||
[o payee]
|
||||
[o `payer]
|
||||
@ -964,7 +965,8 @@
|
||||
(bump-batch xpub %0)
|
||||
=^ cards1=(list card) state
|
||||
(bump-batch xpub %1)
|
||||
[(weld cards0 cards1) state]
|
||||
:_ state
|
||||
[(scan-progress:hc xpub) (weld cards0 cards1)]
|
||||
::
|
||||
:: delete the xpub from scans and set wallet to scanned
|
||||
::
|
||||
@ -1218,6 +1220,21 @@
|
||||
^- card
|
||||
[%give %fact ~[/all] %btc-wallet-update !>(upd)]
|
||||
::
|
||||
++ scan-progress
|
||||
|= [=xpub:bc]
|
||||
|^ ^- card
|
||||
%- give-update
|
||||
:+ %scan-progress
|
||||
(to-idx (~(gut by scans.state) [xpub %0] *batch))
|
||||
(to-idx (~(gut by scans.state) [xpub %1] *batch))
|
||||
++ to-idx
|
||||
|= b=batch
|
||||
^- (unit idx:bc)
|
||||
=/ s=(list idx:bc)
|
||||
(sort ~(tap in todo.b) lth)
|
||||
?~ s ~ `i.s
|
||||
--
|
||||
::
|
||||
++ watch-provider
|
||||
|= who=@p
|
||||
^- card
|
||||
|
@ -110,6 +110,7 @@
|
||||
%cancel-tx (hexb txid.upd)
|
||||
%new-address (address address.upd)
|
||||
%balance (balance balance.upd)
|
||||
%scan-progress (scan-progress main.upd change.upd)
|
||||
%error s+error.upd
|
||||
%broadcast-success ~
|
||||
==
|
||||
@ -161,6 +162,19 @@
|
||||
unconfirmed+(numb q.u.b)
|
||||
==
|
||||
::
|
||||
++ scan-progress
|
||||
|= [main=(unit idx:bitcoin) change=(unit idx:bitcoin)]
|
||||
|^ ^- json
|
||||
%- pairs
|
||||
:~ main+(from-unit main)
|
||||
change+(from-unit change)
|
||||
==
|
||||
++ from-unit
|
||||
|= i=(unit idx:bitcoin)
|
||||
?~ i ~
|
||||
(numb u.i)
|
||||
--
|
||||
::
|
||||
++ btc-state
|
||||
|= bs=btc-state:btc-wallet
|
||||
^- json
|
||||
|
@ -162,6 +162,10 @@
|
||||
[%new-address =address]
|
||||
[%balance balance=(unit [confirmed=sats unconfirmed=sats])]
|
||||
[%error =error]
|
||||
:: current index being scanned in each wallet part
|
||||
:: ~ if scan of that part is done
|
||||
::
|
||||
[%scan-progress main=(unit idx) change=(unit idx)]
|
||||
==
|
||||
::
|
||||
--
|
||||
|
Loading…
Reference in New Issue
Block a user