bfa722d51 · samitouri/QOSAMI-cakewallet-1

cw_bitcoin/lib/bitcoin_wallet_creation_credentials.dart

+1

@@ -78,6 +78,7 @@ class LitecoinWalletFromKeysCredentials extends WalletCredentials {

78 required this.scanSecret,

79 required this.spendPubkey,

80 WalletInfo? walletInfo,

81 + super.hardwareWalletType

82 }) : super(name: name, password: password, walletInfo: walletInfo);

83

84 final String xpub;

cw_monero/lib/monero_wallet_service.dart

+1

@@ -79,6 +79,7 @@ class MoneroRestoreWalletFromKeysCredentials extends WalletCredentials {

79 required this.address,

80 required this.viewKey,

81 required this.spendKey,

82 + super.hardwareWalletType,

83 int height = 0})

84 : super(name: name, password: password, height: height);

85

lib/bitcoin/cw_bitcoin.dart

+2

@@ -35,6 +35,7 @@ class CWBitcoin extends Bitcoin {

35 required String xpub,

36 required String scanSecret,

37 required String spendPubkey,

38 + HardwareWalletType? hardwareWalletType,

39 }) =>

40 LitecoinWalletFromKeysCredentials(

41 name: name,

@@ -42,6 +43,7 @@ class CWBitcoin extends Bitcoin {

43 xpub: xpub,

44 scanSecret: scanSecret,

45 spendPubkey: spendPubkey,

46 + hardwareWalletType: hardwareWalletType,

47 );

48

49 @override

lib/monero/cw_monero.dart

+2

@@ -219,6 +219,7 @@ class CWMonero extends Monero {

219 required String address,

220 required String password,

221 required String language,

222 + HardwareWalletType? hardwareWalletType,

223 required int height}) =>

224 MoneroRestoreWalletFromKeysCredentials(

225 name: name,

@@ -227,6 +228,7 @@ class CWMonero extends Monero {

228 address: address,

229 password: password,

230 language: language,

231 + hardwareWalletType: hardwareWalletType,

232 height: height);

233

234 @override

lib/view_model/wallet_restore_view_model.dart

+2

@@ -250,6 +250,7 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {

250 xpub: viewKey!,

251 scanSecret: scanSecret!,

252 spendPubkey: spendPubkey!,

253 + hardwareWalletType: hardwareWalletType,

254 );

255

256 case WalletType.monero:

@@ -261,6 +262,7 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {

262 address: address!,

263 password: password,

264 language: 'English',

265 + hardwareWalletType: hardwareWalletType

266 );

267

268 case WalletType.nano:

tool/configure.dart

+2 -1

@@ -191,7 +191,7 @@ abstract class Bitcoin {

191 });

192 WalletCredentials createBitcoinRestoreWalletFromWIFCredentials({required String name, required String password, required String wif, WalletInfo? walletInfo});

193 WalletCredentials createBitcoinWalletFromKeys({required String name, required String password, required String xpub, HardwareWalletType? hardwareWalletType});

194 - WalletCredentials createLitecoinWalletFromKeys({required String name, required String password, required String xpub, required String scanSecret, required String spendPubkey});

194 + WalletCredentials createLitecoinWalletFromKeys({required String name, required String password, required String xpub, required String scanSecret, required String spendPubkey, HardwareWalletType? hardwareWalletType});

195 WalletCredentials createBitcoinNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? passphrase, String? mnemonic});

196 WalletCredentials createBitcoinHardwareWalletCredentials({required String name, required HardwareAccountData accountData, WalletInfo? walletInfo});

197 List<String> getWordList();

@@ -456,6 +456,7 @@ abstract class Monero {

456 required String address,

457 required String password,

458 required String language,

459 + HardwareWalletType? hardwareWalletType,

460 required int height});

461 WalletCredentials createMoneroRestoreWalletFromSeedCredentials({required String name, required String password, required String passphrase, required int height, required String mnemonic});

462 WalletCredentials createMoneroRestoreWalletFromHardwareCredentials({required String name, required String password, required int height, required ledger.LedgerConnection ledgerConnection});

properly pass hardwareWalletType for all credentials (#3150)