EOS name should be less than 12 characters, and only contain the foll…

…owing symbols .12345abcdefghijklmnopqrstuvwxyz
christsim · Mar 9, 2023 · 8da7184 · 8da7184
1 parent c1ac682
commit 8da7184
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/dist/wallet-address-validator.js b/dist/wallet-address-validator.js
@@ -12575,8 +12575,10 @@ module.exports = {
 
 },{"./crypto/utils":52}],55:[function(require,module,exports){
 function isValidEOSAddress (address, currency, networkType) {
-  var regex = /^[a-z0-9.]+$/g // Must be numbers, lowercase letters and decimal points only
-  if (address.search(regex) !== -1 && address.length === 12) {
+  // EOS name should be less than 12 characters,
+  // and only contain the following symbols .12345abcdefghijklmnopqrstuvwxyz
+  var regex = /^[.1-5a-z]{1,12}$/g
+  if (address.search(regex) !== -1) {
     return true
   } else {
     return false

diff --git a/dist/wallet-address-validator.min.js b/dist/wallet-address-validator.min.js
diff --git a/src/eos_validator.js b/src/eos_validator.js
@@ -1,6 +1,8 @@
 function isValidEOSAddress (address, currency, networkType) {
-  var regex = /^[a-z0-9.]+$/g // Must be numbers, lowercase letters and decimal points only
-  if (address.search(regex) !== -1 && address.length === 12) {
+  // EOS name should be less than 12 characters,
+  // and only contain the following symbols .12345abcdefghijklmnopqrstuvwxyz
+  var regex = /^[.1-5a-z]{1,12}$/g
+  if (address.search(regex) !== -1) {
     return true
   } else {
     return false

diff --git a/test/wallet_address_validator.js b/test/wallet_address_validator.js
@@ -625,8 +625,9 @@ describe('WAValidator.validate()', function () {
         it('should return true for correct eos addresses', function () {
             valid('bittrexacct1', 'eos');
             valid('binancecleos', 'eos');
-            valid('123456789012', 'eos');
-            valid('12345678.012', 'eos');
+            valid('abcdefz12345', 'eos');
+            valid('abcdefz.123', 'eos');
+            valid('abcdefz.123', 'eos');
         });
 
         it('should return true for correct vet addresses', function () {
@@ -1201,6 +1202,10 @@ describe('WAValidator.validate()', function () {
             invalid('1234567890123', 'eos');
             invalid('12345678901', 'eos');
             invalid('12345678901@', 'eos');
+            invalid('Abcdefg12345', 'eos');
+            invalid('Zbcdefg12345', 'eos');
+            invalid('abcdefg0234', 'eos');
+            invalid('abcdefg1236', 'eos');
         });
 
         it('should return false for incorrect solana addresses', function () {