@bsv/wallet-toolbox 1.2.36 → 1.2.38

package/src/__tests/CWIStyleWalletManager.test.ts

@@ -305,7 +305,7 @@ describe('CWIStyleWalletManager Tests', () => {
 
     test('Throws if no token found by recovery key hash', async () => {
       ;(mockUMPTokenInteractor.findByRecoveryKeyHash as any).mockResolvedValueOnce(undefined)
-      await expect(manager.provideRecoveryKey(recoveryKey)).rejects.toThrow('No user found with this key')
+      await expect(manager.provideRecoveryKey(recoveryKey)).rejects.toThrow('No user found with this recovery key')
     })
   })
 
@@ -349,7 +349,7 @@ describe('CWIStyleWalletManager Tests', () => {
 
     test('Throws error if saving snapshot while no primary key or token set', async () => {
       // Manager is not yet authenticated
-      expect(() => manager.saveSnapshot()).toThrow('No primary key or current UMP token set')
+      expect(() => manager.saveSnapshot()).toThrow('No root primary key or current UMP token set')
     })
 
     test('Throws if snapshot is corrupt or cannot be decrypted', async () => {
@@ -380,7 +380,7 @@ describe('CWIStyleWalletManager Tests', () => {
     })
 
     test('Throws if not authenticated', async () => {
-      await expect(manager.changePassword('test-password')).rejects.toThrow('Not authenticated.')
+      await expect(manager.changePassword('test-password')).rejects.toThrow('Not authenticated or missing required data.')
     })
   })
 
@@ -407,7 +407,7 @@ describe('CWIStyleWalletManager Tests', () => {
     })
 
     test('Throws if not authenticated', async () => {
-      await expect(manager.changeRecoveryKey()).rejects.toThrow('Not authenticated.')
+      await expect(manager.changeRecoveryKey()).rejects.toThrow('Not authenticated or missing required data.')
     })
   })
 
@@ -581,7 +581,7 @@ describe('CWIStyleWalletManager Tests', () => {
 
       // Call the underlying privileged key manager’s decrypt twice.
       // (For example, we use the ciphertext from one of the token’s encrypted fields.)
-      await (manager as any).underlyingPrivilegedKeyManager.decrypt({
+      await (manager as any).rootPrivilegedKeyManager.decrypt({
         ciphertext: (manager as any).currentUMPToken.passwordKeyEncrypted,
         protocolID: [2, 'admin key wrapping'],
         keyID: '1'
@@ -590,7 +590,7 @@ describe('CWIStyleWalletManager Tests', () => {
       // Key expires after 2 minutes
       jest.advanceTimersByTime(121_000)
 
-      await (manager as any).underlyingPrivilegedKeyManager.decrypt({
+      await (manager as any).rootPrivilegedKeyManager.decrypt({
         ciphertext: (manager as any).currentUMPToken.passwordKeyEncrypted,
         protocolID: [2, 'admin key wrapping'],
         keyID: '1'

package/test/Wallet/local/localWallet.man.test.ts

@@ -1,11 +1,7 @@
 import { EntitySyncState, sdk } from '../../../src'
 import { _tu } from '../../utils/TestUtilsWalletStorage'
 import { specOpInvalidChange } from '../../../src/sdk'
-import {
-  createOneSatTestOutput,
-  createSetup,
-  LocalWalletTestOptions,
-} from '../../utils/localWalletMethods'
+import { createOneSatTestOutput, createSetup, LocalWalletTestOptions } from '../../utils/localWalletMethods'
 
 const chain: sdk.Chain = 'test'
 

package/test/Wallet/local/localWallet2.man.test.ts

@@ -201,13 +201,14 @@ describe('localWallet2 tests', () => {
     await storage.destroy()
   })
 
-  test('8 jackie Beef', async () => { 
+  test('8 jackie Beef', async () => {
     const setup = await createSetup(chain, options)
     const beef = Beef.fromBinary(beefJackie)
     console.log(beef.toLogString())
-    const ok = beef.verify(await setup.services.getChainTracker())
+    const ok = await beef.verify(await setup.services.getChainTracker())
     await setup.wallet.destroy()
   })
+
 })
 
 async function createMainReviewSetup(): Promise<{
@@ -232,5 +233,15 @@ async function createMainReviewSetup(): Promise<{
   return { env, storage, services }
 }
 
-  const beefJackie = [
-    1, 1, 1, 1, 196, 222, 98, 76, 119, 112, 138, 49, 125, 79, 3, 8, 17, 96, 88, 134, 18, 94, 233, 6, 43, 58, 55, 200, 53, 21, 225, 58, 243, 130, 114, 64, 2, 0, 190, 239, 0, 1, 0, 1, 0, 0, 0, 1, 157, 193, 59, 124, 10, 214, 21, 108, 182, 51, 203, 122, 124, 52, 230, 65, 248, 166, 3, 136, 224, 45, 213, 116, 91, 81, 101, 168, 142, 252, 196, 20, 110, 0, 0, 0, 107, 72, 48, 69, 2, 33, 0, 144, 86, 132, 240, 56, 253, 101, 20, 254, 1, 184, 144, 98, 236, 225, 242, 239, 88, 99, 196, 58, 33, 141, 79, 234, 140, 7, 22, 254, 140, 65, 83, 2, 32, 113, 198, 86, 176, 19, 16, 165, 168, 5, 227, 70, 44, 5, 22, 144, 179, 172, 170, 13, 148, 3, 236, 35, 2, 74, 238, 235, 84, 148, 192, 102, 138, 65, 33, 3, 15, 101, 106, 207, 42, 192, 187, 51, 59, 128, 27, 240, 244, 240, 4, 224, 230, 41, 166, 89, 216, 46, 7, 24, 242, 180, 20, 90, 12, 57, 59, 144, 255, 255, 255, 255, 2, 136, 19, 0, 0, 0, 0, 0, 0, 25, 118, 169, 20, 240, 178, 178, 204, 51, 126, 211, 251, 43, 177, 154, 94, 189, 29, 53, 41, 220, 136, 142, 80, 136, 172, 208, 140, 0, 0, 0, 0, 0, 0, 25, 118, 169, 20, 217, 48, 110, 108, 236, 100, 116, 90, 181, 114, 45, 176, 198, 216, 150, 134, 16, 251, 10, 177, 136, 172, 0, 0, 0, 0]
+const beefJackie = [
+  1, 1, 1, 1, 196, 222, 98, 76, 119, 112, 138, 49, 125, 79, 3, 8, 17, 96, 88, 134, 18, 94, 233, 6, 43, 58, 55, 200, 53,
+  21, 225, 58, 243, 130, 114, 64, 2, 0, 190, 239, 0, 1, 0, 1, 0, 0, 0, 1, 157, 193, 59, 124, 10, 214, 21, 108, 182, 51,
+  203, 122, 124, 52, 230, 65, 248, 166, 3, 136, 224, 45, 213, 116, 91, 81, 101, 168, 142, 252, 196, 20, 110, 0, 0, 0,
+  107, 72, 48, 69, 2, 33, 0, 144, 86, 132, 240, 56, 253, 101, 20, 254, 1, 184, 144, 98, 236, 225, 242, 239, 88, 99, 196,
+  58, 33, 141, 79, 234, 140, 7, 22, 254, 140, 65, 83, 2, 32, 113, 198, 86, 176, 19, 16, 165, 168, 5, 227, 70, 44, 5, 22,
+  144, 179, 172, 170, 13, 148, 3, 236, 35, 2, 74, 238, 235, 84, 148, 192, 102, 138, 65, 33, 3, 15, 101, 106, 207, 42,
+  192, 187, 51, 59, 128, 27, 240, 244, 240, 4, 224, 230, 41, 166, 89, 216, 46, 7, 24, 242, 180, 20, 90, 12, 57, 59, 144,
+  255, 255, 255, 255, 2, 136, 19, 0, 0, 0, 0, 0, 0, 25, 118, 169, 20, 240, 178, 178, 204, 51, 126, 211, 251, 43, 177,
+  154, 94, 189, 29, 53, 41, 220, 136, 142, 80, 136, 172, 208, 140, 0, 0, 0, 0, 0, 0, 25, 118, 169, 20, 217, 48, 110,
+  108, 236, 100, 116, 90, 181, 114, 45, 176, 198, 216, 150, 134, 16, 251, 10, 177, 136, 172, 0, 0, 0, 0
+]

package/test/Wallet/support/opers1.man.test.ts

@@ -67,7 +67,7 @@ describe('operations1 tests', () => {
     let offset = 2200
     const limit = 100
     let allUnfails: number[] = []
-    for (; ;) {
+    for (;;) {
       let log = ''
       const unfails: number[] = []
       const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset } })
@@ -91,10 +91,10 @@ describe('operations1 tests', () => {
 
   test('7 review and unfail false invalids', async () => {
     const { env, storage, services } = await createMainReviewSetup()
-    let offset = 400
+    let offset = 500
     const limit = 100
     let allUnfails: number[] = []
-    for (; ;) {
+    for (;;) {
       let log = ''
       const unfails: number[] = []
       const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset } })
@@ -128,36 +128,41 @@ describe('operations1 tests', () => {
         and JSON_EXTRACT(f.customInstructions, '$.payee') = '${identityKey}'
         and not exists(select * from outputs as r where r.userId = ${userId} and r.txid = f.txid)
         `)
-      if (outputs.length > 0) 
-        console.log(`userId ${userId} ${identityKey} ${outputs.length} outputs`)
+      if (outputs.length > 0) console.log(`userId ${userId} ${identityKey} ${outputs.length} outputs`)
       for (const output of outputs) {
-        const req = verifyOneOrNone(await storage.findProvenTxReqs({ partial: { txid: output.txid, status: 'completed' } }))
+        const req = verifyOneOrNone(
+          await storage.findProvenTxReqs({ partial: { txid: output.txid, status: 'completed' } })
+        )
         const { type, derivationPrefix, derivationSuffix, payee } = JSON.parse(output.customInstructions!)
         if (req && type === 'BRC29' && derivationPrefix && derivationSuffix) {
           const beef = await storage.getBeefForTransaction(req.txid, {})
           // {"type":"BRC29","derivationPrefix":"LDFooHSsXzw=","derivationSuffix":"4f4ixKv+6SY=","payee":"0352caa755d5b6279e15e47e096db908e7c4a73a31775e7e8720bdd4cf2d44873a"}
-          await storage.internalizeAction({ userId, identityKey: user.identityKey }, {
-            tx: beef.toBinaryAtomic(req.txid),
-            outputs: [{
-              outputIndex: 0,
-              protocol: 'wallet payment',
-              paymentRemittance: {
-                derivationPrefix: derivationPrefix,
-                derivationSuffix: derivationSuffix,
-                senderIdentityKey: user0.identityKey,
-              }
-            }],
-            description: 'Internalizing export funds tx into foreign wallet'
-          })
+          await storage.internalizeAction(
+            { userId, identityKey: user.identityKey },
+            {
+              tx: beef.toBinaryAtomic(req.txid),
+              outputs: [
+                {
+                  outputIndex: 0,
+                  protocol: 'wallet payment',
+                  paymentRemittance: {
+                    derivationPrefix: derivationPrefix,
+                    derivationSuffix: derivationSuffix,
+                    senderIdentityKey: user0.identityKey
+                  }
+                }
+              ],
+              description: 'Internalizing export funds tx into foreign wallet'
+            }
+          )
           console.log('internalize', userId, output.txid)
         }
       }
     }
-      /*
-      */
+    /*
+     */
     await storage.destroy()
   })
-
 })
 
 async function createMainReviewSetup(): Promise<{