@bsv/sdk 1.6.24 → 1.6.26

package/src/identity/__tests/IdentityClient.test.ts

@@ -29,17 +29,71 @@ jest.mock('../../transaction/index.js', () => {
       fromAtomicBEEF: jest.fn().mockImplementation((tx) => ({
         toHexBEEF: () => 'transactionHex'
       })),
-      fromBEEF: jest.fn()
+      fromBEEF: jest.fn().mockReturnValue({
+        outputs: [{ lockingScript: { toHex: () => 'mockLockingScript' } }]
+      })
     }
   }
 })
 
+jest.mock('../../script', () => {
+  const mockPushDropInstance = {
+    lock: jest.fn().mockResolvedValue({
+      toHex: () => 'lockingScriptHex'
+    }),
+    unlock: jest.fn().mockReturnValue({
+      sign: jest.fn().mockResolvedValue({
+        toHex: () => 'unlockingScriptHex'
+      })
+    })
+  }
+
+  const mockPushDrop: any = jest.fn().mockImplementation(() => mockPushDropInstance)
+  mockPushDrop.decode = jest.fn().mockReturnValue({
+    fields: [new Uint8Array([1, 2, 3, 4])]
+  })
+
+  return {
+    PushDrop: mockPushDrop
+  }
+})
+
+jest.mock('../../primitives/index.js', () => {
+  return {
+    Utils: {
+      toBase64: jest.fn().mockReturnValue('mockKeyID'),
+      toArray: jest.fn().mockReturnValue(new Uint8Array()),
+      toUTF8: jest.fn().mockImplementation((data) => {
+        return new TextDecoder().decode(data)
+      }),
+      toHex: jest.fn().mockReturnValue('0102030405060708')
+    },
+    Random: jest.fn().mockReturnValue(new Uint8Array(32)),
+    PrivateKey: jest.fn().mockImplementation(() => ({
+      toPublicKey: jest.fn().mockReturnValue({
+        toString: jest.fn().mockReturnValue('mockPublicKeyString')
+      })
+    }))
+  }
+})
+
 // ----- Begin Test Suite -----
 describe('IdentityClient', () => {
   let walletMock: Partial<WalletInterface>
   let identityClient: IdentityClient
 
   beforeEach(() => {
+    // Mock localStorage for Node.js environment
+    const localStorageMock = {
+      getItem: jest.fn(),
+      setItem: jest.fn(),
+      removeItem: jest.fn()
+    }
+    Object.defineProperty(global, 'localStorage', {
+      value: localStorageMock,
+      writable: true
+    })
+
     // Create a fake wallet implementing the methods used by IdentityClient.
     walletMock = {
       proveCertificate: jest.fn().mockResolvedValue({ keyringForVerifier: 'fakeKeyring' }),
@@ -55,7 +109,12 @@ describe('IdentityClient', () => {
       signAction: jest.fn().mockResolvedValue({ tx: [4, 5, 6] }),
       getNetwork: jest.fn().mockResolvedValue({ network: 'testnet' }),
       discoverByIdentityKey: jest.fn(),
-      discoverByAttributes: jest.fn()
+      discoverByAttributes: jest.fn(),
+      // ContactsManager specific methods
+      listOutputs: jest.fn().mockResolvedValue({ outputs: [], BEEF: [] }),
+      createHmac: jest.fn().mockResolvedValue({ hmac: new Uint8Array([1, 2, 3, 4]) }),
+      decrypt: jest.fn().mockResolvedValue({ plaintext: new Uint8Array() }),
+      encrypt: jest.fn().mockResolvedValue({ ciphertext: new Uint8Array([5, 6, 7, 8]) })
     }
 
     identityClient = new IdentityClient(walletMock as WalletInterface)
@@ -275,4 +334,303 @@ describe('IdentityClient', () => {
       })
     })
   })
+
+  describe('ContactsManager Integration', () => {
+    const mockContact = {
+      name: 'Alice Smith',
+      identityKey: 'abcdef1234567890abcdef1234567890',
+      avatarURL: 'https://example.com/avatar.jpg',
+      abbreviatedKey: 'abcdef1234...',
+      badgeLabel: 'Verified User',
+      badgeIconURL: 'https://example.com/badge.png',
+      badgeClickURL: 'https://example.com/verify'
+    }
+
+    const mockContactWithMetadata = {
+      ...mockContact,
+      metadata: { notes: 'Met at conference' }
+    }
+
+    beforeEach(() => {
+      // Reset wallet mocks for each test
+      jest.clearAllMocks()
+    })
+
+    describe('saveContact', () => {
+      it('should save a contact without metadata', async () => {
+        // Mock empty contacts list (new contact)
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+
+        await identityClient.saveContact(mockContact)
+
+        // Verify HMAC was created for tagging
+        expect(walletMock.createHmac).toHaveBeenCalledWith({
+          protocolID: [2, 'contact'],
+          keyID: mockContact.identityKey,
+          counterparty: 'self',
+          data: expect.any(Uint8Array)
+        })
+
+        // Verify contact data was encrypted
+        expect(walletMock.encrypt).toHaveBeenCalledWith({
+          plaintext: expect.any(Uint8Array),
+          protocolID: [2, 'contact'],
+          keyID: expect.any(String),
+          counterparty: 'self'
+        })
+
+        // Verify new contact transaction was created
+        expect(walletMock.createAction).toHaveBeenCalledWith(
+          expect.objectContaining({
+            description: 'Add Contact',
+            outputs: expect.arrayContaining([
+              expect.objectContaining({
+                basket: 'contacts',
+                outputDescription: `Contact: ${mockContact.name}`
+              })
+            ])
+          })
+        )
+
+        // Verify contact is now available from cache
+        const contacts = await identityClient.getContacts()
+        expect(contacts).toContainEqual(expect.objectContaining({
+          name: mockContact.name,
+          identityKey: mockContact.identityKey
+        }))
+      })
+
+      it('should save a contact with metadata', async () => {
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+
+        await identityClient.saveContact(mockContact, { notes: 'Met at conference' })
+
+        // Verify contact with metadata is available from cache
+        const contacts = await identityClient.getContacts()
+        expect(contacts).toContainEqual(expect.objectContaining({
+          name: mockContact.name,
+          identityKey: mockContact.identityKey,
+          metadata: { notes: 'Met at conference' }
+        }))
+      })
+
+      it('should update existing contact', async () => {
+        // First save a contact to establish it exists
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValueOnce({
+          outputs: [],
+          BEEF: []
+        })
+        await identityClient.saveContact(mockContact)
+
+        // Now mock finding the existing contact for update
+        const existingOutput = {
+          outpoint: 'txid.0',
+          customInstructions: JSON.stringify({ keyID: 'existingKeyID' })
+        }
+
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValueOnce({
+          outputs: [existingOutput],
+          BEEF: [1, 2, 3]
+        })
+
+        ; (walletMock.decrypt as jest.Mock).mockResolvedValue({
+          plaintext: new TextEncoder().encode(JSON.stringify(mockContact))
+        })
+
+        const updatedContact = { ...mockContact, name: 'Alice Updated' }
+        await identityClient.saveContact(updatedContact)
+
+        // Should create update action since contact exists
+        expect(walletMock.createAction).toHaveBeenLastCalledWith(
+          expect.objectContaining({
+            description: 'Update Contact',
+            inputBEEF: [1, 2, 3],
+            inputs: expect.arrayContaining([
+              expect.objectContaining({
+                outpoint: 'txid.0'
+              })
+            ])
+          })
+        )
+      })
+    })
+
+    describe('getContacts', () => {
+      it('should return cached contacts when available', async () => {
+        // First save a contact to populate cache
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+        await identityClient.saveContact(mockContact)
+
+        // Clear mocks to verify cache is used
+        jest.clearAllMocks()
+
+        // Get contacts should use cache and not call wallet
+        const result = await identityClient.getContacts()
+
+        expect(result).toContainEqual(expect.objectContaining({
+          name: mockContact.name,
+          identityKey: mockContact.identityKey
+        }))
+        expect(walletMock.listOutputs).not.toHaveBeenCalled()
+      })
+
+      it('should load contacts from wallet basket when cache is empty', async () => {
+        const mockOutput = {
+          outpoint: 'txid.0',
+          customInstructions: JSON.stringify({ keyID: 'mockKeyID' })
+        }
+
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [mockOutput],
+          BEEF: [1, 2, 3]
+        })
+
+        ; (walletMock.decrypt as jest.Mock).mockResolvedValue({
+          plaintext: new TextEncoder().encode(JSON.stringify(mockContact))
+        })
+
+        const result = await identityClient.getContacts()
+
+        expect(result).toEqual([mockContact])
+        expect(walletMock.listOutputs).toHaveBeenCalledWith({
+          basket: 'contacts',
+          include: 'entire transactions',
+          includeCustomInstructions: true,
+          tags: []
+        })
+
+        // Verify subsequent call uses cache
+        jest.clearAllMocks()
+        const cachedResult = await identityClient.getContacts()
+        expect(cachedResult).toEqual([mockContact])
+        expect(walletMock.listOutputs).not.toHaveBeenCalled()
+      })
+
+      it('should force refresh when requested', async () => {
+        // First populate cache
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+        await identityClient.saveContact(mockContact)
+
+        // Mock empty result for force refresh
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+
+        const result = await identityClient.getContacts(undefined, true)
+
+        expect(result).toEqual([])
+        expect(walletMock.listOutputs).toHaveBeenCalled()
+      })
+
+      it('should filter by identity key when provided', async () => {
+        // Save two different contacts
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+        await identityClient.saveContact(mockContact)
+        
+        const otherContact = { ...mockContact, identityKey: 'different-key', name: 'Bob' }
+        await identityClient.saveContact(otherContact)
+
+        // Filter by specific identity key
+        const result = await identityClient.getContacts(mockContact.identityKey)
+
+        expect(result).toEqual([expect.objectContaining({
+          name: mockContact.name,
+          identityKey: mockContact.identityKey
+        })])
+        expect(result).toHaveLength(1)
+      })
+
+      it('should throw error on listOutputs failure', async () => {
+        ; (walletMock.listOutputs as jest.Mock).mockRejectedValue(
+          new Error('List outputs error')
+        )
+
+        await expect(
+          identityClient.getContacts(undefined, true)
+        ).rejects.toThrow('List outputs error')
+      })
+    })
+
+    describe('removeContact', () => {
+      it('should remove contact from cache and spend UTXO', async () => {
+        // First save two contacts
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+        await identityClient.saveContact(mockContact)
+        
+        const otherContact = { ...mockContact, identityKey: 'other-key', name: 'Bob' }
+        await identityClient.saveContact(otherContact)
+
+        // Mock finding the contact to remove
+        const mockOutput = {
+          outpoint: 'txid.0',
+          customInstructions: JSON.stringify({ keyID: 'mockKeyID' })
+        }
+
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [mockOutput],
+          BEEF: [1, 2, 3]
+        })
+
+        ; (walletMock.decrypt as jest.Mock).mockResolvedValue({
+          plaintext: new TextEncoder().encode(JSON.stringify(mockContact))
+        })
+
+        await identityClient.removeContact(mockContact.identityKey)
+
+        // Verify delete action was created
+        expect(walletMock.createAction).toHaveBeenLastCalledWith(
+          expect.objectContaining({
+            description: 'Delete Contact',
+            inputBEEF: [1, 2, 3],
+            inputs: expect.arrayContaining([
+              expect.objectContaining({
+                outpoint: 'txid.0'
+              })
+            ]),
+            outputs: [] // No outputs for deletion
+          })
+        )
+
+        // Verify contact is removed from cache
+        const remainingContacts = await identityClient.getContacts()
+        expect(remainingContacts).not.toContainEqual(
+          expect.objectContaining({ identityKey: mockContact.identityKey })
+        )
+      })
+
+      it('should handle contact not found gracefully', async () => {
+        ; (walletMock.listOutputs as jest.Mock).mockResolvedValue({
+          outputs: [],
+          BEEF: []
+        })
+
+        // Should not throw when contact doesn't exist
+        await expect(
+          identityClient.removeContact('non-existent-key')
+        ).resolves.toBeUndefined()
+
+        // Should not call createAction since no contact found
+        expect(walletMock.createAction).not.toHaveBeenCalled()
+      })
+    })
+  })
 })

package/src/transaction/Transaction.ts

@@ -804,6 +804,8 @@ export default class Transaction {
           if (proofValid) {
             verifiedTxids.add(txid)
             continue
+          } else {
+            throw new Error(`Invalid merkle path for transaction ${txid}`)
           }
         }
       }