@bsv/wallet-toolbox 1.6.21 → 1.6.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.6.21",
+  "version": "1.6.23",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -22,8 +22,9 @@
     "test:coverage": "npm run build && jest --testPathIgnorePatterns=man.test.ts --coverage",
     "lint": "prettier --write 'src/**/*.ts' --write 'test/**/*.ts' --log-level silent",
     "build": "tsc --build",
-    "prepublish": "npm run lint && npm run build && npm run doc",
-    "doc": "ts2md"
+    "prepublish": "npm run lint && npm run build && npm run doc && npm run sync-versions",
+    "doc": "ts2md",
+    "sync-versions": "node syncVersions.js"
   },
   "bugs": {
     "url": "https://github.com/bsv-blockchain/wallet-toolbox/issues"

package/src/CWIStyleWalletManager.ts

@@ -61,7 +61,9 @@ import {
   Transaction,
   PushDrop,
   CreateActionInput,
-  SHIPBroadcaster
+  SHIPBroadcaster,
+  BigNumber,
+  Curve
 } from '@bsv/sdk'
 import { PrivilegedKeyManager } from './sdk/PrivilegedKeyManager'
 
@@ -1065,7 +1067,13 @@ export class CWIStyleWalletManager implements WalletInterface {
    * Lists all available profiles, including the default profile.
    * @returns Array of profile info objects, including an 'active' flag.
    */
-  listProfiles(): Array<{ id: number[]; name: string; createdAt: number | null; active: boolean }> {
+  listProfiles(): Array<{
+    id: number[]
+    name: string
+    createdAt: number | null
+    active: boolean
+    identityKey: string
+  }> {
     if (!this.authenticated) {
       throw new Error('Not authenticated.')
     }
@@ -1075,14 +1083,16 @@ export class CWIStyleWalletManager implements WalletInterface {
         id: DEFAULT_PROFILE_ID,
         name: 'default',
         createdAt: null, // Default profile doesn't have a creation timestamp in the same way
-        active: this.activeProfileId.every(x => x === 0)
+        active: this.activeProfileId.every(x => x === 0),
+        identityKey: new PrivateKey(this.rootPrimaryKey).toPublicKey().toString()
       },
       // Other profiles
       ...this.profiles.map(p => ({
         id: p.id,
         name: p.name,
         createdAt: p.createdAt,
-        active: this.activeProfileId.every((x, i) => x === p.id[i])
+        active: this.activeProfileId.every((x, i) => x === p.id[i]),
+        identityKey: new PrivateKey(this.XOR(this.rootPrimaryKey as number[], p.primaryPad)).toPublicKey().toString()
       }))
     ]
     return profileList

package/src/signer/methods/buildSignableTransaction.ts

@@ -5,7 +5,7 @@ import {
   StorageCreateTransactionSdkInput,
   StorageCreateTransactionSdkOutput
 } from '../../sdk/WalletStorage.interfaces'
-import { ValidCreateActionArgs, ValidCreateActionInput } from '../../sdk/validationHelpers'
+import { validateSatoshis, ValidCreateActionArgs, ValidCreateActionInput } from '../../sdk/validationHelpers'
 import { WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 import { asBsvSdkScript, verifyTruthy } from '../../utility/utilityHelpers'
 import { KeyPair } from '../../sdk/types'
@@ -143,7 +143,7 @@ export function buildSignableTransaction(
         sequence: 0xffffffff
       }
       tx.addInput(inputToAdd)
-      totalChangeInputs += verifyTruthy(storageInput.sourceSatoshis)
+      totalChangeInputs += validateSatoshis(storageInput.sourceSatoshis, 'storageInput.sourceSatoshis')
     }
   }
 

package/src/storage/methods/createAction.ts

@@ -27,7 +27,12 @@ import {
   StorageGetBeefOptions,
   StorageProvidedBy
 } from '../../sdk/WalletStorage.interfaces'
-import { ValidCreateActionArgs, ValidCreateActionInput, ValidCreateActionOutput } from '../../sdk/validationHelpers'
+import {
+  ValidCreateActionArgs,
+  ValidCreateActionInput,
+  ValidCreateActionOutput,
+  validateSatoshis
+} from '../../sdk/validationHelpers'
 import { WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 import {
   randomBytesBase64,
@@ -417,7 +422,7 @@ async function createNewOutputs(
 
     const ro: StorageCreateTransactionSdkOutput = {
       vout: verifyInteger(o.vout),
-      satoshis: verifyTruthy(o.satoshis),
+      satoshis: validateSatoshis(o.satoshis, 'o.satoshis'),
       lockingScript: !o.lockingScript ? '' : asString(o.lockingScript),
       providedBy: verifyTruthy(o.providedBy) as StorageProvidedBy,
       purpose: o.purpose || undefined,
@@ -630,7 +635,7 @@ async function validateRequiredInputs(
       if (!disableDoubleSpendCheckForTest && !output.spendable && !vargs.isNoSend)
         throw new WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'spendable output unless noSend is true')
       // input is spending an existing user output which has an lockingScript
-      input.satoshis = verifyNumber(output.satoshis)
+      input.satoshis = validateSatoshis(output.satoshis, 'output.satoshis')
       input.lockingScript = Script.fromBinary(asArray(output.lockingScript!))
     } else {
       let btx = beef.findTxid(txid)!
@@ -644,7 +649,7 @@ async function validateRequiredInputs(
       // btx is valid has parsed transaction data.
       if (vout >= btx.tx!.outputs.length) throw new WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'valid outpoint')
       const so = btx.tx!.outputs[vout]
-      input.satoshis = verifyTruthy(so.satoshis)
+      input.satoshis = validateSatoshis(so.satoshis, 'so.satoshis')
       input.lockingScript = so.lockingScript
     }
   }

package/syncVersions.js

@@ -0,0 +1,71 @@
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+/**
+ * Synchronizes version numbers from root package.json to mobile and client package.json files
+ * and updates package-lock.json files by running npm install
+ */
+function syncVersions() {
+  try {
+    // Read the root package.json
+    const rootPackagePath = path.join(__dirname, 'package.json');
+    const rootPackage = JSON.parse(fs.readFileSync(rootPackagePath, 'utf8'));
+    const version = rootPackage.version;
+
+    console.log(`Root package version: ${version}`);
+
+    // Directories to update
+    const directoriesToUpdate = [
+      { packagePath: './mobile/package.json', dir: './mobile' },
+      { packagePath: './client/package.json', dir: './client' }
+    ];
+
+    // Update each package.json file and run npm install
+    directoriesToUpdate.forEach(({ packagePath, dir }) => {
+      const fullPath = path.join(__dirname, packagePath);
+      const fullDirPath = path.join(__dirname, dir);
+      
+      if (fs.existsSync(fullPath)) {
+        const packageData = JSON.parse(fs.readFileSync(fullPath, 'utf8'));
+        const oldVersion = packageData.version;
+        
+        packageData.version = version;
+        fs.writeFileSync(fullPath, JSON.stringify(packageData, null, 2) + '\n');
+        
+        console.log(`Updated ${packagePath}: ${oldVersion} → ${version}`);
+        
+        // Run npm install to update package-lock.json
+        if (fs.existsSync(fullDirPath)) {
+          console.log(`Running npm install in ${dir}...`);
+          try {
+            execSync('npm install', { 
+              cwd: fullDirPath, 
+              stdio: 'inherit',
+              timeout: 60000 // 60 second timeout
+            });
+            console.log(`✓ npm install completed in ${dir}`);
+          } catch (installError) {
+            console.error(`✗ npm install failed in ${dir}:`, installError.message);
+          }
+        } else {
+          console.warn(`Warning: Directory ${dir} not found`);
+        }
+      } else {
+        console.warn(`Warning: ${packagePath} not found`);
+      }
+    });
+
+    console.log('Version synchronization completed successfully!');
+  } catch (error) {
+    console.error('Error synchronizing versions:', error.message);
+    process.exit(1);
+  }
+}
+
+// Run the function if this script is executed directly
+if (require.main === module) {
+  syncVersions();
+}
+
+module.exports = syncVersions;