@bsv/wallet-toolbox 1.5.21 → 1.6.2

package/out/src/signer/methods/completeSignedTransaction.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.completeSignedTransaction = completeSignedTransaction;
 exports.verifyUnlockScripts = verifyUnlockScripts;
 const sdk_1 = require("@bsv/sdk");
-const index_client_1 = require("../../index.client");
-const sdk_2 = require("../../sdk");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
+const utilityHelpers_1 = require("../../utility/utilityHelpers");
+const ScriptTemplateBRC29_1 = require("../../utility/ScriptTemplateBRC29");
+const WalletError_1 = require("../../sdk/WalletError");
 async function completeSignedTransaction(prior, spends, wallet) {
     /////////////////////
     // Insert the user provided unlocking scripts from "spends" arg
@@ -14,10 +16,10 @@ async function completeSignedTransaction(prior, spends, wallet) {
         const createInput = prior.args.inputs[vin];
         const input = prior.tx.inputs[vin];
         if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend does not correspond to prior input with valid unlockingScriptLength.`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', `spend does not correspond to prior input with valid unlockingScriptLength.`);
         if (spend.unlockingScript.length / 2 > createInput.unlockingScriptLength)
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`);
-        input.unlockingScript = (0, index_client_1.asBsvSdkScript)(spend.unlockingScript);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`);
+        input.unlockingScript = (0, utilityHelpers_1.asBsvSdkScript)(spend.unlockingScript);
         if (spend.sequenceNumber !== undefined)
             input.sequence = spend.sequenceNumber;
     }
@@ -28,7 +30,7 @@ async function completeSignedTransaction(prior, spends, wallet) {
     // Insert SABPPP unlock templates for wallet signed inputs
     /////////////////////
     for (const pdi of prior.pdi) {
-        const sabppp = new index_client_1.ScriptTemplateBRC29({
+        const sabppp = new ScriptTemplateBRC29_1.ScriptTemplateBRC29({
             derivationPrefix: pdi.derivationPrefix,
             derivationSuffix: pdi.derivationSuffix,
             keyDeriver: wallet.keyDeriver
@@ -37,7 +39,7 @@ async function completeSignedTransaction(prior, spends, wallet) {
         const lockerPrivKey = keys.privateKey;
         const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey;
         const sourceSatoshis = pdi.sourceSatoshis;
-        const lockingScript = (0, index_client_1.asBsvSdkScript)(pdi.lockingScript);
+        const lockingScript = (0, utilityHelpers_1.asBsvSdkScript)(pdi.lockingScript);
         const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript);
         const input = prior.tx.inputs[pdi.vin];
         input.unlockingScriptTemplate = unlockTemplate;
@@ -57,13 +59,13 @@ function verifyUnlockScripts(txid, beef) {
     var _a, _b, _c, _d;
     const tx = (_a = beef.findTxid(txid)) === null || _a === void 0 ? void 0 : _a.tx;
     if (!tx)
-        throw new sdk_2.WERR_INVALID_PARAMETER(`txid`, `contained in beef, txid ${txid}`);
+        throw new WERR_errors_1.WERR_INVALID_PARAMETER(`txid`, `contained in beef, txid ${txid}`);
     for (let i = 0; i < tx.inputs.length; i++) {
         const input = tx.inputs[i];
         if (!input.sourceTXID)
-            throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].sourceTXID`, `valid`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${i}].sourceTXID`, `valid`);
         if (!input.unlockingScript)
-            throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].unlockingScript`, `valid`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${i}].unlockingScript`, `valid`);
         input.sourceTransaction = (_b = beef.findTxid(input.sourceTXID)) === null || _b === void 0 ? void 0 : _b.tx;
         if (!input.sourceTransaction) {
             // The beef doesn't contain all the source transactions only if advanced features
@@ -93,11 +95,11 @@ function verifyUnlockScripts(txid, beef) {
         try {
             const spendValid = spend.validate();
             if (!spendValid)
-                throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid`);
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid`);
         }
         catch (eu) {
-            const e = sdk_2.WalletError.fromUnknown(eu);
-            throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid. ${e.message}`);
+            const e = WalletError_1.WalletError.fromUnknown(eu);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid. ${e.message}`);
         }
     }
 }

package/out/src/signer/methods/completeSignedTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"completeSignedTransaction.js","sourceRoot":"","sources":["../../../../src/signer/methods/completeSignedTransaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"completeSignedTransaction.js","sourceRoot":"","sources":["../../../../src/signer/methods/completeSignedTransaction.ts"],"names":[],"mappings":";;AAOA,8DAuDC;AAOD,kDA+CC;AApHD,kCAAsF;AAEtF,uDAA8D;AAC9D,iEAA6D;AAC7D,2EAAuE;AACvE,uDAAmD;AAE5C,KAAK,UAAU,yBAAyB,CAC7C,KAAwB,EACxB,MAAuC,EACvC,MAAc;IAEd,qBAAqB;IACrB,+DAA+D;IAC/D,qBAAqB;IACrB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QACvB,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClC,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,qBAAqB,CAAC;YAC/G,MAAM,IAAI,oCAAsB,CAC9B,MAAM,EACN,4EAA4E,CAC7E,CAAA;QACH,IAAI,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,GAAG,WAAW,CAAC,qBAAsB;YACvE,MAAM,IAAI,oCAAsB,CAC9B,MAAM,EACN,gCAAgC,KAAK,CAAC,eAAe,CAAC,MAAM,4BAA4B,WAAW,CAAC,qBAAqB,EAAE,CAC5H,CAAA;QACH,KAAK,CAAC,eAAe,GAAG,IAAA,+BAAc,EAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAC7D,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS;YAAE,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAA;IAC/E,CAAC;IAED,MAAM,OAAO,GAAG;QACd,GAAG,EAAoB,EAAE;KAC1B,CAAA;IAED,qBAAqB;IACrB,0DAA0D;IAC1D,qBAAqB;IACrB,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,yCAAmB,CAAC;YACrC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,sBAAsB,EAAE,CAAA;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAA;QACrC,MAAM,cAAc,GAAG,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,SAAS,CAAA;QAC3D,MAAM,cAAc,GAAG,GAAG,CAAC,cAAc,CAAA;QACzC,MAAM,aAAa,GAAG,IAAA,+BAAc,EAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QACvD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;QAClG,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtC,KAAK,CAAC,uBAAuB,GAAG,cAAc,CAAA;IAChD,CAAC;IAED,qBAAqB;IACrB,4DAA4D;IAC5D,qBAAqB;IACrB,MAAM,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;IAErB,OAAO,KAAK,CAAC,EAAE,CAAA;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAY,EAAE,IAAU;;IAC1D,MAAM,EAAE,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,0CAAE,EAAE,CAAA;IAClC,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,oCAAsB,CAAC,MAAM,EAAE,2BAA2B,IAAI,EAAE,CAAC,CAAA;IAEpF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,CAAC,KAAK,CAAC,UAAU;YAAE,MAAM,IAAI,oCAAsB,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QAC3F,IAAI,CAAC,KAAK,CAAC,eAAe;YAAE,MAAM,IAAI,oCAAsB,CAAC,UAAU,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAA;QACrG,KAAK,CAAC,iBAAiB,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,0CAAE,EAAE,CAAA;QAC7D,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC7B,iFAAiF;YACjF,+BAA+B;YAC/B,6BAA6B;YAC7B,OAAM;YACN,mFAAmF;QACrF,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC1B,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAE9E,MAAM,WAAW,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAA;QAE3D,MAAM,KAAK,GAAG,IAAI,WAAK,CAAC;YACtB,UAAU,EAAE,KAAK,CAAC,UAAW;YAC7B,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,aAAa,EAAE,YAAY,CAAC,aAAa;YACzC,cAAc,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,CAAC;YAC1C,kBAAkB,EAAE,EAAE,CAAC,OAAO;YAC9B,WAAW;YACX,eAAe,EAAE,KAAK,CAAC,eAAgB;YACvC,aAAa,EAAE,MAAA,KAAK,CAAC,QAAQ,mCAAI,CAAC;YAClC,UAAU,EAAE,CAAC;YACb,OAAO,EAAE,EAAE,CAAC,OAAO;YACnB,QAAQ,EAAE,EAAE,CAAC,QAAQ;SACtB,CAAC,CAAA;QAEF,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;YAEnC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,oCAAsB,CAAC,UAAU,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;QACzF,CAAC;QAAC,OAAO,EAAW,EAAE,CAAC;YACrB,MAAM,CAAC,GAAG,yBAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACrC,MAAM,IAAI,oCAAsB,CAAC,UAAU,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QACtF,CAAC;IACH,CAAC;AACH,CAAC"}

package/out/src/signer/methods/createAction.d.ts

@@ -1,7 +1,7 @@
 import { AtomicBEEF, CreateActionResult, OutpointString, SendWithResult, SignableTransaction, TXIDHexString } from '@bsv/sdk';
-import { Script } from '@bsv/sdk';
-import { PendingSignAction, sdk, Wallet } from '../../index.client';
-import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces';
+import { AuthId, ReviewActionResult, StorageProcessActionResults } from '../../sdk/WalletStorage.interfaces';
+import { PendingSignAction, Wallet } from '../../Wallet';
+import { ValidCreateActionArgs, ValidProcessActionArgs } from '../../sdk/validationHelpers';
 export interface CreateActionResultX extends CreateActionResult {
     txid?: TXIDHexString;
     tx?: AtomicBEEF;
@@ -10,10 +10,6 @@ export interface CreateActionResultX extends CreateActionResult {
     signableTransaction?: SignableTransaction;
     notDelayedResults?: ReviewActionResult[];
 }
-export declare function createAction(wallet: Wallet, auth: sdk.AuthId, vargs: sdk.ValidCreateActionArgs): Promise<CreateActionResultX>;
-/**
- * Derive a change output locking script
- */
-export declare function makeChangeLock(out: sdk.StorageCreateTransactionSdkOutput, dctr: sdk.StorageCreateActionResult, args: sdk.ValidCreateActionArgs, changeKeys: sdk.KeyPair, wallet: Wallet): Script;
-export declare function processAction(prior: PendingSignAction | undefined, wallet: Wallet, auth: sdk.AuthId, vargs: sdk.ValidProcessActionArgs): Promise<sdk.StorageProcessActionResults>;
+export declare function createAction(wallet: Wallet, auth: AuthId, vargs: ValidCreateActionArgs): Promise<CreateActionResultX>;
+export declare function processAction(prior: PendingSignAction | undefined, wallet: Wallet, auth: AuthId, vargs: ValidProcessActionArgs): Promise<StorageProcessActionResults>;
 //# sourceMappingURL=createAction.d.ts.map

package/out/src/signer/methods/createAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/createAction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,aAAa,EACd,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,MAAM,EAAe,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAkB,iBAAiB,EAAuB,GAAG,EAAgB,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAEtH,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAGvE,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,YAAY,CAAC,EAAE,cAAc,EAAE,CAAA;IAC/B,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;IAClC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACzC;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,CAAC,MAAM,EAChB,KAAK,EAAE,GAAG,CAAC,qBAAqB,GAC/B,OAAO,CAAC,mBAAmB,CAAC,CA+B9B;AAkDD;;GAEG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,CAAC,iCAAiC,EAC1C,IAAI,EAAE,GAAG,CAAC,yBAAyB,EACnC,IAAI,EAAE,GAAG,CAAC,qBAAqB,EAC/B,UAAU,EAAE,GAAG,CAAC,OAAO,EACvB,MAAM,EAAE,MAAM,GACb,MAAM,CAUR;AAmBD,wBAAsB,aAAa,CACjC,KAAK,EAAE,iBAAiB,GAAG,SAAS,EACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,CAAC,MAAM,EAChB,KAAK,EAAE,GAAG,CAAC,sBAAsB,GAChC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAc1C"}
+{"version":3,"file":"createAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/createAction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,aAAa,EAGd,MAAM,UAAU,CAAA;AAEjB,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,2BAA2B,EAC5B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAA0B,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAMnH,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,YAAY,CAAC,EAAE,cAAc,EAAE,CAAA;IAC/B,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;IAClC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACzC;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CA+B9B;AAmED,wBAAsB,aAAa,CACjC,KAAK,EAAE,iBAAiB,GAAG,SAAS,EACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,2BAA2B,CAAC,CActC"}

package/out/src/signer/methods/createAction.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAction = createAction;
-exports.makeChangeLock = makeChangeLock;
 exports.processAction = processAction;
 const sdk_1 = require("@bsv/sdk");
-const sdk_2 = require("@bsv/sdk");
-const index_client_1 = require("../../index.client");
 const buildSignableTransaction_1 = require("./buildSignableTransaction");
 const completeSignedTransaction_1 = require("./completeSignedTransaction");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
 async function createAction(wallet, auth, vargs) {
     var _a;
     const r = {};
@@ -44,7 +42,7 @@ async function createNewTx(wallet, args) {
 function makeSignableTransactionResult(prior, wallet, args) {
     var _a;
     if (!prior.dcr.inputBeef)
-        throw new index_client_1.sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid');
+        throw new WERR_errors_1.WERR_INTERNAL('prior.dcr.inputBeef must be valid');
     const txid = prior.tx.id('hex');
     const r = {
         noSendChange: args.isNoSend ? (_a = prior.dcr.noSendChangeOutputVouts) === null || _a === void 0 ? void 0 : _a.map(vout => `${txid}.${vout}`) : undefined,
@@ -62,26 +60,12 @@ function makeSignableTransactionBeef(tx, inputBEEF) {
     const beef = new sdk_1.Beef();
     for (const input of tx.inputs) {
         if (!input.sourceTransaction)
-            throw new index_client_1.sdk.WERR_INTERNAL('Every signableTransaction input must have a sourceTransaction');
+            throw new WERR_errors_1.WERR_INTERNAL('Every signableTransaction input must have a sourceTransaction');
         beef.mergeRawTx(input.sourceTransaction.toBinary());
     }
     beef.mergeRawTx(tx.toBinary());
     return beef.toBinaryAtomic(tx.id('hex'));
 }
-/**
- * Derive a change output locking script
- */
-function makeChangeLock(out, dctr, args, changeKeys, wallet) {
-    const derivationPrefix = dctr.derivationPrefix;
-    const derivationSuffix = (0, index_client_1.verifyTruthy)(out.derivationSuffix);
-    const sabppp = new index_client_1.ScriptTemplateBRC29({
-        derivationPrefix,
-        derivationSuffix,
-        keyDeriver: wallet.keyDeriver
-    });
-    const lockingScript = sabppp.lock(changeKeys.privateKey, changeKeys.publicKey);
-    return lockingScript;
-}
 function removeUnlockScripts(args) {
     let storageArgs = args;
     if (!storageArgs.inputs.every(i => i.unlockingScript === undefined)) {
@@ -113,10 +97,10 @@ async function processAction(prior, wallet, auth, vargs) {
     return r;
 }
 function makeDummyTransactionForOutputSatoshis(vout, satoshis) {
-    const tx = new sdk_2.Transaction();
+    const tx = new sdk_1.Transaction();
     for (let i = 0; i < vout; i++)
-        tx.addOutput({ lockingScript: new sdk_2.Script(), satoshis: 0 });
-    tx.addOutput({ lockingScript: new sdk_2.Script(), satoshis });
+        tx.addOutput({ lockingScript: new sdk_1.Script(), satoshis: 0 });
+    tx.addOutput({ lockingScript: new sdk_1.Script(), satoshis });
     return tx;
 }
 //# sourceMappingURL=createAction.js.map

package/out/src/signer/methods/createAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/createAction.ts"],"names":[],"mappings":";;AAwBA,oCAmCC;AAqDD,wCAgBC;AAmBD,sCAmBC;AAtKD,kCAQiB;AACjB,kCAA8C;AAC9C,qDAAsH;AACtH,yEAAqE;AAErE,2EAA4F;AAWrF,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,IAAgB,EAChB,KAAgC;;IAEhC,MAAM,CAAC,GAAwB,EAAE,CAAA;IAEjC,IAAI,KAAK,GAAkC,SAAS,CAAA;IAEpD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAExC,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,6BAA6B,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;QAC5D,CAAC;QAED,KAAK,CAAC,EAAE,GAAG,MAAM,IAAA,qDAAyB,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;QAE7D,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;QAC3B,MAAM,IAAI,GAAG,IAAI,UAAI,EAAE,CAAA;QACvB,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAC5D,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAE/B,IAAA,+CAAmB,EAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAEjC,CAAC,CAAC,YAAY,GAAG,MAAA,KAAK,CAAC,GAAG,CAAC,uBAAuB,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAA;QACpF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc;YAAE,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACvE,CAAC;IAED,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAE9F,CAAC,CAAC,eAAe,GAAG,eAAe,CAAA;IACnC,CAAC,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAEvC,OAAO,CAAC,CAAA;AACV,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,MAAc,EAAE,IAA+B;IACxE,MAAM,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAC7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;IAE1D,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;IAE/B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,mDAAwB,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAEvE,MAAM,KAAK,GAAsB,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAA;IAE1E,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,6BAA6B,CACpC,KAAwB,EACxB,MAAc,EACd,IAA+B;;IAE/B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS;QAAE,MAAM,IAAI,kBAAG,CAAC,aAAa,CAAC,mCAAmC,CAAC,CAAA;IAE1F,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAE/B,MAAM,CAAC,GAAuB;QAC5B,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAA,KAAK,CAAC,GAAG,CAAC,uBAAuB,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3G,mBAAmB,EAAE;YACnB,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS;YAC9B,EAAE,EAAE,2BAA2B,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;SAC/D;KACF,CAAA;IAED,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,mBAAoB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAA;IAEnE,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,2BAA2B,CAAC,EAAe,EAAE,SAAmB;IACvE,uDAAuD;IACvD,6FAA6F;IAC7F,MAAM,IAAI,GAAG,IAAI,UAAI,EAAE,CAAA;IACvB,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,iBAAiB;YAC1B,MAAM,IAAI,kBAAG,CAAC,aAAa,CAAC,+DAA+D,CAAC,CAAA;QAC9F,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,iBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAA;IACtD,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9B,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;AAC1C,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,GAA0C,EAC1C,IAAmC,EACnC,IAA+B,EAC/B,UAAuB,EACvB,MAAc;IAEd,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAA;IAC9C,MAAM,gBAAgB,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,IAAI,kCAAmB,CAAC;QACrC,gBAAgB;QAChB,gBAAgB;QAChB,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;IAC9E,OAAO,aAAa,CAAA;AACtB,CAAC;AAED,SAAS,mBAAmB,CAAC,IAA+B;IAC1D,IAAI,WAAW,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS,CAAC,EAAE,CAAC;QACpE,8EAA8E;QAC9E,WAAW,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;QACrC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC5B,MAAM,EAAE,GAA+B;gBACrC,GAAG,CAAC;gBACJ,qBAAqB,EAAE,CAAC,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;aAC5G,CAAA;YACD,OAAO,EAAE,CAAC,eAAe,CAAA;YACzB,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,KAAoC,EACpC,MAAc,EACd,IAAgB,EAChB,KAAiC;IAEjC,MAAM,IAAI,GAAiC;QACzC,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QAC9C,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QAC5C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;QAC9C,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;KACzD,CAAA;IACD,MAAM,CAAC,GAAoC,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;IAEnF,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,qCAAqC,CAAC,IAAY,EAAE,QAAgB;IAC3E,MAAM,EAAE,GAAG,IAAI,iBAAW,EAAE,CAAA;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE;QAAE,EAAE,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,IAAI,YAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAA;IACzF,EAAE,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,IAAI,YAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IACvD,OAAO,EAAE,CAAA;AACX,CAAC"}
+{"version":3,"file":"createAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/createAction.ts"],"names":[],"mappings":"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"}

package/out/src/signer/methods/internalizeAction.d.ts

@@ -1,5 +1,6 @@
 import { InternalizeActionArgs } from '@bsv/sdk';
-import { sdk, Wallet } from '../../index.client';
+import { Wallet } from '../../Wallet';
+import { AuthId, StorageInternalizeActionResult } from '../../sdk/WalletStorage.interfaces';
 /**
  * Internalize Action allows a wallet to take ownership of outputs in a pre-existing transaction.
  * The transaction may, or may not already be known to both the storage and user.
@@ -27,5 +28,5 @@ import { sdk, Wallet } from '../../index.client';
  * 2. Targetting a previously "custom" non-change output converts it into a change output. This alters the transaction's `amount`, and the wallet balance.
  *
  */
-export declare function internalizeAction(wallet: Wallet, auth: sdk.AuthId, args: InternalizeActionArgs): Promise<sdk.StorageInternalizeActionResult>;
+export declare function internalizeAction(wallet: Wallet, auth: AuthId, args: InternalizeActionArgs): Promise<StorageInternalizeActionResult>;
 //# sourceMappingURL=internalizeAction.d.ts.map

package/out/src/signer/methods/internalizeAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internalizeAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/internalizeAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EAKtB,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,CAAC,MAAM,EAChB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CA6D7C"}
+{"version":3,"file":"internalizeAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/internalizeAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,qBAAqB,EAA4C,MAAM,UAAU,CAAA;AAChG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAA;AAI3F;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,8BAA8B,CAAC,CA6DzC"}

package/out/src/signer/methods/internalizeAction.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.internalizeAction = internalizeAction;
 const sdk_1 = require("@bsv/sdk");
-const index_client_1 = require("../../index.client");
+const validationHelpers_1 = require("../../sdk/validationHelpers");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
 /**
  * Internalize Action allows a wallet to take ownership of outputs in a pre-existing transaction.
  * The transaction may, or may not already be known to both the storage and user.
@@ -31,12 +32,12 @@ const index_client_1 = require("../../index.client");
  *
  */
 async function internalizeAction(wallet, auth, args) {
-    const vargs = index_client_1.sdk.validateInternalizeActionArgs(args);
+    const vargs = (0, validationHelpers_1.validateInternalizeActionArgs)(args);
     const { ab, tx, txid } = await validateAtomicBeef();
     const brc29ProtocolID = [2, '3241645161d8'];
     for (const o of vargs.outputs) {
         if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length)
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('outputIndex', `a valid output index in range 0 to ${tx.outputs.length - 1}`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('outputIndex', `a valid output index in range 0 to ${tx.outputs.length - 1}`);
         switch (o.protocol) {
             case 'basket insertion':
                 setupBasketInsertionForOutput(o, vargs);
@@ -45,7 +46,7 @@ async function internalizeAction(wallet, auth, args) {
                 setupWalletPaymentForOutput(o, vargs);
                 break;
             default:
-                throw new index_client_1.sdk.WERR_INTERNAL(`unexpected protocol ${o.protocol}`);
+                throw new WERR_errors_1.WERR_INTERNAL(`unexpected protocol ${o.protocol}`);
         }
     }
     const r = await wallet.storage.internalizeAction(args);
@@ -54,12 +55,12 @@ async function internalizeAction(wallet, auth, args) {
         const p = o.paymentRemittance;
         const output = tx.outputs[o.outputIndex];
         if (!p)
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('paymentRemitance', `valid for protocol ${o.protocol}`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('paymentRemittance', `valid for protocol ${o.protocol}`);
         const keyID = `${p.derivationPrefix} ${p.derivationSuffix}`;
         const privKey = wallet.keyDeriver.derivePrivateKey(brc29ProtocolID, keyID, p.senderIdentityKey);
         const expectedLockScript = new sdk_1.P2PKH().lock(privKey.toAddress());
         if (output.lockingScript.toHex() !== expectedLockScript.toHex())
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('paymentRemitance', `locked by script conforming to BRC-29`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('paymentRemittance', `locked by script conforming to BRC-29`);
     }
     function setupBasketInsertionForOutput(o, dargs) {
         /*
@@ -72,12 +73,12 @@ async function internalizeAction(wallet, auth, args) {
         const txValid = await ab.verify(await wallet.getServices().getChainTracker(), false);
         if (!txValid || !ab.atomicTxid) {
             console.log(`internalizeAction beef is invalid: ${ab.toLogString()}`);
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF');
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF');
         }
         const txid = ab.atomicTxid;
         const btx = ab.findTxid(txid);
         if (!btx)
-            throw new index_client_1.sdk.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`);
         const tx = btx.tx;
         return { ab, tx, txid };
     }

package/out/src/signer/methods/internalizeAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"internalizeAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/internalizeAction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"internalizeAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/internalizeAction.ts"],"names":[],"mappings":"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"}

package/out/src/signer/methods/proveCertificate.d.ts

@@ -1,4 +1,6 @@
 import { ProveCertificateResult } from '@bsv/sdk';
-import { sdk, Wallet } from '../../index.client';
-export declare function proveCertificate(wallet: Wallet, auth: sdk.AuthId, vargs: sdk.ValidProveCertificateArgs): Promise<ProveCertificateResult>;
+import { Wallet } from '../../Wallet';
+import { ValidProveCertificateArgs } from '../../sdk/validationHelpers';
+import { AuthId } from '../../sdk/WalletStorage.interfaces';
+export declare function proveCertificate(wallet: Wallet, auth: AuthId, vargs: ValidProveCertificateArgs): Promise<ProveCertificateResult>;
 //# sourceMappingURL=proveCertificate.d.ts.map

package/out/src/signer/methods/proveCertificate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proveCertificate.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/proveCertificate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAEhD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,CAAC,MAAM,EAChB,KAAK,EAAE,GAAG,CAAC,yBAAyB,GACnC,OAAO,CAAC,sBAAsB,CAAC,CAiCjC"}
+{"version":3,"file":"proveCertificate.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/proveCertificate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,OAAO,EAA6B,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAClG,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAA;AAE3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,sBAAsB,CAAC,CAiCjC"}

package/out/src/signer/methods/proveCertificate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proveCertificate = proveCertificate;
 const sdk_1 = require("@bsv/sdk");
-const index_client_1 = require("../../index.client");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
 async function proveCertificate(wallet, auth, vargs) {
     const lcargs = {
         partial: {
@@ -21,7 +21,7 @@ async function proveCertificate(wallet, auth, vargs) {
     };
     const lcr = await wallet.storage.listCertificates(lcargs);
     if (lcr.certificates.length != 1)
-        throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `a unique certificate match`);
+        throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', `a unique certificate match`);
     const storageCert = lcr.certificates[0];
     const keyringForVerifier = await sdk_1.MasterCertificate.createKeyringForVerifier(wallet, storageCert.certifier, vargs.verifier, storageCert.fields, vargs.fieldsToReveal, storageCert.keyring, storageCert.serialNumber, vargs.privileged, vargs.privilegedReason);
     return { keyringForVerifier };

package/out/src/signer/methods/proveCertificate.js.map

@@ -1 +1 @@
-{"version":3,"file":"proveCertificate.js","sourceRoot":"","sources":["../../../../src/signer/methods/proveCertificate.ts"],"names":[],"mappings":";;AAGA,4CAqCC;AAxCD,kCAAoE;AACpE,qDAAgD;AAEzC,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,IAAgB,EAChB,KAAoC;IAEpC,MAAM,MAAM,GAAkC;QAC5C,OAAO,EAAE;YACP,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,UAAU,EAAE,KAAK;KAClB,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC;QAAE,MAAM,IAAI,kBAAG,CAAC,sBAAsB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;IAC5G,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,kBAAkB,GAAG,MAAM,uBAAiB,CAAC,wBAAwB,CACzE,MAAM,EACN,WAAW,CAAC,SAAS,EACrB,KAAK,CAAC,QAAQ,EACd,WAAW,CAAC,MAAM,EAClB,KAAK,CAAC,cAAc,EACpB,WAAW,CAAC,OAAQ,EACpB,WAAW,CAAC,YAAY,EACxB,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,gBAAgB,CACvB,CAAA;IAED,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC/B,CAAC"}
+{"version":3,"file":"proveCertificate.js","sourceRoot":"","sources":["../../../../src/signer/methods/proveCertificate.ts"],"names":[],"mappings":";;AAMA,4CAqCC;AA3CD,kCAAoE;AAEpE,uDAA8D;AAIvD,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,IAAY,EACZ,KAAgC;IAEhC,MAAM,MAAM,GAA8B;QACxC,OAAO,EAAE;YACP,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,UAAU,EAAE,KAAK;KAClB,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACzD,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC;QAAE,MAAM,IAAI,oCAAsB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;IACxG,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,kBAAkB,GAAG,MAAM,uBAAiB,CAAC,wBAAwB,CACzE,MAAM,EACN,WAAW,CAAC,SAAS,EACrB,KAAK,CAAC,QAAQ,EACd,WAAW,CAAC,MAAM,EAClB,KAAK,CAAC,cAAc,EACpB,WAAW,CAAC,OAAQ,EACpB,WAAW,CAAC,YAAY,EACxB,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,gBAAgB,CACvB,CAAA;IAED,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC/B,CAAC"}

package/out/src/signer/methods/signAction.d.ts

@@ -1,11 +1,11 @@
 import { AtomicBEEF, SendWithResult, SignActionArgs, SignActionResult, TXIDHexString } from '@bsv/sdk';
-import { sdk, Wallet } from '../../index.client';
-import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces';
+import { AuthId, ReviewActionResult } from '../../sdk/WalletStorage.interfaces';
+import { Wallet } from '../../Wallet';
 export interface SignActionResultX extends SignActionResult {
     txid?: TXIDHexString;
     tx?: AtomicBEEF;
     sendWithResults?: SendWithResult[];
     notDelayedResults?: ReviewActionResult[];
 }
-export declare function signAction(wallet: Wallet, auth: sdk.AuthId, args: SignActionArgs): Promise<SignActionResultX>;
+export declare function signAction(wallet: Wallet, auth: AuthId, args: SignActionArgs): Promise<SignActionResultX>;
 //# sourceMappingURL=signAction.d.ts.map

package/out/src/signer/methods/signAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAQ,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC5G,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAKvE,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;IAClC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACzC;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0BnH"}
+{"version":3,"file":"signAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAQ,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE5G,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAE/E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,IAAI,CAAC,EAAE,aAAa,CAAA;IACpB,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,eAAe,CAAC,EAAE,cAAc,EAAE,CAAA;IAClC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACzC;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0B/G"}

package/out/src/signer/methods/signAction.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signAction = signAction;
 const sdk_1 = require("@bsv/sdk");
-const index_client_1 = require("../../index.client");
 const createAction_1 = require("./createAction");
-const sdk_2 = require("../../sdk");
 const completeSignedTransaction_1 = require("./completeSignedTransaction");
+const WERR_errors_1 = require("../../sdk/WERR_errors");
+const validationHelpers_1 = require("../../sdk/validationHelpers");
 async function signAction(wallet, auth, args) {
     const prior = wallet.pendingSignActions[args.reference];
     if (!prior)
-        throw new index_client_1.sdk.WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.');
+        throw new WERR_errors_1.WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.');
     if (!prior.dcr.inputBeef)
-        throw new index_client_1.sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid');
+        throw new WERR_errors_1.WERR_INTERNAL('prior.dcr.inputBeef must be valid');
     const vargs = mergePriorOptions(prior.args, args);
     prior.tx = await (0, completeSignedTransaction_1.completeSignedTransaction)(prior, vargs.spends, wallet);
     const { sendWithResults, notDelayedResults } = await (0, createAction_1.processAction)(prior, wallet, auth, vargs);
@@ -37,6 +37,6 @@ function mergePriorOptions(caVargs, saArgs) {
         saOptions.noSend = caVargs.options.noSend;
     if (saOptions.sendWith === undefined)
         saOptions.sendWith = caVargs.options.sendWith;
-    return (0, sdk_2.validateSignActionArgs)(saArgs);
+    return (0, validationHelpers_1.validateSignActionArgs)(saArgs);
 }
 //# sourceMappingURL=signAction.js.map

package/out/src/signer/methods/signAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"signAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":";;AAeA,gCA0BC;AAzCD,kCAA4G;AAC5G,qDAAgD;AAChD,iDAA8C;AAE9C,mCAAkD;AAClD,2EAA4F;AAUrF,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,IAAgB,EAAE,IAAoB;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvD,IAAI,CAAC,KAAK;QACR,MAAM,IAAI,kBAAG,CAAC,oBAAoB,CAAC,8EAA8E,CAAC,CAAA;IACpH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS;QAAE,MAAM,IAAI,kBAAG,CAAC,aAAa,CAAC,mCAAmC,CAAC,CAAA;IAE1F,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAEjD,KAAK,CAAC,EAAE,GAAG,MAAM,IAAA,qDAAyB,EAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEvE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,4BAAa,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAE9F,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAC/B,MAAM,IAAI,GAAG,UAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACjD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAE/B,IAAA,+CAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE/B,MAAM,CAAC,GAAsB;QAC3B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACxB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;QACxE,eAAe;QACf,iBAAiB;KAClB,CAAA;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAkC,EAAE,MAAsB;IACnF,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,OAAO,KAAd,MAAM,CAAC,OAAO,GAAK,EAAE,EAAC,CAAA;IACzC,IAAI,SAAS,CAAC,sBAAsB,KAAK,SAAS;QAChD,SAAS,CAAC,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAA;IAC3E,IAAI,SAAS,CAAC,cAAc,KAAK,SAAS;QAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAA;IACrG,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS;QAAE,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;IAC7E,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS;QAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;IACnF,OAAO,IAAA,4BAAsB,EAAC,MAAM,CAAC,CAAA;AACvC,CAAC"}
+{"version":3,"file":"signAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":";;AAeA,gCA0BC;AAzCD,kCAA4G;AAC5G,iDAA8C;AAE9C,2EAA4F;AAE5F,uDAA2E;AAC3E,mEAAgH;AASzG,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,IAAY,EAAE,IAAoB;IACjF,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvD,IAAI,CAAC,KAAK;QACR,MAAM,IAAI,kCAAoB,CAAC,8EAA8E,CAAC,CAAA;IAChH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS;QAAE,MAAM,IAAI,2BAAa,CAAC,mCAAmC,CAAC,CAAA;IAEtF,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAEjD,KAAK,CAAC,EAAE,GAAG,MAAM,IAAA,qDAAyB,EAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEvE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,4BAAa,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;IAE9F,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAC/B,MAAM,IAAI,GAAG,UAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACjD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAE/B,IAAA,+CAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE/B,MAAM,CAAC,GAAsB;QAC3B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACxB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;QACxE,eAAe;QACf,iBAAiB;KAClB,CAAA;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,iBAAiB,CAAC,OAA8B,EAAE,MAAsB;IAC/E,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,OAAO,KAAd,MAAM,CAAC,OAAO,GAAK,EAAE,EAAC,CAAA;IACzC,IAAI,SAAS,CAAC,sBAAsB,KAAK,SAAS;QAChD,SAAS,CAAC,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAA;IAC3E,IAAI,SAAS,CAAC,cAAc,KAAK,SAAS;QAAE,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAA;IACrG,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS;QAAE,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;IAC7E,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS;QAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAA;IACnF,OAAO,IAAA,0CAAsB,EAAC,MAAM,CAAC,CAAA;AACvC,CAAC"}