Refactor Coin Control

cw_bitcoin/lib/bitcoin_transaction_credentials.dart

@@ -1,19 +1,22 @@
-import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
-import 'package:cw_core/output_info.dart';
-import 'package:cw_core/unspent_coin_type.dart';
+import "package:cw_bitcoin/bitcoin_transaction_priority.dart";
+import "package:cw_core/coin_control/coin_selection.dart";
+import "package:cw_core/output_info.dart";
+import "package:cw_core/unspent_coin_type.dart";
 
 class BitcoinTransactionCredentials {
   BitcoinTransactionCredentials(
     this.outputs, {
     required this.priority,
     this.feeRate,
     this.coinTypeToSpendFrom = UnspentCoinType.any,
+    this.coinSelection = const AllCoinSelection(),
     this.payjoinUri,
   });
 
   final List<OutputInfo> outputs;
   final BitcoinTransactionPriority? priority;
   final int? feeRate;
+  final CoinSelection coinSelection;
   final UnspentCoinType coinTypeToSpendFrom;
   final String? payjoinUri;
 }

cw_bitcoin/lib/bitcoin_unspent.dart

@@ -1,5 +1,6 @@
-import 'package:cw_bitcoin/bitcoin_address_record.dart';
-import 'package:cw_core/unspent_transaction_output.dart';
+import "package:bitcoin_base/bitcoin_base.dart";
+import "package:cw_bitcoin/bitcoin_address_record.dart";
+import "package:cw_core/unspent_transaction_output.dart";
 
 class BitcoinUnspent extends Unspent {
   BitcoinUnspent(BaseBitcoinAddressRecord addressRecord, String hash, int value, int vout)
@@ -26,6 +27,9 @@ class BitcoinUnspent extends Unspent {
 
   final BaseBitcoinAddressRecord bitcoinAddressRecord;
   bool? isPegOut;
+
+  @override
+  String get id => bitcoinAddressRecord.type == SegwitAddresType.mweb ? hash : "$hash:$vout";
 }
 
 class BitcoinSilentPaymentsUnspent extends BitcoinUnspent {
@@ -63,6 +67,9 @@ class BitcoinSilentPaymentsUnspent extends BitcoinUnspent {
     return json;
   }
 
+  @override
+  bool get isSilentPayment => true;
+
   String? silentPaymentTweak;
   String? silentPaymentLabel;
 }

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -37,7 +37,7 @@ import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/sync_status.dart';
 import "package:cw_core/receive_page_option.dart";
 import 'package:cw_core/unspent_coin_type.dart';
-import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_bitcoin/bitcoin_unspent.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/utils/zpub.dart';
 import 'package:cw_core/wallet_info.dart';
@@ -59,7 +59,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     required String password,
     required WalletInfo walletInfo,
     required DerivationInfo derivationInfo,
-    required Box<UnspentCoinsInfo> unspentCoinsInfo,
     required Box<PayjoinSession> payjoinBox,
     required EncryptionFileUtils encryptionFileUtils,
     Uint8List? seedBytes,
@@ -85,7 +84,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
           password: password,
           walletInfo: walletInfo,
           derivationInfo: derivationInfo,
-          unspentCoinsInfo: unspentCoinsInfo,
           network: networkParam == null
               ? BitcoinNetwork.mainnet
               : networkParam == BitcoinNetwork.mainnet
@@ -183,7 +181,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     required String mnemonic,
     required String password,
     required WalletInfo walletInfo,
-    required Box<UnspentCoinsInfo> unspentCoinsInfo,
     required Box<PayjoinSession> payjoinBox,
     required EncryptionFileUtils encryptionFileUtils,
     String? passphrase,
@@ -219,7 +216,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       password: password,
       walletInfo: walletInfo,
       derivationInfo: derivationInfo,
-      unspentCoinsInfo: unspentCoinsInfo,
       initialAddresses: initialAddresses,
       initialSilentAddresses: initialSilentAddresses,
       initialSilentAddressIndex: initialSilentAddressIndex,
@@ -238,7 +234,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
   static Future<BitcoinWallet> open({
     required String name,
     required WalletInfo walletInfo,
-    required Box<UnspentCoinsInfo> unspentCoinsInfo,
     required Box<PayjoinSession> payjoinBox,
     required String password,
     required EncryptionFileUtils encryptionFileUtils,
@@ -322,7 +317,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       passphrase: passphrase,
       walletInfo: walletInfo,
       derivationInfo: derivationInfo,
-      unspentCoinsInfo: unspentCoinsInfo,
       initialAddresses: snp?.addresses,
       initialSilentAddresses: snp?.silentAddresses,
       initialSilentAddressIndex: snp?.silentAddressIndex ?? 0,
@@ -430,9 +424,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
   @override
   bool get hasLightningSupport => seed != null && LightningWallet.isAvailable;
 
-  bool get isPayjoinAvailable => unspentCoinsInfo.values
-      .where((element) => element.walletId == id && element.isSending && !element.isFrozen)
-      .isNotEmpty;
+  Future<bool> get isPayjoinAvailable async =>
+      (await spendableCoins()).isNotEmpty;
 
   Future<PsbtV2> buildPsbt({
     required List<BitcoinOutput> outputs,
@@ -606,7 +599,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     }
 
     final originalPsbt =
-        await signPsbt(base64.encode(transaction.asPsbtV0()), getUtxoWithPrivateKeys());
+        await signPsbt(base64.encode(transaction.asPsbtV0()), await getUtxoWithPrivateKeys());
 
     tx.commitOverride = () async {
       final sender =
@@ -617,10 +610,10 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     return tx;
   }
 
-  List<UtxoWithPrivateKey> getUtxoWithPrivateKeys({bool confirmedOnly = false}) =>
-      unspentCoinsForCurrentAccount
-          .where(
-              (e) => e.isSending && !e.isFrozen && (!confirmedOnly || (e.confirmations ?? 0) > 0))
+  Future<List<UtxoWithPrivateKey>> getUtxoWithPrivateKeys({bool confirmedOnly = false}) async =>
+      (await spendableCoins())
+          .cast<BitcoinUnspent>()
+          .where((e) => !confirmedOnly || (e.confirmations ?? 0) > 0)
           .map((unspent) => UtxoWithPrivateKey.fromUnspent(unspent, this))
           .toList();
 
@@ -747,4 +740,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
 
     return true;
   }
+
+  @override
+  Uri coinControlUrl(String txId) => Uri.https("ordinals.com", "/tx/${txId}");
 }

cw_bitcoin/lib/bitcoin_wallet_service.dart

@@ -4,9 +4,10 @@ import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonics_bip39.dart';
 import 'package:cw_bitcoin/mnemonic_is_incorrect_exception.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
+import "package:cw_core/coin_control/coin_notes_store.dart";
+import "package:cw_core/coin_control/frozen_coins_store.dart";
 import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_core/payjoin_session.dart';
-import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/utils/zpub.dart';
 import 'package:cw_core/wallet_service.dart';
 import 'package:cw_bitcoin/bitcoin_wallet.dart';
@@ -21,9 +22,8 @@ class BitcoinWalletService extends WalletService<
     BitcoinRestoreWalletFromSeedCredentials,
     BitcoinWalletFromKeysCredentials,
     BitcoinRestoreWalletFromHardware> {
-  BitcoinWalletService(this.unspentCoinsInfoSource, this.payjoinSessionSource, this.isDirect);
+  BitcoinWalletService(this.payjoinSessionSource, this.isDirect);
 
-  final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
   final Box<PayjoinSession> payjoinSessionSource;
   final bool isDirect;
 
@@ -63,7 +63,6 @@ class BitcoinWalletService extends WalletService<
       password: credentials.password!,
       passphrase: credentials.passphrase,
       walletInfo: credentials.walletInfo!,
-      unspentCoinsInfo: unspentCoinsInfoSource,
       payjoinBox: payjoinSessionSource,
       network: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
@@ -90,7 +89,6 @@ class BitcoinWalletService extends WalletService<
         password: password,
         name: name,
         walletInfo: walletInfo,
-        unspentCoinsInfo: unspentCoinsInfoSource,
         payjoinBox: payjoinSessionSource,
         encryptionFileUtils: encryptionFileUtilsFor(isDirect),
       );
@@ -103,7 +101,6 @@ class BitcoinWalletService extends WalletService<
         password: password,
         name: name,
         walletInfo: walletInfo,
-        unspentCoinsInfo: unspentCoinsInfoSource,
         payjoinBox: payjoinSessionSource,
         encryptionFileUtils: encryptionFileUtilsFor(isDirect),
       );
@@ -121,15 +118,8 @@ class BitcoinWalletService extends WalletService<
     }
     await WalletInfo.delete(walletInfo);
 
-    final unspentCoinsToDelete = unspentCoinsInfoSource.values
-        .where((unspentCoin) => unspentCoin.walletId == walletInfo.id)
-        .toList();
-
-    final keysToDelete = unspentCoinsToDelete.map((unspentCoin) => unspentCoin.key).toList();
-
-    if (keysToDelete.isNotEmpty) {
-      await unspentCoinsInfoSource.deleteAll(keysToDelete);
-    }
+    await FrozenCoinsStore.instance.deleteWallet(walletInfo.internalId);
+    await CoinNotesStore.instance.deleteWallet(walletInfo.internalId);
   }
 
   @override
@@ -148,7 +138,6 @@ class BitcoinWalletService extends WalletService<
       xpub: xpub,
       walletInfo: credentials.walletInfo!,
       derivationInfo: derivationInfo,
-      unspentCoinsInfo: unspentCoinsInfoSource,
       networkParam: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
       payjoinBox: payjoinSessionSource,
@@ -172,7 +161,6 @@ class BitcoinWalletService extends WalletService<
       xpub: xpub,
       walletInfo: credentials.walletInfo!,
       derivationInfo: await credentials.walletInfo!.getDerivationInfo(),
-      unspentCoinsInfo: unspentCoinsInfoSource,
       networkParam: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
       payjoinBox: payjoinSessionSource,
@@ -199,7 +187,6 @@ class BitcoinWalletService extends WalletService<
       passphrase: credentials.passphrase,
       mnemonic: credentials.mnemonic,
       walletInfo: credentials.walletInfo!,
-      unspentCoinsInfo: unspentCoinsInfoSource,
       payjoinBox: payjoinSessionSource,
       network: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),

cw_bitcoin/lib/electrum_balance.dart

@@ -36,6 +36,14 @@ class ElectrumBalance extends Balance {
   @override
   Money frozen;
 
+  ElectrumBalance copyWith({Money? frozen}) => ElectrumBalance(
+        confirmed: confirmed,
+        unconfirmed: unconfirmed,
+        frozen: frozen ?? this.frozen,
+        secondConfirmed: secondConfirmed,
+        secondUnconfirmed: secondUnconfirmed,
+      );
+
   ElectrumBalance copy() => ElectrumBalance(
         confirmed: confirmed,
         unconfirmed: unconfirmed,