From 404672f10fdbc5bc780822af69a434d525df01cc Mon Sep 17 00:00:00 2001
From: Hector Chu <hectorchu@gmail.com>
Date: Wed, 24 Apr 2024 14:49:51 +0100
Subject: [PATCH] Get sending up to the confirmation box
---
cw_bitcoin/lib/electrum_wallet.dart | 2 +-
cw_bitcoin/lib/litecoin_wallet.dart | 6 ++++--
cw_bitcoin/lib/litecoin_wallet_addresses.dart | 7 +++++++
lib/core/address_validator.dart | 16 +++++++++-------
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index b25069863..37937f45c 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -157,7 +157,7 @@ abstract class ElectrumWalletBase
syncStatus = AttemptingSyncStatus();
await updateTransactions();
_subscribeForUpdates();
- if (!(this is LitecoinWallet)) {
+ if (this is! LitecoinWallet) {
await updateUnspent();
await updateBalance();
}
diff --git a/cw_bitcoin/lib/litecoin_wallet.dart b/cw_bitcoin/lib/litecoin_wallet.dart
index 7506e368a..adce6e6b7 100644
--- a/cw_bitcoin/lib/litecoin_wallet.dart
+++ b/cw_bitcoin/lib/litecoin_wallet.dart
@@ -242,8 +242,10 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
mwebUtxos.forEach((outputId, utxo) {
final addressRecord = walletAddresses.allAddresses.firstWhere(
(addressRecord) => addressRecord.address == utxo.address);
- unspentCoins.add(BitcoinUnspent(addressRecord, outputId,
- utxo.value.toInt(), mwebAddrs.indexOf(utxo.address)));
+ final unspent = BitcoinUnspent(addressRecord, outputId,
+ utxo.value.toInt(), mwebAddrs.indexOf(utxo.address));
+ if (unspent.vout == 0) unspent.isChange = true;
+ unspentCoins.add(unspent);
});
}
diff --git a/cw_bitcoin/lib/litecoin_wallet_addresses.dart b/cw_bitcoin/lib/litecoin_wallet_addresses.dart
index e1ee81b31..226bd1fc6 100644
--- a/cw_bitcoin/lib/litecoin_wallet_addresses.dart
+++ b/cw_bitcoin/lib/litecoin_wallet_addresses.dart
@@ -62,4 +62,11 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
}
return getAddress(index: index, hd: hd, addressType: addressType);
}
+
+ @action
+ @override
+ Future<String> getChangeAddress() async {
+ await topUpMweb(0);
+ return mwebAddrs[0];
+ }
}
diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart
index 967cf9bf0..bb69d4ecf 100644
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@@ -9,8 +9,9 @@ class AddressValidator extends TextValidator {
AddressValidator({required CryptoCurrency type})
: super(
errorMessage: S.current.error_text_address,
- useAdditionalValidation: type == CryptoCurrency.btc
- ? (String txt) => validateAddress(address: txt, network: BitcoinNetwork.mainnet)
+ useAdditionalValidation: type == CryptoCurrency.btc || type == CryptoCurrency.ltc
+ ? (String txt) => validateAddress(address: txt, network:
+ type == CryptoCurrency.btc ? BitcoinNetwork.mainnet : LitecoinNetwork.mainnet)
: null,
pattern: getPattern(type),
length: getLength(type));
@@ -27,6 +28,8 @@ class AddressValidator extends TextValidator {
'|^[0-9a-zA-Z]{105}\$|^addr1[0-9a-zA-Z]{98}\$';
case CryptoCurrency.btc:
return '^${P2pkhAddress.regex.pattern}\$|^${P2shAddress.regex.pattern}\$|^${P2wpkhAddress.regex.pattern}\$|${P2trAddress.regex.pattern}\$|^${P2wshAddress.regex.pattern}\$';
+ case CryptoCurrency.ltc:
+ return '^${P2pkhAddress.regex.pattern}\$|^${P2shAddress.regex.pattern}\$|^${P2wpkhAddress.regex.pattern}\$|${P2trAddress.regex.pattern}\$|^${P2wshAddress.regex.pattern}\$|^${MwebAddress.regex.pattern}\$';
case CryptoCurrency.nano:
return '[0-9a-zA-Z_]';
case CryptoCurrency.banano:
@@ -96,8 +99,6 @@ class AddressValidator extends TextValidator {
return '^(?!bitcoincash:)[0-9a-zA-Z]*\$|^(?!bitcoincash:)q|p[0-9a-zA-Z]{41}\$|^(?!bitcoincash:)q|p[0-9a-zA-Z]{42}\$|^bitcoincash:q|p[0-9a-zA-Z]{41}\$|^bitcoincash:q|p[0-9a-zA-Z]{42}\$';
case CryptoCurrency.bnb:
return '[0-9a-zA-Z]';
- case CryptoCurrency.ltc:
- return '^(?!(ltc|LTC)1)[0-9a-zA-Z]*\$|(^LTC1[A-Z0-9]*\$)|(^ltc1[a-z0-9]*\$)';
case CryptoCurrency.hbar:
return '[0-9a-zA-Z.]';
case CryptoCurrency.zaddr:
@@ -144,6 +145,8 @@ class AddressValidator extends TextValidator {
return null;
case CryptoCurrency.btc:
return null;
+ case CryptoCurrency.ltc:
+ return null;
case CryptoCurrency.dash:
return [34];
case CryptoCurrency.eos:
@@ -190,8 +193,6 @@ class AddressValidator extends TextValidator {
return [42, 43, 44, 54, 55];
case CryptoCurrency.bnb:
return [42];
- case CryptoCurrency.ltc:
- return [34, 43, 63];
case CryptoCurrency.nano:
return [64, 65];
case CryptoCurrency.banano:
@@ -278,7 +279,8 @@ class AddressValidator extends TextValidator {
case CryptoCurrency.ltc:
return '([^0-9a-zA-Z]|^)^L[a-zA-Z0-9]{26,33}([^0-9a-zA-Z]|\$)'
'|([^0-9a-zA-Z]|^)[LM][a-km-zA-HJ-NP-Z1-9]{26,33}([^0-9a-zA-Z]|\$)'
- '|([^0-9a-zA-Z]|^)ltc[a-zA-Z0-9]{26,45}([^0-9a-zA-Z]|\$)';
+ '|([^0-9a-zA-Z]|^)ltc[a-zA-Z0-9]{26,45}([^0-9a-zA-Z]|\$)'
+ '|([^0-9a-zA-Z]|^)((ltc|t)mweb1q[ac-hj-np-z02-9]{90,120})([^0-9a-zA-Z]|\$)';
case CryptoCurrency.eth:
return '0x[0-9a-zA-Z]{42}';
case CryptoCurrency.maticpoly: