From ffb4684b0b355baef7198d272ae563d3c64b47e7 Mon Sep 17 00:00:00 2001 From: Marvin ROGER Date: Mon, 3 Sep 2018 15:27:46 +0200 Subject: [PATCH] Fix checkAddress when address contains 0 or 2 (#53) Fix #50 --- __tests__/data/invalid.js | 3 +++ src/parse.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/__tests__/data/invalid.js b/__tests__/data/invalid.js index c22e761..7171d14 100644 --- a/__tests__/data/invalid.js +++ b/__tests__/data/invalid.js @@ -43,6 +43,9 @@ const INVALID_ADDRESSES = [ 'zrb_1mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1nz', 'xrb_2mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1nz', 'xrb_1mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1n', + 'xrb_1mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1n0', + 'xrb_1mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1n2', + 'xrb_1mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1nl', 'xrb_1mbj7xi6yrwcuwetzd5535pdqjea5rfpsoqo9nw4gxg8itycgntucp49i1nv', ]; diff --git a/src/parse.ts b/src/parse.ts index c8878e4..3fb1e4b 100644 --- a/src/parse.ts +++ b/src/parse.ts @@ -18,7 +18,7 @@ export interface ParseAddressResult { /** @hidden */ export function parseAddress(address: any): ParseAddressResult { const invalid = { valid: false, publicKeyBytes: null }; - if (!checkString(address) || !/^(xrb_|nano_)[13][0-9a-km-uw-z]{59}$/.test(address)) { + if (!checkString(address) || !/^(xrb_|nano_)[13][13-9a-km-uw-z]{59}$/.test(address)) { return invalid; }