@bsv/wallet-toolbox 1.2.42 → 1.2.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.2.42",
+  "version": "1.2.44",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/WalletPermissionsManager.ts

@@ -70,6 +70,9 @@ export interface PermissionToken {
   /** The transaction ID where this token resides. */
   txid: string
 
+  /** The current transaction encapsulating the token. */
+  tx: number[]
+
   /** The output index within that transaction. */
   outputIndex: number
 
@@ -923,15 +926,19 @@ export class WalletPermissionsManager implements WalletInterface {
   }
 
   private async decryptPermissionTokenField(ciphertext: number[]): Promise<number[]> {
-    const { plaintext } = await this.underlying.decrypt(
-      {
-        ciphertext,
-        protocolID: WalletPermissionsManager.PERM_TOKEN_ENCRYPTION_PROTOCOL,
-        keyID: '1'
-      },
-      this.adminOriginator
-    )
-    return plaintext
+    try {
+      const { plaintext } = await this.underlying.decrypt(
+        {
+          ciphertext,
+          protocolID: WalletPermissionsManager.PERM_TOKEN_ENCRYPTION_PROTOCOL,
+          keyID: '1'
+        },
+        this.adminOriginator
+      )
+      return plaintext
+    } catch (e) {
+      return ciphertext
+    }
   }
 
   /**
@@ -1001,14 +1008,15 @@ export class WalletPermissionsManager implements WalletInterface {
           `counterparty ${counterparty}`
         ],
         tagQueryMode: 'all',
-        include: 'locking scripts'
+        include: 'entire transactions'
       },
       this.adminOriginator
     )
 
     for (const out of result.outputs) {
-      const script = LockingScript.fromHex(out.lockingScript!)
-      const dec = PushDrop.decode(script)
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec || !dec.fields || dec.fields.length < 6) continue
       const domainRaw = dec.fields[0]
       const expiryRaw = dec.fields[1]
@@ -1040,9 +1048,10 @@ export class WalletPermissionsManager implements WalletInterface {
         continue
       }
       return {
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         satoshis: out.satoshis,
         originator,
         privileged,
@@ -1066,13 +1075,15 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: BASKET_MAP.basket,
         tags: [`originator ${originator}`, `basket ${basket}`],
         tagQueryMode: 'all',
-        include: 'locking scripts'
+        include: 'entire transactions'
       },
       this.adminOriginator
     )
 
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 3) continue
       const domainRaw = dec.fields[0]
       const expiryRaw = dec.fields[1]
@@ -1085,9 +1096,10 @@ export class WalletPermissionsManager implements WalletInterface {
       if (!includeExpired && this.isTokenExpired(expiryDecoded)) continue
 
       return {
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         satoshis: out.satoshis,
         originator,
         basketName: basketDecoded,
@@ -1111,13 +1123,15 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: BASKET_MAP.certificate,
         tags: [`originator ${originator}`, `privileged ${!!privileged}`, `type ${certType}`, `verifier ${verifier}`],
         tagQueryMode: 'all',
-        include: 'locking scripts'
+        include: 'entire transactions'
       },
       this.adminOriginator
     )
 
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 6) continue
       const [domainRaw, expiryRaw, privRaw, typeRaw, fieldsRaw, verifierRaw] = dec.fields
 
@@ -1147,9 +1161,10 @@ export class WalletPermissionsManager implements WalletInterface {
         continue
       }
       return {
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         satoshis: out.satoshis,
         originator,
         privileged,
@@ -1169,13 +1184,15 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: BASKET_MAP.spending,
         tags: [`originator ${originator}`],
         tagQueryMode: 'all',
-        include: 'locking scripts'
+        include: 'entire transactions'
       },
       this.adminOriginator
     )
 
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 2) continue
       const domainRaw = dec.fields[0]
       const amtRaw = dec.fields[1]
@@ -1186,9 +1203,10 @@ export class WalletPermissionsManager implements WalletInterface {
       const authorizedAmount = parseInt(amtDecodedStr, 10)
 
       return {
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         satoshis: out.satoshis,
         originator,
         authorizedAmount,
@@ -1313,6 +1331,7 @@ export class WalletPermissionsManager implements WalletInterface {
     const { signableTransaction } = await this.createAction(
       {
         description: `Renew ${r.type} permission`,
+        inputBEEF: oldToken.tx,
         inputs: [
           {
             outpoint: oldOutpoint,
@@ -1447,7 +1466,7 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: basketName,
         tags,
         tagQueryMode: 'all',
-        include: 'locking scripts',
+        include: 'entire transactions',
         limit: 100
       },
       this.adminOriginator
@@ -1455,7 +1474,9 @@ export class WalletPermissionsManager implements WalletInterface {
 
     const tokens: PermissionToken[] = []
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 6) continue
       const [domainRaw, expiryRaw, privRaw, secRaw, protoRaw, cptyRaw] = dec.fields
 
@@ -1467,9 +1488,10 @@ export class WalletPermissionsManager implements WalletInterface {
       const cptyDec = Utils.toUTF8(await this.decryptPermissionTokenField(cptyRaw))
 
       tokens.push({
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         satoshis: out.satoshis,
         originator: domainDec,
         expiry: expiryDec,
@@ -1519,7 +1541,7 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: basketName,
         tags,
         tagQueryMode: 'all',
-        include: 'locking scripts',
+        include: 'entire transactions',
         limit: 10000
       },
       this.adminOriginator
@@ -1527,17 +1549,20 @@ export class WalletPermissionsManager implements WalletInterface {
 
     const tokens: PermissionToken[] = []
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 3) continue
       const [domainRaw, expiryRaw, basketRaw] = dec.fields
       const domainDecoded = Utils.toUTF8(await this.decryptPermissionTokenField(domainRaw))
       const expiryDecoded = parseInt(Utils.toUTF8(await this.decryptPermissionTokenField(expiryRaw)), 10)
       const basketDecoded = Utils.toUTF8(await this.decryptPermissionTokenField(basketRaw))
       tokens.push({
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
         satoshis: out.satoshis,
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         originator: domainDecoded,
         basketName: basketDecoded,
         expiry: expiryDecoded
@@ -1577,7 +1602,7 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: basketName,
         tags,
         tagQueryMode: 'all',
-        include: 'locking scripts',
+        include: 'entire transactions',
         limit: 10000
       },
       this.adminOriginator
@@ -1585,17 +1610,20 @@ export class WalletPermissionsManager implements WalletInterface {
 
     const tokens: PermissionToken[] = []
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 2) continue
       const [domainRaw, amtRaw] = dec.fields
       const domainDecoded = Utils.toUTF8(await this.decryptPermissionTokenField(domainRaw))
       const amtDecodedStr = Utils.toUTF8(await this.decryptPermissionTokenField(amtRaw))
       const authorizedAmount = parseInt(amtDecodedStr, 10)
       tokens.push({
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
         satoshis: out.satoshis,
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         originator: domainDecoded,
         authorizedAmount,
         expiry: 0
@@ -1635,7 +1663,7 @@ export class WalletPermissionsManager implements WalletInterface {
         basket: basketName,
         tags,
         tagQueryMode: 'all',
-        include: 'locking scripts',
+        include: 'entire transactions',
         limit: 10000
       },
       this.adminOriginator
@@ -1643,7 +1671,9 @@ export class WalletPermissionsManager implements WalletInterface {
 
     const tokens: PermissionToken[] = []
     for (const out of result.outputs) {
-      const dec = PushDrop.decode(LockingScript.fromHex(out.lockingScript!))
+      const [txid, outputIndexStr] = out.outpoint.split('.')
+      const tx = Transaction.fromBEEF(result.BEEF!, txid)
+      const dec = PushDrop.decode(tx.outputs[Number(outputIndexStr)].lockingScript)
       if (!dec?.fields || dec.fields.length < 6) continue
       const [domainRaw, expiryRaw, privRaw, typeRaw, fieldsRaw, verifierRaw] = dec.fields
       const domainDecoded = Utils.toUTF8(await this.decryptPermissionTokenField(domainRaw))
@@ -1654,10 +1684,11 @@ export class WalletPermissionsManager implements WalletInterface {
       const fieldsJson = await this.decryptPermissionTokenField(fieldsRaw)
       const allFields = JSON.parse(Utils.toUTF8(fieldsJson)) as string[]
       tokens.push({
+        tx: tx.toBEEF(),
         txid: out.outpoint.split('.')[0],
         outputIndex: parseInt(out.outpoint.split('.')[1], 10),
         satoshis: out.satoshis,
-        outputScript: out.lockingScript!,
+        outputScript: tx.outputs[Number(outputIndexStr)].lockingScript.toHex(),
         originator: domainDecoded,
         privileged: privDecoded,
         certType: typeDecoded,
@@ -1705,6 +1736,7 @@ export class WalletPermissionsManager implements WalletInterface {
     const { signableTransaction } = await this.createAction(
       {
         description: `Revoke permission`,
+        inputBEEF: oldToken.tx,
         inputs: [
           {
             outpoint: oldOutpoint,

package/src/__tests/WalletPermissionsManager.checks.test.ts

@@ -186,6 +186,7 @@ describe('WalletPermissionsManager - Permission Checks', () => {
       // Suppose the user already had a token but it’s expired. We mock `findProtocolToken` so that
       // it returns an expired token, forcing a renewal request.
       const expiredToken: PermissionToken = {
+        tx: [],
         txid: 'oldtxid123',
         outputIndex: 0,
         outputScript: 'deadbeef',
@@ -366,7 +367,7 @@ describe('WalletPermissionsManager - Permission Checks', () => {
       expect(underlying.listOutputs).toHaveBeenLastCalledWith(
         {
           basket: 'admin basket-access',
-          include: 'locking scripts',
+          include: 'entire transactions',
           tagQueryMode: 'all',
           tags: ['originator some-user.com', 'basket user-basket']
         },
@@ -470,6 +471,7 @@ describe('WalletPermissionsManager - Permission Checks', () => {
 
       // Suppose we find an existing token that covers fields: ['name', 'dob', 'nationality']
       const existingToken: PermissionToken = {
+        tx: [],
         txid: 'aabbcc',
         outputIndex: 0,
         outputScript: 'scriptHex',
@@ -541,6 +543,7 @@ describe('WalletPermissionsManager - Permission Checks', () => {
 
       // Mock an expired token
       const expiredCertToken: PermissionToken = {
+        tx: [],
         txid: 'old-expired',
         outputIndex: 0,
         outputScript: 'deadbeef',
@@ -666,6 +669,7 @@ describe('WalletPermissionsManager - Permission Checks', () => {
       // Suppose we find an existing DSAP token with authorizedAmount=500
       // manager.findSpendingToken() is used internally, so let's mock it
       const existingSpendingToken: PermissionToken = {
+        tx: [],
         txid: 'dsap-old',
         outputIndex: 0,
         outputScript: 'scriptHex',
@@ -711,6 +715,7 @@ describe('WalletPermissionsManager - Permission Checks', () => {
 
       // existing DSAP token with authorizedAmount=1000
       const dsapToken: PermissionToken = {
+        tx: [],
         txid: 'dsap123',
         outputIndex: 0,
         outputScript: '9218',

package/src/__tests/WalletPermissionsManager.encryption.test.ts

@@ -1,4 +1,4 @@
-import { mockUnderlyingWallet, MockedBSV_SDK } from './WalletPermissionsManager.fixtures'
+import { mockUnderlyingWallet, MockedBSV_SDK, MockTransaction } from './WalletPermissionsManager.fixtures'
 import { WalletPermissionsManager } from '../WalletPermissionsManager'
 import { jest } from '@jest/globals'
 import { Utils } from '@bsv/sdk'
@@ -282,6 +282,22 @@ describe('WalletPermissionsManager - Metadata Encryption & Decryption', () => {
 
   describe('Integration Test for listOutputs decryption', () => {
     it('should decrypt customInstructions in listOutputs if encryptWalletMetadata=true', async () => {
+      jest.spyOn(MockedBSV_SDK.Transaction, 'fromBEEF').mockImplementation(() => {
+        const mockTx = new MockTransaction()
+        // Add outputs with lockingScript
+        mockTx.outputs = [
+          {
+            lockingScript: {
+              // Ensure this matches what PushDrop.decode expects to work with
+              toHex: () => 'some script'
+            }
+          }
+        ]
+        // Add the toBEEF method
+        mockTx.toBEEF = () => []
+        return mockTx
+      })
+
       const manager = new WalletPermissionsManager(underlying, 'admin.domain.com', {
         encryptWalletMetadata: true
       })
@@ -332,6 +348,31 @@ describe('WalletPermissionsManager - Metadata Encryption & Decryption', () => {
     })
 
     it('should fallback to the original ciphertext if decrypt fails in listOutputs', async () => {
+      jest.spyOn(MockedBSV_SDK.Transaction, 'fromBEEF').mockImplementation(() => {
+        const mockTx = new MockTransaction()
+        // Add outputs with lockingScript
+        mockTx.outputs = [
+          {
+            lockingScript: {
+              // Ensure this matches what PushDrop.decode expects to work with
+              toHex: () => 'some script'
+            }
+          }
+        ]
+        // Add the toBEEF method
+        mockTx.toBEEF = () => []
+        return mockTx
+      })
+      // Add this to your test alongside the Transaction.fromBEEF mock
+      jest.spyOn(MockedBSV_SDK.PushDrop, 'decode').mockReturnValue({
+        fields: [
+          // Values that will decrypt to the expected values for domain, expiry, and basket
+          Utils.toArray('encoded-domain'),
+          Utils.toArray('encoded-expiry'),
+          Utils.toArray('encoded-basket')
+        ]
+      })
+
       const manager = new WalletPermissionsManager(underlying, 'admin.domain.com', {
         encryptWalletMetadata: true
       })
@@ -342,7 +383,7 @@ describe('WalletPermissionsManager - Metadata Encryption & Decryption', () => {
         totalOutputs: 1,
         outputs: [
           {
-            outpoint: 'fakeTxid.1',
+            outpoint: 'fakeTxid.0',
             satoshis: 500,
             lockingScript: 'OP_RETURN something',
             basket: 'some-basket',

package/src/__tests/WalletPermissionsManager.fixtures.ts

@@ -33,6 +33,11 @@ export class MockTransaction {
   getFee(): number {
     return this.fee
   }
+
+  toBEEF(): number[] {
+    // Return an empty array for the BEEF representation
+    return []
+  }
 }
 
 ;(MockTransaction as any).fromAtomicBEEF = jest.fn(() => {
@@ -256,7 +261,7 @@ export function mockUnderlyingWallet(): jest.Mocked<any> {
       subject: '02aaaaaaaaaa...',
       serialNumber: 'serial123',
       certifier: '02ccccccccccc...',
-      revocationOutpoint: 'some.txid.1',
+      revocationOutpoint: 'sometxid.1',
       signature: 'deadbeef',
       fields: { name: 'Alice', dob: '1990-01-01' }
     }),

package/src/__tests/WalletPermissionsManager.flows.test.ts

@@ -339,6 +339,7 @@ describe('WalletPermissionsManager - Permission Request Flow & Active Requests',
         }
         // second time => pretend we found a valid token
         const mockToken: PermissionToken = {
+          tx: [],
           txid: 'abcdef',
           outputIndex: 0,
           outputScript: '00',
@@ -400,6 +401,7 @@ describe('WalletPermissionsManager - Permission Request Flow & Active Requests',
 
       // We'll mock findProtocolToken to return an expired token
       const expiredToken: PermissionToken = {
+        tx: [],
         txid: 'expiredTxid123',
         outputIndex: 0,
         outputScript: '76a914xxxx...88ac',

package/src/__tests/WalletPermissionsManager.proxying.test.ts

@@ -362,11 +362,25 @@ describe('WalletPermissionsManager - Regression & Integration with Underlying Wa
    * ----------------------------------------------------------------------- */
 
   it('should ensure basket listing permission then call listOutputs, decrypting customInstructions', async () => {
+    jest.spyOn(MockedBSV_SDK.Transaction, 'fromBEEF').mockImplementation(() => {
+      const mockTx = new MockTransaction()
+      // Add outputs with lockingScript
+      mockTx.outputs = [
+        {
+          lockingScript: {
+            // Ensure this matches what PushDrop.decode expects to work with
+            toHex: () => 'mockLockingScriptHex'
+          }
+        }
+      ]
+      return mockTx
+    })
+
     underlying.listOutputs.mockResolvedValue({
       totalOutputs: 1,
       outputs: [
         {
-          outpoint: 'zzz.1',
+          outpoint: 'zzz.0',
           satoshis: 100,
           lockingScript: 'mockscript',
           customInstructions: 'EncryptedWeird'
@@ -381,7 +395,7 @@ describe('WalletPermissionsManager - Regression & Integration with Underlying Wa
       [
         {
           basket: 'admin basket-access',
-          include: 'locking scripts',
+          include: 'entire transactions',
           tagQueryMode: 'all',
           tags: ['originator app.example.com', 'basket user-basket']
         },

package/src/__tests/WalletPermissionsManager.tokens.test.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, beforeEach, afterEach, jest } from '@jest/globals'
-import { mockUnderlyingWallet, MockedBSV_SDK } from './WalletPermissionsManager.fixtures'
+import { mockUnderlyingWallet, MockedBSV_SDK, MockTransaction } from './WalletPermissionsManager.fixtures'
 import { WalletPermissionsManager, PermissionRequest, PermissionToken } from '../WalletPermissionsManager'
+import { Utils } from '@bsv/sdk'
 
 // Re-mock @bsv/sdk with our fixture classes (MockTransaction, MockLockingScript, etc.)
 jest.mock('@bsv/sdk', () => MockedBSV_SDK)
@@ -340,6 +341,7 @@ describe('WalletPermissionsManager - On-Chain Token Creation, Renewal & Revocati
     it('should spend the old token input and create a new protocol token output with updated expiry', async () => {
       // Suppose the user has an old protocol token:
       const oldToken: PermissionToken = {
+        tx: [],
         txid: 'oldTokenTX',
         outputIndex: 2,
         outputScript: '76a914...ac', // not used by the mock
@@ -399,6 +401,7 @@ describe('WalletPermissionsManager - On-Chain Token Creation, Renewal & Revocati
 
     it('should allow updating the authorizedAmount in DSAP renewal', async () => {
       const oldToken: PermissionToken = {
+        tx: [],
         txid: 'dsap-old-tx',
         outputIndex: 0,
         outputScript: 'sample script',
@@ -462,6 +465,7 @@ describe('WalletPermissionsManager - On-Chain Token Creation, Renewal & Revocati
     it('should create a transaction that consumes (spends) the old token with no new outputs', async () => {
       // A sample old token
       const oldToken: PermissionToken = {
+        tx: [],
         txid: 'revocableToken.txid',
         outputIndex: 1,
         outputScript: 'fakePushdropScript',
@@ -498,8 +502,43 @@ describe('WalletPermissionsManager - On-Chain Token Creation, Renewal & Revocati
     })
 
     it('should remove the old token from listing after revocation', async () => {
+      jest.spyOn(MockedBSV_SDK.Transaction, 'fromBEEF').mockImplementation(() => {
+        const mockTx = new MockTransaction()
+        // Add outputs with lockingScript
+        mockTx.outputs = [
+          {
+            lockingScript: {
+              // Ensure this matches what PushDrop.decode expects to work with
+              toHex: () => 'some script'
+            }
+          }
+        ]
+        // Add the toBEEF method
+        mockTx.toBEEF = () => []
+        return mockTx
+      })
+      // Add this to your test alongside the Transaction.fromBEEF mock
+      jest.spyOn(MockedBSV_SDK.PushDrop, 'decode').mockReturnValue({
+        fields: [
+          // Values that will decrypt to the expected values for domain, expiry, and basket
+          Utils.toArray('encoded-domain'),
+          Utils.toArray('encoded-expiry'),
+          Utils.toArray('encoded-basket')
+        ]
+      })
+
+      // You'll also need to mock the decryptPermissionTokenField method
+      // to handle these encoded values
+      jest.spyOn(manager as any, 'decryptPermissionTokenField').mockImplementation(field => {
+        if (field === 'encoded-domain') return new Uint8Array([...Buffer.from('example.com')])
+        if (field === 'encoded-expiry') return new Uint8Array([...Buffer.from('1735689600')])
+        if (field === 'encoded-basket') return new Uint8Array([...Buffer.from('protocol-permission')])
+        return new Uint8Array()
+      })
+
       // 1) Setup the underlying wallet to initially return the old token in listOutputs
       const oldToken: PermissionToken = {
+        tx: [],
         txid: 'aaaa1111',
         outputIndex: 0,
         outputScript: 'some script',

package/src/services/createDefaultWalletServicesOptions.ts

@@ -43,6 +43,6 @@ export function createDefaultWalletServicesOptions(chain: sdk.Chain): sdk.Wallet
 }
 
 export function arcDefaultUrl(chain: sdk.Chain): string {
-  const url = chain === 'main' ? 'https://api.taal.com/arc' : 'https://arc-test.taal.com'
+  const url = chain === 'main' ? 'https://arc.taal.com' : 'https://arc-test.taal.com'
   return url
 }

package/out/src/services/__tests/ARC.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ARC.test.d.ts.map

package/out/src/services/__tests/ARC.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ARC.test.d.ts","sourceRoot":"","sources":["../../../../src/services/__tests/ARC.test.ts"],"names":[],"mappings":""}

package/out/src/services/__tests/ARC.test.js.map

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