Merge pull request #1444 from cake-tech/sign-message-fixes

[wip] fixing

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -2,6 +2,7 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:convert/convert.dart';
 
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
+import 'package:cw_bitcoin/electrum_derivations.dart';
 import 'package:cw_bitcoin/psbt_transaction_builder.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/unspent_coins_info.dart';
@@ -39,26 +40,21 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     Map<String, int>? initialChangeAddressIndex,
     String? passphrase,
   }) : super(
-      mnemonic: mnemonic,
-      passphrase: passphrase,
-      xpub: xpub,
-      password: password,
-      walletInfo: walletInfo,
-      unspentCoinsInfo: unspentCoinsInfo,
-      networkType: networkParam == null
-          ? bitcoin.bitcoin
-          : networkParam == BitcoinNetwork.mainnet
-              ? bitcoin.bitcoin
-              : bitcoin.testnet,
-      initialAddresses: initialAddresses,
-      initialBalance: initialBalance,
-      seedBytes: seedBytes,
-      currency: CryptoCurrency.btc) {
-    // in a standard BIP44 wallet, mainHd derivation path = m/84'/0'/0'/0 (account 0, index unspecified here)
-    // the sideHd derivation path = m/84'/0'/0'/1 (account 1, index unspecified here)
-    // String derivationPath = walletInfo.derivationInfo!.derivationPath!;
-    // String sideDerivationPath = derivationPath.substring(0, derivationPath.length - 1) + "1";
-    // final hd = bitcoin.HDWallet.fromSeed(seedBytes, network: networkType);
+            mnemonic: mnemonic,
+            passphrase: passphrase,
+            xpub: xpub,
+            password: password,
+            walletInfo: walletInfo,
+            unspentCoinsInfo: unspentCoinsInfo,
+            networkType: networkParam == null
+                ? bitcoin.bitcoin
+                : networkParam == BitcoinNetwork.mainnet
+                    ? bitcoin.bitcoin
+                    : bitcoin.testnet,
+            initialAddresses: initialAddresses,
+            initialBalance: initialBalance,
+            seedBytes: seedBytes,
+            currency: CryptoCurrency.btc) {
     walletAddresses = BitcoinWalletAddresses(
       walletInfo,
       electrumClient: electrumClient,
@@ -134,7 +130,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     );
 
     // set the default if not present:
-    walletInfo.derivationInfo!.derivationPath = snp.derivationPath ?? "m/0'/0";
+    final electrumPath = electrum_derivations[DerivationType.electrum]!.first.derivationPath!;
+    walletInfo.derivationInfo!.derivationPath = snp.derivationPath ?? electrumPath;
     walletInfo.derivationInfo!.derivationType = snp.derivationType ?? DerivationType.electrum;
 
     Uint8List? seedBytes = null;
@@ -154,6 +151,10 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       }
     }
 
+    print(walletInfo.derivationInfo!.derivationType);
+    print(walletInfo.derivationInfo!.derivationPath);
+    print("@@@@@@@@@@@@@@@");
+
     return BitcoinWallet(
       mnemonic: snp.mnemonic,
       xpub: snp.xpub,
@@ -178,7 +179,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
   void setLedger(Ledger setLedger, LedgerDevice setLedgerDevice) {
     _ledger = setLedger;
     _ledgerDevice = setLedgerDevice;
-    _bitcoinLedgerApp = BitcoinLedgerApp(_ledger!, derivationPath: walletInfo.derivationInfo!.derivationPath!);
+    _bitcoinLedgerApp =
+        BitcoinLedgerApp(_ledger!, derivationPath: walletInfo.derivationInfo!.derivationPath!);
   }
 
   @override
@@ -201,16 +203,17 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       final publicKeyAndDerivationPath = publicKeys[utxo.ownerDetails.address.pubKeyHash()]!;
 
       psbtReadyInputs.add(PSBTReadyUtxoWithAddress(
-          utxo: utxo.utxo,
-          rawTx: rawTx,
-          ownerDetails: utxo.ownerDetails,
-          ownerDerivationPath: publicKeyAndDerivationPath.derivationPath,
-          ownerMasterFingerprint: masterFingerprint,
-          ownerPublicKey: publicKeyAndDerivationPath.publicKey,
+        utxo: utxo.utxo,
+        rawTx: rawTx,
+        ownerDetails: utxo.ownerDetails,
+        ownerDerivationPath: publicKeyAndDerivationPath.derivationPath,
+        ownerMasterFingerprint: masterFingerprint,
+        ownerPublicKey: publicKeyAndDerivationPath.publicKey,
       ));
     }
 
-    final psbt = PSBTTransactionBuild(inputs: psbtReadyInputs, outputs: outputs, enableRBF: enableRBF);
+    final psbt =
+        PSBTTransactionBuild(inputs: psbtReadyInputs, outputs: outputs, enableRBF: enableRBF);
 
     final rawHex = await _bitcoinLedgerApp!.signPsbt(_ledgerDevice!, psbt: psbt.psbt);
     return BtcTransaction.fromRaw(hex.encode(rawHex));

cw_bitcoin/lib/electrum_wallet.dart

@@ -17,6 +17,7 @@ import 'package:cw_bitcoin/bitcoin_unspent.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_keys.dart';
 import 'package:cw_bitcoin/electrum.dart';
 import 'package:cw_bitcoin/electrum_balance.dart';
+import 'package:cw_bitcoin/electrum_derivations.dart';
 import 'package:cw_bitcoin/electrum_transaction_history.dart';
 import 'package:cw_bitcoin/electrum_transaction_info.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
@@ -101,10 +102,11 @@ abstract class ElectrumWalletBase
     }
 
     if (seedBytes != null) {
+      final electrumPath = electrum_derivations[DerivationType.electrum]!.first.derivationPath!;
       return currency == CryptoCurrency.bch
           ? bitcoinCashHDWallet(seedBytes)
           : bitcoin.HDWallet.fromSeed(seedBytes, network: networkType)
-              .derivePath(_hardenedDerivationPath(derivationInfo?.derivationPath ?? "m/0'"));
+              .derivePath(_hardenedDerivationPath(derivationInfo?.derivationPath ?? electrumPath));
     }
 
     return bitcoin.HDWallet.fromBase58(xpub!);
@@ -120,6 +122,7 @@ abstract class ElectrumWalletBase
   final String? _mnemonic;
 
   bitcoin.HDWallet get hd => accountHD.derive(0);
+  bitcoin.HDWallet get sideHd => accountHD.derive(1);
   final String? passphrase;
 
   @override
@@ -247,8 +250,9 @@ abstract class ElectrumWalletBase
         final address = addressTypeFromStr(utx.address, network);
         final hd =
             utx.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd;
+        final electrumPath = electrum_derivations[DerivationType.electrum]!.first.derivationPath!;
         final derivationPath =
-            "${_hardenedDerivationPath(walletInfo.derivationInfo?.derivationPath ?? "m/0'")}"
+            "${_hardenedDerivationPath(walletInfo.derivationInfo?.derivationPath ?? electrumPath)}"
             "/${utx.bitcoinAddressRecord.isHidden ? "1" : "0"}"
             "/${utx.bitcoinAddressRecord.index}";
         final pubKeyHex = hd.derive(utx.bitcoinAddressRecord.index).pubKey!;
@@ -376,8 +380,9 @@ abstract class ElectrumWalletBase
 
       final hd =
           utx.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd;
+      final electrumPath = electrum_derivations[DerivationType.electrum]!.first.derivationPath!;
       final derivationPath =
-          "${_hardenedDerivationPath(walletInfo.derivationInfo?.derivationPath ?? "m/0'")}"
+          "${_hardenedDerivationPath(walletInfo.derivationInfo?.derivationPath ?? electrumPath)}"
           "/${utx.bitcoinAddressRecord.isHidden ? "1" : "0"}"
           "/${utx.bitcoinAddressRecord.index}";
       final pubKeyHex = hd.derive(utx.bitcoinAddressRecord.index).pubKey!;
@@ -1376,7 +1381,7 @@ abstract class ElectrumWalletBase
     }
 
     List<int> sigDecodedBytes = [];
-    
+
     if (signature.endsWith('=')) {
       sigDecodedBytes = base64.decode(signature);
     } else {

cw_bitcoin/lib/electrum_wallet_snapshot.dart

@@ -2,6 +2,8 @@ import 'dart:convert';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/electrum_balance.dart';
+import 'package:cw_bitcoin/electrum_derivations.dart';
+import 'package:cw_bitcoin/electrum_wallet.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/utils/file.dart';
@@ -57,9 +59,10 @@ class ElectrumWalletSnapshot {
     var regularAddressIndexByType = {SegwitAddresType.p2wpkh.toString(): 0};
     var changeAddressIndexByType = {SegwitAddresType.p2wpkh.toString(): 0};
 
-    final derivationType =
-        DerivationType.values[(data['derivationTypeIndex'] as int?) ?? DerivationType.electrum.index];
-    final derivationPath = data['derivationPath'] as String? ?? "m/0'/0";
+    final electrumPath = electrum_derivations[DerivationType.electrum]!.first.derivationPath!;
+    final derivationType = DerivationType
+        .values[(data['derivationTypeIndex'] as int?) ?? DerivationType.electrum.index];
+    final derivationPath = data['derivationPath'] as String? ?? electrumPath;
 
     try {
       regularAddressIndexByType = {

lib/bitcoin/cw_bitcoin.dart

@@ -298,12 +298,7 @@ class CWBitcoin extends Bitcoin {
     List<DerivationType> types = await compareDerivationMethods(mnemonic: mnemonic, node: node);
     if (types.length == 1 && types.first == DerivationType.electrum) {
       return [
-        DerivationInfo(
-          derivationType: DerivationType.electrum,
-          derivationPath: "m/0'",
-          description: "Electrum",
-          scriptType: "p2wpkh",
-        )
+        electrum_derivations[DerivationType.electrum]!.first
       ];
     }
 
@@ -395,6 +390,11 @@ class CWBitcoin extends Bitcoin {
     return list;
   }
 
+  @override
+  Map<DerivationType, List<DerivationInfo>> getElectrumDerivations() {
+    return electrum_derivations;
+  }
+
   @override
   bool hasTaprootInput(PendingTransaction pendingTransaction) {
     return (pendingTransaction as PendingBitcoinTransaction).hasTaprootInputs;

lib/view_model/wallet_creation_vm.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/background_tasks.dart';
@@ -98,10 +99,7 @@ abstract class WalletCreationVMBase with Store {
         );
       case WalletType.bitcoin:
       case WalletType.litecoin:
-        return DerivationInfo(
-          derivationType: DerivationType.electrum,
-          derivationPath: "m/0'",
-        );
+        return bitcoin!.getElectrumDerivations()[DerivationType.electrum]!.first;
       default:
         return null;
     }

tool/configure.dart

@@ -186,6 +186,7 @@ abstract class Bitcoin {
       {required String mnemonic, required Node node});
   Future<List<DerivationInfo>> getDerivationsFromMnemonic(
       {required String mnemonic, required Node node, String? passphrase});
+  Map<DerivationType, List<DerivationInfo>> getElectrumDerivations();
   Future<void> setAddressType(Object wallet, dynamic option);
   ReceivePageOption getSelectedAddressType(Object wallet);
   List<ReceivePageOption> getBitcoinReceivePageOptions();