Skip to content
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

Major codebase cleanup #415

Merged
merged 32 commits into from
Jan 7, 2025
Merged

Major codebase cleanup #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9edf8ba
rearrange
mocodesmo Dec 31, 2024
eed8f3f
updates
mocodesmo Dec 31, 2024
c03421b
updates
mocodesmo Jan 1, 2025
36804d2
clean
mocodesmo Jan 1, 2025
057aae6
updates
mocodesmo Jan 1, 2025
1b24bbd
clean
mocodesmo Jan 1, 2025
ca32965
updates
mocodesmo Jan 1, 2025
2c34342
clean
mocodesmo Jan 1, 2025
1696b64
clean
mocodesmo Jan 1, 2025
48cc1fe
clean
mocodesmo Jan 1, 2025
42f814d
clean
mocodesmo Jan 1, 2025
08a8978
rename
mocodesmo Jan 1, 2025
567d3cf
clean
mocodesmo Jan 1, 2025
8d44e72
clean
mocodesmo Jan 1, 2025
87fdb76
updates
mocodesmo Jan 1, 2025
3f5df40
network cubit to bloc
mocodesmo Jan 2, 2025
f8be66f
clean
mocodesmo Jan 2, 2025
118fde6
clean
mocodesmo Jan 2, 2025
0589659
fixes
mocodesmo Jan 2, 2025
26bd7d7
fixes
mocodesmo Jan 2, 2025
fcbcf65
fixes
mocodesmo Jan 2, 2025
dee040b
clean
mocodesmo Jan 2, 2025
94ca64a
fixes
mocodesmo Jan 2, 2025
cf46efa
fixes
mocodesmo Jan 2, 2025
ea2303a
fixes
mocodesmo Jan 2, 2025
96a0fd4
fixes
mocodesmo Jan 3, 2025
2323997
fixes
mocodesmo Jan 3, 2025
5a1b0ed
network fixes
mocodesmo Jan 3, 2025
01ff02b
refactor AppWalletsRepository to use a list instead of BehaviorSubjec…
mocodesmo Jan 3, 2025
5d0c4ba
slow route fix
mocodesmo Jan 5, 2025
d018d34
send fixes
mocodesmo Jan 5, 2025
01b186f
Merge branch 'main' into bloc_cleanup
mocodesmo Jan 5, 2025
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
4 changes: 4 additions & 0 deletions devtools_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions lib/_model/wallet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class Wallet with _$Wallet {
@Default(0) int subKeyIndex,
// List<String>? labelTags,
// List<Bip329Label>? bip329Labels,
Address? firstAddress,
}) = _Wallet;
const Wallet._();

Expand Down Expand Up @@ -515,6 +516,10 @@ class Wallet with _$Wallet {
List<SwapTx> swapsToProcess() {
return swaps.where((swap) => swap.proceesTx() && !swap.failed()).toList();
}

int balanceSats() => balance ?? 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not change the balance field/parameter to balanceSats directly with a default value of 0 instead of having balance which is unclear if it is in sats or btc or fiat and then having a function for balanceSats which just returns balance or 0… I think this can be clearer by just replacing the balance field for balanceSats directly with a default 0 value.


String balanceStr() => ((balance ?? 0) / 100000000).toStringAsFixed(8);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The balanceStr seems to be the balance in btc and as a String then, but the fact that it is in btc is not clear from the name. balanceBtc would be a better name I think, and I would leave it as a numeric value (preferably Decimal type) and leave String formatting up to the presentation/UI layer and not the model. The intl package number formatting capabilities (NumberFormat.currency) can be used in the Widgets for a formatted String of a currency balance like this.

}

@freezed
Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/boltz/swap.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 7 additions & 6 deletions lib/_pkg/deep_link.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -39,8 +40,8 @@ class DeepLink {
Future<Err?> handleUri({
required String link,
// required SettingsCubit settingsCubit,
required HomeCubit homeCubit,
required NetworkCubit networkCubit,
required HomeBloc homeCubit,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HomeBloc is renamed, but the variable is still named homeCubit.
Same for networkCubit.

required NetworkBloc networkCubit,
required BuildContext context,
}) async {
try {
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions lib/_pkg/migrations/migration0_1to0_2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/_pkg/migrations/migration0_2to0_3.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 7 additions & 6 deletions lib/_pkg/payjoin/manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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']) {
Expand Down Expand Up @@ -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 &&
Expand Down
1 change: 1 addition & 0 deletions lib/_pkg/storage/storage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class StorageKeys {
static const wallets = 'wallets';
static const settings = 'settings';
static const network = 'network';
static const networkReposity = 'networkReposity';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not clear why a repository itself should have a key to be stored itself...?

static const networkFees = 'networkFees';
static const currency = 'currency';
static const lighting = 'lighting';
Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/wallet/address.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/wallet/balance.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/wallet/bdk/create.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/wallet/bdk/sensitive_create.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions lib/_pkg/wallet/create.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -17,7 +17,7 @@ class WalletCreate implements IWalletCreate {
_bdkCreate = bdkCreate,
_walletsStorageRepository = walletsStorageRepository;

final WalletsRepository _walletsRepository;
final InternalWalletsRepository _walletsRepository;
final WalletsStorageRepository _walletsStorageRepository;

final LWKCreate _lwkCreate;
Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/wallet/lwk/transaction.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions lib/_pkg/wallet/network.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
43 changes: 0 additions & 43 deletions lib/_pkg/wallet/repository/network.dart
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions lib/_pkg/wallet/sync.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading
Loading