Skip to content

fix(demo): dispose sqlite persister before folder rename in wallet service #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reez merged 2 commits into from
Jul 24, 2026
Merged

fix(demo): dispose sqlite persister before folder rename in wallet service #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7cfe3c
fix(demo): dispose sqlite persister before folder rename in wallet se…
Ugarba202 Jul 9, 2026
9f95b60
fix(demo): explicitly dispose persister handles and split reseeding i…
Ugarba202 Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions bdk_demo/lib/services/wallet_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,16 @@ class WalletService {

try {
final persister = Persister.newSqlite(path: dbPath);
final wallet = _walletLoadRunner(
descriptor: descriptor,
changeDescriptor: changeDescriptor,
persister: persister,
lookahead: AppConstants.walletLookahead,
);
return wallet;
try {
return _walletLoadRunner(
descriptor: descriptor,
changeDescriptor: changeDescriptor,
persister: persister,
lookahead: AppConstants.walletLookahead,
);
} finally {
persister.dispose();
}
} catch (error) {
throw StateError(
'Failed to load existing SQLite wallet at "$dbPath". '
Expand Down Expand Up @@ -539,9 +542,11 @@ class WalletService {
);
} catch (_) {
_walletDisposer(wallet);
persister.dispose();
await WalletStoragePaths.deleteWalletData(walletId);
rethrow;
}
persister.dispose();
return wallet;
}

Expand Down Expand Up @@ -610,13 +615,28 @@ class WalletService {
changeDescriptor,
fallbackDbPath,
);
await WalletStoragePaths.replaceWalletDataWithFallback(walletId);
return wallet;
} catch (_) {
_walletDisposer(wallet);
fallbackPersister.dispose();
await WalletStoragePaths.deleteFallbackWalletData(walletId);
rethrow;
}

_walletDisposer(wallet);
fallbackPersister.dispose();
await WalletStoragePaths.replaceWalletDataWithFallback(walletId);
final dbPath = await WalletStoragePaths.sqlitePathForWallet(walletId);
final persister = Persister.newSqlite(path: dbPath);
try {
return _walletLoadRunner(
descriptor: descriptor,
changeDescriptor: changeDescriptor,
persister: persister,
lookahead: AppConstants.walletLookahead,
);
} finally {
persister.dispose();
}
}

Descriptor _deriveDescriptor(
Expand Down Expand Up @@ -670,9 +690,10 @@ class WalletService {
);

Wallet? wallet;
Persister? persister;
try {
final dbPath = await WalletStoragePaths.sqlitePathForWallet(record.id);
final persister = Persister.newSqlite(path: dbPath);
persister = Persister.newSqlite(path: dbPath);
wallet = Wallet(
descriptor: descriptor,
changeDescriptor: changeDescriptor,
Expand All @@ -694,8 +715,12 @@ class WalletService {
if (wallet != null) {
_walletDisposer(wallet);
}
persister?.dispose();
persister = null;
await WalletStoragePaths.deleteWalletData(record.id);
rethrow;
} finally {
persister?.dispose();
}

return (record, wallet);
Expand Down
3 changes: 3 additions & 0 deletions bdk_demo/test/services/wallet_sync_job_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ _createSqliteWalletFixture(WalletNetwork walletNetwork) async {
dbPath: dbPath,
);
wallet.dispose();
persister.dispose();

return (
dbPath: dbPath,
Expand Down Expand Up @@ -294,6 +295,7 @@ void main() {
lookahead: AppConstants.walletLookahead,
);
addTearDown(wallet.dispose);
addTearDown(persister.dispose);

expect(
() => persistWalletSqliteWithReopenVerify(
Expand Down Expand Up @@ -341,6 +343,7 @@ void main() {
lookahead: AppConstants.walletLookahead,
);
addTearDown(wallet.dispose);
addTearDown(persister.dispose);

await persistWalletSqliteWithReopenVerify(
wallet: wallet,
Expand Down
Loading