CAKE-298 | used 8 minor digits for btc amount validator; applied btc address formats for btc address validator
OleksandrSobol committed
Mar 26, 2021 at 14:45 UTC
928be1a49c1e416a4255c91e1620f6fd6c0c46d0
2 files changed
+4
-4
lib/core/address_validator.dart
+3
-2
@@ -22,7 +22,8 @@ class AddressValidator extends TextValidator {
22
case CryptoCurrency.bnb:
23
return '[0-9a-zA-Z]';
24
case CryptoCurrency.btc:
25
- return '[0-9a-zA-Z]';
25
+ return '^1[0-9a-zA-Z]{32}\$|^1[0-9a-zA-Z]{33}\$|^3[0-9a-zA-Z]{32}\$'
26
+ '|^3[0-9a-zA-Z]{33}\$|^bc1[0-9a-zA-Z]{39}\$|^bc1[0-9a-zA-Z]{59}\$';
27
case CryptoCurrency.dai:
28
return '[0-9a-zA-Z]';
29
case CryptoCurrency.dash:
@@ -61,7 +62,7 @@ class AddressValidator extends TextValidator {
62
case CryptoCurrency.bnb:
63
return [42];
64
case CryptoCurrency.btc:
64
- return [33, 34, 42, 62];
65
+ return null;
66
case CryptoCurrency.dai:
67
return [42];
68
case CryptoCurrency.dash:
lib/core/amount_validator.dart
+1
-2
@@ -16,8 +16,7 @@ class AmountValidator extends TextValidator {
16
case WalletType.monero:
17
return '^([0-9]+([.\,][0-9]{0,12})?|[.\,][0-9]{1,12})\$';
18
case WalletType.bitcoin:
19
- // FIXME: Incorrect pattern for bitcoin
20
- return '^([0-9]+([.\,][0-9]{0,12})?|[.\,][0-9]{1,12})\$';
19
+ return '^([0-9]+([.\,][0-9]{0,8})?|[.\,][0-9]{1,8})\$';
20
default:
21
return '';
22
}