Merge branch 'main' into zano-pr

cake-tech · Nov 7, 2024 · 4081c51 · 4081c51
2 parents 465f1de + 0fcfd76
commit 4081c51
Show file tree

Hide file tree

Showing 247 changed files with 4,723 additions and 1,264 deletions.
diff --git a/assets/images/flags/abw.png b/assets/images/flags/abw.png
diff --git a/assets/images/flags/afg.png b/assets/images/flags/afg.png
diff --git a/assets/images/flags/ago.png b/assets/images/flags/ago.png
diff --git a/assets/images/flags/aia.png b/assets/images/flags/aia.png
diff --git a/assets/images/flags/and.png b/assets/images/flags/and.png
diff --git a/assets/images/flags/asm.png b/assets/images/flags/asm.png
diff --git a/assets/images/flags/atf.png b/assets/images/flags/atf.png
diff --git a/assets/images/flags/atg.png b/assets/images/flags/atg.png
diff --git a/assets/images/flags/aut.png b/assets/images/flags/aut.png
diff --git a/assets/images/flags/aze.png b/assets/images/flags/aze.png
diff --git a/assets/images/flags/bel.png b/assets/images/flags/bel.png
diff --git a/assets/images/flags/bes.png b/assets/images/flags/bes.png
diff --git a/assets/images/flags/bhr.png b/assets/images/flags/bhr.png
diff --git a/assets/images/flags/blz.png b/assets/images/flags/blz.png
diff --git a/assets/images/flags/bmu.png b/assets/images/flags/bmu.png
diff --git a/assets/images/flags/bol.png b/assets/images/flags/bol.png
diff --git a/assets/images/flags/brn.png b/assets/images/flags/brn.png
diff --git a/assets/images/flags/btn.png b/assets/images/flags/btn.png
diff --git a/assets/images/flags/bvt.png b/assets/images/flags/bvt.png
diff --git a/assets/images/flags/bwa.png b/assets/images/flags/bwa.png
diff --git a/assets/images/flags/cck.png b/assets/images/flags/cck.png
diff --git a/assets/images/flags/cmr.png b/assets/images/flags/cmr.png
diff --git a/assets/images/flags/cok.png b/assets/images/flags/cok.png
diff --git a/assets/images/flags/cpv.png b/assets/images/flags/cpv.png
diff --git a/assets/images/flags/cri.png b/assets/images/flags/cri.png
diff --git a/assets/images/flags/cuw.png b/assets/images/flags/cuw.png
diff --git a/assets/images/flags/cxr.png b/assets/images/flags/cxr.png
diff --git a/assets/images/flags/cyp.png b/assets/images/flags/cyp.png
diff --git a/assets/images/flags/dji.png b/assets/images/flags/dji.png
diff --git a/assets/images/flags/dma.png b/assets/images/flags/dma.png
diff --git a/assets/images/flags/dza.png b/assets/images/flags/dza.png
diff --git a/assets/images/flags/ecu.png b/assets/images/flags/ecu.png
diff --git a/assets/images/flags/est.png b/assets/images/flags/est.png
diff --git a/assets/images/flags/eth.png b/assets/images/flags/eth.png
diff --git a/assets/images/flags/fin.png b/assets/images/flags/fin.png
diff --git a/assets/images/flags/fji.png b/assets/images/flags/fji.png
diff --git a/assets/images/flags/flk.png b/assets/images/flags/flk.png
diff --git a/assets/images/flags/fro.png b/assets/images/flags/fro.png
diff --git a/assets/images/flags/fsm.png b/assets/images/flags/fsm.png
diff --git a/assets/images/flags/gab.png b/assets/images/flags/gab.png
diff --git a/assets/images/flags/geo.png b/assets/images/flags/geo.png
diff --git a/assets/images/flags/ggi.png b/assets/images/flags/ggi.png
diff --git a/assets/images/flags/ggy.png b/assets/images/flags/ggy.png
diff --git a/assets/images/flags/glp.png b/assets/images/flags/glp.png
diff --git a/assets/images/flags/gmb.png b/assets/images/flags/gmb.png
diff --git a/assets/images/flags/grc.png b/assets/images/flags/grc.png
diff --git a/assets/images/flags/grd.png b/assets/images/flags/grd.png
diff --git a/assets/images/flags/grl.png b/assets/images/flags/grl.png
diff --git a/assets/images/flags/guf.png b/assets/images/flags/guf.png
diff --git a/assets/images/flags/gum.png b/assets/images/flags/gum.png
diff --git a/assets/images/flags/guy.png b/assets/images/flags/guy.png
diff --git a/assets/images/flags/hmd.png b/assets/images/flags/hmd.png
diff --git a/assets/images/flags/iot.png b/assets/images/flags/iot.png
diff --git a/assets/images/flags/irl.png b/assets/images/flags/irl.png
diff --git a/assets/images/flags/jam.png b/assets/images/flags/jam.png
diff --git a/assets/images/flags/jey.png b/assets/images/flags/jey.png
diff --git a/assets/images/flags/jor.png b/assets/images/flags/jor.png
diff --git a/assets/images/flags/kaz.png b/assets/images/flags/kaz.png
diff --git a/assets/images/flags/ken.png b/assets/images/flags/ken.png
diff --git a/assets/images/flags/kir.png b/assets/images/flags/kir.png
diff --git a/assets/images/flags/kwt.png b/assets/images/flags/kwt.png
diff --git a/assets/images/flags/lbn.png b/assets/images/flags/lbn.png
diff --git a/assets/images/flags/lie.png b/assets/images/flags/lie.png
diff --git a/assets/images/flags/lka.png b/assets/images/flags/lka.png
diff --git a/assets/images/flags/ltu.png b/assets/images/flags/ltu.png
diff --git a/assets/images/flags/lux.png b/assets/images/flags/lux.png
diff --git a/assets/images/flags/lva.png b/assets/images/flags/lva.png
diff --git a/assets/images/flags/mco.png b/assets/images/flags/mco.png
diff --git a/assets/images/flags/mlt.png b/assets/images/flags/mlt.png
diff --git a/assets/images/flags/mnp.png b/assets/images/flags/mnp.png
diff --git a/assets/images/flags/mrt.png b/assets/images/flags/mrt.png
diff --git a/assets/images/flags/msr.png b/assets/images/flags/msr.png
diff --git a/assets/images/flags/mtq.png b/assets/images/flags/mtq.png
diff --git a/assets/images/flags/mwi.png b/assets/images/flags/mwi.png
diff --git a/assets/images/flags/myt.png b/assets/images/flags/myt.png
diff --git a/assets/images/flags/ner.png b/assets/images/flags/ner.png
diff --git a/assets/images/flags/nfk.png b/assets/images/flags/nfk.png
diff --git a/assets/images/flags/niu.png b/assets/images/flags/niu.png
diff --git a/assets/images/flags/omn.png b/assets/images/flags/omn.png
diff --git a/assets/images/flags/per.png b/assets/images/flags/per.png
diff --git a/assets/images/flags/plw.png b/assets/images/flags/plw.png
diff --git a/assets/images/flags/pri.png b/assets/images/flags/pri.png
diff --git a/assets/images/flags/pyf.png b/assets/images/flags/pyf.png
diff --git a/assets/images/flags/qat.png b/assets/images/flags/qat.png
diff --git a/assets/images/flags/slb.png b/assets/images/flags/slb.png
diff --git a/assets/images/flags/slv.png b/assets/images/flags/slv.png
diff --git a/assets/images/flags/svk.png b/assets/images/flags/svk.png
diff --git a/assets/images/flags/svn.png b/assets/images/flags/svn.png
diff --git a/assets/images/flags/tkm.png b/assets/images/flags/tkm.png
diff --git a/assets/images/flags/ton.png b/assets/images/flags/ton.png
diff --git a/assets/images/flags/tuv.png b/assets/images/flags/tuv.png
diff --git a/assets/images/flags/ury.png b/assets/images/flags/ury.png
diff --git a/assets/images/flags/vat.png b/assets/images/flags/vat.png
diff --git a/assets/images/flags/vir.png b/assets/images/flags/vir.png
diff --git a/assets/images/flags/vut.png b/assets/images/flags/vut.png
diff --git a/cw_bitcoin/lib/electrum.dart b/cw_bitcoin/lib/electrum.dart
@@ -124,6 +124,7 @@ class ElectrumClient {
         final errorMsg = error.toString();
         print(errorMsg);
         unterminatedString = '';
+        socket = null;
       },
       onDone: () {
         print("SOCKET CLOSED!!!!!");
@@ -132,6 +133,7 @@ class ElectrumClient {
           if (host == socket?.address.host || socket == null) {
             _setConnectionStatus(ConnectionStatus.disconnected);
             socket?.destroy();
+            socket = null;
           }
         } catch (e) {
           print("onDone: $e");

diff --git a/cw_bitcoin/lib/electrum_balance.dart b/cw_bitcoin/lib/electrum_balance.dart
@@ -24,9 +24,12 @@ class ElectrumBalance extends Balance {
     final decoded = json.decode(jsonSource) as Map;
 
     return ElectrumBalance(
-        confirmed: decoded['confirmed'] as int? ?? 0,
-        unconfirmed: decoded['unconfirmed'] as int? ?? 0,
-        frozen: decoded['frozen'] as int? ?? 0);
+      confirmed: decoded['confirmed'] as int? ?? 0,
+      unconfirmed: decoded['unconfirmed'] as int? ?? 0,
+      frozen: decoded['frozen'] as int? ?? 0,
+      secondConfirmed: decoded['secondConfirmed'] as int? ?? 0,
+      secondUnconfirmed: decoded['secondUnconfirmed'] as int? ?? 0,
+    );
   }
 
   int confirmed;
@@ -36,8 +39,7 @@ class ElectrumBalance extends Balance {
   int secondUnconfirmed = 0;
 
   @override
-  String get formattedAvailableBalance =>
-      bitcoinAmountToString(amount: confirmed - frozen);
+  String get formattedAvailableBalance => bitcoinAmountToString(amount: confirmed - frozen);
 
   @override
   String get formattedAdditionalBalance => bitcoinAmountToString(amount: unconfirmed);

diff --git a/cw_bitcoin/lib/electrum_transaction_info.dart b/cw_bitcoin/lib/electrum_transaction_info.dart
@@ -41,6 +41,7 @@ class ElectrumTransactionInfo extends TransactionInfo {
     String? to,
     this.unspents,
     this.isReceivedSilentPayment = false,
+    Map<String, dynamic>? additionalInfo,
   }) {
     this.id = id;
     this.height = height;
@@ -54,6 +55,7 @@ class ElectrumTransactionInfo extends TransactionInfo {
     this.isReplaced = isReplaced;
     this.confirmations = confirmations;
     this.to = to;
+    this.additionalInfo = additionalInfo ?? {};
   }
 
   factory ElectrumTransactionInfo.fromElectrumVerbose(Map<String, Object> obj, WalletType type,
@@ -212,6 +214,7 @@ class ElectrumTransactionInfo extends TransactionInfo {
               BitcoinSilentPaymentsUnspent.fromJSON(null, unspent as Map<String, dynamic>))
           .toList(),
       isReceivedSilentPayment: data['isReceivedSilentPayment'] as bool? ?? false,
+      additionalInfo: data['additionalInfo'] as Map<String, dynamic>?,
     );
   }
 
@@ -246,7 +249,8 @@ class ElectrumTransactionInfo extends TransactionInfo {
         isReplaced: isReplaced ?? false,
         inputAddresses: inputAddresses,
         outputAddresses: outputAddresses,
-        confirmations: info.confirmations);
+        confirmations: info.confirmations,
+        additionalInfo: additionalInfo);
   }
 
   Map<String, dynamic> toJson() {
@@ -265,10 +269,11 @@ class ElectrumTransactionInfo extends TransactionInfo {
     m['inputAddresses'] = inputAddresses;
     m['outputAddresses'] = outputAddresses;
     m['isReceivedSilentPayment'] = isReceivedSilentPayment;
+    m['additionalInfo'] = additionalInfo;
     return m;
   }
 
   String toString() {
-    return 'ElectrumTransactionInfo(id: $id, height: $height, amount: $amount, fee: $fee, direction: $direction, date: $date, isPending: $isPending, isReplaced: $isReplaced, confirmations: $confirmations, to: $to, unspent: $unspents, inputAddresses: $inputAddresses, outputAddresses: $outputAddresses)';
+    return 'ElectrumTransactionInfo(id: $id, height: $height, amount: $amount, fee: $fee, direction: $direction, date: $date, isPending: $isPending, isReplaced: $isReplaced, confirmations: $confirmations, to: $to, unspent: $unspents, inputAddresses: $inputAddresses, outputAddresses: $outputAddresses, additionalInfo: $additionalInfo)';
   }
 }