added originator

Author: jackielu3

src/identity/ContactsManager.ts

@@ -214,7 +214,7 @@ export class ContactsManager {
     }, this.originator)
 
     // Create locking script for the new contact token
-    const lockingScript = await new PushDrop(this.wallet).lock(
+    const lockingScript = await new PushDrop(this.wallet, this.originator).lock(
       [ciphertext],
       CONTACT_PROTOCOL_ID,
       keyID,
@@ -226,7 +226,7 @@ export class ContactsManager {
       const [txid, outputIndex] = String(existingOutput.outpoint).split('.')
       const prevOutpoint = `${txid}.${outputIndex}` as const
 
-      const pushdrop = new PushDrop(this.wallet)
+      const pushdrop = new PushDrop(this.wallet, this.originator)
       const { signableTransaction } = await this.wallet.createAction({
         description: 'Update Contact',
         inputBEEF: outputs.BEEF as number[],
@@ -339,7 +339,7 @@ export class ContactsManager {
           // Found the contact's output, spend it without creating a new one
           const prevOutpoint = `${txid}.${outputIndex}` as const
 
-          const pushdrop = new PushDrop(this.wallet)
+          const pushdrop = new PushDrop(this.wallet, this.originator)
           const { signableTransaction } = await this.wallet.createAction({
             description: 'Delete Contact',
             inputBEEF: outputs.BEEF as number[],

src/identity/IdentityClient.ts

@@ -48,7 +48,6 @@ export class IdentityClient {
     certificate: WalletCertificate,
     fieldsToReveal: CertificateFieldNameUnder50Bytes[]
   ): Promise<BroadcastResponse | BroadcastFailure> {
-    debugger
     if (Object.keys(certificate.fields).length === 0) {
       throw new Error('Public reveal failed: Certificate has no fields to reveal!')
     }
@@ -123,7 +122,6 @@ export class IdentityClient {
     args: DiscoverByIdentityKeyArgs,
     overrideWithContacts = true
   ): Promise<DisplayableIdentity[]> {
-    debugger
     if (overrideWithContacts) {
       // Override results with personal contacts if available
       const contacts = await this.contactsManager.getContacts(args.identityKey)

src/identity/__tests/IdentityClient.test.ts

@@ -193,7 +193,7 @@ describe('IdentityClient', () => {
         certificate,
         fieldsToReveal,
         verifier: expect.any(String)
-      })
+      }, undefined)
 
       // Validate that createAction was called.
       expect(walletMock.createAction).toHaveBeenCalled()

src/overlay-tools/OverlayAdminTokenTemplate.ts

@@ -1,5 +1,5 @@
 import PushDrop from '../script/templates/PushDrop.js'
-import { WalletInterface } from '../wallet/Wallet.interfaces.js'
+import { OriginatorDomainNameStringUnder250Bytes, WalletInterface } from '../wallet/Wallet.interfaces.js'
 import {
   LockingScript,
   ScriptTemplate,
@@ -48,8 +48,8 @@ export default class OverlayAdminTokenTemplate implements ScriptTemplate {
    * Constructs a new Overlay Admin template instance
    * @param wallet Wallet to use for locking and unlocking
    */
-  constructor (wallet: WalletInterface) {
-    this.pushDrop = new PushDrop(wallet)
+  constructor (wallet: WalletInterface, originator?: OriginatorDomainNameStringUnder250Bytes) {
+    this.pushDrop = new PushDrop(wallet, originator)
   }
 
   /**

src/registry/RegistryClient.ts

@@ -3,7 +3,8 @@ import {
   WalletProtocol,
   WalletClient,
   PubKeyHex,
-  SecurityLevel
+  SecurityLevel,
+  OriginatorDomainNameStringUnder250Bytes
 } from '../wallet/index.js'
 import { Utils } from '../primitives/index.js'
 import {
@@ -51,7 +52,8 @@ export class RegistryClient {
 
   constructor (
     private readonly wallet: WalletInterface = new WalletClient(),
-    options: { acceptDelayedBroadcast?: boolean, resolver?: LookupResolver } = {}
+    options: { acceptDelayedBroadcast?: boolean, resolver?: LookupResolver } = {},
+    private readonly originator?: OriginatorDomainNameStringUnder250Bytes
   ) {
     this.acceptDelayedBroadcast = options.acceptDelayedBroadcast ?? false
     this.resolver = options.resolver ?? new LookupResolver()
@@ -91,7 +93,7 @@ export class RegistryClient {
    */
   async registerDefinition (data: DefinitionData): Promise<BroadcastResponse | BroadcastFailure> {
     const registryOperator = await this.getIdentityKey()
-    const pushdrop = new PushDrop(this.wallet)
+    const pushdrop = new PushDrop(this.wallet, this.originator)
 
     // Convert definition data into PushDrop fields
     const fields = this.buildPushDropFields(data, registryOperator)
@@ -117,7 +119,7 @@ export class RegistryClient {
         acceptDelayedBroadcast: this.acceptDelayedBroadcast,
         randomizeOutputs: false
       }
-    })
+    }, this.originator)
     if (tx === undefined) {
       throw new Error(`Failed to create ${data.definitionType} registration transaction!`)
     }
@@ -262,15 +264,15 @@ export class RegistryClient {
         acceptDelayedBroadcast: this.acceptDelayedBroadcast,
         randomizeOutputs: false
       }
-    })
+    }, this.originator)
 
     if (signableTransaction === undefined) {
       throw new Error('Failed to create signable transaction.')
     }
     const partialTx = Transaction.fromAtomicBEEF(signableTransaction.tx)
 
     // Prepare the unlocker
-    const pushdrop = new PushDrop(this.wallet)
+    const pushdrop = new PushDrop(this.wallet, this.originator)
     const unlocker = pushdrop.unlock(
       this.mapDefinitionTypeToWalletProtocol(registryRecord.definitionType),
       REGISTRANT_KEY_ID,
@@ -291,7 +293,7 @@ export class RegistryClient {
       options: {
         acceptDelayedBroadcast: this.acceptDelayedBroadcast
       }
-    })
+    }, this.originator)
 
     if (signedTx === undefined) {
       throw new Error('Failed to finalize the transaction signature.')
@@ -344,7 +346,7 @@ export class RegistryClient {
             ? (registryRecord.name !== undefined ? registryRecord.name : registryRecord.type)
             : 'unknown'
 
-    const pushdrop = new PushDrop(this.wallet)
+    const pushdrop = new PushDrop(this.wallet, this.originator)
 
     // Build the new locking script with updated data
     const fields = this.buildPushDropFields(updatedData, currentIdentityKey)
@@ -374,7 +376,7 @@ export class RegistryClient {
         acceptDelayedBroadcast: this.acceptDelayedBroadcast,
         randomizeOutputs: false
       }
-    })
+    }, this.originator)
 
     if (signableTransaction === undefined) {
       throw new Error('Failed to create signable transaction.')
@@ -403,7 +405,7 @@ export class RegistryClient {
       options: {
         acceptDelayedBroadcast: this.acceptDelayedBroadcast
       }
-    })
+    }, this.originator)
 
     if (signedTx === undefined) {
       throw new Error('Failed to finalize the transaction signature.')

src/registry/__tests/RegistryClient.test.ts

@@ -95,6 +95,7 @@ jest.mock('../../primitives/index.js', () => {
 })
 
 let walletMock: Partial<WalletInterface>
+const TEST_ORIGINATOR = 'test.originator.example'
 
 /**
  * Build minimal valid DefinitionData for each type
@@ -163,7 +164,7 @@ describe('RegistryClient', () => {
       getNetwork: jest.fn().mockResolvedValue({ network: 'main' })
     }
 
-    registryClient = new RegistryClient(walletMock as WalletInterface)
+    registryClient = new RegistryClient(walletMock as WalletInterface, {}, TEST_ORIGINATOR)
 
     // Mock the resolver instance since it's now initialized in constructor
     ; (registryClient as any).resolver = {
@@ -195,7 +196,8 @@ describe('RegistryClient', () => {
               lockingScript: 'mockLockingScriptHex'
             })
           ])
-        })
+        }),
+        TEST_ORIGINATOR
       )
       expect(TopicBroadcaster).toHaveBeenCalledWith(['tm_basketmap'], expect.objectContaining({
         networkPreset: 'main'
@@ -219,7 +221,8 @@ describe('RegistryClient', () => {
               lockingScript: 'mockLockingScriptHex'
             })
           ])
-        })
+        }),
+        TEST_ORIGINATOR
       )
 
       expect(TopicBroadcaster).toHaveBeenCalledWith(['tm_protomap'], expect.objectContaining({
@@ -244,7 +247,8 @@ describe('RegistryClient', () => {
               lockingScript: 'mockLockingScriptHex'
             })
           ])
-        })
+        }),
+        TEST_ORIGINATOR
       )
 
       expect(TopicBroadcaster).toHaveBeenCalledWith(['tm_certmap'], expect.objectContaining({
@@ -445,7 +449,8 @@ describe('RegistryClient', () => {
               inputDescription: 'Removing basket token'
             }
           ]
-        })
+        }),
+        TEST_ORIGINATOR
       )
 
       expect(TopicBroadcaster).toHaveBeenCalledWith(['tm_basketmap'], expect.objectContaining({
@@ -535,7 +540,8 @@ describe('RegistryClient', () => {
               inputDescription: 'Removing protocol token'
             }
           ]
-        })
+        }),
+        TEST_ORIGINATOR
       )
 
       expect(TopicBroadcaster).toHaveBeenCalledWith(['tm_protomap'], expect.objectContaining({
@@ -573,7 +579,8 @@ describe('RegistryClient', () => {
               inputDescription: 'Removing certificate token'
             }
           ]
-        })
+        }),
+        TEST_ORIGINATOR
       )
 
       expect(TopicBroadcaster).toHaveBeenCalledWith(['tm_certmap'], expect.objectContaining({
@@ -604,13 +611,14 @@ describe('RegistryClient', () => {
       expect(walletMock.createAction).toHaveBeenCalledWith(
         expect.objectContaining({
           description: 'Remove certificate item: testCertType'
-        })
+        }),
+        TEST_ORIGINATOR
       )
     })
 
     it('should use acceptDelayedBroadcast setting from constructor', async () => {
       // Create a new client with acceptDelayedBroadcast: true
-      const clientWithDelayedBroadcast = new RegistryClient(walletMock as WalletInterface, { acceptDelayedBroadcast: true })
+      const clientWithDelayedBroadcast = new RegistryClient(walletMock as WalletInterface, { acceptDelayedBroadcast: true }, TEST_ORIGINATOR)
       ; (clientWithDelayedBroadcast as any).resolver = {
         query: jest.fn().mockResolvedValue({ type: 'output-list', outputs: [] })
       }
@@ -622,15 +630,17 @@ describe('RegistryClient', () => {
           options: expect.objectContaining({
             acceptDelayedBroadcast: true
           })
-        })
+        }),
+        TEST_ORIGINATOR
       )
 
       expect(walletMock.signAction).toHaveBeenCalledWith(
         expect.objectContaining({
           options: expect.objectContaining({
             acceptDelayedBroadcast: true
           })
-        })
+        }),
+        TEST_ORIGINATOR
       )
     })
   })