Skip to content

6.5.4 #1777

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
i5hi merged 9 commits into from
Jan 12, 2026
Merged

6.5.4 #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9398d60
feat: Seed retry logic
i5hi Jan 12, 2026
4e5fa34
fix: remove hasValue check
i5hi Jan 12, 2026
2f36e50
fix: start with 100ms delay
i5hi Jan 12, 2026
a6ad0cc
fix: use first_unlock to allow usage in background tasks
i5hi Jan 12, 2026
687b90c
fix: use longer initial delay.
i5hi Jan 12, 2026
c4797ea
fix: revert keychain accessiblity. update locator registration order.
i5hi Jan 12, 2026
8186606
fix: revert keychain accessiblity. update locator registration order.
i5hi Jan 12, 2026
7b8f2bd
Merge pull request #1774 from SatoshiPortal/seed-fetch-retry
i5hi Jan 12, 2026
abbc2c1
Merge branch 'main' into develop
i5hi Jan 12, 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
24 changes: 12 additions & 12 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 138;
CURRENT_PROJECT_VERSION = 139;
DEVELOPMENT_TEAM = BX99T32YGS;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_NAME = 6.5.3;
FLUTTER_BUILD_NUMBER = 138;
FLUTTER_BUILD_NAME = 6.5.4;
FLUTTER_BUILD_NUMBER = 139;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = BULL;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
Expand All @@ -501,7 +501,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.5.3;
MARKETING_VERSION = 6.5.4;
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -679,11 +679,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 138;
CURRENT_PROJECT_VERSION = 139;
DEVELOPMENT_TEAM = BX99T32YGS;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_NAME = 6.5.3;
FLUTTER_BUILD_NUMBER = 138;
FLUTTER_BUILD_NAME = 6.5.4;
FLUTTER_BUILD_NUMBER = 139;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = BULL;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
Expand All @@ -692,7 +692,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.5.3;
MARKETING_VERSION = 6.5.4;
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand All @@ -708,11 +708,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 138;
CURRENT_PROJECT_VERSION = 139;
DEVELOPMENT_TEAM = BX99T32YGS;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_NAME = 6.5.3;
FLUTTER_BUILD_NUMBER = 138;
FLUTTER_BUILD_NAME = 6.5.4;
FLUTTER_BUILD_NUMBER = 139;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = BULL;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
Expand All @@ -721,7 +721,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.5.3;
MARKETING_VERSION = 6.5.4;
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down
2 changes: 1 addition & 1 deletion lib/core/core_locator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class CoreLocator {
await MempoolLocator.registerDatasources(locator);
PayjoinLocator.registerDatasources(locator);
await RecoverbullLocator.registerDatasources(locator);
SeedLocator.registerDatasources(locator);
await StorageLocator.registerDatasources(locator);
SeedLocator.registerDatasources(locator);
await SwapsLocator.registerDatasources(locator);
await WalletLocator.registerDatasources(locator);
await SettingsLocator.registerDatasources(locator);
Expand Down
65 changes: 56 additions & 9 deletions lib/core/seed/data/datasources/seed_datasource.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:bb_mobile/core/errors/bull_exception.dart';
import 'package:bb_mobile/core/seed/data/models/seed_model.dart';
import 'package:bb_mobile/core/storage/data/datasources/key_value_storage/key_value_storage_datasource.dart';
import 'package:bb_mobile/core/utils/constants.dart';
import 'package:bb_mobile/core/utils/logger.dart';
import 'package:flutter/foundation.dart';

class SeedDatasource {
Expand All @@ -20,18 +21,64 @@ class SeedDatasource {
}

Future<SeedModel> get(String fingerprint) async {
const maxRetries = 5;
const initialDelay = Duration(milliseconds: 300);
final key = composeSeedStorageKey(fingerprint);
final value = await _secureStorage.getValue(key);
if (value == null) {
throw SeedNotFoundException(
'Seed not found for fingerprint: $fingerprint',
);
}

final json = jsonDecode(value) as Map<String, dynamic>;
final seed = SeedModel.fromJson(json);
for (int attempt = 0; attempt < maxRetries; attempt++) {
try {
final value = await _secureStorage.getValue(key);
if (value != null) {
final json = jsonDecode(value) as Map<String, dynamic>;
final seed = SeedModel.fromJson(json);
if (attempt > 0) {
log.fine(
'Seed found for fingerprint $fingerprint on attempt ${attempt + 1}',
);
}
return seed;
}

if (attempt < maxRetries - 1) {
final delay = Duration(
milliseconds: initialDelay.inMilliseconds * (1 << attempt),
);
log.fine(
'Seed read returned null for fingerprint $fingerprint on attempt ${attempt + 1}, retrying in ${delay.inMilliseconds}ms',
);
await Future.delayed(delay);
continue;
}

throw SeedNotFoundException(
'Seed not found for fingerprint: $fingerprint',
);
} catch (e) {
if (e is SeedNotFoundException) {
rethrow;
}

if (attempt < maxRetries - 1) {
final delay = Duration(
milliseconds: initialDelay.inMilliseconds * (1 << attempt),
);
log.fine(
'Exception reading seed for fingerprint $fingerprint on attempt ${attempt + 1}: $e, retrying in ${delay.inMilliseconds}ms',
);
await Future.delayed(delay);
continue;
}

log.severe(
'Failed to read seed for fingerprint $fingerprint after $maxRetries attempts: $e',
);
throw SeedNotFoundException(
'Seed not found for fingerprint: $fingerprint',
);
}
}

return seed;
throw SeedNotFoundException('Seed not found for fingerprint: $fingerprint');
}

Future<bool> exists(String fingerprint) {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: bb_mobile
description: Bull Bitcoin Mobile Wallet
publish_to: "none"
version: 6.5.3+138
version: 6.5.4+139

environment:
sdk: ">=3.10.0 <4.0.0"
Expand Down
Loading