update loadWalletInfo

diff --git a/database/wallet_store.go b/database/wallet_store.go
index c974bff..442ebfb 100644 (file)
--- a/database/wallet_store.go
+++ b/database/wallet_store.go
@@ -319,7 +319,7 @@ func (store *WalletStore) GetRecoveryStatus(recoveryKey []byte) []byte {
 func (store *WalletStore) GetWalletInfo() (*wallet.StatusInfo, error) {
        rawStatus := store.walletDB.Get([]byte(dbm.WalletKey))
        if rawStatus == nil {
-               return nil, fmt.Errorf("failed get wallet info")
+               return nil, wallet.ErrGetWalletStatusInfo
        }
        status := new(wallet.StatusInfo)
        if err := json.Unmarshal(rawStatus, status); err != nil {

diff --git a/wallet/wallet.go b/wallet/wallet.go
index fedd51e..930fe15 100644 (file)
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -26,6 +26,7 @@ var (
 
        errBestBlockNotFoundInCore = errors.New("best block not found in core")
        errWalletVersionMismatch   = errors.New("wallet version mismatch")
+       ErrGetWalletStatusInfo     = errors.New("failed get wallet info")
 )
 
 //StatusInfo is base valid block info to handle orphan block rollback
@@ -144,19 +145,20 @@ func (w *Wallet) loadWalletInfo() error {
        //      w.store.DeleteWalletUTXOs()
        // }
        walletStatus, err := w.store.GetWalletInfo()
-       if err != nil {
+       if walletStatus == nil && err != ErrGetWalletStatusInfo {
                return err
        }
-       w.status = *walletStatus
-       err = w.checkWalletInfo()
-       if err == nil {
-               return nil
+       if walletStatus != nil {
+               w.status = *walletStatus
+               err = w.checkWalletInfo()
+               if err == nil {
+                       return nil
+               }
+               log.WithFields(log.Fields{"module": logModule}).Warn(err.Error())
+               w.store.DeleteWalletTransactions()
+               w.store.DeleteWalletUTXOs()
        }
 
-       log.WithFields(log.Fields{"module": logModule}).Warn(err.Error())
-       w.store.DeleteWalletTransactions()
-       w.store.DeleteWalletUTXOs()
-
        w.status.Version = currentVersion
        w.status.WorkHash = bc.Hash{}
        block, err := w.chain.GetBlockByHeight(0)