v6.7.0

- Update dependencies.

Author: mrtnetwork

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.7.0
+
+- Update dependencies.
+
 ## 6.6.0
 
 - Update dependencies.

example/pubspec.lock

@@ -15,7 +15,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "6.5.0"
+    version: "6.6.0"
   blockchain_utils:
     dependency: "direct main"
     description:

lib/src/provider/models/utxo_details.dart

@@ -94,6 +94,8 @@ abstract class BitcoinBaseOutput {
 
   /// Convert the output to a TxOutput, a generic representation of a transaction output.
   TxOutput get toOutput;
+
+  BigInt get value;
 }
 
 abstract class BCHBaseOutput extends BitcoinOutput {
@@ -106,6 +108,7 @@ abstract class BitcoinSpendableBaseOutput implements BitcoinBaseOutput {
   abstract final BitcoinBaseAddress address;
 
   /// The value (amount) of the Bitcoin output.
+  @override
   abstract final BigInt value;
 }
 
@@ -133,6 +136,7 @@ class BitcoinScriptOutput implements BitcoinBaseOutput {
   final Script script;
 
   /// The value (amount) of the Bitcoin output.
+  @override
   final BigInt value;
 
   final CashToken? token;
@@ -180,9 +184,12 @@ class BitcoinBurnableOutput extends BitcoinBaseOutput {
   final String categoryID;
 
   /// The value (amount) of the burnable output (optional only for token with hasAmount flags).
-  final BigInt? value;
+  @override
+  final BigInt value;
 
-  BitcoinBurnableOutput({required this.categoryID, this.utxoHash, this.value});
+  BitcoinBurnableOutput(
+      {required this.categoryID, this.utxoHash, BigInt? value})
+      : value = value ?? BigInt.zero;
 
   @override
   TxOutput get toOutput => throw UnimplementedError();
@@ -297,14 +304,10 @@ extension Calculate on List<UtxoWithAddress> {
   Map<String, BigInt> sumOfTokenUtxos() {
     final tokens = <String, BigInt>{};
     for (final utxo in this) {
-      if (utxo.utxo.token == null) continue;
-      final token = utxo.utxo.token!;
-      if (!token.hasAmount) continue;
-      if (tokens.containsKey(token.category)) {
-        tokens[token.category] = tokens[token.category]! + token.amount;
-      } else {
-        tokens[token.category] = token.amount;
-      }
+      final token = utxo.utxo.token;
+      if (token == null || !token.hasAmount) continue;
+      final amount = tokens[token.category] ?? BigInt.zero;
+      tokens[token.category] = amount + token.amount;
     }
     return tokens;
   }

lib/src/transaction_builder/core.dart

@@ -1,12 +1,30 @@
 import 'package:bitcoin_base/src/bitcoin/script/scripts.dart';
+import 'package:bitcoin_base/src/models/network.dart';
 import 'package:bitcoin_base/src/provider/models/utxo_details.dart';
+import 'package:blockchain_utils/helper/extensions/extensions.dart';
 
 typedef BitcoinSignerCallBack = String Function(
     List<int> trDigest, UtxoWithAddress utxo, String publicKey, int sighash);
 typedef BitcoinSignerCallBackAsync = Future<String> Function(
     List<int> trDigest, UtxoWithAddress utxo, String publicKey, int sighash);
 
 abstract class BasedBitcoinTransacationBuilder {
+  final List<BitcoinBaseOutput> outPuts;
+  final List<UtxoWithAddress> utxos;
+  final BitcoinOrdering inputOrdering;
+  final BitcoinOrdering outputOrdering;
+  final BigInt fee;
+  final BasedUtxoNetwork network;
+  BasedBitcoinTransacationBuilder(
+      {required List<BitcoinBaseOutput> outPuts,
+      required List<UtxoWithAddress> utxos,
+      required this.inputOrdering,
+      required this.outputOrdering,
+      required this.fee,
+      required this.network})
+      : outPuts = outPuts.immutable,
+        utxos = utxos.immutable;
+
   BtcTransaction buildTransaction(BitcoinSignerCallBack sign);
   Future<BtcTransaction> buildTransactionAsync(BitcoinSignerCallBackAsync sign);
 

lib/src/transaction_builder/forked_transaction_builder.dart

@@ -24,27 +24,21 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// - [outputOrdering]: Ordering preference for transaction outputs. Default is BIP-69.
 ///
 /// Note: The constructor automatically validates the builder by calling the [_validateBuilder] method.
-class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
-  final List<BitcoinBaseOutput> outPuts;
-  final BigInt fee;
-  final BasedUtxoNetwork network;
-  final List<UtxoWithAddress> utxosInfo;
+class ForkedTransactionBuilder extends BasedBitcoinTransacationBuilder {
   final String? memo;
   final bool enableRBF;
   final bool isFakeTransaction;
-  final BitcoinOrdering inputOrdering;
-  final BitcoinOrdering outputOrdering;
+
   ForkedTransactionBuilder(
-      {required this.outPuts,
-      required this.fee,
-      required this.network,
-      required List<UtxoWithAddress> utxos,
-      this.inputOrdering = BitcoinOrdering.bip69,
-      this.outputOrdering = BitcoinOrdering.bip69,
+      {required super.outPuts,
+      required super.fee,
+      required super.network,
+      required super.utxos,
+      super.inputOrdering = BitcoinOrdering.bip69,
+      super.outputOrdering = BitcoinOrdering.bip69,
       this.memo,
       this.enableRBF = false,
-      this.isFakeTransaction = false})
-      : utxosInfo = utxos {
+      this.isFakeTransaction = false}) {
     _validateBuilder();
   }
 
@@ -56,7 +50,7 @@ class ForkedTransactionBuilder implements BasedBitcoinTransacationBuilder {
 
     /// validate every address is related to network
     /// exception if failed.
-    for (final i in utxosInfo) {
+    for (final i in utxos) {
       i.ownerDetails.address.toAddress(network);
     }
     for (final i in outPuts) {
@@ -242,21 +236,20 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   }
 
   Tuple<List<TxInput>, List<UtxoWithAddress>> _buildInputs() {
-    var sortedUtxos = List<UtxoWithAddress>.from(utxosInfo);
+    final sortedUtxos = List<UtxoWithAddress>.from(utxos);
 
     if (inputOrdering == BitcoinOrdering.shuffle) {
-      sortedUtxos = sortedUtxos..shuffle();
+      sortedUtxos.shuffle();
     } else if (inputOrdering == BitcoinOrdering.bip69) {
-      sortedUtxos = sortedUtxos
-        ..sort(
-          (a, b) {
-            final txidComparison = a.utxo.txHash.compareTo(b.utxo.txHash);
-            if (txidComparison == 0) {
-              return a.utxo.vout - b.utxo.vout;
-            }
-            return txidComparison;
-          },
-        );
+      sortedUtxos.sort(
+        (a, b) {
+          final txidComparison = a.utxo.txHash.compareTo(b.utxo.txHash);
+          if (txidComparison == 0) {
+            return a.utxo.vout - b.utxo.vout;
+          }
+          return txidComparison;
+        },
+      );
     }
     final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {
@@ -320,14 +313,10 @@ be retrieved by anyone who examines the blockchain's history.
   Map<String, BigInt> _sumTokenOutputAmounts(List<TxOutput> outputs) {
     final tokens = <String, BigInt>{};
     for (final out in outputs) {
-      if (out.cashToken == null) continue;
-      final token = out.cashToken!;
-      if (!token.hasAmount) continue;
-      if (tokens.containsKey(token.category)) {
-        tokens[token.category] = tokens[token.category]! + token.amount;
-      } else {
-        tokens[token.category] = token.amount;
-      }
+      final token = out.cashToken;
+      if (token == null || !token.hasAmount) continue;
+      final amount = tokens[token.category] ?? BigInt.zero;
+      tokens[token.category] = amount + token.amount;
     }
     return tokens;
   }
@@ -355,14 +344,12 @@ be retrieved by anyone who examines the blockchain's history.
     final sumTokenOutputAmouts = _sumTokenOutputAmounts(outputs);
     for (final i in sumOfTokenUtxos.entries) {
       if (sumTokenOutputAmouts[i.key] != i.value) {
-        var amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
+        BigInt amount = sumTokenOutputAmouts[i.key] ?? BigInt.zero;
         amount += outPuts
             .whereType<BitcoinBurnableOutput>()
             .where((element) => element.categoryID == i.key)
-            .fold(
-                BigInt.zero,
-                (previousValue, element) =>
-                    previousValue + (element.value ?? BigInt.zero));
+            .fold(BigInt.zero,
+                (previousValue, element) => previousValue + (element.value));
 
         if (amount != i.value) {
           throw DartBitcoinPluginException(

lib/src/transaction_builder/transaction_builder.dart

@@ -17,35 +17,29 @@ import 'package:blockchain_utils/blockchain_utils.dart';
 /// - [outPuts]: List of Bitcoin outputs to be included in the transaction.
 /// - [fee]: Transaction fee (BigInt) for processing the transaction.
 /// - [network]: The target Bitcoin network.
-/// - [utxosInfo]: List of UtxoWithAddress objects providing information about Unspent Transaction Outputs (UTXOs).
 /// - [memo]: Optional memo or additional information associated with the transaction.
 /// - [enableRBF]: Flag indicating whether Replace-By-Fee (RBF) is enabled. Default is false.
 /// - [isFakeTransaction]: Flag indicating whether the transaction is a fake/mock transaction. Default is false.
 /// - [inputOrdering]: Ordering preference for transaction inputs. Default is BIP-69.
 /// - [outputOrdering]: Ordering preference for transaction outputs. Default is BIP-69.
 ///
 /// Note: The constructor automatically validates the builder by calling the [_validateBuilder] method.
-class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
-  final List<BitcoinBaseOutput> outPuts;
-  final BigInt fee;
-  final BasedUtxoNetwork network;
-  final List<UtxoWithAddress> utxosInfo;
+class BitcoinTransactionBuilder extends BasedBitcoinTransacationBuilder {
   final String? memo;
   final bool enableRBF;
   final bool isFakeTransaction;
-  final BitcoinOrdering inputOrdering;
-  final BitcoinOrdering outputOrdering;
+
   BitcoinTransactionBuilder({
-    required this.outPuts,
-    required this.fee,
-    required this.network,
-    required List<UtxoWithAddress> utxos,
-    this.inputOrdering = BitcoinOrdering.bip69,
-    this.outputOrdering = BitcoinOrdering.bip69,
+    required super.outPuts,
+    required super.fee,
+    required super.network,
+    required super.utxos,
+    super.inputOrdering = BitcoinOrdering.bip69,
+    super.outputOrdering = BitcoinOrdering.bip69,
     this.memo,
     this.enableRBF = false,
     this.isFakeTransaction = false,
-  }) : utxosInfo = utxos {
+  }) {
     _validateBuilder();
   }
 
@@ -55,14 +49,14 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
       throw const DartBitcoinPluginException(
           'invalid network for BitcoinCashNetwork and BSVNetwork use ForkedTransactionBuilder');
     }
-    final token = utxosInfo.any((element) => element.utxo.token != null);
+    final token = utxos.any((element) => element.utxo.token != null);
     final tokenInput = outPuts.whereType<BitcoinTokenOutput>();
     final burn = outPuts.whereType<BitcoinBurnableOutput>();
     if (token || tokenInput.isNotEmpty || burn.isNotEmpty) {
       throw const DartBitcoinPluginException(
           'Cash Token only work on Bitcoin cash network');
     }
-    for (final i in utxosInfo) {
+    for (final i in utxos) {
       /// Verify each input for its association with this network's address. Raise an exception if the address is incorrect.
       i.ownerDetails.address.toAddress(network);
     }
@@ -151,7 +145,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// Returns:
   /// - bool: True if at least one UTXO in the list is a SegWit UTXO, false otherwise.
   bool _hasSegwit() {
-    for (final element in utxosInfo) {
+    for (final element in utxos) {
       if (element.utxo.isSegwit) {
         return true;
       }
@@ -166,7 +160,7 @@ class BitcoinTransactionBuilder implements BasedBitcoinTransacationBuilder {
   /// Returns:
   /// - bool: True if at least one UTXO in the list is a P2TR UTXO, false otherwise.
   bool _hasTaproot() {
-    for (final element in utxosInfo) {
+    for (final element in utxos) {
       if (element.utxo.isP2tr) {
         return true;
       }
@@ -383,21 +377,20 @@ that demonstrate the right to spend the bitcoins associated with the correspondi
   }
 
   Tuple<List<TxInput>, List<UtxoWithAddress>> _buildInputs() {
-    var sortedUtxos = List<UtxoWithAddress>.from(utxosInfo);
+    final sortedUtxos = List<UtxoWithAddress>.from(utxos);
 
     if (inputOrdering == BitcoinOrdering.shuffle) {
-      sortedUtxos = sortedUtxos..shuffle();
+      sortedUtxos.shuffle();
     } else if (inputOrdering == BitcoinOrdering.bip69) {
-      sortedUtxos = sortedUtxos
-        ..sort(
-          (a, b) {
-            final txidComparison = a.utxo.txHash.compareTo(b.utxo.txHash);
-            if (txidComparison == 0) {
-              return a.utxo.vout - b.utxo.vout;
-            }
-            return txidComparison;
-          },
-        );
+      sortedUtxos.sort(
+        (a, b) {
+          final txidComparison = a.utxo.txHash.compareTo(b.utxo.txHash);
+          if (txidComparison == 0) {
+            return a.utxo.vout - b.utxo.vout;
+          }
+          return txidComparison;
+        },
+      );
     }
     final inputs = sortedUtxos.map((e) => e.utxo.toInput()).toList();
     if (enableRBF && inputs.isNotEmpty) {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: bitcoin_base
 description: A versatile library for Bitcoin, Dogecoin, Litecoin, Dash, BSV, and BCH. Supports P2PKH, P2SH, P2WPKH, P2WSH, P2TR, with advanced creation, signing, and spending capabilities.
-version: 6.6.0
+version: 6.7.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com
@@ -23,9 +23,9 @@ dependencies:
 
 
 dev_dependencies:
-  lints: ^5.1.1
-  test: ^1.25.9
-  flutter_lints: ^5.0.0
+  lints: ^6.0.0
+  test: ^1.26.3
+  flutter_lints: ^6.0.0
 
 
 # For information on the generic Dart part of this file, see the