Merge new release and Add Linux password flow to BCH

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -81,7 +81,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     required WalletInfo walletInfo,
     required Box<UnspentCoinsInfo> unspentCoinsInfo,
     required String password,
-    required EncryptionFileUtils encryptionFileUtils
+    required EncryptionFileUtils encryptionFileUtils,
   }) async {
     final snp = await ElectrumWallletSnapshot.load(encryptionFileUtils, name, walletInfo.type, password);
     return BitcoinWallet(

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet.dart

@@ -1,5 +1,6 @@
 import 'package:bitbox/bitbox.dart' as bitbox;
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_no_inputs_exception.dart';
@@ -31,6 +32,7 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
       required WalletInfo walletInfo,
       required Box<UnspentCoinsInfo> unspentCoinsInfo,
       required Uint8List seedBytes,
+      required EncryptionFileUtils encryptionFileUtils,
       List<BitcoinAddressRecord>? initialAddresses,
       ElectrumBalance? initialBalance,
       int initialRegularAddressIndex = 0,
@@ -44,7 +46,8 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
             initialAddresses: initialAddresses,
             initialBalance: initialBalance,
             seedBytes: seedBytes,
-            currency: CryptoCurrency.bch) {
+            currency: CryptoCurrency.bch,
+            encryptionFileUtils: encryptionFileUtils) {
     walletAddresses = BitcoinCashWalletAddresses(walletInfo,
         electrumClient: electrumClient,
         initialAddresses: initialAddresses,
@@ -62,6 +65,7 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
       required String password,
       required WalletInfo walletInfo,
       required Box<UnspentCoinsInfo> unspentCoinsInfo,
+      required EncryptionFileUtils encryptionFileUtils,
       List<BitcoinAddressRecord>? initialAddresses,
       ElectrumBalance? initialBalance,
       int initialRegularAddressIndex = 0,
@@ -74,6 +78,7 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
         initialAddresses: initialAddresses,
         initialBalance: initialBalance,
         seedBytes: await Mnemonic.toSeed(mnemonic),
+        encryptionFileUtils: encryptionFileUtils,
         initialRegularAddressIndex: initialRegularAddressIndex,
         initialChangeAddressIndex: initialChangeAddressIndex);
   }
@@ -83,8 +88,9 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
     required WalletInfo walletInfo,
     required Box<UnspentCoinsInfo> unspentCoinsInfo,
     required String password,
+    required EncryptionFileUtils encryptionFileUtils,
   }) async {
-    final snp = await ElectrumWallletSnapshot.load(name, walletInfo.type, password);
+    final snp = await ElectrumWallletSnapshot.load(encryptionFileUtils, name, walletInfo.type, password);
     return BitcoinCashWallet(
         mnemonic: snp.mnemonic,
         password: password,
@@ -93,6 +99,7 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
         initialAddresses: snp.addresses,
         initialBalance: snp.balance,
         seedBytes: await Mnemonic.toSeed(snp.mnemonic),
+        encryptionFileUtils: encryptionFileUtils,
         initialRegularAddressIndex: snp.regularAddressIndex,
         initialChangeAddressIndex: snp.changeAddressIndex);
   }

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_creation_credentials.dart

@@ -2,8 +2,8 @@ import 'package:cw_core/wallet_credentials.dart';
 import 'package:cw_core/wallet_info.dart';
 
 class BitcoinCashNewWalletCredentials extends WalletCredentials {
-  BitcoinCashNewWalletCredentials({required String name, WalletInfo? walletInfo})
+  BitcoinCashNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password})
-      : super(name: name, walletInfo: walletInfo);
+      : super(name: name, walletInfo: walletInfo, password: password);
 }
 
 class BitcoinCashRestoreWalletFromSeedCredentials extends WalletCredentials {

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_service.dart

@@ -2,10 +2,8 @@ import 'dart:io';
 
 import 'package:bip39/bip39.dart';
 import 'package:cw_bitcoin_cash/cw_bitcoin_cash.dart';
-import 'package:cw_core/balance.dart';
+import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_core/pathForWallet.dart';
-import 'package:cw_core/transaction_history.dart';
-import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
@@ -17,10 +15,11 @@ import 'package:hive/hive.dart';
 class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredentials,
     BitcoinCashRestoreWalletFromSeedCredentials,
     BitcoinCashRestoreWalletFromWIFCredentials> {
-  BitcoinCashWalletService(this.walletInfoSource, this.unspentCoinsInfoSource);
+  BitcoinCashWalletService(this.walletInfoSource, this.unspentCoinsInfoSource, this.isDirect);
 
   final Box<WalletInfo> walletInfoSource;
   final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
+  final bool isDirect;
 
   @override
   WalletType getType() => WalletType.bitcoinCash;
@@ -36,7 +35,8 @@ class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredent
         mnemonic: await Mnemonic.generate(),
         password: credentials.password!,
         walletInfo: credentials.walletInfo!,
-        unspentCoinsInfo: unspentCoinsInfoSource);
+        unspentCoinsInfo: unspentCoinsInfoSource,
+        encryptionFileUtils: encryptionFileUtilsFor(isDirect));
     await wallet.save();
     await wallet.init();
     return wallet;
@@ -48,7 +48,8 @@ class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredent
             (info) => info.id == WalletBase.idFor(name, getType()))!;
     final wallet = await BitcoinCashWalletBase.open(
         password: password, name: name, walletInfo: walletInfo,
-        unspentCoinsInfo: unspentCoinsInfoSource);
+        unspentCoinsInfo: unspentCoinsInfoSource,
+        encryptionFileUtils: encryptionFileUtilsFor(isDirect));
     await wallet.init();
     return wallet;
   }
@@ -70,7 +71,8 @@ class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredent
         password: password,
         name: currentName,
         walletInfo: currentWalletInfo,
-        unspentCoinsInfo: unspentCoinsInfoSource);
+        unspentCoinsInfo: unspentCoinsInfoSource,
+        encryptionFileUtils: encryptionFileUtilsFor(isDirect));
 
     await currentWallet.renameWalletFiles(newName);
 
@@ -99,7 +101,8 @@ class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredent
         password: credentials.password!,
         mnemonic: credentials.mnemonic,
         walletInfo: credentials.walletInfo!,
-        unspentCoinsInfo: unspentCoinsInfoSource);
+        unspentCoinsInfo: unspentCoinsInfoSource,
+        encryptionFileUtils: encryptionFileUtilsFor(isDirect));
     await wallet.save();
     await wallet.init();
     return wallet;

lib/bitcoin_cash/cw_bitcoin_cash.dart

@@ -12,16 +12,17 @@ class CWBitcoinCash extends BitcoinCash {
 
   @override
   WalletService createBitcoinCashWalletService(
-      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) {
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool isDirect) {
-    return BitcoinCashWalletService(walletInfoSource, unspentCoinSource);
+    return BitcoinCashWalletService(walletInfoSource, unspentCoinSource, isDirect);
   }
 
   @override
   WalletCredentials createBitcoinCashNewWalletCredentials({
     required String name,
     WalletInfo? walletInfo,
+    String? password,
   }) =>
-      BitcoinCashNewWalletCredentials(name: name, walletInfo: walletInfo);
+      BitcoinCashNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createBitcoinCashRestoreWalletFromSeedCredentials(

scripts/linux/app_env.sh

@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.1.2"
+CAKEWALLET_VERSION="1.1.3"
-CAKEWALLET_BUILD_NUMBER=5
+CAKEWALLET_BUILD_NUMBER=6
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."

tool/configure.dart

@@ -604,10 +604,10 @@ abstract class BitcoinCash {
   String getCashAddrFormat(String address);
 
   WalletService createBitcoinCashWalletService(
-      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource);
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool isDirect);
 
   WalletCredentials createBitcoinCashNewWalletCredentials(
-      {required String name, WalletInfo? walletInfo});
+      {required String name, WalletInfo? walletInfo, String? password});
 
   WalletCredentials createBitcoinCashRestoreWalletFromSeedCredentials(
       {required String name, required String mnemonic, required String password});