@bsv/wallet-toolbox 2.4.21 → 2.5.0

package/out/src/utility/ScriptTemplateBRC29.d.ts

@@ -1,4 +1,4 @@
-import { HexString, KeyDeriverApi, WalletProtocol, ScriptTemplate, ScriptTemplateUnlock, LockingScript, P2PKH, PrivateKey, Script } from '@bsv/sdk';
+import { HexString, KeyDeriverApi, WalletProtocol, ScriptTemplate, ScriptTemplateUnlock, LockingScript, P2PKH, PrivateKey, PublicKey, Script } from '@bsv/sdk';
 export declare const brc29ProtocolID: WalletProtocol;
 export interface ScriptTemplateParamsBRC29 {
     derivationPrefix?: string;
@@ -16,7 +16,8 @@ export declare class ScriptTemplateBRC29 implements ScriptTemplate {
     getKeyID(): string;
     getKeyDeriver(privKey: PrivateKey | HexString): KeyDeriverApi;
     lock(lockerPrivKey: string, unlockerPubKey: string): LockingScript;
-    unlock(unlockerPrivKey: string, lockerPubKey: string, sourceSatoshis?: number, lockingScript?: Script): ScriptTemplateUnlock;
+    unlock(unlockerPrivKey: PrivateKey | HexString, lockerPubKey: PublicKey | string, sourceSatoshis?: number, lockingScript?: Script): ScriptTemplateUnlock;
+    unlockWithDerivedPrivateKey(derivedPrivateKey: PrivateKey, sourceSatoshis?: number, lockingScript?: Script): ScriptTemplateUnlock;
     /**
      * P2PKH unlock estimateLength is a constant
      */

package/out/src/utility/ScriptTemplateBRC29.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptTemplateBRC29.d.ts","sourceRoot":"","sources":["../../../src/utility/ScriptTemplateBRC29.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,aAAa,EACb,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,UAAU,EACV,MAAM,EAEP,MAAM,UAAU,CAAA;AAGjB,eAAO,MAAM,eAAe,EAAE,cAAoC,CAAA;AAElE,MAAM,WAAW,yBAAyB;IACxC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,aAAa,CAAA;CAC1B;AAED;;;GAGG;AACH,qBAAa,mBAAoB,YAAW,cAAc;IAGpC,MAAM,EAAE,yBAAyB;IAFrD,KAAK,EAAE,KAAK,CAAA;IAEZ,YAAoB,MAAM,EAAE,yBAAyB,EAKpD;IAED,QAAQ,IAAK,MAAM,CAElB;IAED,aAAa,CAAE,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa,CAI7D;IAED,IAAI,CAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,aAAa,CAMlE;IAED,MAAM,CACJ,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,MAAM,GACrB,oBAAoB,CAMtB;IAED;;OAEG;IACH,YAAY,SAAM;CACnB"}
+{"version":3,"file":"ScriptTemplateBRC29.d.ts","sourceRoot":"","sources":["../../../src/utility/ScriptTemplateBRC29.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,aAAa,EACb,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,UAAU,EACV,SAAS,EACT,MAAM,EAEP,MAAM,UAAU,CAAA;AAGjB,eAAO,MAAM,eAAe,EAAE,cAAoC,CAAA;AAElE,MAAM,WAAW,yBAAyB;IACxC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,aAAa,CAAA;CAC1B;AAED;;;GAGG;AACH,qBAAa,mBAAoB,YAAW,cAAc;IAGpC,MAAM,EAAE,yBAAyB;IAFrD,KAAK,EAAE,KAAK,CAAA;IAEZ,YAAoB,MAAM,EAAE,yBAAyB,EAKpD;IAED,QAAQ,IAAK,MAAM,CAElB;IAED,aAAa,CAAE,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa,CAU7D;IAED,IAAI,CAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,aAAa,CAMlE;IAED,MAAM,CACJ,eAAe,EAAE,UAAU,GAAG,SAAS,EACvC,YAAY,EAAE,SAAS,GAAG,MAAM,EAChC,cAAc,CAAC,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,MAAM,GACrB,oBAAoB,CAItB;IAED,2BAA2B,CACzB,iBAAiB,EAAE,UAAU,EAC7B,cAAc,CAAC,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,MAAM,GACrB,oBAAoB,CAEtB;IAED;;OAEG;IACH,YAAY,SAAM;CACnB"}

package/out/src/utility/ScriptTemplateBRC29.js

@@ -21,8 +21,15 @@ class ScriptTemplateBRC29 {
         return `${this.params.derivationPrefix ?? ''} ${this.params.derivationSuffix ?? ''}`;
     }
     getKeyDeriver(privKey) {
-        if (typeof privKey === 'string')
+        if (this.params.keyDeriver?.rootKey === privKey)
+            return this.params.keyDeriver;
+        if (typeof privKey === 'string') {
+            // The wallet signing path supplies its existing root key on every input.
+            // Avoid parsing the same hex key into a BigNumber for each template.
+            if (this.params.keyDeriver?.rootKey.toHex() === privKey)
+                return this.params.keyDeriver;
             privKey = sdk_1.PrivateKey.fromHex(privKey);
+        }
         if (this.params.keyDeriver == null || this.params.keyDeriver.rootKey.toHex() !== privKey.toHex()) {
             return new sdk_1.CachedKeyDeriver(privKey);
         }
@@ -37,10 +44,11 @@ class ScriptTemplateBRC29 {
     }
     unlock(unlockerPrivKey, lockerPubKey, sourceSatoshis, lockingScript) {
         const derivedPrivateKey = this.getKeyDeriver(unlockerPrivKey)
-            .derivePrivateKey(exports.brc29ProtocolID, this.getKeyID(), lockerPubKey)
-            .toHex();
-        const r = this.p2pkh.unlock((0, utilityHelpers_1.asBsvSdkPrivateKey)(derivedPrivateKey), 'all', false, sourceSatoshis, lockingScript);
-        return r;
+            .derivePrivateKey(exports.brc29ProtocolID, this.getKeyID(), lockerPubKey);
+        return this.unlockWithDerivedPrivateKey(derivedPrivateKey, sourceSatoshis, lockingScript);
+    }
+    unlockWithDerivedPrivateKey(derivedPrivateKey, sourceSatoshis, lockingScript) {
+        return this.p2pkh.unlock(derivedPrivateKey, 'all', false, sourceSatoshis, lockingScript);
     }
     /**
      * P2PKH unlock estimateLength is a constant

package/out/src/utility/ScriptTemplateBRC29.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptTemplateBRC29.js","sourceRoot":"","sources":["../../../src/utility/ScriptTemplateBRC29.ts"],"names":[],"mappings":";;;AAAA,kCAWiB;AACjB,qDAAmE;AAEtD,QAAA,eAAe,GAAmB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;AAQlE;;;GAGG;AACH;IAGsB,MAAM;IAF1B,KAAK,CAAO;IAEZ,YAAoB,MAAiC;sBAAjC,MAAM;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,WAAK,EAAE,CAAA;QAExB,IAAA,6BAAY,EAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACrC,IAAA,6BAAY,EAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACvC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAA;IACtF,CAAC;IAED,aAAa,CAAE,OAA+B;QAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,GAAG,gBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YAAC,OAAO,IAAI,sBAAgB,CAAC,OAAO,CAAC,CAAA;QAAC,CAAC;QAC1I,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;IAC/B,CAAC;IAED,IAAI,CAAE,aAAqB,EAAE,cAAsB;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;aAC9C,eAAe,CAAC,QAAA,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,KAAK,CAAC;aACxE,SAAS,EAAE,CAAA;QACd,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAClC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,CACJ,eAAuB,EACvB,YAAoB,EACpB,cAAuB,EACvB,aAAsB;QAEtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;aAC1D,gBAAgB,CAAC,QAAA,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC;aAChE,KAAK,EAAE,CAAA;QACV,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAA,mCAAkB,EAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;QAC/G,OAAO,CAAC,CAAA;IACV,CAAC;IAED;;OAEG;IACH,YAAY,GAAG,GAAG,CAAA;CACnB"}
+{"version":3,"file":"ScriptTemplateBRC29.js","sourceRoot":"","sources":["../../../src/utility/ScriptTemplateBRC29.ts"],"names":[],"mappings":";;;AAAA,kCAYiB;AACjB,qDAA+C;AAElC,QAAA,eAAe,GAAmB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;AAQlE;;;GAGG;AACH;IAGsB,MAAM;IAF1B,KAAK,CAAO;IAEZ,YAAoB,MAAiC;sBAAjC,MAAM;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,WAAK,EAAE,CAAA;QAExB,IAAA,6BAAY,EAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACrC,IAAA,6BAAY,EAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACvC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAA;IACtF,CAAC;IAED,aAAa,CAAE,OAA+B;QAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;QAC9E,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,yEAAyE;YACzE,qEAAqE;YACrE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,OAAO;gBAAE,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;YACtF,OAAO,GAAG,gBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YAAC,OAAO,IAAI,sBAAgB,CAAC,OAAO,CAAC,CAAA;QAAC,CAAC;QAC1I,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;IAC/B,CAAC;IAED,IAAI,CAAE,aAAqB,EAAE,cAAsB;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;aAC9C,eAAe,CAAC,QAAA,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,KAAK,CAAC;aACxE,SAAS,EAAE,CAAA;QACd,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAClC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,CACJ,eAAuC,EACvC,YAAgC,EAChC,cAAuB,EACvB,aAAsB;QAEtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;aAC1D,gBAAgB,CAAC,QAAA,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAA;QACnE,OAAO,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;IAC3F,CAAC;IAED,2BAA2B,CACzB,iBAA6B,EAC7B,cAAuB,EACvB,aAAsB;QAEtB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;IAC1F,CAAC;IAED;;OAEG;IACH,YAAY,GAAG,GAAG,CAAA;CACnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "2.4.21",
+  "version": "2.5.0",
   "sideEffects": false,
   "type": "commonjs",
   "engines": {
@@ -69,7 +69,8 @@
     "ws": "^8.21.1"
   },
   "devDependencies": {
-    "@bsv/sdk": "^2.2.17",
+    "@bsv/sdk": "^2.3.0",
+    "@bsv/verifast": "^0.3.4",
     "@jest/globals": "^30.4.1",
     "@types/body-parser": "^1.19.6",
     "@types/cors": "^2.8.19",
@@ -108,6 +109,8 @@
     "operator:build": "pnpm build && tsc --project operator/tsconfig.json --pretty false",
     "operator": "pnpm operator:build && node .operator-build/cli.js",
     "bench:action-batch": "pnpm build && jest --runInBand --runTestsByPath benchmarks/action-batch.bench.test.ts --testPathIgnorePatterns=man.test.ts",
+    "bench:create-action-funding": "pnpm build && jest --runInBand --runTestsByPath benchmarks/create-action-funding.bench.test.ts --testPathIgnorePatterns=man.test.ts",
+    "bench:create-action-beef": "pnpm build && jest --runInBand --runTestsByPath benchmarks/create-action-beef.bench.test.ts --testPathIgnorePatterns=man.test.ts",
     "format:check": "pnpm --workspace-root exec prettier --check \"packages/wallet/wallet-toolbox/{README.md,jest.config.cjs,package.json,tsconfig*.json}\"",
     "lint": "oxlint src test benchmarks examples operator --deny-warnings",
     "lint:ci": "pnpm lint",