Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Whirlpool
whirlpool-client-cli
Commits
b186c3c8
Commit
b186c3c8
authored
Jul 02, 2020
by
zeroleak
Browse files
API: add "refresh" parameter to GET /rest/utxos
parent
55f08b70
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
doc/API.md
doc/API.md
+3
-0
src/main/java/com/samourai/whirlpool/cli/api/controllers/utxo/UtxosListController.java
...irlpool/cli/api/controllers/utxo/UtxosListController.java
+10
-6
src/main/java/com/samourai/whirlpool/cli/services/WalletAggregateService.java
...mourai/whirlpool/cli/services/WalletAggregateService.java
+1
-1
No files found.
doc/API.md
View file @
b186c3c8
...
...
@@ -92,6 +92,9 @@ Response:
## UTXO controls
### List utxos: ```GET /rest/utxos```
Parameters:
*
refresh (optional): "true" to refresh utxos
Response:
```
{
...
...
src/main/java/com/samourai/whirlpool/cli/api/controllers/
wallet
/UtxosListController.java
→
src/main/java/com/samourai/whirlpool/cli/api/controllers/
utxo
/UtxosListController.java
View file @
b186c3c8
package
com.samourai.whirlpool.cli.api.controllers.
wallet
;
package
com.samourai.whirlpool.cli.api.controllers.
utxo
;
import
com.samourai.whirlpool.cli.api.controllers.AbstractRestController
;
import
com.samourai.whirlpool.cli.api.protocol.CliApiEndpoint
;
...
...
@@ -7,19 +7,23 @@ import com.samourai.whirlpool.cli.services.CliWalletService;
import
com.samourai.whirlpool.client.wallet.WhirlpoolWallet
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.web.bind.annotation.RequestHeader
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
@RestController
public
class
UtxosListController
extends
AbstractRestController
{
@Autowired
private
CliWalletService
cliWalletService
;
@RequestMapping
(
value
=
CliApiEndpoint
.
REST_UTXOS
,
method
=
RequestMethod
.
GET
)
public
ApiWalletUtxosResponse
wallet
(
@RequestHeader
HttpHeaders
headers
)
throws
Exception
{
public
ApiWalletUtxosResponse
wallet
(
@RequestHeader
HttpHeaders
headers
,
@RequestParam
(
value
=
"refresh"
,
defaultValue
=
"false"
)
boolean
refresh
)
throws
Exception
{
checkHeaders
(
headers
);
WhirlpoolWallet
whirlpoolWallet
=
cliWalletService
.
getSessionWallet
();
if
(
refresh
)
{
// wait for utxo refresh
whirlpoolWallet
.
refreshUtxos
(
true
);
}
return
new
ApiWalletUtxosResponse
(
whirlpoolWallet
);
}
}
src/main/java/com/samourai/whirlpool/cli/services/WalletAggregateService.java
View file @
b186c3c8
...
...
@@ -160,7 +160,7 @@ public class WalletAggregateService {
return
false
;
}
ClientUtils
.
sleep
Refresh
Utxos
(
params
);
ClientUtils
.
sleepUtxos
Delay
(
params
);
log
.
info
(
" • Consolidating deposit..."
);
boolean
success
=
toWallet
(
depositWallet
,
depositWallet
,
feeSatPerByte
,
backendApi
);
return
success
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment