From dd80c5c49d20437e174e48804feafc812d566fa9 Mon Sep 17 00:00:00 2001 From: Chengcheng Zhang <943420582@qq.com> Date: Sat, 6 Jul 2019 15:41:23 +0800 Subject: [PATCH] update --- wallet/unconfirmed.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wallet/unconfirmed.go b/wallet/unconfirmed.go index 1bffb881..9e4ce3e2 100644 --- a/wallet/unconfirmed.go +++ b/wallet/unconfirmed.go @@ -71,6 +71,7 @@ func (w *Wallet) GetUnconfirmedTxByTxID(txID string) (*query.AnnotatedTx, error) if err != nil { return nil, err } + if annotatedTx == nil { return nil, fmt.Errorf("No transaction(tx_id=%s) from txpool", txID) } @@ -83,6 +84,7 @@ func (w *Wallet) RemoveUnconfirmedTx(txD *protocol.TxDesc) { if !w.checkRelatedTransaction(txD.Tx) { return } + w.store.DeleteUnconfirmedTransaction(txD.Tx.ID.String()) w.AccountMgr.RemoveUnconfirmedUtxo(txD.Tx.ResultIds) } @@ -160,6 +162,7 @@ func (w *Wallet) delExpiredTxs() error { if err != nil { return err } + for _, tx := range AnnotatedTx { if time.Now().After(time.Unix(int64(tx.Timestamp), 0).Add(MaxUnconfirmedTxDuration)) { w.store.DeleteUnconfirmedTransaction(tx.ID.String()) @@ -174,8 +177,10 @@ func (w *Wallet) delUnconfirmedTx() { log.WithFields(log.Fields{"module": logModule, "err": err}).Error("wallet fail on delUnconfirmedTx") return } + ticker := time.NewTicker(UnconfirmedTxCheckPeriod) defer ticker.Stop() + for { <-ticker.C if err := w.delExpiredTxs(); err != nil { -- 2.11.0