wallet: load scan data from the Store and make the syncer Store-mandatory

bwtest/mock/addr_store.go

@@ -189,6 +189,17 @@ func (m *AddrStore) BirthdayBlock(
 	return args.Get(0).(waddrmgr.BlockStamp), args.Bool(1), args.Error(2)
 }
 
+// MasterHDPubKey returns the plaintext master HD public key bytes persisted
+// for the wallet.
+func (m *AddrStore) MasterHDPubKey(ns walletdb.ReadBucket) ([]byte, error) {
+	args := m.Called(ns)
+	if raw, ok := args.Get(0).([]byte); ok {
+		return raw, args.Error(1)
+	}
+
+	return nil, args.Error(1)
+}
+
 // IsWatchOnlyAccount determines if the account with the given key scope
 // is set up as watch-only.
 func (m *AddrStore) IsWatchOnlyAccount(ns walletdb.ReadBucket,

waddrmgr/interface.go

@@ -151,6 +151,11 @@ type AddrStore interface {
 	// BirthdayBlock returns the birthday block of the address store.
 	BirthdayBlock(ns walletdb.ReadBucket) (BlockStamp, bool, error)
 
+	// MasterHDPubKey returns the plaintext master HD public key bytes
+	// persisted for the wallet, or ErrNoExist when none is persisted (shell,
+	// watch-only, or pre-master-key wallets).
+	MasterHDPubKey(ns walletdb.ReadBucket) ([]byte, error)
+
 	// IsWatchOnlyAccount determines if the account with the given key scope
 	// is set up as watch-only.
 	IsWatchOnlyAccount(ns walletdb.ReadBucket, keyScope KeyScope,

wallet/benchmark_helpers_test.go

@@ -309,7 +309,7 @@ func setupBenchmarkWallet(tb testing.TB,
 	}
 
 	if w.sync == nil {
-		w.sync = newSyncer(w.cfg, w.addrStore, w.txStore, w)
+		w.sync = newSyncer(w.cfg, w.addrStore, w.txStore, w, w.store, w.id)
 	}
 
 	require.NotNil(tb, w.store)

wallet/common_test.go

@@ -28,7 +28,6 @@ var (
 	errDeriveFail     = errors.New("derive fail")
 	errLoadStateFail  = errors.New("load state fail")
 	errRollbackFail   = errors.New("rollback fail")
-	errFetchFail      = errors.New("fetch fail")
 	errCFilterFail    = errors.New("cfilter fail")
 	errActiveMgrsFail = errors.New("active managers fail")