From 02d885d560c41573dc1d2b52e38aeb2bcb667f58 Mon Sep 17 00:00:00 2001 From: JSKitty Date: Thu, 21 Sep 2023 17:45:22 +0100 Subject: [PATCH 1/2] Fix MasterKey use after #158 and #200 conflict (#205) --- scripts/Activity.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Activity.vue b/scripts/Activity.vue index e546cedef..5dd19cae1 100644 --- a/scripts/Activity.vue +++ b/scripts/Activity.vue @@ -181,7 +181,7 @@ async function parseTXs(arrTXs) { // Check all addresses to find our own, caching them for performance for (const strAddr of cTx.receivers.concat(cTx.senders)) { // If a previous Tx checked this address, skip it, otherwise, check it against our own address(es) - if (!(await wallet.getMasterKey().isOwnAddress(strAddr))) { + if (!(await wallet.isOwnAddress(strAddr))) { // External address, this is not a self-only Tx fSendToSelf = false; } @@ -208,7 +208,7 @@ async function parseTXs(arrTXs) { const arrExternalAddresses = ( await Promise.all( cTx[where].map(async (addr) => [ - await wallet.getMasterKey().isOwnAddress(addr), + await wallet.isOwnAddress(addr), addr, ]) ) From e468186851493c956155d0f8e745bf7a8b1e31ed Mon Sep 17 00:00:00 2001 From: JSKitty Date: Fri, 22 Sep 2023 16:57:18 +0100 Subject: [PATCH 2/2] Fix incorrect `getXPub` in `openExplorer()` (#207) --- scripts/global.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/global.js b/scripts/global.js index 0098f5c00..1ce274f8c 100644 --- a/scripts/global.js +++ b/scripts/global.js @@ -801,7 +801,7 @@ export async function openSendQRScanner() { */ export async function openExplorer(strAddress = '') { if (wallet.isLoaded() && wallet.isHD() && !strAddress) { - const xpub = await wallet.getxpub(); + const xpub = await wallet.getXPub(); window.open(cExplorer.url + '/xpub/' + xpub, '_blank'); } else { const address = strAddress || (await wallet.getAddress());