fix pubdata and GetTxAssets with all mask

pull/541/head
sidhujag 2020-09-07 13:57:13 -07:00
parent d378eb2257
commit 65efc8400c
4 changed files with 5 additions and 1 deletions

View File

@ -1354,6 +1354,7 @@ func (w *Worker) GetAsset(asset string, page int, txsOnPage int, option AccountD
AssetGuid: assetGuid,
Symbol: dbAsset.AssetObj.Symbol,
Contract: "0x" + hex.EncodeToString(dbAsset.AssetObj.Contract),
PubData: string(dbAsset.AssetObj.PubData),
Balance: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.Balance)),
TotalSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.TotalSupply)),
MaxSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.MaxSupply)),
@ -1783,6 +1784,7 @@ func (w *Worker) GetAddressUtxo(address string, onlyConfirmed bool) (Utxos, erro
AssetGuid: a.AssetInfo.AssetGuid,
Symbol: dbAsset.AssetObj.Symbol,
Contract: "0x" + hex.EncodeToString(dbAsset.AssetObj.Contract),
PubData: string(dbAsset.AssetObj.PubData),
Balance: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.Balance)),
TotalSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.TotalSupply)),
MaxSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.MaxSupply)),

View File

@ -683,6 +683,7 @@ func (w *Worker) GetXpubUtxo(xpub string, onlyConfirmed bool, gap int) (Utxos, e
AssetGuid: a.AssetInfo.AssetGuid,
Symbol: dbAsset.AssetObj.Symbol,
Contract: "0x" + hex.EncodeToString(dbAsset.AssetObj.Contract),
PubData: string(dbAsset.AssetObj.PubData),
Balance: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.Balance)),
TotalSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.TotalSupply)),
MaxSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.MaxSupply)),

View File

@ -388,7 +388,7 @@ func (d *RocksDB) GetTxAssets(assetGuid uint32, lower uint32, higher uint32, ass
txids := []string{}
for _, txIndex := range txIndexes {
mask := uint32(txIndex.Type)
if (uint32(assetsBitMask) & mask) == mask {
if (assetsBitMask == bchain.AllMask || uint32(assetsBitMask) & mask) == mask {
txids = append(txids, hex.EncodeToString(txIndex.BtxID))
}
}

View File

@ -631,6 +631,7 @@ func (s *SocketIoServer) getAssetHistory(asset string, opts *assetOpts) (res res
AssetGuid: assetGuid,
Symbol: dbAsset.AssetObj.Symbol,
Contract: "0x" + hex.EncodeToString(dbAsset.AssetObj.Contract),
PubData: string(dbAsset.AssetObj.PubData),
Balance: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.Balance)),
TotalSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.TotalSupply)),
MaxSupply: (*bchain.Amount)(big.NewInt(dbAsset.AssetObj.MaxSupply)),