refactor: Major codebase cleanup (#415)

* rearrange * updates * updates * clean * updates * clean * updates * clean * clean * clean * clean * rename * clean * clean * updates * network cubit to bloc * clean * clean * fixes * fixes * fixes * clean * fixes * fixes * fixes * fixes * fixes * network fixes * refactor AppWalletsRepository to use a list instead of BehaviorSubject for wallet services * slow route fix * send fixes
SatoshiPortal · Jan 7, 2025 · 5140ece · 5140ece
1 parent c518ffb
commit 5140ece
Show file tree

Hide file tree

Showing 116 changed files with 4,278 additions and 4,178 deletions.
diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1,4 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
+  - provider: true
diff --git a/lib/_model/wallet.dart b/lib/_model/wallet.dart
@@ -63,6 +63,7 @@ class Wallet with _$Wallet {
     @Default(0) int subKeyIndex,
     // List<String>? labelTags,
     // List<Bip329Label>? bip329Labels,
+    Address? firstAddress,
   }) = _Wallet;
   const Wallet._();
 
@@ -515,6 +516,10 @@ class Wallet with _$Wallet {
   List<SwapTx> swapsToProcess() {
     return swaps.where((swap) => swap.proceesTx() && !swap.failed()).toList();
   }
+
+  int balanceSats() => balance ?? 0;
+
+  String balanceStr() => ((balance ?? 0) / 100000000).toStringAsFixed(8);
 }
 
 @freezed

diff --git a/lib/_pkg/boltz/swap.dart b/lib/_pkg/boltz/swap.dart
@@ -8,22 +8,22 @@ import 'package:bb_mobile/_pkg/consts/configs.dart';
 import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/storage/secure_storage.dart';
 import 'package:bb_mobile/_pkg/storage/storage.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/network.dart';
+import 'package:bb_mobile/_repository/wallet/internal_network.dart';
 import 'package:boltz_dart/boltz_dart.dart';
 import 'package:dio/dio.dart';
 
 class SwapBoltz {
   SwapBoltz({
     required SecureStorage secureStorage,
     required Dio dio,
-    required NetworkRepository networkRepository,
+    required InternalNetworkRepository networkRepository,
   })  : _secureStorage = secureStorage,
         _networkRepository = networkRepository,
         _dio = dio;
 
   final SecureStorage _secureStorage;
   final Dio _dio;
-  final NetworkRepository _networkRepository;
+  final InternalNetworkRepository _networkRepository;
 
   Future<(Invoice?, Err?)> decodeInvoice({
     required String invoice,

diff --git a/lib/_pkg/deep_link.dart b/lib/_pkg/deep_link.dart
@@ -3,8 +3,9 @@ import 'dart:async';
 import 'package:bb_mobile/_model/wallet.dart';
 import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/bip21.dart';
-import 'package:bb_mobile/home/bloc/home_cubit.dart';
-import 'package:bb_mobile/network/bloc/network_cubit.dart';
+import 'package:bb_mobile/home/bloc/home_bloc.dart';
+import 'package:bb_mobile/network/bloc/event.dart';
+import 'package:bb_mobile/network/bloc/network_bloc.dart';
 import 'package:flutter/material.dart';
 // import 'package:uni_links/uni_links.dart';
 
@@ -39,8 +40,8 @@ class DeepLink {
   Future<Err?> handleUri({
     required String link,
     // required SettingsCubit settingsCubit,
-    required HomeCubit homeCubit,
-    required NetworkCubit networkCubit,
+    required HomeBloc homeCubit,
+    required NetworkBloc networkCubit,
     required BuildContext context,
   }) async {
     try {
@@ -50,8 +51,8 @@ class DeepLink {
       final address = bip21Obj.address;
       final isTestnet = isTestnetAddress(address);
       if (isTestnet == null) return Err('Invalid address');
-      final currentIsTestnet = networkCubit.state.testnet;
-      if (currentIsTestnet != isTestnet) networkCubit.toggleTestnet();
+      final currentIsTestnet = networkCubit.state.networkData.testnet;
+      if (currentIsTestnet != isTestnet) networkCubit.add(ToggleTestnet());
       await Future.delayed(const Duration(milliseconds: 200));
       final wallet = homeCubit.state.getFirstWithSpendableAndBalance(
         isTestnet ? BBNetwork.Testnet : BBNetwork.Mainnet,

diff --git a/lib/_pkg/migrations/migration0_1to0_2.dart b/lib/_pkg/migrations/migration0_1to0_2.dart
@@ -15,9 +15,9 @@ import 'package:bb_mobile/_pkg/wallet/bdk/sensitive_create.dart';
 import 'package:bb_mobile/_pkg/wallet/create.dart';
 import 'package:bb_mobile/_pkg/wallet/lwk/create.dart';
 import 'package:bb_mobile/_pkg/wallet/lwk/sensitive_create.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/sensitive_storage.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/storage.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
+import 'package:bb_mobile/_repository/wallet/sensitive_wallet_storage.dart';
+import 'package:bb_mobile/_repository/wallet/wallet_storage.dart';
 
 // int mainWalletIndex = 0;
 // int testWalletIndex = 0;
@@ -331,7 +331,7 @@ Future<List<Wallet>> createLiquidWallet(
   Seed? liquidTestnetSeed,
   HiveStorage hiveStorage,
 ) async {
-  final WalletsRepository walletRep = WalletsRepository();
+  final InternalWalletsRepository walletRep = InternalWalletsRepository();
   final BDKCreate bdkCreate = BDKCreate(walletsRepository: walletRep);
   final BDKSensitiveCreate bdkSensitiveCreate =
       BDKSensitiveCreate(walletsRepository: walletRep, bdkCreate: bdkCreate);

diff --git a/lib/_pkg/migrations/migration0_2to0_3.dart b/lib/_pkg/migrations/migration0_2to0_3.dart
@@ -5,7 +5,7 @@ import 'package:bb_mobile/_model/wallet.dart';
 import 'package:bb_mobile/_pkg/storage/hive.dart';
 import 'package:bb_mobile/_pkg/storage/secure_storage.dart';
 import 'package:bb_mobile/_pkg/storage/storage.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/sensitive_storage.dart';
+import 'package:bb_mobile/_repository/wallet/sensitive_wallet_storage.dart';
 import 'package:boltz_dart/boltz_dart.dart';
 
 Future<void> doMigration0_2to0_3(

diff --git a/lib/_pkg/payjoin/manager.dart b/lib/_pkg/payjoin/manager.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:isolate';
 import 'dart:math';
-import 'dart:typed_data';
 
 import 'package:bb_mobile/_model/wallet.dart';
 import 'package:bb_mobile/_pkg/error.dart';
@@ -218,7 +217,7 @@ class PayjoinManager {
       SendPort? mainToIsolateSendPort;
 
       receivePort.listen((message) async {
-        print('Receiver isolate: $message');
+        // print('Receiver isolate: $message');
         if (message is Map<String, dynamic>) {
           try {
             switch (message['type']) {
@@ -325,10 +324,12 @@ class PayjoinManager {
     if (senderErr != null) throw senderErr;
 
     final filteredReceivers = receiverSessions
-        .where((session) =>
-            session.walletId == wallet.id &&
-            session.status != PayjoinSessionStatus.success &&
-            session.status != PayjoinSessionStatus.unrecoverable)
+        .where(
+          (session) =>
+              session.walletId == wallet.id &&
+              session.status != PayjoinSessionStatus.success &&
+              session.status != PayjoinSessionStatus.unrecoverable,
+        )
         .toList();
     final filteredSenders = senderSessions.where((session) {
       return session.walletId == wallet.id &&

diff --git a/lib/_pkg/storage/storage.dart b/lib/_pkg/storage/storage.dart
@@ -13,6 +13,7 @@ class StorageKeys {
   static const wallets = 'wallets';
   static const settings = 'settings';
   static const network = 'network';
+  static const networkReposity = 'networkReposity';
   static const networkFees = 'networkFees';
   static const currency = 'currency';
   static const lighting = 'lighting';

diff --git a/lib/_pkg/wallet/address.dart b/lib/_pkg/wallet/address.dart
@@ -4,18 +4,18 @@ import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/_interface.dart';
 import 'package:bb_mobile/_pkg/wallet/bdk/address.dart';
 import 'package:bb_mobile/_pkg/wallet/lwk/address.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
 
 class WalletAddress implements IWalletAddress {
   WalletAddress({
-    required WalletsRepository walletsRepository,
+    required InternalWalletsRepository walletsRepository,
     required BDKAddress bdkAddress,
     required LWKAddress lwkAddress,
   })  : _walletsRepository = walletsRepository,
         _bdkAddress = bdkAddress,
         _lwkAddress = lwkAddress;
 
-  final WalletsRepository _walletsRepository;
+  final InternalWalletsRepository _walletsRepository;
   final BDKAddress _bdkAddress;
   final LWKAddress _lwkAddress;
 

diff --git a/lib/_pkg/wallet/balance.dart b/lib/_pkg/wallet/balance.dart
@@ -3,18 +3,18 @@ import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/_interface.dart';
 import 'package:bb_mobile/_pkg/wallet/bdk/balance.dart';
 import 'package:bb_mobile/_pkg/wallet/lwk/balance.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
 
 class WalletBalance implements IWalletBalance {
   WalletBalance({
-    required WalletsRepository walletsRepository,
+    required InternalWalletsRepository walletsRepository,
     required BDKBalance bdkBalance,
     required LWKBalance lwkBalance,
   })  : _walletsRepository = walletsRepository,
         _bdkBalance = bdkBalance,
         _lwkBalance = lwkBalance;
 
-  final WalletsRepository _walletsRepository;
+  final InternalWalletsRepository _walletsRepository;
   final BDKBalance _bdkBalance;
   final LWKBalance _lwkBalance;
 

diff --git a/lib/_pkg/wallet/bdk/create.dart b/lib/_pkg/wallet/bdk/create.dart
@@ -2,16 +2,16 @@ import 'package:bb_mobile/_model/address.dart';
 import 'package:bb_mobile/_model/cold_card.dart';
 import 'package:bb_mobile/_model/wallet.dart';
 import 'package:bb_mobile/_pkg/error.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
 import 'package:bb_mobile/_pkg/wallet/utils.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
 import 'package:bdk_flutter/bdk_flutter.dart' as bdk;
 import 'package:path_provider/path_provider.dart';
 
 class BDKCreate {
-  BDKCreate({required WalletsRepository walletsRepository})
+  BDKCreate({required InternalWalletsRepository walletsRepository})
       : _walletsRepository = walletsRepository;
 
-  final WalletsRepository _walletsRepository;
+  final InternalWalletsRepository _walletsRepository;
 
   Future<(bdk.Wallet?, Err?)> loadPublicBdkWallet(
     Wallet wallet,

diff --git a/lib/_pkg/wallet/bdk/sensitive_create.dart b/lib/_pkg/wallet/bdk/sensitive_create.dart
@@ -4,19 +4,19 @@ import 'package:bb_mobile/_model/wallet.dart';
 import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/bdk/create.dart';
 import 'package:bb_mobile/_pkg/wallet/create.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
 import 'package:bb_mobile/_pkg/wallet/utils.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
 import 'package:bdk_flutter/bdk_flutter.dart' as bdk;
 import 'package:path_provider/path_provider.dart';
 
 class BDKSensitiveCreate {
   BDKSensitiveCreate({
-    required WalletsRepository walletsRepository,
+    required InternalWalletsRepository walletsRepository,
     required BDKCreate bdkCreate,
   })  : _walletsRepository = walletsRepository,
         _bdkCreate = bdkCreate;
 
-  final WalletsRepository _walletsRepository;
+  final InternalWalletsRepository _walletsRepository;
   final BDKCreate _bdkCreate;
 
   Future<(List<String>?, Err?)> createMnemonic() async {

diff --git a/lib/_pkg/wallet/create.dart b/lib/_pkg/wallet/create.dart
@@ -3,12 +3,12 @@ import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/_interface.dart';
 import 'package:bb_mobile/_pkg/wallet/bdk/create.dart';
 import 'package:bb_mobile/_pkg/wallet/lwk/create.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/storage.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
+import 'package:bb_mobile/_repository/wallet/wallet_storage.dart';
 
 class WalletCreate implements IWalletCreate {
   WalletCreate({
-    required WalletsRepository walletsRepository,
+    required InternalWalletsRepository walletsRepository,
     required LWKCreate lwkCreate,
     required BDKCreate bdkCreate,
     required WalletsStorageRepository walletsStorageRepository,
@@ -17,7 +17,7 @@ class WalletCreate implements IWalletCreate {
         _bdkCreate = bdkCreate,
         _walletsStorageRepository = walletsStorageRepository;
 
-  final WalletsRepository _walletsRepository;
+  final InternalWalletsRepository _walletsRepository;
   final WalletsStorageRepository _walletsStorageRepository;
 
   final LWKCreate _lwkCreate;

diff --git a/lib/_pkg/wallet/lwk/transaction.dart b/lib/_pkg/wallet/lwk/transaction.dart
@@ -7,18 +7,18 @@ import 'package:bb_mobile/_model/transaction.dart';
 import 'package:bb_mobile/_model/wallet.dart';
 import 'package:bb_mobile/_pkg/boltz/swap.dart';
 import 'package:bb_mobile/_pkg/error.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/network.dart';
+import 'package:bb_mobile/_repository/wallet/internal_network.dart';
 import 'package:convert/convert.dart';
 import 'package:lwk_dart/lwk_dart.dart' as lwk;
 
 class LWKTransactions {
   LWKTransactions({
-    required NetworkRepository networkRepository,
+    required InternalNetworkRepository networkRepository,
     required SwapBoltz swapBoltz,
   })  : _networkRepository = networkRepository,
         _swapBoltz = swapBoltz;
 
-  final NetworkRepository _networkRepository;
+  final InternalNetworkRepository _networkRepository;
   final SwapBoltz _swapBoltz;
 
   Transaction addOutputAddresses(Address newAddress, Transaction tx) {

diff --git a/lib/_pkg/wallet/network.dart b/lib/_pkg/wallet/network.dart
@@ -3,17 +3,17 @@ import 'dart:async';
 import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/_interface.dart';
 import 'package:bb_mobile/_pkg/wallet/bdk/network.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/network.dart';
+import 'package:bb_mobile/_repository/wallet/internal_network.dart';
 
 class WalletNetwork implements IWalletNetwork {
   WalletNetwork({
-    required NetworkRepository networkRepository,
+    required InternalNetworkRepository networkRepository,
     required BDKNetwork bdkNetwork,
     // required Logger logger,
   })  : _networkRepository = networkRepository,
         _bdkNetwork = bdkNetwork;
 
-  final NetworkRepository _networkRepository;
+  final InternalNetworkRepository _networkRepository;
   final BDKNetwork _bdkNetwork;
   // final Logger _logger;
 

diff --git a/lib/_pkg/wallet/repository/network.dart b/lib/_pkg/wallet/repository/network.dart
diff --git a/lib/_pkg/wallet/sync.dart b/lib/_pkg/wallet/sync.dart
@@ -5,24 +5,24 @@ import 'package:bb_mobile/_pkg/error.dart';
 import 'package:bb_mobile/_pkg/wallet/_interface.dart';
 import 'package:bb_mobile/_pkg/wallet/bdk/sync.dart';
 import 'package:bb_mobile/_pkg/wallet/lwk/sync.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/network.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/storage.dart';
-import 'package:bb_mobile/_pkg/wallet/repository/wallets.dart';
+import 'package:bb_mobile/_repository/wallet/internal_network.dart';
+import 'package:bb_mobile/_repository/wallet/internal_wallets.dart';
+import 'package:bb_mobile/_repository/wallet/wallet_storage.dart';
 import 'package:bb_mobile/locator.dart';
 
 class WalletSync implements IWalletSync {
   WalletSync({
-    required WalletsRepository walletsRepository,
-    required NetworkRepository networkRepository,
+    required InternalWalletsRepository walletsRepository,
+    required InternalNetworkRepository networkRepository,
     required BDKSync bdkSync,
     required LWKSync lwkSync,
   })  : _walletsRepository = walletsRepository,
         _networkRepository = networkRepository,
         _bdkSync = bdkSync,
         _lwkSync = lwkSync;
 
-  final WalletsRepository _walletsRepository;
-  final NetworkRepository _networkRepository;
+  final InternalWalletsRepository _walletsRepository;
+  final InternalNetworkRepository _networkRepository;
   final BDKSync _bdkSync;
   final LWKSync _lwkSync;