X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=wallet%2Funconfirmed.go;fp=wallet%2Funconfirmed.go;h=229cbc5876a6a950cbc00f7d881aa78a31ca7726;hp=8effda0a8edb1add1a2b948d5096a4900cca4dbb;hb=489e57ce3c46eb9e8ca25c7e966a1ea26fe41d57;hpb=5d4626d20a2e591b219f2e48b7391e5be1cf88ef diff --git a/wallet/unconfirmed.go b/wallet/unconfirmed.go index 8effda0a..229cbc58 100644 --- a/wallet/unconfirmed.go +++ b/wallet/unconfirmed.go @@ -1,6 +1,7 @@ package wallet import ( + "encoding/hex" "fmt" "sort" "time" @@ -9,6 +10,7 @@ import ( log "github.com/sirupsen/logrus" + acc "github.com/vapor/account" "github.com/vapor/blockchain/query" "github.com/vapor/crypto/sha3pool" "github.com/vapor/protocol" @@ -113,8 +115,8 @@ func (w *Wallet) checkRelatedTransaction(tx *types.Tx) bool { 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 { @@ -128,7 +130,7 @@ func (w *Wallet) checkRelatedTransaction(tx *types.Tx) bool { 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 }