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

Normalize address in worker.GetAddress

Browse Source
This commit is contained in:
Martin Boehm 2018-09-02 21:32:20 +02:00
parent fdf1fe612f
commit fdb069ef31
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/worker.go
View File

@ -77,7 +77,7 @@ func (w *Worker) GetTransaction(txid string, bestheight uint32, spendingTxs bool
return nil, errors.Annotatef(err, "GetTxAddresses %v", bchainVin.Txid) return nil, errors.Annotatef(err, "GetTxAddresses %v", bchainVin.Txid)
} }
if tas == nil { if tas == nil {
// mempool transactions are not in TxAddresses, all confirmed should be there, log a problem // mempool transactions are not in TxAddresses but confirmed should be there, log a problem
if bchainTx.Confirmations > 0 { if bchainTx.Confirmations > 0 {
glog.Warning("DB inconsistency: tx ", bchainVin.Txid, ": not found in txAddresses") glog.Warning("DB inconsistency: tx ", bchainVin.Txid, ": not found in txAddresses")
} }
@ -99,6 +99,7 @@ func (w *Worker) GetTransaction(txid string, bestheight uint32, spendingTxs bool
output := &tas.Outputs[vin.Vout] output := &tas.Outputs[vin.Vout]
vin.ValueSat = output.ValueSat vin.ValueSat = output.ValueSat
vin.Value = w.chainParser.AmountToDecimalString(&vin.ValueSat) vin.Value = w.chainParser.AmountToDecimalString(&vin.ValueSat)
vin.AddrDesc = output.AddrDesc
vin.Addresses, vin.Searchable, err = output.Addresses(w.chainParser) vin.Addresses, vin.Searchable, err = output.Addresses(w.chainParser)
if err != nil { if err != nil {
glog.Errorf("output.Addresses error %v, tx %v, output %v", err, bchainVin.Txid, i) glog.Errorf("output.Addresses error %v, tx %v, output %v", err, bchainVin.Txid, i)
@ -274,6 +275,11 @@ func (w *Worker) GetAddress(address string, page int, txsOnPage int, onlyTxids b
if err != nil { if err != nil {
return nil, NewApiError(fmt.Sprintf("Address not found, %v", err), true) return nil, NewApiError(fmt.Sprintf("Address not found, %v", err), true)
} }
// convert the address to the format defined by the parser
addresses, _, err := w.chainParser.GetAddressesFromAddrDesc(addrDesc)
if len(addresses) == 1 {
address = addresses[0]
}
txc, err := w.getAddressTxids(addrDesc, false) txc, err := w.getAddressTxids(addrDesc, false)
if err != nil { if err != nil {
return nil, errors.Annotatef(err, "getAddressTxids %v false", address) return nil, errors.Annotatef(err, "getAddressTxids %v false", address)
@ -326,7 +332,6 @@ func (w *Worker) GetAddress(address string, page int, txsOnPage int, onlyTxids b
} else { } else {
uBalSat.Add(&uBalSat, tx.getAddrVoutValue(addrDesc)) uBalSat.Add(&uBalSat, tx.getAddrVoutValue(addrDesc))
uBalSat.Sub(&uBalSat, tx.getAddrVinValue(addrDesc)) uBalSat.Sub(&uBalSat, tx.getAddrVinValue(addrDesc))
glog.Info("uBalSat ", uBalSat, tx.getAddrVoutValue(addrDesc), tx.getAddrVinValue(addrDesc))
txs[txi] = tx txs[txi] = tx
txi++ txi++
} }