LBRYFoundation/lbcwallet
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcwallet.git synced 2025-08-27 07:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only log rollbacks for detached txstore blocks.

Browse source 
Instead of logging whenever there is a chain fork + reorg, only log if
a detached block affects the wallet in some manner.
This commit is contained in:
Josh Rickmar 2014-06-20 08:35:14 -05:00
parent d75a3fc4e7
commit 938dfa1517
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acctmgr.go
View file

@ -619,8 +619,6 @@ func (am *AccountManager) RegisterNewAccount(a *Account) error {
// Rollback rolls back each managed Account to the state before the block // Rollback rolls back each managed Account to the state before the block
// specified by height and hash was connected to the main chain. // specified by height and hash was connected to the main chain.
func (am *AccountManager) Rollback(height int32, hash *btcwire.ShaHash) error { func (am *AccountManager) Rollback(height int32, hash *btcwire.ShaHash) error {
log.Infof("Rolling back tx history since block height %v", height)
for _, a := range am.AllAccounts() { for _, a := range am.AllAccounts() {
if err := a.TxStore.Rollback(height); err != nil { if err := a.TxStore.Rollback(height); err != nil {
return err return err

9
txstore/tx.go
View file

@ -808,6 +808,15 @@ func (s *Store) Rollback(height int32) error {
detached := s.blocks[i:] detached := s.blocks[i:]
s.blocks = s.blocks[:i] s.blocks = s.blocks[:i]
for _, b := range detached { for _, b := range detached {
movedTxs := len(b.txs)
// Don't include coinbase transaction with number of moved txs.
// There should always be at least one tx in a block collection,
// and if there is a coinbase, it would be at index 0.
if b.txs[0].tx.Index() == 0 {
movedTxs--
}
log.Infof("Rolling back block %d (%d transactions marked "+
"unconfirmed)", b.Height, movedTxs)
delete(s.blockIndexes, b.Block.Height) delete(s.blockIndexes, b.Block.Height)
for _, r := range b.txs { for _, r := range b.txs {
oldTxIndex := r.Tx().Index() oldTxIndex := r.Tx().Index()