for _, tx := range b.Transactions {
for _, orig := range tx.Inputs {
if cci, ok := orig.TypedInput.(*types.CrossChainInput); ok {
+ if cci.AssetId.String() == consensus.BTMAssetID.String() {
+ continue
+ }
assetID := cci.AssetId
if _, err := newStore.GetAsset(assetID); err == nil {
continue
return Txs
}
-func findTransactionsByAccount(annotatedTx *query.AnnotatedTx, accountID string) bool {
+func FindTransactionsByAccount(annotatedTx *query.AnnotatedTx, accountID string) bool {
for _, input := range annotatedTx.Inputs {
if input.AccountID == accountID {
return true
newAnnotatedTxs := []*query.AnnotatedTx{}
for _, annotatedTx := range annotatedTxs {
- if accountID == "" || findTransactionsByAccount(annotatedTx, accountID) {
- annotateTxsAsset(w, []*query.AnnotatedTx{annotatedTx})
- newAnnotatedTxs = append([]*query.AnnotatedTx{annotatedTx}, newAnnotatedTxs...)
- }
+ annotateTxsAsset(w, []*query.AnnotatedTx{annotatedTx})
+ newAnnotatedTxs = append([]*query.AnnotatedTx{annotatedTx}, newAnnotatedTxs...)
}
if unconfirmed {
- sort.Sort(SortByTimestamp(annotatedTxs))
+ sort.Sort(SortByTimestamp(newAnnotatedTxs))
} else {
- sort.Sort(SortByHeight(annotatedTxs))
+ sort.Sort(SortByHeight(newAnnotatedTxs))
}
return newAnnotatedTxs, nil