package wallet
import (
+ "encoding/hex"
"fmt"
"sort"
"time"
log "github.com/sirupsen/logrus"
+ acc "github.com/vapor/account"
"github.com/vapor/blockchain/query"
"github.com/vapor/crypto/sha3pool"
"github.com/vapor/protocol"
newAnnotatedTxs := []*query.AnnotatedTx{}
for _, annotatedTx := range annotatedTxs {
- if accountID == "" || findTransactionsByAccount(annotatedTx, accountID) {
+ if accountID == "" || FindTransactionsByAccount(annotatedTx, accountID) {
annotateTxsAsset(w, []*query.AnnotatedTx{annotatedTx})
newAnnotatedTxs = append([]*query.AnnotatedTx{annotatedTx}, newAnnotatedTxs...)
}
var hash [32]byte
sha3pool.Sum256(hash[:], v.ControlProgram())
cp, err := w.AccountMgr.GetControlProgram(bc.NewHash(hash))
- if err != nil {
- log.WithFields(log.Fields{"module": logModule, "err": err, "hash": string(hash[:])}).Error("checkRelatedTransaction fail.")
+ if err != nil && err != acc.ErrFindCtrlProgram {
+ log.WithFields(log.Fields{"module": logModule, "err": err, "hash": hex.EncodeToString(hash[:])}).Error("checkRelatedTransaction fail.")
continue
}
if cp != nil {
continue
}
utxo, err := w.Store.GetStandardUTXO(outid)
- if err != nil {
+ if err != nil && err != ErrGetStandardUTXO {
log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": outid.String()}).Error("checkRelatedTransaction fail.")
continue
}