v6.9.0

- Fix Segwit address equality operation.

Author: mrtnetwork

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.9.0
+
+- Fix Segwit address equality operation.
+
 ## 6.8.0
 
 - Update dependencies.

example/pubspec.lock

@@ -15,15 +15,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "6.6.0"
+    version: "6.8.0"
   blockchain_utils:
     dependency: "direct main"
     description:
       name: blockchain_utils
-      sha256: "2681bc950d31fd12eff8b9ea803d686a845a69f94fa88fdefc8c12ad63f55837"
+      sha256: edc360f7f2a8978d089a34dd62a5dfad303c79260e5f6207e1709fed80c84334
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "5.2.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -110,26 +110,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "11.0.1"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -219,10 +219,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.6"
   typed_data:
     dependency: transitive
     description:
@@ -235,10 +235,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -256,5 +256,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-  dart: ">=3.7.0-0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

lib/src/bitcoin/address/segwit_address.dart

@@ -50,7 +50,7 @@ abstract class SegwitAddress implements BitcoinBaseAddress {
     if (other is! SegwitAddress) return false;
     if (runtimeType != other.runtimeType) return false;
     if (type != other.type) return false;
-    return addressProgram == addressProgram &&
+    return addressProgram == other.addressProgram &&
         segwitVersion == other.segwitVersion;
   }
 

lib/src/provider/models/electrum/models.dart

@@ -85,13 +85,13 @@ class ElectrumGetMerkleResponse {
 
 class ElectrumVerbosTxResponse {
   final String txId;
-  final String hash;
-  final int version;
-  final int size;
+  final String? hash;
+  final int? version;
+  final int? size;
   final int? vsize;
   final int? weight;
-  final int locktime;
-  final String hex;
+  final int? locktime;
+  final String? hex;
   final String? blockhash;
   final int? confirmations;
   final int? time;
@@ -100,11 +100,11 @@ class ElectrumVerbosTxResponse {
     return ElectrumVerbosTxResponse(
         txId: json["txid"],
         hash: json["hash"],
-        version: IntUtils.parse(json["version"]),
-        size: IntUtils.parse(json["size"]),
+        version: IntUtils.tryParse(json["version"]),
+        size: IntUtils.tryParse(json["size"]),
         vsize: IntUtils.tryParse(json["vsize"]),
         weight: IntUtils.tryParse(json["weight"]),
-        locktime: IntUtils.parse(json["locktime"]),
+        locktime: IntUtils.tryParse(json["locktime"]),
         hex: json["hex"],
         blockhash: json["blockhash"],
         confirmations: IntUtils.tryParse(json["confirmations"]),
@@ -113,13 +113,13 @@ class ElectrumVerbosTxResponse {
   }
   const ElectrumVerbosTxResponse(
       {required this.txId,
-      required this.hash,
-      required this.version,
-      required this.size,
-      required this.vsize,
-      required this.weight,
-      required this.locktime,
-      required this.hex,
+      this.hash,
+      this.version,
+      this.size,
+      this.vsize,
+      this.weight,
+      this.locktime,
+      this.hex,
       this.blockhash,
       this.confirmations,
       this.time,

lib/src/provider/models/multisig_script.dart

@@ -81,7 +81,7 @@ class MultiSignatureAddress {
   }
 
   BitcoinBaseAddress toP2shAddress(
-      [P2shAddressType addressType = P2shAddressType.p2pkhInP2sh]) {
+      {P2shAddressType addressType = P2shAddressType.p2pkhInP2sh}) {
     if (!legacySupportP2shTypes.contains(addressType)) {
       throw DartBitcoinPluginException(
           "invalid p2sh type please use one of them ${legacySupportP2shTypes.map((e) => "$e").join(", ")}");
@@ -108,7 +108,7 @@ class MultiSignatureAddress {
       case P2shAddressType.p2pkhInP2sh32:
       case P2shAddressType.p2pkhInP2shwt:
       case P2shAddressType.p2pkhInP2sh32wt:
-        return toP2shAddress(addressType as P2shAddressType);
+        return toP2shAddress(addressType: addressType as P2shAddressType);
       default:
         throw const DartBitcoinPluginException(
             'invalid multisig address type. use of of them [BitcoinAddressType.p2wsh, BitcoinAddressType.p2wshInP2sh, BitcoinAddressType.p2pkhInP2sh]');

lib/src/transaction_builder/transaction_builder.dart

@@ -190,7 +190,9 @@ class BitcoinTransactionBuilder extends BasedBitcoinTransacationBuilder {
           return script;
         case P2shAddressType.p2pkhInP2sh:
           if (isTaproot) {
-            return multiSigAAddr.toP2shAddress().toScriptPubKey();
+            return multiSigAAddr
+                .toP2shAddress(addressType: P2shAddressType.p2pkhInP2sh)
+                .toScriptPubKey();
           }
           return script;
         default:

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.8.0
+version: 6.9.0
 homepage: "https://github.com/mrtnetwork/bitcoin_base"
 repository: "https://github.com/mrtnetwork/bitcoin_base"
 Author: mrhaydari.t@gmail.com