change address fixes

This commit is contained in:
Matthew Fosse 2024-08-19 15:11:08 -04:00
parent c620d6d5a8
commit ef077c8647
2 changed files with 10 additions and 7 deletions

View file

@ -83,6 +83,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
sideHd: accountHD.childKey(Bip32KeyIndex(1)), sideHd: accountHD.childKey(Bip32KeyIndex(1)),
network: network, network: network,
mwebHd: mwebHd, mwebHd: mwebHd,
mwebEnabled: mwebEnabled,
); );
autorun((_) { autorun((_) {
this.walletAddresses.isEnabledAutoGenerateSubaddress = this.isEnabledAutoGenerateSubaddress; this.walletAddresses.isEnabledAutoGenerateSubaddress = this.isEnabledAutoGenerateSubaddress;
@ -822,6 +823,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
} }
mwebEnabled = enabled; mwebEnabled = enabled;
(walletAddresses as LitecoinWalletAddresses).mwebEnabled = enabled;
stopSync(); stopSync();
startSync(); startSync();
} }

View file

@ -17,8 +17,9 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
WalletInfo walletInfo, { WalletInfo walletInfo, {
required super.mainHd, required super.mainHd,
required super.sideHd, required super.sideHd,
required this.mwebHd,
required super.network, required super.network,
required this.mwebHd,
required this.mwebEnabled,
super.initialAddresses, super.initialAddresses,
super.initialRegularAddressIndex, super.initialRegularAddressIndex,
super.initialChangeAddressIndex, super.initialChangeAddressIndex,
@ -27,6 +28,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
} }
final Bip32Slip10Secp256k1 mwebHd; final Bip32Slip10Secp256k1 mwebHd;
bool mwebEnabled;
List<int> get scanSecret => mwebHd.childKey(Bip32KeyIndex(0x80000000)).privateKey.privKey.raw; List<int> get scanSecret => mwebHd.childKey(Bip32KeyIndex(0x80000000)).privateKey.privKey.raw;
List<int> get spendPubkey => List<int> get spendPubkey =>
@ -78,11 +80,10 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
@action @action
@override @override
Future<String> getChangeAddress() async { Future<String> getChangeAddress() async {
// super.getChangeAddress(); if (mwebEnabled) {
// updateChangeAddresses(); await topUpMweb(0);
// print("getChangeAddress @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); return mwebAddrs[0];
// this means all change addresses used will be mweb addresses!: }
await topUpMweb(0); return super.getChangeAddress();
return mwebAddrs[0];
} }
} }