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

fix assetinfo not in api res

pull/541/head
sidhujag 2020-09-06 15:06:45 -07:00
parent 5909580bf8
commit eba5b07f03
3 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/worker.go
View File

@ -160,6 +160,7 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height int, spe
}
vin.Hex = bchainVin.ScriptSig.Hex
vin.Coinbase = bchainVin.Coinbase
vin.AssetInfo = bchainVin.AssetInfo
if w.chainType == bchain.ChainBitcoinType {
// bchainVin.Txid=="" is coinbase transaction
if bchainVin.Txid != "" {
@ -256,12 +257,11 @@ func (w *Worker) GetTransactionFromBchainTx(bchainTx *bchain.Tx, height int, spe
vout.N = i
vout.ValueSat = (*bchain.Amount)(&bchainVout.ValueSat)
valOutSat.Add(&valOutSat, &bchainVout.ValueSat)
if bchainVout.AssetInfo != nil {
vout.AssetInfo = bchainVin.AssetInfo
if vout.AssetInfo != nil {
if mapTTS == nil {
mapTTS = map[uint32]*bchain.TokenTransferSummary{}
}
vout.AssetInfo = bchainVout.AssetInfo
tts, ok := mapTTS[vout.AssetInfo.AssetGuid]
if !ok {
dbAsset, errAsset := w.db.GetAsset(vout.AssetInfo.AssetGuid, nil)
@ -398,6 +398,7 @@ func (w *Worker) GetTransactionFromMempoolTx(mempoolTx *bchain.MempoolTx) (*Tx,
}
vin.Hex = bchainVin.ScriptSig.Hex
vin.Coinbase = bchainVin.Coinbase
vin.AssetInfo = bchainVin.AssetInfo
if w.chainType == bchain.ChainBitcoinType {
// bchainVin.Txid=="" is coinbase transaction
if bchainVin.Txid != "" {
@ -456,11 +457,11 @@ func (w *Worker) GetTransactionFromMempoolTx(mempoolTx *bchain.MempoolTx) (*Tx,
if err != nil {
glog.V(2).Infof("getAddressesFromVout error %v, %v, output %v", err, mempoolTx.Txid, bchainVout.N)
}
if bchainVout.AssetInfo != nil {
vout.AssetInfo = bchainVout.AssetInfo
if vout.AssetInfo != nil {
if mapTTS == nil {
mapTTS = map[uint32]*bchain.TokenTransferSummary{}
}
vout.AssetInfo = bchainVout.AssetInfo
tts, ok := mapTTS[vout.AssetInfo.AssetGuid]
if !ok {
dbAsset, errAsset := w.db.GetAsset(vout.AssetInfo.AssetGuid, nil)
@ -720,6 +721,7 @@ func (w *Worker) txFromTxAddress(txid string, ta *bchain.TxAddresses, bi *bchain
if err != nil {
glog.Errorf("tai.Addresses error %v, tx %v, input %v, tai %+v", err, txid, i, tai)
}
vin.AssetInfo = tai.AssetInfo
if vin.AssetInfo != nil {
if mapTTS == nil {
mapTTS = map[uint32]*bchain.TokenTransferSummary{}
@ -758,6 +760,7 @@ func (w *Worker) txFromTxAddress(txid string, ta *bchain.TxAddresses, bi *bchain
glog.Errorf("tai.Addresses error %v, tx %v, output %v, tao %+v", err, txid, i, tao)
}
vout.Spent = tao.Spent
vout.AssetInfo = tao.AssetInfo
if vout.AssetInfo != nil {
if mapTTS == nil {
mapTTS = map[uint32]*bchain.TokenTransferSummary{}
@ -1161,7 +1164,7 @@ func (w *Worker) GetAddress(address string, page int, txsOnPage int, option Acco
totalSent = &ba.SentSat
}
if ba.AssetBalances != nil && option > AccountDetailsBasic {
tokens = make(bchain.Tokens, 0, len(ba.AssetBalances)+1)
tokens = make(bchain.Tokens, 0, len(ba.AssetBalances))
for k, v := range ba.AssetBalances {
dbAsset, errAsset := w.db.GetAsset(uint32(k), nil)
if errAsset != nil || dbAsset == nil {

29
bchain/coins/sys/syscoinparser.go
View File

@ -253,30 +253,18 @@ func (p *SyscoinParser) TryGetOPReturn(script []byte) []byte {
func (p *SyscoinParser) GetAllocationFromTx(tx *bchain.Tx) (*bchain.AssetAllocation, error) {
var sptData []byte
var addrDesc bchain.AddressDescriptor
var err error
for _, output := range tx.Vout {
addrDesc, err := p.GetAddrDescFromVout(&output)
addrDesc, err = p.GetAddrDescFromVout(&output)
if err != nil || len(addrDesc) == 0 || len(addrDesc) > maxAddrDescLen {
continue
}
if addrDesc[0] == txscript.OP_RETURN {
script, err := p.GetScriptFromAddrDesc(addrDesc)
if err != nil {
return nil, err
}
sptData = p.TryGetOPReturn(script)
if sptData == nil {
return nil, errors.New("OP_RETURN empty")
}
break
}
}
var assetAllocation bchain.AssetAllocation
r := bytes.NewReader(sptData)
err := assetAllocation.AssetObj.Deserialize(r)
if err != nil {
return nil, err
}
return &assetAllocation, nil
return p.GetAssetFromDesc(&addrDesc)
}
func (p *SyscoinParser) GetAssetFromDesc(addrDesc *bchain.AddressDescriptor) (*bchain.Asset, error) {
@ -288,14 +276,7 @@ func (p *SyscoinParser) GetAssetFromDesc(addrDesc *bchain.AddressDescriptor) (*b
if sptData == nil {
return nil, errors.New("OP_RETURN empty")
}
var asset bchain.Asset
r := bytes.NewReader(sptData)
err = asset.AssetObj.Deserialize(r)
if err != nil {
return nil, err
}
return &asset, nil
return p.GetAssetFromData(sptData)
}
func (p *SyscoinParser) GetAssetFromData(sptData []byte) (*bchain.Asset, error) {

2
static/templates/txdetail.html
View File

@ -58,7 +58,7 @@
<span class="tx-addr">Unparsed address</span>
{{- end -}}
<span class="tx-amt">
{{formatAmount $vout.ValueSat}} {{$cs}} {{if $vout.AssetInfo}} {{$vout.AssetInfo.ValueStr}}{{end}}{{if $vout.Spent}}<a class="text-danger" href="{{if $vout.SpentTxID}}/tx/{{$vout.SpentTxID}}{{else}}/spending/{{$tx.Txid}}/{{$vout.N}}{{end}}" title="Spent">➡</a>{{else -}}
{{formatAmount $vout.ValueSat}} {{$cs}}{{if $vout.AssetInfo}} {{$vout.AssetInfo.ValueStr}}{{end}}{{if $vout.Spent}}<a class="text-danger" href="{{if $vout.SpentTxID}}/tx/{{$vout.SpentTxID}}{{else}}/spending/{{$tx.Txid}}/{{$vout.N}}{{end}}" title="Spent">➡</a>{{else -}}
<span class="text-success" title="Unspent"> <b>×</b></span>
{{- end -}}
</span>