@bsv/wallet-toolbox 1.2.44 → 1.2.46

package/package.json

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

package/src/CWIStyleWalletManager.ts

@@ -360,7 +360,11 @@ export class OverlayUMPTokenInteractor implements UMPTokenInteractor {
         description: oldTokenToConsume ? 'Renew UMP token (consume old, create new)' : 'Create new UMP token',
         inputs,
         outputs,
-        inputBEEF: inputToken?.beef
+        inputBEEF: inputToken?.beef,
+        options: {
+          randomizeOutputs: false,
+          acceptDelayedBroadcast: false
+        }
       },
       adminOriginator
     )
@@ -1040,7 +1044,7 @@ export class CWIStyleWalletManager implements WalletInterface {
       await this.getFactor('presentationKey'),
       await this.getFactor('recoveryKey'),
       this.rootPrimaryKey,
-      await this.getFactor('privilegedKey', true), // Get ROOT privileged key
+      await this.getFactor('privilegedKey'), // Get ROOT privileged key
       this.profiles // Pass the updated profile list
     )
 
@@ -1082,7 +1086,7 @@ export class CWIStyleWalletManager implements WalletInterface {
       await this.getFactor('presentationKey'),
       await this.getFactor('recoveryKey'),
       this.rootPrimaryKey,
-      await this.getFactor('privilegedKey', true), // Get ROOT privileged key
+      await this.getFactor('privilegedKey'), // Get ROOT privileged key
       this.profiles // Pass updated list
     )
   }
@@ -1161,7 +1165,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     // Decrypt existing factors needed for re-encryption, using the *root* privileged key manager
     const recoveryKey = await this.getFactor('recoveryKey')
     const presentationKey = await this.getFactor('presentationKey')
-    const rootPrivilegedKey = await this.getFactor('privilegedKey', true) // Get ROOT privileged key
+    const rootPrivilegedKey = await this.getFactor('privilegedKey') // Get ROOT privileged key
 
     await this.updateAuthFactors(
       passwordSalt,
@@ -1195,7 +1199,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     // Decrypt existing factors needed
     const passwordKey = await this.getFactor('passwordKey')
     const presentationKey = await this.getFactor('presentationKey')
-    const rootPrivilegedKey = await this.getFactor('privilegedKey', true) // Get ROOT privileged key
+    const rootPrivilegedKey = await this.getFactor('privilegedKey') // Get ROOT privileged key
 
     // Generate and save new recovery key
     const newRecoveryKey = Random(32)
@@ -1226,7 +1230,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     // Decrypt existing factors
     const recoveryKey = await this.getFactor('recoveryKey')
     const passwordKey = await this.getFactor('passwordKey')
-    const rootPrivilegedKey = await this.getFactor('privilegedKey', true) // Get ROOT privileged key
+    const rootPrivilegedKey = await this.getFactor('privilegedKey') // Get ROOT privileged key
 
     await this.updateAuthFactors(
       this.currentUMPToken.passwordSalt,
@@ -1268,8 +1272,7 @@ export class CWIStyleWalletManager implements WalletInterface {
    * @returns The decrypted key bytes.
    */
   private async getFactor(
-    factorName: 'passwordKey' | 'presentationKey' | 'recoveryKey' | 'privilegedKey',
-    getRoot: boolean = false
+    factorName: 'passwordKey' | 'presentationKey' | 'recoveryKey' | 'privilegedKey'
   ): Promise<number[]> {
     if (!this.authenticated || !this.currentUMPToken || !this.rootPrivilegedKeyManager) {
       throw new Error(`Cannot get factor "${factorName}": Wallet not ready.`)
@@ -1356,13 +1359,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     if (profiles && profiles.length > 0) {
       const profilesJson = JSON.stringify(profiles)
       const profilesBytes = Utils.toArray(profilesJson, 'utf8')
-      profilesEncrypted = (
-        await tempRootPrivilegedKeyManager.encrypt({
-          plaintext: profilesBytes,
-          protocolID: [2, 'admin profile wrapping'], // Separate protocol for profiles
-          keyID: '1'
-        })
-      ).ciphertext
+      profilesEncrypted = new SymmetricKey(rootPrimaryKey).encrypt(profilesBytes) as number[]
     }
 
     // Construct the new UMP token data
@@ -1405,7 +1402,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     const currentActiveId = this.activeProfileId
     let walletToUse: WalletInterface | undefined = this.underlying
 
-    if (currentActiveId.every(x => x === 0)) {
+    if (!currentActiveId.every(x => x === 0)) {
       console.log('Temporarily switching to default profile to update UMP token...')
       await this.switchProfile(DEFAULT_PROFILE_ID) // This rebuilds this.underlying
       walletToUse = this.underlying
@@ -1418,7 +1415,7 @@ export class CWIStyleWalletManager implements WalletInterface {
     // Publish the new token on-chain, consuming the old one
     try {
       newTokenData.currentOutpoint = await this.UMPTokenInteractor.buildAndSend(
-        walletToUse, // Use the (potentially temporarily activated) default profile wallet
+        walletToUse,
         this.adminOriginator,
         newTokenData,
         oldTokenToConsume // Consume the previous token
@@ -1614,13 +1611,9 @@ export class CWIStyleWalletManager implements WalletInterface {
     this.profiles = [] // Clear existing profiles before loading
     if (this.currentUMPToken.profilesEncrypted && this.currentUMPToken.profilesEncrypted.length > 0) {
       try {
-        const decryptedProfileBytes = (
-          await this.rootPrivilegedKeyManager.decrypt({
-            ciphertext: this.currentUMPToken.profilesEncrypted,
-            protocolID: [2, 'admin profile wrapping'], // Use profile protocol ID
-            keyID: '1'
-          })
-        ).plaintext
+        const decryptedProfileBytes = new SymmetricKey(rootPrimaryKey).decrypt(
+          this.currentUMPToken.profilesEncrypted
+        ) as number[]
         const profilesJson = Utils.toUTF8(decryptedProfileBytes)
         this.profiles = JSON.parse(profilesJson) as Profile[]
       } catch (error) {

package/src/WalletPermissionsManager.ts

@@ -1289,7 +1289,10 @@ export class WalletPermissionsManager implements WalletInterface {
             basket: basketName,
             tags
           }
-        ]
+        ],
+        options: {
+          acceptDelayedBroadcast: false
+        }
       },
       this.adminOriginator
     )
@@ -1347,7 +1350,10 @@ export class WalletPermissionsManager implements WalletInterface {
             basket: BASKET_MAP[r.type],
             tags
           }
-        ]
+        ],
+        options: {
+          acceptDelayedBroadcast: false
+        }
       },
       this.adminOriginator
     )
@@ -1743,7 +1749,10 @@ export class WalletPermissionsManager implements WalletInterface {
             unlockingScriptLength: 73, // length of signature
             inputDescription: `Consume old permission token`
           }
-        ]
+        ],
+        options: {
+          acceptDelayedBroadcast: false
+        }
       },
       this.adminOriginator
     )