From b71330c60626def65f2eb7dd7d2d4fe5ad5963a7 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 5 Sep 2021 00:30:24 +0400 Subject: [PATCH] Lowercase Segwit uppercase addresses for tracking matching. --- backend/src/api/websocket-handler.ts | 6 +++++- frontend/src/app/components/address/address.component.ts | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 7699a5a0d..29b3b7d8f 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -82,7 +82,11 @@ class WebsocketHandler { if (parsedMessage && parsedMessage['track-address']) { if (/^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100})$/ .test(parsedMessage['track-address'])) { - client['track-address'] = parsedMessage['track-address']; + let matchedAddress = parsedMessage['track-address']; + if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}$/.test(parsedMessage['track-address'])) { + matchedAddress = matchedAddress.toLowerCase(); + } + client['track-address'] = matchedAddress; } else { client['track-address'] = null; } diff --git a/frontend/src/app/components/address/address.component.ts b/frontend/src/app/components/address/address.component.ts index ca0198c8f..a12de7343 100644 --- a/frontend/src/app/components/address/address.component.ts +++ b/frontend/src/app/components/address/address.component.ts @@ -69,6 +69,9 @@ export class AddressComponent implements OnInit, OnDestroy { this.transactions = null; document.body.scrollTo(0, 0); this.addressString = params.get('id') || ''; + if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}$/.test(this.addressString)) { + this.addressString = this.addressString.toLowerCase(); + } this.seoService.setTitle($localize`:@@address.component.browser-title:Address: ${this.addressString}:INTERPOLATION:`); return merge(