Merge remote-tracking branch 'benma/revert'

Author: benma

CHANGELOG.md

@@ -1,7 +1,6 @@
 # Changelog
 
 ## [Unreleased]
-- Gracefully deal with corrupt bbolt database files
 
 ## 4.35.0
 - Render number of blocks scanned and percentage progress using fixed-width digits for a more stable UI

backend/backend.go

@@ -196,7 +196,7 @@ func NewBackend(arguments *arguments.Arguments, environment Environment) (*Backe
 		aopp:     AOPP{State: aoppStateInactive},
 		log:      log,
 	}
-	notifier, err := NewNotifier(filepath.Join(arguments.MainDirectoryPath(), "notifier.db"), log)
+	notifier, err := NewNotifier(filepath.Join(arguments.MainDirectoryPath(), "notifier.db"))
 	if err != nil {
 		return nil, err
 	}

backend/coins/btc/account.go

@@ -292,7 +292,7 @@ func (account *Account) Initialize() error {
 
 	dbName := fmt.Sprintf("%s.db", accountIdentifier)
 	account.log.Debugf("Opening the database '%s' to persist the transactions.", dbName)
-	db, err := transactionsdb.NewDB(path.Join(account.Config().DBFolder, dbName), account.log)
+	db, err := transactionsdb.NewDB(path.Join(account.Config().DBFolder, dbName))
 	if err != nil {
 		return err
 	}

backend/coins/btc/db/transactionsdb/transactionsdb.go

@@ -26,9 +26,7 @@ import (
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/transactions"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/types"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/util"
-	"github.com/digitalbitbox/bitbox-wallet-app/util/bolt"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
-	"github.com/sirupsen/logrus"
 	"go.etcd.io/bbolt"
 )
 
@@ -47,8 +45,8 @@ type DB struct {
 }
 
 // NewDB creates/opens a new db.
-func NewDB(filename string, log *logrus.Entry) (*DB, error) {
-	db, err := bolt.Open(filename, log)
+func NewDB(filename string) (*DB, error) {
+	db, err := bbolt.Open(filename, 0600, nil)
 	if err != nil {
 		return nil, errp.WithStack(err)
 	}

backend/coins/btc/db/transactionsdb/transactionsdb_test.go

@@ -26,14 +26,12 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/blockchain"
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/types"
-	"github.com/digitalbitbox/bitbox-wallet-app/util/logging"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/test"
 	"github.com/stretchr/testify/require"
 )
 
 func getDB() *DB {
-	db, err := NewDB(path.Join(test.TstTempDir("transactionsdb_test"), "testdb"),
-		logging.Get().WithGroup("transactionsdb_test"))
+	db, err := NewDB(path.Join(test.TstTempDir("transactionsdb_test"), "testdb"))
 	if err != nil {
 		panic(err)
 	}

backend/coins/btc/transactions/transactions_test.go

@@ -99,7 +99,7 @@ func (s *transactionsSuite) SetupTest() {
 	_, s.addressChain = addressesTest.NewAddressChain()
 	s.synchronizer = synchronizer.NewSynchronizer(func() {}, func() {}, s.log)
 	s.blockchainMock = NewBlockchainMock()
-	db, err := transactionsdb.NewDB(test.TstTempFile("bitbox-wallet-db-"), s.log)
+	db, err := transactionsdb.NewDB(test.TstTempFile("bitbox-wallet-db-"))
 	if err != nil {
 		panic(err)
 	}

backend/coins/eth/account.go

@@ -158,7 +158,7 @@ func (account *Account) Initialize() error {
 
 	dbName := fmt.Sprintf("%s.db", accountIdentifier)
 	account.log.Debugf("Opening the database '%s' to persist the transactions.", dbName)
-	db, err := db.NewDB(path.Join(account.Config().DBFolder, dbName), account.log)
+	db, err := db.NewDB(path.Join(account.Config().DBFolder, dbName))
 	if err != nil {
 		return err
 	}

backend/coins/eth/db/db.go

@@ -20,10 +20,8 @@ import (
 	"sort"
 
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/eth/types"
-	"github.com/digitalbitbox/bitbox-wallet-app/util/bolt"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/jsonp"
-	"github.com/sirupsen/logrus"
 	"go.etcd.io/bbolt"
 )
 
@@ -37,8 +35,8 @@ type DB struct {
 }
 
 // NewDB creates/opens a new db.
-func NewDB(filename string, log *logrus.Entry) (*DB, error) {
-	db, err := bolt.Open(filename, log)
+func NewDB(filename string) (*DB, error) {
+	db, err := bbolt.Open(filename, 0600, nil)
 	if err != nil {
 		return nil, err
 	}

backend/notifier.go

@@ -18,9 +18,7 @@ import (
 	"fmt"
 
 	"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts"
-	"github.com/digitalbitbox/bitbox-wallet-app/util/bolt"
 	"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
-	"github.com/sirupsen/logrus"
 	"go.etcd.io/bbolt"
 )
 
@@ -35,8 +33,8 @@ type Notifier struct {
 }
 
 // NewNotifier returns a new Notifier.
-func NewNotifier(dbFilename string, log *logrus.Entry) (*Notifier, error) {
-	db, err := bolt.Open(dbFilename, log)
+func NewNotifier(dbFilename string) (*Notifier, error) {
+	db, err := bbolt.Open(dbFilename, 0600, nil)
 	if err != nil {
 		return nil, errp.WithStack(err)
 	}

backend/rates/db.go

@@ -6,13 +6,12 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/digitalbitbox/bitbox-wallet-app/util/bolt"
-	"github.com/sirupsen/logrus"
 	"go.etcd.io/bbolt"
 )
 
-func openRatesDB(dir string, log *logrus.Entry) (*bbolt.DB, error) {
-	return bolt.Open(filepath.Join(dir, "rates.db"), log)
+func openRatesDB(dir string) (*bbolt.DB, error) {
+	opt := &bbolt.Options{Timeout: 5 * time.Second} // network disks may take long
+	return bbolt.Open(filepath.Join(dir, "rates.db"), 0600, opt)
 }
 
 // loadHistoryBucket loads data from an updater.historyDB bucket identified by the key.