Pass originator into contacts manager

Author: BraydenLangley

src/identity/ContactsManager.ts

@@ -32,9 +32,11 @@ export class ContactsManager {
   private readonly wallet: WalletInterface
   private readonly cache = new MemoryCache()
   private readonly CONTACTS_CACHE_KEY = 'metanet-contacts'
+  private readonly originator?: string
 
-  constructor (wallet?: WalletInterface) {
+  constructor (wallet?: WalletInterface, originator?: string) {
     this.wallet = wallet ?? new WalletClient()
+    this.originator = originator
   }
 
   /**
@@ -68,7 +70,7 @@ export class ContactsManager {
         keyID: identityKey,
         counterparty: 'self',
         data: Utils.toArray(identityKey, 'utf8')
-      })
+      }, this.originator)
       tags.push(`identityKey ${Utils.toHex(hashedIdentityKey)}`)
     }
 
@@ -79,7 +81,7 @@ export class ContactsManager {
       includeCustomInstructions: true,
       tags,
       limit
-    })
+    }, this.originator)
 
     if (outputs.outputs == null || outputs.outputs.length === 0) {
       this.cache.setItem(this.CONTACTS_CACHE_KEY, JSON.stringify([]))
@@ -104,7 +106,7 @@ export class ContactsManager {
           protocolID: CONTACT_PROTOCOL_ID,
           keyID,
           counterparty: 'self'
-        })
+        }, this.originator)
 
         // Parse the contact data
         const contactData: Contact = JSON.parse(Utils.toUTF8(plaintext))
@@ -157,7 +159,7 @@ export class ContactsManager {
       keyID: contact.identityKey,
       counterparty: 'self',
       data: Utils.toArray(contact.identityKey, 'utf8')
-    })
+    }, this.originator)
 
     // Check if this contact already exists (to update it)
     const outputs = await this.wallet.listOutputs({
@@ -166,7 +168,7 @@ export class ContactsManager {
       includeCustomInstructions: true,
       tags: [`identityKey ${Utils.toHex(hashedIdentityKey)}`],
       limit: 100 // Should only be one contact!
-    })
+    }, this.originator)
 
     let existingOutput: any = null
     let keyID = Utils.toBase64(Random(32))
@@ -185,7 +187,7 @@ export class ContactsManager {
             protocolID: CONTACT_PROTOCOL_ID,
             keyID,
             counterparty: 'self'
-          })
+          }, this.originator)
 
           const storedContact: Contact = JSON.parse(Utils.toUTF8(plaintext))
           if (storedContact.identityKey === contact.identityKey) {
@@ -209,7 +211,7 @@ export class ContactsManager {
       protocolID: CONTACT_PROTOCOL_ID,
       keyID,
       counterparty: 'self'
-    })
+    }, this.originator)
 
     // Create locking script for the new contact token
     const lockingScript = await new PushDrop(this.wallet).lock(
@@ -242,7 +244,7 @@ export class ContactsManager {
           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')
 
@@ -255,7 +257,7 @@ export class ContactsManager {
       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 {
@@ -271,7 +273,7 @@ export class ContactsManager {
           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')
     }
@@ -302,7 +304,7 @@ export class ContactsManager {
       keyID: identityKey,
       counterparty: 'self',
       data: Utils.toArray(identityKey, 'utf8')
-    })
+    }, this.originator)
     tags.push(`identityKey ${Utils.toHex(hashedIdentityKey)}`)
 
     // Find and spend the contact's output
@@ -312,7 +314,7 @@ export class ContactsManager {
       includeCustomInstructions: true,
       tags,
       limit: 100 // Should only be one contact!
-    })
+    }, this.originator)
 
     if (outputs.outputs == null) return
 
@@ -330,7 +332,7 @@ export class ContactsManager {
           protocolID: CONTACT_PROTOCOL_ID,
           keyID,
           counterparty: 'self'
-        })
+        }, this.originator)
 
         const storedContact: Contact = JSON.parse(Utils.toUTF8(plaintext))
         if (storedContact.identityKey === identityKey) {
@@ -348,7 +350,7 @@ export class ContactsManager {
             }],
             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')
 
@@ -361,7 +363,7 @@ export class ContactsManager {
           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

src/identity/IdentityClient.ts

@@ -1,4 +1,3 @@
-import { AuthFetch } from '../auth/clients/index.js'
 import { DEFAULT_IDENTITY_CLIENT_OPTIONS, defaultIdentity, DisplayableIdentity, KNOWN_IDENTITY_TYPES } from './types/index.js'
 import {
   Base64String,
@@ -23,17 +22,16 @@ import { ContactsManager, Contact } from './ContactsManager.js'
  * IdentityClient lets you discover who others are, and let the world know who you are.
  */
 export class IdentityClient {
-  private readonly authClient: AuthFetch
   private readonly wallet: WalletInterface
   private readonly contactsManager: ContactsManager
   constructor (
     wallet?: WalletInterface,
     private readonly options = DEFAULT_IDENTITY_CLIENT_OPTIONS,
     private readonly originator?: OriginatorDomainNameStringUnder250Bytes
   ) {
+    this.originator = originator
     this.wallet = wallet ?? new WalletClient()
-    this.authClient = new AuthFetch(this.wallet)
-    this.contactsManager = new ContactsManager(this.wallet)
+    this.contactsManager = new ContactsManager(this.wallet, this.originator)
   }
 
   /**