cleanup
parent
a3eb233904
commit
43768dc387
|
@ -557,6 +557,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
|
||||||
var xpubAddresses map[string]struct{}
|
var xpubAddresses map[string]struct{}
|
||||||
if option > AccountDetailsBasic {
|
if option > AccountDetailsBasic {
|
||||||
tokens = make(bchain.Tokens, 0, 4)
|
tokens = make(bchain.Tokens, 0, 4)
|
||||||
|
tokensAsset = make(bchain.Tokens, 0, 4)
|
||||||
xpubAddresses = make(map[string]struct{})
|
xpubAddresses = make(map[string]struct{})
|
||||||
}
|
}
|
||||||
for ci, da := range [][]xpubAddress{data.addresses, data.changeAddresses} {
|
for ci, da := range [][]xpubAddress{data.addresses, data.changeAddresses} {
|
||||||
|
@ -581,9 +582,6 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
|
||||||
filter.TokensToReturn == TokensToReturnUsed && token.BalanceSat != nil ||
|
filter.TokensToReturn == TokensToReturnUsed && token.BalanceSat != nil ||
|
||||||
filter.TokensToReturn == TokensToReturnNonzeroBalance && token.BalanceSat != nil && token.BalanceSat.AsInt64() != 0 {
|
filter.TokensToReturn == TokensToReturnNonzeroBalance && token.BalanceSat != nil && token.BalanceSat.AsInt64() != 0 {
|
||||||
if token.Type != bchain.XPUBAddressTokenType {
|
if token.Type != bchain.XPUBAddressTokenType {
|
||||||
if tokensAsset == nil {
|
|
||||||
tokensAsset = make(bchain.Tokens, 0, 4)
|
|
||||||
}
|
|
||||||
tokensAsset = append(tokensAsset, token)
|
tokensAsset = append(tokensAsset, token)
|
||||||
} else {
|
} else {
|
||||||
tokens = append(tokens, token)
|
tokens = append(tokens, token)
|
||||||
|
@ -612,12 +610,14 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
|
||||||
Txids: txids,
|
Txids: txids,
|
||||||
UsedTokens: usedTokens,
|
UsedTokens: usedTokens,
|
||||||
Tokens: tokens,
|
Tokens: tokens,
|
||||||
TokensAsset: tokensAsset,
|
|
||||||
XPubAddresses: xpubAddresses,
|
XPubAddresses: xpubAddresses,
|
||||||
}
|
}
|
||||||
if usedAssetTokens > 0 {
|
if usedAssetTokens > 0 {
|
||||||
addr.UsedAssetTokens = usedAssetTokens
|
addr.UsedAssetTokens = usedAssetTokens
|
||||||
}
|
}
|
||||||
|
if len(tokensAsset) > 0 {
|
||||||
|
addr.TokensAsset = tokensAsset
|
||||||
|
}
|
||||||
glog.Info("GetXpubAddress ", xpub[:16], ", ", len(data.addresses)+len(data.changeAddresses), " derived addresses, ", txCount, " confirmed txs, finished in ", time.Since(start))
|
glog.Info("GetXpubAddress ", xpub[:16], ", ", len(data.addresses)+len(data.changeAddresses), " derived addresses, ", txCount, " confirmed txs, finished in ", time.Since(start))
|
||||||
return &addr, nil
|
return &addr, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue