feat: unspents and tweaks subscribe method

cake-tech · Nov 5, 2024 · c9a5023 · c9a5023
1 parent a3e131d
commit c9a5023
Show file tree

Hide file tree

Showing 25 changed files with 1,435 additions and 1,002 deletions.
diff --git a/cw_bitcoin/lib/address_from_output.dart b/cw_bitcoin/lib/address_from_output.dart
diff --git a/cw_bitcoin/lib/bitcoin_address_record.dart b/cw_bitcoin/lib/bitcoin_address_record.dart
@@ -139,7 +139,8 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
         other.index == index &&
         other.derivationInfo == derivationInfo &&
         other.scriptHash == scriptHash &&
-        other.type == type;
+        other.type == type &&
+        other.derivationType == derivationType;
   }
 
   @override
@@ -148,7 +149,8 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
       index.hashCode ^
       derivationInfo.hashCode ^
       scriptHash.hashCode ^
-      type.hashCode;
+      type.hashCode ^
+      derivationType.hashCode;
 }
 
 class BitcoinSilentPaymentAddressRecord extends BaseBitcoinAddressRecord {

diff --git a/cw_bitcoin/lib/bitcoin_unspent.dart b/cw_bitcoin/lib/bitcoin_unspent.dart
@@ -14,8 +14,8 @@ class BitcoinUnspent extends Unspent {
       BitcoinUnspent(
         address ?? BitcoinAddressRecord.fromJSON(json['address_record'].toString()),
         json['tx_hash'] as String,
-        json['value'] as int,
-        json['tx_pos'] as int,
+        int.parse(json['value'].toString()),
+        int.parse(json['tx_pos'].toString()),
       );
 
   Map<String, dynamic> toJson() {