From 5b2470955d480656f2f3e636bc257a9da3f7bf0d Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 28 Jul 2023 16:04:03 +0900
Subject: [PATCH] track p2pk addresses by scriptpubkey not scripthash

---
 backend/src/api/websocket-handler.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts
index 3438e0e0c..74c4ed832 100644
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -191,14 +191,14 @@ class WebsocketHandler {
               }
               if (/^[0-9a-fA-F]{130}$/.test(parsedMessage['track-address'])) {
                 client['track-address'] = null;
-                client['track-scripthash'] = transactionUtils.calcScriptHash('41' + matchedAddress + 'ac');
+                client['track-scriptpubkey'] = '41' + matchedAddress + 'ac';
               } else {
                 client['track-address'] = matchedAddress;
-                client['track-scripthash'] = null;
+                client['track-scriptpubkey'] = null;
               }
             } else {
               client['track-address'] = null;
-              client['track-scripthash'] = null;
+              client['track-scriptpubkey'] = null;
             }
           }
 
@@ -553,11 +553,11 @@ class WebsocketHandler {
         }
       }
 
-      if (client['track-scripthash']) {
+      if (client['track-scriptpubkey']) {
         const foundTransactions: TransactionExtended[] = [];
 
         for (const tx of newTransactions) {
-          const someVin = tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk' && vin.prevout.scriptpubkey === client['track-scripthash']);
+          const someVin = tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk' && vin.prevout.scriptpubkey === client['track-scriptpubkey']);
           if (someVin) {
             if (config.MEMPOOL.BACKEND !== 'esplora') {
               try {
@@ -571,7 +571,7 @@ class WebsocketHandler {
             }
             return;
           }
-          const someVout = tx.vout.some((vout) => vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey === client['track-scripthash']);
+          const someVout = tx.vout.some((vout) => vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey === client['track-scriptpubkey']);
           if (someVout) {
             if (config.MEMPOOL.BACKEND !== 'esplora') {
               try {
@@ -866,15 +866,15 @@ class WebsocketHandler {
         }
       }
 
-      if (client['track-scripthash']) {
+      if (client['track-scriptpubkey']) {
         const foundTransactions: TransactionExtended[] = [];
 
         transactions.forEach((tx) => {
-          if (tx.vin && tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk' && vin.prevout.scriptpubkey === client['track-scripthash'])) {
+          if (tx.vin && tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk' && vin.prevout.scriptpubkey === client['track-scriptpubkey'])) {
             foundTransactions.push(tx);
             return;
           }
-          if (tx.vout && tx.vout.some((vout) => vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey === client['track-scripthash'])) {
+          if (tx.vout && tx.vout.some((vout) => vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey === client['track-scriptpubkey'])) {
             foundTransactions.push(tx);
           }
         });