spacecruft
/
blockbook
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only show aux fee and notary if details are not nil

pull/541/head
sidhujag 2020-09-07 12:37:55 -07:00
parent 6894103f90
commit d378eb2257
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/worker.go
View File

@ -1360,9 +1360,7 @@ func (w *Worker) GetAsset(asset string, page int, txsOnPage int, option AccountD
Decimals: int(dbAsset.AssetObj.Precision),
UpdateCapabilityFlags: dbAsset.AssetObj.UpdateCapabilityFlags,
NotaryKeyID: hex.EncodeToString(dbAsset.AssetObj.NotaryKeyID),
NotaryDetails: &dbAsset.AssetObj.NotaryDetails,
AuxFeeKeyID: hex.EncodeToString(dbAsset.AssetObj.AuxFeeKeyID),
AuxFeeDetails: &dbAsset.AssetObj.AuxFeeDetails,
},
Paging: pg,
UnconfirmedTxs: unconfirmedTxs,
@ -1370,6 +1368,12 @@ func (w *Worker) GetAsset(asset string, page int, txsOnPage int, option AccountD
Txs: int(dbAsset.Transactions),
Txids: txids,
}
if len(dbAsset.AssetObj.AuxFeeKeyID) > 0 {
r.AssetDetails.AuxFeeDetails = &dbAsset.AssetObj.AuxFeeDetails
}
if len(dbAsset.AssetObj.NotaryKeyID) > 0 {
r.AssetDetails.NotaryDetails = &dbAsset.AssetObj.NotaryDetails
}
json.Unmarshal(dbAsset.AssetObj.PubData, &r.AssetDetails.PubData)
glog.Info("GetAsset ", asset, " finished in ", time.Since(start))
return r, nil
@ -1785,9 +1789,13 @@ func (w *Worker) GetAddressUtxo(address string, onlyConfirmed bool) (Utxos, erro
Decimals: int(dbAsset.AssetObj.Precision),
UpdateCapabilityFlags: dbAsset.AssetObj.UpdateCapabilityFlags,
NotaryKeyID: hex.EncodeToString(dbAsset.AssetObj.NotaryKeyID),
NotaryDetails: &dbAsset.AssetObj.NotaryDetails,
AuxFeeKeyID: hex.EncodeToString(dbAsset.AssetObj.AuxFeeKeyID),
AuxFeeDetails: &dbAsset.AssetObj.AuxFeeDetails,
}
if len(dbAsset.AssetObj.AuxFeeKeyID) > 0 {
assetDetails.AuxFeeDetails = &dbAsset.AssetObj.AuxFeeDetails
}
if len(dbAsset.AssetObj.NotaryKeyID) > 0 {
assetDetails.NotaryDetails = &dbAsset.AssetObj.NotaryDetails
}
assets = append(assets, assetDetails)
}

8
api/xpub.go
View File

@ -689,9 +689,13 @@ func (w *Worker) GetXpubUtxo(xpub string, onlyConfirmed bool, gap int) (Utxos, e
Decimals: int(dbAsset.AssetObj.Precision),
UpdateCapabilityFlags: dbAsset.AssetObj.UpdateCapabilityFlags,
NotaryKeyID: hex.EncodeToString(dbAsset.AssetObj.NotaryKeyID),
NotaryDetails: &dbAsset.AssetObj.NotaryDetails,
AuxFeeKeyID: hex.EncodeToString(dbAsset.AssetObj.AuxFeeKeyID),
AuxFeeDetails: &dbAsset.AssetObj.AuxFeeDetails,
}
if len(dbAsset.AssetObj.AuxFeeKeyID) > 0 {
assetDetails.AuxFeeDetails = &dbAsset.AssetObj.AuxFeeDetails
}
if len(dbAsset.AssetObj.NotaryKeyID) > 0 {
assetDetails.NotaryDetails = &dbAsset.AssetObj.NotaryDetails
}
assets = append(assets, assetDetails)
}

8
server/socketio.go
View File

@ -637,11 +637,15 @@ func (s *SocketIoServer) getAssetHistory(asset string, opts *assetOpts) (res res
Decimals: int(dbAsset.AssetObj.Precision),
UpdateCapabilityFlags: dbAsset.AssetObj.UpdateCapabilityFlags,
NotaryKeyID: hex.EncodeToString(dbAsset.AssetObj.NotaryKeyID),
NotaryDetails: &dbAsset.AssetObj.NotaryDetails,
AuxFeeKeyID: hex.EncodeToString(dbAsset.AssetObj.AuxFeeKeyID),
AuxFeeDetails: &dbAsset.AssetObj.AuxFeeDetails,
}
if len(dbAsset.AssetObj.AuxFeeKeyID) > 0 {
res.Result.AssetDetails.AuxFeeDetails = &dbAsset.AssetObj.AuxFeeDetails
}
if len(dbAsset.AssetObj.NotaryKeyID) > 0 {
res.Result.AssetDetails.NotaryDetails = &dbAsset.AssetObj.NotaryDetails
}
json.Unmarshal(dbAsset.AssetObj.PubData, &res.Result.AssetDetails.PubData)
res.Result.Items = append(res.Result.Items, ahi)
// }