update log (#259)

* update log

* update

diff --git a/database/wallet_store.go b/database/wallet_store.go
index 85eb2e1..b810e46 100644 (file)
--- a/database/wallet_store.go
+++ b/database/wallet_store.go
@@ -246,7 +246,7 @@ func (store *WalletStore) GetGlobalTransactionIndex(txID string) []byte {
 func (store *WalletStore) GetStandardUTXO(outid bc.Hash) (*acc.UTXO, error) {
        rawUTXO := store.db.Get(StandardUTXOKey(outid))
        if rawUTXO == nil {
 func (store *WalletStore) GetStandardUTXO(outid bc.Hash) (*acc.UTXO, error) {
        rawUTXO := store.db.Get(StandardUTXOKey(outid))
        if rawUTXO == nil {

-               return nil, fmt.Errorf("failed get standard UTXO, outputID: %s ", outid.String())
+               return nil, wallet.ErrGetStandardUTXO

        }
 
        UTXO := new(acc.UTXO)
        }
 
        UTXO := new(acc.UTXO)

diff --git a/wallet/annotated.go b/wallet/annotated.go
index fe05f7b..ef8cfc3 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -32,7 +32,7 @@ func annotateTxsAsset(w *Wallet, txs []*query.AnnotatedTx) {
 
 func (w *Wallet) getExternalDefinition(assetID *bc.AssetID) json.RawMessage {
        externalAsset, err := w.Store.GetAsset(assetID)
 
 func (w *Wallet) getExternalDefinition(assetID *bc.AssetID) json.RawMessage {
        externalAsset, err := w.Store.GetAsset(assetID)

-       if err != nil {
+       if err != nil && err != ErrGetAsset {

                log.WithFields(log.Fields{"module": logModule, "err": err, "assetID": assetID.String()}).Info("fail on get asset definition.")
        }
        if externalAsset == nil {
                log.WithFields(log.Fields{"module": logModule, "err": err, "assetID": assetID.String()}).Info("fail on get asset definition.")
        }
        if externalAsset == nil {

diff --git a/wallet/indexer.go b/wallet/indexer.go
index 317ee0e..9f55115 100644 (file)
--- a/wallet/indexer.go
+++ b/wallet/indexer.go
@@ -106,22 +106,22 @@ transactionLoop:
                        if _, err := w.AccountMgr.GetControlProgram(bc.NewHash(hash)); err == nil {
                                annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos))
                                continue transactionLoop
                        if _, err := w.AccountMgr.GetControlProgram(bc.NewHash(hash)); err == nil {
                                annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos))
                                continue transactionLoop

-                       } else {
-                               log.WithFields(log.Fields{"module": logModule, "err": err, "hash": hex.EncodeToString(hash[:])}).Info("filterAccountTxs fail.")
+                       } else if err != account.ErrFindCtrlProgram {
+                               log.WithFields(log.Fields{"module": logModule, "err": err, "hash": hex.EncodeToString(hash[:])}).Error("filterAccountTxs fail.")

                        }
                }
 
                for _, v := range tx.Inputs {
                        outid, err := v.SpentOutputID()
                        if err != nil {
                        }
                }
 
                for _, v := range tx.Inputs {
                        outid, err := v.SpentOutputID()
                        if err != nil {

-                               log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": hex.EncodeToString(outid.Bytes())}).Info("filterAccountTxs fail.")
+                               log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": outid.String()}).Error("filterAccountTxs fail.")

                                continue
                        }
                        if _, err = w.Store.GetStandardUTXO(outid); err == nil {
                                annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos))
                                continue transactionLoop
                                continue
                        }
                        if _, err = w.Store.GetStandardUTXO(outid); err == nil {
                                annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos))
                                continue transactionLoop

-                       } else {
-                               log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": hex.EncodeToString(outid.Bytes())}).Info("filterAccountTxs fail.")
+                       } else if err != ErrGetStandardUTXO {
+                               log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": outid.String()}).Error("filterAccountTxs fail.")

                        }
                }
        }
                        }
                }
        }

diff --git a/wallet/unconfirmed.go b/wallet/unconfirmed.go
index 8effda0..229cbc5 100644 (file)
--- a/wallet/unconfirmed.go
+++ b/wallet/unconfirmed.go
@@ -1,6 +1,7 @@
 package wallet
 
 import (
 package wallet
 
 import (

+       "encoding/hex"

        "fmt"
        "sort"
        "time"
        "fmt"
        "sort"
        "time"


@@ -9,6 +10,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
 
        log "github.com/sirupsen/logrus"
 

+       acc "github.com/vapor/account"

        "github.com/vapor/blockchain/query"
        "github.com/vapor/crypto/sha3pool"
        "github.com/vapor/protocol"
        "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))
                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
                }
                if cp != nil {


@@ -128,7 +130,7 @@ func (w *Wallet) checkRelatedTransaction(tx *types.Tx) bool {
                        continue
                }
                utxo, err := w.Store.GetStandardUTXO(outid)
                        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
                }
                        log.WithFields(log.Fields{"module": logModule, "err": err, "outputID": outid.String()}).Error("checkRelatedTransaction fail.")
                        continue
                }

diff --git a/wallet/utxo.go b/wallet/utxo.go
index 0419daf..bc60f56 100644 (file)
--- a/wallet/utxo.go
+++ b/wallet/utxo.go
@@ -121,7 +121,7 @@ func (w *Wallet) filterAccountUtxo(utxos []*account.UTXO) []*account.UTXO {
                var hash [32]byte
                sha3pool.Sum256(hash[:], []byte(s))
                cp, err := w.AccountMgr.GetControlProgram(bc.NewHash(hash))
                var hash [32]byte
                sha3pool.Sum256(hash[:], []byte(s))
                cp, err := w.AccountMgr.GetControlProgram(bc.NewHash(hash))

-               if err != nil {
+               if err != nil && err != account.ErrFindCtrlProgram {

                        log.WithFields(log.Fields{"module": logModule, "err": err}).Error("filterAccountUtxo fail.")
                        continue
                }
                        log.WithFields(log.Fields{"module": logModule, "err": err}).Error("filterAccountUtxo fail.")
                        continue
                }

diff --git a/wallet/wallet.go b/wallet/wallet.go
index ab865bb..0a955d2 100644 (file)
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -29,6 +29,7 @@ var (
        ErrGetWalletStatusInfo     = errors.New("failed get wallet info")
        ErrGetAsset                = errors.New("Failed to find asset definition")
        ErrAccntTxIDNotFound       = errors.New("account TXID not found")
        ErrGetWalletStatusInfo     = errors.New("failed get wallet info")
        ErrGetAsset                = errors.New("Failed to find asset definition")
        ErrAccntTxIDNotFound       = errors.New("account TXID not found")

+       ErrGetStandardUTXO         = errors.New("failed get standard UTXO")

 )
 
 //StatusInfo is base valid block info to handle orphan block rollback
 )
 
 //StatusInfo is base valid block info to handle orphan block rollback