RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix utxo rest API endpoint

Browse Source
This commit is contained in:
Martin Boehm 2022-03-03 12:09:04 +01:00
parent 3d59bd096b
commit ad18eda804
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/public.go
View File

@ -1050,7 +1050,8 @@ func (s *PublicServer) apiXpub(r *http.Request, apiVersion int) (interface{}, er
func (s *PublicServer) apiUtxo(r *http.Request, apiVersion int) (interface{}, error) { func (s *PublicServer) apiUtxo(r *http.Request, apiVersion int) (interface{}, error) {
var utxo []api.Utxo var utxo []api.Utxo
var err error var err error
if i := strings.LastIndexByte(r.URL.Path, '/'); i > 0 { if i := strings.LastIndex(r.URL.Path, "utxo/"); i > 0 {
desc := r.URL.Path[i+5:]
onlyConfirmed := false onlyConfirmed := false
c := r.URL.Query().Get("confirmed") c := r.URL.Query().Get("confirmed")
if len(c) > 0 { if len(c) > 0 {
@ -1063,11 +1064,11 @@ func (s *PublicServer) apiUtxo(r *http.Request, apiVersion int) (interface{}, er
if ec != nil { if ec != nil {
gap = 0 gap = 0
} }
utxo, err = s.api.GetXpubUtxo(r.URL.Path[i+1:], onlyConfirmed, gap) utxo, err = s.api.GetXpubUtxo(desc, onlyConfirmed, gap)
if err == nil { if err == nil {
s.metrics.ExplorerViews.With(common.Labels{"action": "api-xpub-utxo"}).Inc() s.metrics.ExplorerViews.With(common.Labels{"action": "api-xpub-utxo"}).Inc()
} else { } else {
utxo, err = s.api.GetAddressUtxo(r.URL.Path[i+1:], onlyConfirmed) utxo, err = s.api.GetAddressUtxo(desc, onlyConfirmed)
s.metrics.ExplorerViews.With(common.Labels{"action": "api-address-utxo"}).Inc() s.metrics.ExplorerViews.With(common.Labels{"action": "api-address-utxo"}).Inc()
} }
if err == nil && apiVersion == apiV1 { if err == nil && apiVersion == apiV1 {

9
server/public_test.go
View File

@ -811,6 +811,15 @@ func httpTestsBitcoinType(t *testing.T, ts *httptest.Server) {
`[{"txid":"3d90d15ed026dc45e19ffb52875ed18fa9e8012ad123d7f7212176e2b0ebdb71","vout":0,"value":"118641975500","height":225494,"confirmations":1,"address":"2N6utyMZfPNUb1Bk8oz7p2JqJrXkq83gegu","path":"m/49'/1'/33'/1/3"}]`, `[{"txid":"3d90d15ed026dc45e19ffb52875ed18fa9e8012ad123d7f7212176e2b0ebdb71","vout":0,"value":"118641975500","height":225494,"confirmations":1,"address":"2N6utyMZfPNUb1Bk8oz7p2JqJrXkq83gegu","path":"m/49'/1'/33'/1/3"}]`,
}, },
}, },
{
name: "apiUtxo v2 xpub",
r: newGetRequest(ts.URL + "/api/v2/utxo/" + url.QueryEscape(dbtestdata.TaprootDescriptor)),
status: http.StatusOK,
contentType: "application/json; charset=utf-8",
body: []string{
`[]`,
},
},
{ {
name: "apiBalanceHistory Addr2 v2", name: "apiBalanceHistory Addr2 v2",
r: newGetRequest(ts.URL + "/api/v2/balancehistory/mtGXQvBowMkBpnhLckhxhbwYK44Gs9eEtz"), r: newGetRequest(ts.URL + "/api/v2/balancehistory/mtGXQvBowMkBpnhLckhxhbwYK44Gs9eEtz"),