Return addrTxCount for get xpub endpoint

This commit is contained in:
Martin Boehm 2023-04-20 21:49:22 +02:00
parent c4fff10e5f
commit a77f615e28
4 changed files with 13 additions and 9 deletions

View File

@ -326,6 +326,7 @@ type Address struct {
UnconfirmedBalanceSat *Amount `json:"unconfirmedBalance"` UnconfirmedBalanceSat *Amount `json:"unconfirmedBalance"`
UnconfirmedTxs int `json:"unconfirmedTxs"` UnconfirmedTxs int `json:"unconfirmedTxs"`
Txs int `json:"txs"` Txs int `json:"txs"`
AddrTxCount int `json:"addrTxCount,omitempty"`
NonTokenTxs int `json:"nonTokenTxs,omitempty"` NonTokenTxs int `json:"nonTokenTxs,omitempty"`
InternalTxs int `json:"internalTxs,omitempty"` InternalTxs int `json:"internalTxs,omitempty"`
Transactions []*Tx `json:"transactions,omitempty"` Transactions []*Tx `json:"transactions,omitempty"`

View File

@ -541,6 +541,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
} else { } else {
txCount = int(data.txCountEstimate) txCount = int(data.txCountEstimate)
} }
addrTxCount := int(data.txCountEstimate)
usedTokens := 0 usedTokens := 0
var tokens []Token var tokens []Token
var xpubAddresses map[string]struct{} var xpubAddresses map[string]struct{}
@ -589,6 +590,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
TotalReceivedSat: (*Amount)(&totalReceived), TotalReceivedSat: (*Amount)(&totalReceived),
TotalSentSat: (*Amount)(&data.sentSat), TotalSentSat: (*Amount)(&data.sentSat),
Txs: txCount, Txs: txCount,
AddrTxCount: addrTxCount,
UnconfirmedBalanceSat: (*Amount)(&uBalSat), UnconfirmedBalanceSat: (*Amount)(&uBalSat),
UnconfirmedTxs: unconfirmedTxs, UnconfirmedTxs: unconfirmedTxs,
Transactions: txs, Transactions: txs,

View File

@ -145,6 +145,7 @@ export interface Address {
unconfirmedBalance: string; unconfirmedBalance: string;
unconfirmedTxs: number; unconfirmedTxs: number;
txs: number; txs: number;
addrTxCount?: number;
nonTokenTxs?: number; nonTokenTxs?: number;
internalTxs?: number; internalTxs?: number;
transactions?: Tx[]; transactions?: Tx[];

File diff suppressed because one or more lines are too long