@bsv/sdk 2.0.16 → 2.1.1

package/dist/cjs/src/compat/Mnemonic.js

@@ -67,14 +67,14 @@ class Mnemonic {
      */
     toBinary() {
         const bw = new utils_js_1.Writer();
-        if (this.mnemonic !== '') {
+        if (this.mnemonic === '') {
+            bw.writeVarIntNum(0);
+        }
+        else {
             const buf = (0, utils_js_1.toArray)(this.mnemonic, 'utf8');
             bw.writeVarIntNum(buf.length);
             bw.write(buf);
         }
-        else {
-            bw.writeVarIntNum(0);
-        }
         if (this.seed.length > 0) {
             bw.writeVarIntNum(this.seed.length);
             bw.write(this.seed);
@@ -108,7 +108,7 @@ class Mnemonic {
      * @throws {Error} If the bit length is not a multiple of 32 or is less than 128.
      */
     fromRandom(bits) {
-        if (bits === undefined || bits === null || isNaN(bits) || bits === 0) {
+        if (bits === undefined || bits === null || Number.isNaN(bits) || bits === 0) {
             bits = 128;
         }
         if (bits % 32 !== 0) {
@@ -200,8 +200,8 @@ class Mnemonic {
         const hash = Hash.sha256(buf);
         let bin = '';
         const bits = buf.length * 8;
-        for (let i = 0; i < buf.length; i++) {
-            bin = bin + ('00000000' + buf[i].toString(2)).slice(-8);
+        for (const byte of buf) {
+            bin = bin + ('00000000' + byte.toString(2)).slice(-8);
         }
         let hashbits = hash[0].toString(2);
         hashbits = ('00000000' + hashbits).slice(-8).slice(0, bits / 32);
@@ -215,7 +215,7 @@ class Mnemonic {
             if (mnemonic !== '') {
                 mnemonic = mnemonic + this.Wordlist.space;
             }
-            const wi = parseInt(bin.slice(i * 11, (i + 1) * 11), 2);
+            const wi = Number.parseInt(bin.slice(i * 11, (i + 1) * 11), 2);
             mnemonic = mnemonic + this.Wordlist.value[wi];
         }
         this.mnemonic = mnemonic;
@@ -232,8 +232,8 @@ class Mnemonic {
         // confirm no invalid words
         const words = mnemonic.split(this.Wordlist.space);
         let bin = '';
-        for (let i = 0; i < words.length; i++) {
-            const ind = this.Wordlist.value.indexOf(words[i]);
+        for (const word of words) {
+            const ind = this.Wordlist.value.indexOf(word);
             if (ind < 0) {
                 return false;
             }
@@ -249,7 +249,7 @@ class Mnemonic {
         const nonhashBits = bin.slice(0, bin.length - cs);
         const buf = [];
         for (let i = 0; i < nonhashBits.length / 8; i++) {
-            buf.push(parseInt(bin.slice(i * 8, (i + 1) * 8), 2));
+            buf.push(Number.parseInt(bin.slice(i * 8, (i + 1) * 8), 2));
         }
         const hash = Hash.sha256(buf.slice(0, nonhashBits.length / 8));
         let expectedHashBits = hash[0].toString(2);
@@ -271,7 +271,7 @@ class Mnemonic {
             throw new Error('Mnemonic does not pass the check - was the mnemonic typed incorrectly? Are there extra spaces?');
         }
         if (typeof passphrase !== 'string') {
-            throw new Error('passphrase must be a string or undefined');
+            throw new TypeError('passphrase must be a string or undefined');
         }
         mnemonic = mnemonic.normalize('NFKD');
         passphrase = passphrase.normalize('NFKD');

package/dist/cjs/src/compat/Mnemonic.js.map

@@ -1 +1 @@
-{"version":3,"file":"Mnemonic.js","sourceRoot":"","sources":["../../../../src/compat/Mnemonic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Mnemonic.js","sourceRoot":"","sources":["../../../../src/compat/Mnemonic.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/identity/ContactsManager.js

@@ -39,53 +39,55 @@ class ContactsManager {
      * @returns A promise that resolves with an array of contacts
      */
     async getContacts(identityKey, forceRefresh = false, limit = 1000) {
-        // Check in-memory cache first unless forcing refresh
         if (!forceRefresh) {
-            const cached = this.cache.getItem(this.CONTACTS_CACHE_KEY);
-            if (cached != null && cached !== '') {
-                try {
-                    const cachedContacts = JSON.parse(cached);
-                    return identityKey != null
-                        ? cachedContacts.filter(c => c.identityKey === identityKey)
-                        : cachedContacts;
-                }
-                catch (e) {
-                    console.warn('Invalid cached contacts JSON; will reload from chain', e);
-                }
-            }
-        }
-        const tags = [];
-        if (identityKey != null) {
-            // Hash the identity key to use as a tag for quick lookup
-            const { hmac: hashedIdentityKey } = await this.wallet.createHmac({
-                protocolID: CONTACT_PROTOCOL_ID,
-                keyID: identityKey,
-                counterparty: 'self',
-                data: index_js_2.Utils.toArray(identityKey, 'utf8')
-            }, this.originator);
-            tags.push(`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`);
+            const fromCache = this.loadCachedContacts(identityKey);
+            if (fromCache !== null)
+                return fromCache;
         }
-        // Get all contact outputs from the contacts basket
-        const outputs = await this.wallet.listOutputs({
-            basket: 'contacts',
-            include: 'locking scripts',
-            includeCustomInstructions: true,
-            tags,
-            limit
-        }, this.originator);
+        const tags = await this.buildIdentityKeyTags(identityKey);
+        const outputs = await this.wallet.listOutputs({ basket: 'contacts', include: 'locking scripts', includeCustomInstructions: true, tags, limit }, this.originator);
         if (outputs.outputs == null || outputs.outputs.length === 0) {
             this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify([]));
             return [];
         }
-        // Pre-process outputs synchronously to extract decode data, then decrypt in parallel
+        const contacts = await this.decryptContactOutputs(outputs.outputs);
+        this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify(contacts));
+        return identityKey != null ? contacts.filter(c => c.identityKey === identityKey) : contacts;
+    }
+    /** Returns cached contacts (optionally filtered) or null if cache is missing/invalid. */
+    loadCachedContacts(identityKey) {
+        const cached = this.cache.getItem(this.CONTACTS_CACHE_KEY);
+        if (cached == null || cached === '')
+            return null;
+        try {
+            const cachedContacts = JSON.parse(cached);
+            return identityKey != null ? cachedContacts.filter(c => c.identityKey === identityKey) : cachedContacts;
+        }
+        catch (e) {
+            console.warn('Invalid cached contacts JSON; will reload from chain', e);
+            return null;
+        }
+    }
+    /** Builds the HMAC-based identity-key tag array; empty array if no identity key is given. */
+    async buildIdentityKeyTags(identityKey) {
+        if (identityKey == null)
+            return [];
+        const { hmac: hashedIdentityKey } = await this.wallet.createHmac({
+            protocolID: CONTACT_PROTOCOL_ID,
+            keyID: identityKey,
+            counterparty: 'self',
+            data: index_js_2.Utils.toArray(identityKey, 'utf8')
+        }, this.originator);
+        return [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`];
+    }
+    /** Decodes and decrypts all contact outputs in parallel, returning valid Contact objects. */
+    async decryptContactOutputs(rawOutputs) {
         const decryptTasks = [];
-        for (const output of outputs.outputs) {
+        for (const output of rawOutputs) {
             try {
-                if (output.lockingScript == null)
+                if (output.lockingScript == null || output.customInstructions == null)
                     continue;
                 const decoded = index_js_3.PushDrop.decode(index_js_3.LockingScript.fromHex(output.lockingScript));
-                if (output.customInstructions == null)
-                    continue;
                 const keyID = JSON.parse(output.customInstructions).keyID;
                 decryptTasks.push({ keyID, ciphertext: decoded.fields[0] });
             }
@@ -93,20 +95,12 @@ class ContactsManager {
                 console.warn('ContactsManager: Failed to decode contact output:', error);
             }
         }
-        // Decrypt all contacts in parallel — each call is a network round-trip over localhost
-        const decryptResults = await Promise.allSettled(decryptTasks.map(async (task) => await this.wallet.decrypt({
-            ciphertext: task.ciphertext,
-            protocolID: CONTACT_PROTOCOL_ID,
-            keyID: task.keyID,
-            counterparty: 'self'
-        }, this.originator)));
+        const decryptResults = await Promise.allSettled(decryptTasks.map(async (task) => await this.wallet.decrypt({ ciphertext: task.ciphertext, protocolID: CONTACT_PROTOCOL_ID, keyID: task.keyID, counterparty: 'self' }, this.originator)));
         const contacts = [];
-        for (let i = 0; i < decryptResults.length; i++) {
-            const result = decryptResults[i];
+        for (const result of decryptResults) {
             if (result.status === 'fulfilled') {
                 try {
-                    const contactData = JSON.parse(index_js_2.Utils.toUTF8(result.value.plaintext));
-                    contacts.push(contactData);
+                    contacts.push(JSON.parse(index_js_2.Utils.toUTF8(result.value.plaintext)));
                 }
                 catch (error) {
                     console.warn('ContactsManager: Failed to parse contact data:', error);
@@ -116,12 +110,7 @@ class ContactsManager {
                 console.warn('ContactsManager: Failed to decrypt contact output:', result.reason);
             }
         }
-        // Cache the loaded contacts
-        this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify(contacts));
-        const filteredContacts = identityKey != null
-            ? contacts.filter(c => c.identityKey === identityKey)
-            : contacts;
-        return filteredContacts;
+        return contacts;
     }
     /**
      * Save or update a Metanet contact
@@ -129,136 +118,110 @@ class ContactsManager {
      * @param metadata Optional metadata to store with the contact (ex. notes, aliases, etc)
      */
     async saveContact(contact, metadata) {
-        // Get current contacts from cache or blockchain
         const cached = this.cache.getItem(this.CONTACTS_CACHE_KEY);
-        let contacts;
-        if (cached != null && cached !== '') {
-            contacts = JSON.parse(cached);
-        }
-        else {
-            // If cache is empty, get current data from blockchain
-            contacts = await this.getContacts();
-        }
+        const contacts = (cached != null && cached !== '') ? JSON.parse(cached) : await this.getContacts();
+        const contactToStore = { ...contact, metadata };
         const existingIndex = contacts.findIndex(c => c.identityKey === contact.identityKey);
-        const contactToStore = {
-            ...contact,
-            metadata
-        };
-        if (existingIndex >= 0) {
+        if (existingIndex >= 0)
             contacts[existingIndex] = contactToStore;
+        else
+            contacts.push(contactToStore);
+        const hashedIdentityKey = await this.hashIdentityKey(contact.identityKey);
+        const outputs = await this.wallet.listOutputs({
+            basket: 'contacts', include: 'entire transactions', includeCustomInstructions: true,
+            tags: [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`], limit: 100
+        }, this.originator);
+        const { existingOutput, keyID } = await this.findExistingOutput(outputs, contact.identityKey);
+        const lockingScript = await this.encryptAndLock(contactToStore, keyID);
+        if (existingOutput != null) {
+            await this.updateContactOutput(outputs, existingOutput, lockingScript, keyID, hashedIdentityKey, contact);
         }
         else {
-            contacts.push(contactToStore);
+            await this.createContactOutput(lockingScript, keyID, hashedIdentityKey, contact);
         }
-        const { hmac: hashedIdentityKey } = await this.wallet.createHmac({
-            protocolID: CONTACT_PROTOCOL_ID,
-            keyID: contact.identityKey,
-            counterparty: 'self',
-            data: index_js_2.Utils.toArray(contact.identityKey, 'utf8')
-        }, this.originator);
-        // Check if this contact already exists (to update it)
-        const outputs = await this.wallet.listOutputs({
-            basket: 'contacts',
-            include: 'entire transactions',
-            includeCustomInstructions: true,
-            tags: [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`],
-            limit: 100 // Should only be one contact!
+        this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify(contacts));
+    }
+    /** Computes the HMAC-based hash of an identity key for tag indexing. */
+    async hashIdentityKey(identityKey) {
+        const { hmac } = await this.wallet.createHmac({
+            protocolID: CONTACT_PROTOCOL_ID, keyID: identityKey, counterparty: 'self',
+            data: index_js_2.Utils.toArray(identityKey, 'utf8')
         }, this.originator);
+        return hmac;
+    }
+    /** Scans existing outputs to find the one matching the given identity key; returns output + keyID. */
+    async findExistingOutput(outputs, identityKey) {
         let existingOutput = null;
         let keyID = index_js_2.Utils.toBase64((0, index_js_2.Random)(32));
-        if (outputs.outputs != null) {
-            // Find output by trying to decrypt and checking identityKey in payload
-            for (const output of outputs.outputs) {
-                try {
-                    const [txid, outputIndex] = output.outpoint.split('.');
-                    const tx = index_js_4.Transaction.fromBEEF(outputs.BEEF, txid);
-                    const decoded = index_js_3.PushDrop.decode(tx.outputs[Number(outputIndex)].lockingScript);
-                    if (output.customInstructions == null)
-                        continue;
-                    keyID = JSON.parse(output.customInstructions).keyID;
-                    const { plaintext } = await this.wallet.decrypt({
-                        ciphertext: decoded.fields[0],
-                        protocolID: CONTACT_PROTOCOL_ID,
-                        keyID,
-                        counterparty: 'self'
-                    }, this.originator);
-                    const storedContact = JSON.parse(index_js_2.Utils.toUTF8(plaintext));
-                    if (storedContact.identityKey === contact.identityKey) {
-                        // Found the right output
-                        existingOutput = output;
-                        break;
-                    }
-                }
-                catch (e) {
-                    // Skip malformed or undecryptable outputs
+        if (outputs.outputs == null)
+            return { existingOutput, keyID };
+        for (const output of outputs.outputs) {
+            try {
+                const [txid, outputIndex] = output.outpoint.split('.');
+                const tx = index_js_4.Transaction.fromBEEF(outputs.BEEF, txid);
+                const decoded = index_js_3.PushDrop.decode(tx.outputs[Number(outputIndex)].lockingScript);
+                if (output.customInstructions == null)
+                    continue;
+                keyID = JSON.parse(output.customInstructions).keyID;
+                const { plaintext } = await this.wallet.decrypt({ ciphertext: decoded.fields[0], protocolID: CONTACT_PROTOCOL_ID, keyID, counterparty: 'self' }, this.originator);
+                const storedContact = JSON.parse(index_js_2.Utils.toUTF8(plaintext));
+                if (storedContact.identityKey === identityKey) {
+                    existingOutput = output;
+                    break;
                 }
             }
+            catch (_malformedOrUndecryptableOutput) { /* skip */ }
         }
-        // Encrypt the contact data directly
-        const contactWithMetadata = {
-            ...contact,
-            metadata
-        };
+        return { existingOutput, keyID };
+    }
+    /** Encrypts a contact and produces its PushDrop locking script. */
+    async encryptAndLock(contactData, keyID) {
         const { ciphertext } = await this.wallet.encrypt({
-            plaintext: index_js_2.Utils.toArray(JSON.stringify(contactWithMetadata), 'utf8'),
-            protocolID: CONTACT_PROTOCOL_ID,
-            keyID,
-            counterparty: 'self'
+            plaintext: index_js_2.Utils.toArray(JSON.stringify(contactData), 'utf8'),
+            protocolID: CONTACT_PROTOCOL_ID, keyID, counterparty: 'self'
         }, this.originator);
-        // Create locking script for the new contact token
-        const lockingScript = await new index_js_3.PushDrop(this.wallet, this.originator).lock([ciphertext], CONTACT_PROTOCOL_ID, keyID, 'self');
-        if (existingOutput != null) {
-            // Update existing contact by spending its output
-            const [txid, outputIndex] = String(existingOutput.outpoint).split('.');
-            const prevOutpoint = `${txid}.${outputIndex}`;
-            const pushdrop = new index_js_3.PushDrop(this.wallet, this.originator);
-            const { signableTransaction } = await this.wallet.createAction({
-                description: 'Update Contact',
-                inputBEEF: outputs.BEEF,
-                inputs: [{
-                        outpoint: prevOutpoint,
-                        unlockingScriptLength: 74,
-                        inputDescription: 'Spend previous contact output'
-                    }],
-                outputs: [{
-                        basket: 'contacts',
-                        satoshis: 1,
-                        lockingScript: lockingScript.toHex(),
-                        outputDescription: `Updated Contact: ${contact.name ?? contact.identityKey.slice(0, 10)}`,
-                        tags: [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`],
-                        customInstructions: JSON.stringify({ keyID })
-                    }],
-                options: { acceptDelayedBroadcast: false, randomizeOutputs: false } // TODO: Support custom config as needed.
-            }, this.originator);
-            if (signableTransaction == null)
-                throw new Error('Unable to update contact');
-            const unlocker = pushdrop.unlock(CONTACT_PROTOCOL_ID, keyID, 'self');
-            const unlockingScript = await unlocker.sign(index_js_4.Transaction.fromBEEF(signableTransaction.tx), 0);
-            const { tx } = await this.wallet.signAction({
-                reference: signableTransaction.reference,
-                spends: { 0: { unlockingScript: unlockingScript.toHex() } }
-            }, this.originator);
-            if (tx == null)
-                throw new Error('Failed to update contact output');
-        }
-        else {
-            // Create new contact output
-            const { tx } = await this.wallet.createAction({
-                description: 'Add Contact',
-                outputs: [{
-                        basket: 'contacts',
-                        satoshis: 1,
-                        lockingScript: lockingScript.toHex(),
-                        outputDescription: `Contact: ${contact.name ?? contact.identityKey.slice(0, 10)}`,
-                        tags: [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`],
-                        customInstructions: JSON.stringify({ keyID })
-                    }],
-                options: { acceptDelayedBroadcast: false, randomizeOutputs: false } // TODO: Support custom config as needed.
-            }, this.originator);
-            if (tx == null)
-                throw new Error('Failed to create contact output');
-        }
-        this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify(contacts));
+        return await new index_js_3.PushDrop(this.wallet, this.originator).lock([ciphertext], CONTACT_PROTOCOL_ID, keyID, 'self');
+    }
+    /** Spends an existing contact output and creates a replacement with updated data. */
+    async updateContactOutput(outputs, existingOutput, lockingScript, keyID, hashedIdentityKey, contact) {
+        const [txid, outputIndex] = String(existingOutput.outpoint).split('.');
+        const prevOutpoint = `${txid}.${outputIndex}`;
+        const pushdrop = new index_js_3.PushDrop(this.wallet, this.originator);
+        const { signableTransaction } = await this.wallet.createAction({
+            description: 'Update Contact',
+            inputBEEF: outputs.BEEF,
+            inputs: [{ outpoint: prevOutpoint, unlockingScriptLength: 74, inputDescription: 'Spend previous contact output' }],
+            outputs: [{
+                    basket: 'contacts', satoshis: 1, lockingScript: lockingScript.toHex(),
+                    outputDescription: `Updated Contact: ${contact.name ?? contact.identityKey.slice(0, 10)}`,
+                    tags: [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`], customInstructions: JSON.stringify({ keyID })
+                }],
+            options: { acceptDelayedBroadcast: false, randomizeOutputs: false }
+        }, this.originator);
+        if (signableTransaction == null)
+            throw new Error('Unable to update contact');
+        const unlockingScript = await pushdrop.unlock(CONTACT_PROTOCOL_ID, keyID, 'self')
+            .sign(index_js_4.Transaction.fromBEEF(signableTransaction.tx), 0);
+        const { tx } = await this.wallet.signAction({
+            reference: signableTransaction.reference,
+            spends: { 0: { unlockingScript: unlockingScript.toHex() } }
+        }, this.originator);
+        if (tx == null)
+            throw new Error('Failed to update contact output');
+    }
+    /** Creates a new on-chain contact output. */
+    async createContactOutput(lockingScript, keyID, hashedIdentityKey, contact) {
+        const { tx } = await this.wallet.createAction({
+            description: 'Add Contact',
+            outputs: [{
+                    basket: 'contacts', satoshis: 1, lockingScript: lockingScript.toHex(),
+                    outputDescription: `Contact: ${contact.name ?? contact.identityKey.slice(0, 10)}`,
+                    tags: [`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`], customInstructions: JSON.stringify({ keyID })
+                }],
+            options: { acceptDelayedBroadcast: false, randomizeOutputs: false }
+        }, this.originator);
+        if (tx == null)
+            throw new Error('Failed to create contact output');
     }
     /**
      * Remove a contact from the contacts basket
@@ -270,81 +233,58 @@ class ContactsManager {
         if (cached != null && cached !== '') {
             try {
                 const contacts = JSON.parse(cached);
-                const filteredContacts = contacts.filter(c => c.identityKey !== identityKey);
-                this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify(filteredContacts));
+                this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify(contacts.filter(c => c.identityKey !== identityKey)));
             }
             catch (e) {
                 console.warn('Failed to update cache after contact removal:', e);
             }
         }
-        // Hash the identity key to use as a tag for quick lookup
-        const tags = [];
-        const { hmac: hashedIdentityKey } = await this.wallet.createHmac({
-            protocolID: CONTACT_PROTOCOL_ID,
-            keyID: identityKey,
-            counterparty: 'self',
-            data: index_js_2.Utils.toArray(identityKey, 'utf8')
-        }, this.originator);
-        tags.push(`identityKey ${index_js_2.Utils.toHex(hashedIdentityKey)}`);
-        // Find and spend the contact's output
-        const outputs = await this.wallet.listOutputs({
-            basket: 'contacts',
-            include: 'entire transactions',
-            includeCustomInstructions: true,
-            tags,
-            limit: 100 // Should only be one contact!
-        }, this.originator);
+        const tags = await this.buildIdentityKeyTags(identityKey);
+        const outputs = await this.wallet.listOutputs({ basket: 'contacts', include: 'entire transactions', includeCustomInstructions: true, tags, limit: 100 }, this.originator);
         if (outputs.outputs == null)
             return;
-        // Find the output for this specific contact by decrypting and checking identityKey
         for (const output of outputs.outputs) {
             try {
-                const [txid, outputIndex] = String(output.outpoint).split('.');
-                const tx = index_js_4.Transaction.fromBEEF(outputs.BEEF, txid);
-                const decoded = index_js_3.PushDrop.decode(tx.outputs[Number(outputIndex)].lockingScript);
-                if (output.customInstructions == null)
-                    continue;
-                const keyID = JSON.parse(output.customInstructions).keyID;
-                const { plaintext } = await this.wallet.decrypt({
-                    ciphertext: decoded.fields[0],
-                    protocolID: CONTACT_PROTOCOL_ID,
-                    keyID,
-                    counterparty: 'self'
-                }, this.originator);
-                const storedContact = JSON.parse(index_js_2.Utils.toUTF8(plaintext));
-                if (storedContact.identityKey === identityKey) {
-                    // Found the contact's output, spend it without creating a new one
-                    const prevOutpoint = `${txid}.${outputIndex}`;
-                    const pushdrop = new index_js_3.PushDrop(this.wallet, this.originator);
-                    const { signableTransaction } = await this.wallet.createAction({
-                        description: 'Delete Contact',
-                        inputBEEF: outputs.BEEF,
-                        inputs: [{
-                                outpoint: prevOutpoint,
-                                unlockingScriptLength: 74,
-                                inputDescription: 'Spend contact output to delete'
-                            }],
-                        outputs: [], // No outputs = deletion
-                        options: { acceptDelayedBroadcast: false, randomizeOutputs: false } // TODO: Support custom config as needed.
-                    }, this.originator);
-                    if (signableTransaction == null)
-                        throw new Error('Unable to delete contact');
-                    const unlocker = pushdrop.unlock(CONTACT_PROTOCOL_ID, keyID, 'self');
-                    const unlockingScript = await unlocker.sign(index_js_4.Transaction.fromBEEF(signableTransaction.tx), 0);
-                    const { tx: deleteTx } = await this.wallet.signAction({
-                        reference: signableTransaction.reference,
-                        spends: { 0: { unlockingScript: unlockingScript.toHex() } }
-                    }, this.originator);
-                    if (deleteTx == null)
-                        throw new Error('Failed to delete contact output');
+                const spent = await this.trySpendContactOutput(output, outputs, identityKey);
+                if (spent)
                     return;
-                }
-            }
-            catch (e) {
-                // Skip malformed or undecryptable outputs
             }
+            catch (_malformedOrUndecryptableOutput) { /* skip */ }
         }
     }
+    /** Attempts to decrypt and spend a single output if it matches the given identity key. Returns true if spent. */
+    async trySpendContactOutput(output, outputs, identityKey) {
+        const [txid, outputIndex] = String(output.outpoint).split('.');
+        const tx = index_js_4.Transaction.fromBEEF(outputs.BEEF, txid);
+        const decoded = index_js_3.PushDrop.decode(tx.outputs[Number(outputIndex)].lockingScript);
+        if (output.customInstructions == null)
+            return false;
+        const keyID = JSON.parse(output.customInstructions).keyID;
+        const { plaintext } = await this.wallet.decrypt({ ciphertext: decoded.fields[0], protocolID: CONTACT_PROTOCOL_ID, keyID, counterparty: 'self' }, this.originator);
+        const storedContact = JSON.parse(index_js_2.Utils.toUTF8(plaintext));
+        if (storedContact.identityKey !== identityKey)
+            return false;
+        const prevOutpoint = `${txid}.${outputIndex}`;
+        const pushdrop = new index_js_3.PushDrop(this.wallet, this.originator);
+        const { signableTransaction } = await this.wallet.createAction({
+            description: 'Delete Contact',
+            inputBEEF: outputs.BEEF,
+            inputs: [{ outpoint: prevOutpoint, unlockingScriptLength: 74, inputDescription: 'Spend contact output to delete' }],
+            outputs: [],
+            options: { acceptDelayedBroadcast: false, randomizeOutputs: false }
+        }, this.originator);
+        if (signableTransaction == null)
+            throw new Error('Unable to delete contact');
+        const unlockingScript = await pushdrop.unlock(CONTACT_PROTOCOL_ID, keyID, 'self')
+            .sign(index_js_4.Transaction.fromBEEF(signableTransaction.tx), 0);
+        const { tx: deleteTx } = await this.wallet.signAction({
+            reference: signableTransaction.reference,
+            spends: { 0: { unlockingScript: unlockingScript.toHex() } }
+        }, this.originator);
+        if (deleteTx == null)
+            throw new Error('Failed to delete contact output');
+        return true;
+    }
 }
 exports.ContactsManager = ContactsManager;
 //# sourceMappingURL=ContactsManager.js.map