Merge branch 'main' of https://github.com/cake-tech/cake_wallet into …

…CW-718-Fix-Prevent-Screenshots-iOS

assets/bitcoin_electrum_server_list.yml

@@ -6,3 +6,6 @@
   isDefault: true
 -
   uri: electrs.cakewallet.com:50001
+-
+  uri: fulcrum.sethforprivacy.com:50002
+  useSSL: true

cw_bitcoin/lib/electrum_wallet.dart

@@ -479,8 +479,14 @@ abstract class ElectrumWalletBase
 
         final result = json.decode(response.body) as Map<String, num>;
         final slowFee = result['economyFee']?.toInt() ?? 0;
-        final mediumFee = result['hourFee']?.toInt() ?? 0;
-        final fastFee = result['fastestFee']?.toInt() ?? 0;
+        int mediumFee = result['hourFee']?.toInt() ?? 0;
+        int fastFee = result['fastestFee']?.toInt() ?? 0;
+        if (slowFee == mediumFee) {
+          mediumFee++;
+        }
+        while (fastFee <= mediumFee) {
+          fastFee++;
+        }
         _feeRates = [slowFee, mediumFee, fastFee];
         return;
       } catch (_) {}
@@ -813,6 +819,8 @@ abstract class ElectrumWalletBase
       network: network,
       memo: memo,
       feeRate: feeRate,
+      inputPrivKeyInfos: utxoDetails.inputPrivKeyInfos,
+      vinOutpoints: utxoDetails.vinOutpoints,
     );
 
     if (fee == 0) {
@@ -1639,27 +1647,29 @@ abstract class ElectrumWalletBase
     if (verboseTransaction.isEmpty) {
       transactionHex = await electrumClient.getTransactionHex(hash: hash);
 
-      if (height != null && await checkIfMempoolAPIIsEnabled()) {
-        final blockHash = await http.get(
-          Uri.parse(
-            "http://mempool.cakewallet.com:8999/api/v1/block-height/$height",
-          ),
-        );
-
-        if (blockHash.statusCode == 200 &&
-            blockHash.body.isNotEmpty &&
-            jsonDecode(blockHash.body) != null) {
-          final blockResponse = await http.get(
+      if (height != null && height > 0 && await checkIfMempoolAPIIsEnabled()) {
+        try {
+          final blockHash = await http.get(
             Uri.parse(
-              "http://mempool.cakewallet.com:8999/api/v1/block/${blockHash.body}",
+              "http://mempool.cakewallet.com:8999/api/v1/block-height/$height",
             ),
           );
-          if (blockResponse.statusCode == 200 &&
-              blockResponse.body.isNotEmpty &&
-              jsonDecode(blockResponse.body)['timestamp'] != null) {
-            time = int.parse(jsonDecode(blockResponse.body)['timestamp'].toString());
+
+          if (blockHash.statusCode == 200 &&
+              blockHash.body.isNotEmpty &&
+              jsonDecode(blockHash.body) != null) {
+            final blockResponse = await http.get(
+              Uri.parse(
+                "http://mempool.cakewallet.com:8999/api/v1/block/${blockHash.body}",
+              ),
+            );
+            if (blockResponse.statusCode == 200 &&
+                blockResponse.body.isNotEmpty &&
+                jsonDecode(blockResponse.body)['timestamp'] != null) {
+              time = int.parse(jsonDecode(blockResponse.body)['timestamp'].toString());
+            }
           }
-        }
+        } catch (_) {}
       }
     } else {
       transactionHex = verboseTransaction['hex'] as String;

cw_bitcoin/lib/electrum_wallet_addresses.dart

@@ -100,10 +100,12 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   static const gap = 20;
 
   final ObservableList<BitcoinAddressRecord> _addresses;
-  late ObservableList<BaseBitcoinAddressRecord> addressesByReceiveType;
+  final ObservableList<BaseBitcoinAddressRecord> addressesByReceiveType;
   final ObservableList<BitcoinAddressRecord> receiveAddresses;
   final ObservableList<BitcoinAddressRecord> changeAddresses;
+  // TODO: add this variable in `bitcoin_wallet_addresses` and just add a cast in cw_bitcoin to use it
   final ObservableList<BitcoinSilentPaymentAddressRecord> silentAddresses;
+  // TODO: add this variable in `litecoin_wallet_addresses` and just add a cast in cw_bitcoin to use it
   final ObservableList<BitcoinAddressRecord> mwebAddresses;
   final BasedUtxoNetwork network;
   final Bip32Slip10Secp256k1 mainHd;

cw_bitcoin/lib/exceptions.dart

@@ -45,6 +45,6 @@ class BitcoinTransactionCommitFailedVoutNegative extends TransactionCommitFailed
 
 class BitcoinTransactionCommitFailedBIP68Final extends TransactionCommitFailedBIP68Final {}
 
-class BitcoinTransactionCommitFailedLessThanMin extends TransactionCommitFailedBIP68Final {}
+class BitcoinTransactionCommitFailedLessThanMin extends TransactionCommitFailedLessThanMin {}
 
 class BitcoinTransactionSilentPaymentsNotSupported extends TransactionInputNotSupported {}

cw_bitcoin/lib/litecoin_wallet.dart

@@ -236,16 +236,18 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
   Future<void> waitForMwebAddresses() async {
     // ensure that we have the full 1000 mweb addresses generated before continuing:
     // should no longer be needed, but leaving here just in case
-    final mwebAddrs = (walletAddresses as LitecoinWalletAddresses).mwebAddrs;
-    while (mwebAddrs.length < 1000) {
-      print("waiting for mweb addresses to finish generating...");
-      await Future.delayed(const Duration(milliseconds: 1000));
-    }
+    // final mwebAddrs = (walletAddresses as LitecoinWalletAddresses).mwebAddrs;
+    // while (mwebAddrs.length < 1000) {
+    //   print("waiting for mweb addresses to finish generating...");
+    //   await Future.delayed(const Duration(milliseconds: 1000));
+    // }
+    await (walletAddresses as LitecoinWalletAddresses).ensureMwebAddressUpToIndexExists(1020);
   }
 
   @action
   @override
   Future<void> startSync() async {
+    print("startSync() called!");
     if (syncStatus is SyncronizingSyncStatus) {
       return;
     }
@@ -289,45 +291,58 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
     _syncTimer = Timer.periodic(const Duration(milliseconds: 1500), (timer) async {
       if (syncStatus is FailedSyncStatus) return;
 
+      print("SYNCING....");
+
       final nodeHeight =
           await electrumClient.getCurrentBlockChainTip() ?? 0; // current block height of our node
+
+      if (nodeHeight == 0) {
+        // we aren't connected to the ltc node yet
+        if (syncStatus is! NotConnectedSyncStatus) {
+          syncStatus = FailedSyncStatus(error: "Failed to connect to Litecoin node");
+        }
+        return;
+      }
+
       final resp = await CwMweb.status(StatusRequest());
-      print("resp.mwebUtxosHeight: ${resp.mwebUtxosHeight}");
-      print("resp.mwebHeaderHeight: ${resp.mwebHeaderHeight}");
-      print("resp.blockHeaderHeight: ${resp.blockHeaderHeight}");
-
-      if (resp.blockHeaderHeight < nodeHeight) {
-        int h = resp.blockHeaderHeight;
-        syncStatus = SyncingSyncStatus(nodeHeight - h, h / nodeHeight);
-      } else if (resp.mwebHeaderHeight < nodeHeight) {
-        int h = resp.mwebHeaderHeight;
-        syncStatus = SyncingSyncStatus(nodeHeight - h, h / nodeHeight);
-      } else if (resp.mwebUtxosHeight < nodeHeight) {
-        syncStatus = SyncingSyncStatus(1, 0.999);
-      } else {
-        if (resp.mwebUtxosHeight > walletInfo.restoreHeight) {
-          await walletInfo.updateRestoreHeight(resp.mwebUtxosHeight);
-          await checkMwebUtxosSpent();
-          // update the confirmations for each transaction:
-          for (final transaction in transactionHistory.transactions.values) {
-            if (transaction.isPending) continue;
-            int txHeight = transaction.height ?? resp.mwebUtxosHeight;
-            final confirmations = (resp.mwebUtxosHeight - txHeight) + 1;
-            if (transaction.confirmations == confirmations) continue;
-            transaction.confirmations = confirmations;
-            transactionHistory.addOne(transaction);
+
+      try {
+        if (resp.blockHeaderHeight < nodeHeight) {
+          int h = resp.blockHeaderHeight;
+          syncStatus = SyncingSyncStatus(nodeHeight - h, h / nodeHeight);
+        } else if (resp.mwebHeaderHeight < nodeHeight) {
+          int h = resp.mwebHeaderHeight;
+          syncStatus = SyncingSyncStatus(nodeHeight - h, h / nodeHeight);
+        } else if (resp.mwebUtxosHeight < nodeHeight) {
+          syncStatus = SyncingSyncStatus(1, 0.999);
+        } else {
+          if (resp.mwebUtxosHeight > walletInfo.restoreHeight) {
+            await walletInfo.updateRestoreHeight(resp.mwebUtxosHeight);
+            await checkMwebUtxosSpent();
+            // update the confirmations for each transaction:
+            for (final transaction in transactionHistory.transactions.values) {
+              if (transaction.isPending) continue;
+              int txHeight = transaction.height ?? resp.mwebUtxosHeight;
+              final confirmations = (resp.mwebUtxosHeight - txHeight) + 1;
+              if (transaction.confirmations == confirmations) continue;
+              transaction.confirmations = confirmations;
+              transactionHistory.addOne(transaction);
+            }
+            await transactionHistory.save();
           }
-          await transactionHistory.save();
-        }
 
-        // prevent unnecessary reaction triggers:
-        if (syncStatus is! SyncedSyncStatus) {
-          // mwebd is synced, but we could still be processing incoming utxos:
-          if (!processingUtxos) {
-            syncStatus = SyncedSyncStatus();
+          // prevent unnecessary reaction triggers:
+          if (syncStatus is! SyncedSyncStatus) {
+            // mwebd is synced, but we could still be processing incoming utxos:
+            if (!processingUtxos) {
+              syncStatus = SyncedSyncStatus();
+            }
           }
+          return;
         }
-        return;
+      } catch (e) {
+        print("error syncing: $e");
+        syncStatus = FailedSyncStatus(error: e.toString());
       }
     });
   }
@@ -411,6 +426,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
   }
 
   Future<void> handleIncoming(MwebUtxo utxo, RpcClient stub) async {
+    print("handleIncoming() called!");
     final status = await stub.status(StatusRequest());
     var date = DateTime.now();
     var confirmations = 0;

cw_bitcoin/lib/litecoin_wallet_addresses.dart

@@ -70,13 +70,9 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
         await Future.delayed(Duration(milliseconds: 100));
       }
     }
-  }
 
-  Future<void> initMwebAddresses() async {
-    if (mwebAddrs.length < 1000) {
-      print("Generating MWEB addresses...");
-      await ensureMwebAddressUpToIndexExists(1020);
-      print("done generating MWEB addresses");
+    // ensure mweb addresses are up to date:
+    if (mwebAddresses.length < mwebAddrs.length) {
       List<BitcoinAddressRecord> addressRecords = mwebAddrs
           .asMap()
           .entries
@@ -88,7 +84,27 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
               ))
           .toList();
       addMwebAddresses(addressRecords);
-      print("added ${addressRecords.length} mweb addresses");
+      print("set ${addressRecords.length} mweb addresses");
+    }
+  }
+
+  Future<void> initMwebAddresses() async {
+    if (mwebAddrs.length < 1000) {
+      print("Generating MWEB addresses...");
+      await ensureMwebAddressUpToIndexExists(20);
+      print("done generating MWEB addresses");
+      // List<BitcoinAddressRecord> addressRecords = mwebAddrs
+      //     .asMap()
+      //     .entries
+      //     .map((e) => BitcoinAddressRecord(
+      //           e.value,
+      //           index: e.key,
+      //           type: SegwitAddresType.mweb,
+      //           network: network,
+      //         ))
+      //     .toList();
+      // addMwebAddresses(addressRecords);
+      // print("added ${addressRecords.length} mweb addresses");
       return;
     }
   }

cw_bitcoin/pubspec.lock

@@ -49,6 +49,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  bech32:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "05755063b593aa6cca0a4820a318e0ce17de6192"
+      url: "https://github.com/cake-tech/bech32.git"
+    source: git
+    version: "0.2.2"
   bip32:
     dependency: transitive
     description:
@@ -78,8 +87,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: "."
-      ref: cake-update-v7
-      resolved-ref: f577e83fe78766b2655ea0602baa9299b953a31b
+      ref: cake-update-v8
+      resolved-ref: fc045a11db3d85d806ca67f75e8b916c706745a2
       url: "https://github.com/cake-tech/bitcoin_base"
     source: git
     version: "4.7.0"
@@ -308,13 +317,13 @@ packages:
     source: hosted
     version: "1.3.1"
   ffi:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.0"
   ffigen:
     dependency: transitive
     description:
@@ -450,6 +459,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.2"
+  http2:
+    dependency: transitive
+    description:
+      name: http2
+      sha256: "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -693,13 +710,13 @@ packages:
     source: hosted
     version: "2.1.8"
   pointycastle:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: pointycastle
-      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.1"
+    version: "3.7.4"
   pool:
     dependency: transitive
     description:
@@ -709,13 +726,13 @@ packages:
     source: hosted
     version: "1.5.1"
   protobuf:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: protobuf
-      sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
+      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.1.0"
   provider:
     dependency: transitive
     description:

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet.dart

@@ -83,7 +83,7 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
       unspentCoinsInfo: unspentCoinsInfo,
       initialAddresses: initialAddresses,
       initialBalance: initialBalance,
-      seedBytes: await MnemonicBip39.toSeed(mnemonic, passphrase: passphrase),
+      seedBytes: MnemonicBip39.toSeed(mnemonic, passphrase: passphrase),
       encryptionFileUtils: encryptionFileUtils,
       initialRegularAddressIndex: initialRegularAddressIndex,
       initialChangeAddressIndex: initialChangeAddressIndex,

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_service.dart

@@ -36,7 +36,7 @@ class BitcoinCashWalletService extends WalletService<
     final strength = credentials.seedPhraseLength == 24 ? 256 : 128;
 
     final wallet = await BitcoinCashWalletBase.create(
-      mnemonic: credentials.mnemonic ?? await MnemonicBip39.generate(strength: strength),
+      mnemonic: credentials.mnemonic ?? MnemonicBip39.generate(strength: strength),
       password: credentials.password!,
       walletInfo: credentials.walletInfo!,
       unspentCoinsInfo: unspentCoinsInfoSource,

cw_core/lib/crypto_currency.dart

@@ -106,6 +106,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
     CryptoCurrency.usdcTrc20,
     CryptoCurrency.tbtc,
     CryptoCurrency.wow,
+    CryptoCurrency.ton,
   ];
 
   static const havenCurrencies = [
@@ -223,6 +224,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
   static const usdcTrc20 = CryptoCurrency(title: 'USDC', tag: 'TRX', fullName: 'USDC Coin', raw: 92, name: 'usdctrc20', iconPath: 'assets/images/usdc_icon.png', decimals: 6);
   static const tbtc = CryptoCurrency(title: 'tBTC', fullName: 'Testnet Bitcoin', raw: 93, name: 'tbtc', iconPath: 'assets/images/tbtc.png', decimals: 8);
   static const wow = CryptoCurrency(title: 'WOW', fullName: 'Wownero', raw: 94, name: 'wow', iconPath: 'assets/images/wownero_icon.png', decimals: 11);
+  static const ton = CryptoCurrency(title: 'TON', fullName: 'Toncoin', raw: 95, name: 'ton', iconPath: 'assets/images/ton_icon.png', decimals: 8);
 
 
   static final Map<int, CryptoCurrency> _rawCurrencyMap =