@bsv/wallet-toolbox 1.3.28 → 1.3.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +19 -0
- package/docs/client.md +550 -172
- package/docs/monitor.md +25 -7
- package/docs/services.md +134 -23
- package/docs/storage.md +53 -22
- package/docs/wallet.md +550 -172
- package/mobile/out/src/monitor/Monitor.js +1 -1
- package/mobile/out/src/monitor/Monitor.js.map +1 -1
- package/mobile/out/src/sdk/WalletServices.interfaces.d.ts.map +1 -1
- package/mobile/out/src/services/ServiceCollection.d.ts +2 -2
- package/mobile/out/src/services/ServiceCollection.d.ts.map +1 -1
- package/mobile/out/src/services/ServiceCollection.js.map +1 -1
- package/mobile/out/src/services/Services.d.ts.map +1 -1
- package/mobile/out/src/services/Services.js.map +1 -1
- package/mobile/out/src/services/createDefaultWalletServicesOptions.d.ts.map +1 -1
- package/mobile/out/src/services/createDefaultWalletServicesOptions.js +1 -3
- package/mobile/out/src/services/createDefaultWalletServicesOptions.js.map +1 -1
- package/mobile/out/src/signer/methods/completeSignedTransaction.d.ts +10 -0
- package/mobile/out/src/signer/methods/completeSignedTransaction.d.ts.map +1 -0
- package/mobile/out/src/signer/methods/completeSignedTransaction.js +104 -0
- package/mobile/out/src/signer/methods/completeSignedTransaction.js.map +1 -0
- package/mobile/out/src/signer/methods/createAction.d.ts +2 -3
- package/mobile/out/src/signer/methods/createAction.d.ts.map +1 -1
- package/mobile/out/src/signer/methods/createAction.js +8 -46
- package/mobile/out/src/signer/methods/createAction.js.map +1 -1
- package/mobile/out/src/signer/methods/signAction.d.ts +2 -4
- package/mobile/out/src/signer/methods/signAction.d.ts.map +1 -1
- package/mobile/out/src/signer/methods/signAction.js +7 -54
- package/mobile/out/src/signer/methods/signAction.js.map +1 -1
- package/mobile/out/src/storage/methods/createAction.d.ts.map +1 -1
- package/mobile/out/src/storage/methods/createAction.js.map +1 -1
- package/mobile/package-lock.json +2 -2
- package/mobile/package.json +1 -1
- package/out/src/monitor/Monitor.js +1 -1
- package/out/src/monitor/Monitor.js.map +1 -1
- package/out/src/sdk/WalletServices.interfaces.d.ts.map +1 -1
- package/out/src/services/ServiceCollection.d.ts +2 -2
- package/out/src/services/ServiceCollection.d.ts.map +1 -1
- package/out/src/services/ServiceCollection.js.map +1 -1
- package/out/src/services/Services.d.ts.map +1 -1
- package/out/src/services/Services.js.map +1 -1
- package/out/src/services/createDefaultWalletServicesOptions.d.ts.map +1 -1
- package/out/src/services/createDefaultWalletServicesOptions.js +1 -3
- package/out/src/services/createDefaultWalletServicesOptions.js.map +1 -1
- package/out/src/signer/methods/completeSignedTransaction.d.ts +10 -0
- package/out/src/signer/methods/completeSignedTransaction.d.ts.map +1 -0
- package/out/src/signer/methods/completeSignedTransaction.js +104 -0
- package/out/src/signer/methods/completeSignedTransaction.js.map +1 -0
- package/out/src/signer/methods/createAction.d.ts +2 -3
- package/out/src/signer/methods/createAction.d.ts.map +1 -1
- package/out/src/signer/methods/createAction.js +8 -46
- package/out/src/signer/methods/createAction.js.map +1 -1
- package/out/src/signer/methods/signAction.d.ts +2 -4
- package/out/src/signer/methods/signAction.d.ts.map +1 -1
- package/out/src/signer/methods/signAction.js +7 -54
- package/out/src/signer/methods/signAction.js.map +1 -1
- package/out/src/storage/StorageKnex.d.ts.map +1 -1
- package/out/src/storage/StorageKnex.js +7 -2
- package/out/src/storage/StorageKnex.js.map +1 -1
- package/out/src/storage/methods/createAction.d.ts.map +1 -1
- package/out/src/storage/methods/createAction.js.map +1 -1
- package/out/test/Wallet/support/operations.man.test.js +23 -5
- package/out/test/Wallet/support/operations.man.test.js.map +1 -1
- package/out/test/wallet/action/createAction2.test.d.ts.map +1 -1
- package/out/test/wallet/action/createAction2.test.js +1 -0
- package/out/test/wallet/action/createAction2.test.js.map +1 -1
- package/out/tsconfig.all.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/monitor/Monitor.ts +1 -1
- package/src/sdk/WalletServices.interfaces.ts +2 -2
- package/src/services/ServiceCollection.ts +9 -6
- package/src/services/Services.ts +13 -25
- package/src/services/createDefaultWalletServicesOptions.ts +1 -4
- package/src/signer/methods/completeSignedTransaction.ts +115 -0
- package/src/signer/methods/createAction.ts +9 -68
- package/src/signer/methods/signAction.ts +11 -78
- package/src/storage/StorageKnex.ts +45 -14
- package/src/storage/StorageProvider.ts +1 -1
- package/src/storage/methods/createAction.ts +4 -1
- package/test/Wallet/support/operations.man.test.ts +29 -10
- package/test/wallet/action/createAction2.test.ts +1 -0
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.completeSignedTransaction = completeSignedTransaction;
|
|
4
|
+
exports.verifyUnlockScripts = verifyUnlockScripts;
|
|
5
|
+
const sdk_1 = require("@bsv/sdk");
|
|
6
|
+
const index_client_1 = require("../../index.client");
|
|
7
|
+
const sdk_2 = require("../../sdk");
|
|
8
|
+
async function completeSignedTransaction(prior, spends, wallet) {
|
|
9
|
+
/////////////////////
|
|
10
|
+
// Insert the user provided unlocking scripts from "spends" arg
|
|
11
|
+
/////////////////////
|
|
12
|
+
for (const [key, spend] of Object.entries(spends)) {
|
|
13
|
+
const vin = Number(key);
|
|
14
|
+
const createInput = prior.args.inputs[vin];
|
|
15
|
+
const input = prior.tx.inputs[vin];
|
|
16
|
+
if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
|
|
17
|
+
throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend does not correspond to prior input with valid unlockingScriptLength.`);
|
|
18
|
+
if (spend.unlockingScript.length / 2 > createInput.unlockingScriptLength)
|
|
19
|
+
throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`);
|
|
20
|
+
input.unlockingScript = (0, index_client_1.asBsvSdkScript)(spend.unlockingScript);
|
|
21
|
+
if (spend.sequenceNumber !== undefined)
|
|
22
|
+
input.sequence = spend.sequenceNumber;
|
|
23
|
+
}
|
|
24
|
+
const results = {
|
|
25
|
+
sdk: {}
|
|
26
|
+
};
|
|
27
|
+
/////////////////////
|
|
28
|
+
// Insert SABPPP unlock templates for wallet signed inputs
|
|
29
|
+
/////////////////////
|
|
30
|
+
for (const pdi of prior.pdi) {
|
|
31
|
+
const sabppp = new index_client_1.ScriptTemplateBRC29({
|
|
32
|
+
derivationPrefix: pdi.derivationPrefix,
|
|
33
|
+
derivationSuffix: pdi.derivationSuffix,
|
|
34
|
+
keyDeriver: wallet.keyDeriver
|
|
35
|
+
});
|
|
36
|
+
const keys = wallet.getClientChangeKeyPair();
|
|
37
|
+
const lockerPrivKey = keys.privateKey;
|
|
38
|
+
const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey;
|
|
39
|
+
const sourceSatoshis = pdi.sourceSatoshis;
|
|
40
|
+
const lockingScript = (0, index_client_1.asBsvSdkScript)(pdi.lockingScript);
|
|
41
|
+
const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript);
|
|
42
|
+
const input = prior.tx.inputs[pdi.vin];
|
|
43
|
+
input.unlockingScriptTemplate = unlockTemplate;
|
|
44
|
+
}
|
|
45
|
+
/////////////////////
|
|
46
|
+
// Sign wallet signed inputs making transaction fully valid.
|
|
47
|
+
/////////////////////
|
|
48
|
+
await prior.tx.sign();
|
|
49
|
+
return prior.tx;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* @param txid The TXID of a transaction in the beef for which all unlocking scripts must be valid.
|
|
53
|
+
* @param beef Must contain transactions for txid and all its inputs.
|
|
54
|
+
* @throws WERR_INVALID_PARAMETER if any unlocking script is invalid, if sourceTXID is invalid, if beef doesn't contain required transactions.
|
|
55
|
+
*/
|
|
56
|
+
function verifyUnlockScripts(txid, beef) {
|
|
57
|
+
var _a, _b, _c, _d;
|
|
58
|
+
const tx = (_a = beef.findTxid(txid)) === null || _a === void 0 ? void 0 : _a.tx;
|
|
59
|
+
if (!tx)
|
|
60
|
+
throw new sdk_2.WERR_INVALID_PARAMETER(`txid`, `contained in beef, txid ${txid}`);
|
|
61
|
+
for (let i = 0; i < tx.inputs.length; i++) {
|
|
62
|
+
const input = tx.inputs[i];
|
|
63
|
+
if (!input.sourceTXID)
|
|
64
|
+
throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].sourceTXID`, `valid`);
|
|
65
|
+
if (!input.unlockingScript)
|
|
66
|
+
throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].unlockingScript`, `valid`);
|
|
67
|
+
input.sourceTransaction = (_b = beef.findTxid(input.sourceTXID)) === null || _b === void 0 ? void 0 : _b.tx;
|
|
68
|
+
if (!input.sourceTransaction) {
|
|
69
|
+
// The beef doesn't contain all the source transactions only if advanced features
|
|
70
|
+
// such as knownTxids are used.
|
|
71
|
+
// Skip unlock script checks.
|
|
72
|
+
return;
|
|
73
|
+
// throw new WERR_INVALID_PARAMETER(`inputs[${i}].sourceTXID`, `contained in beef`)
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
for (let i = 0; i < tx.inputs.length; i++) {
|
|
77
|
+
const input = tx.inputs[i];
|
|
78
|
+
const sourceOutput = input.sourceTransaction.outputs[input.sourceOutputIndex];
|
|
79
|
+
const otherInputs = tx.inputs.filter((_, idx) => idx !== i);
|
|
80
|
+
const spend = new sdk_1.Spend({
|
|
81
|
+
sourceTXID: input.sourceTXID,
|
|
82
|
+
sourceOutputIndex: input.sourceOutputIndex,
|
|
83
|
+
lockingScript: sourceOutput.lockingScript,
|
|
84
|
+
sourceSatoshis: (_c = sourceOutput.satoshis) !== null && _c !== void 0 ? _c : 0,
|
|
85
|
+
transactionVersion: tx.version,
|
|
86
|
+
otherInputs,
|
|
87
|
+
unlockingScript: input.unlockingScript,
|
|
88
|
+
inputSequence: (_d = input.sequence) !== null && _d !== void 0 ? _d : 0,
|
|
89
|
+
inputIndex: i,
|
|
90
|
+
outputs: tx.outputs,
|
|
91
|
+
lockTime: tx.lockTime
|
|
92
|
+
});
|
|
93
|
+
try {
|
|
94
|
+
const spendValid = spend.validate();
|
|
95
|
+
if (!spendValid)
|
|
96
|
+
throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid`);
|
|
97
|
+
}
|
|
98
|
+
catch (eu) {
|
|
99
|
+
const e = sdk_2.WalletError.fromUnknown(eu);
|
|
100
|
+
throw new sdk_2.WERR_INVALID_PARAMETER(`inputs[${i}].unlockScript`, `valid. ${e.message}`);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=completeSignedTransaction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"completeSignedTransaction.js","sourceRoot":"","sources":["../../../../src/signer/methods/completeSignedTransaction.ts"],"names":[],"mappings":";;AAKA,8DAuDC;AAOD,kDA+CC;AAlHD,kCAAsF;AAEtF,qDAA6E;AAC7E,mCAA8E;AAEvE,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,kBAAG,CAAC,sBAAsB,CAClC,MAAM,EACN,4EAA4E,CAC7E,CAAA;QACH,IAAI,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,GAAG,WAAW,CAAC,qBAAsB;YACvE,MAAM,IAAI,kBAAG,CAAC,sBAAsB,CAClC,MAAM,EACN,gCAAgC,KAAK,CAAC,eAAe,CAAC,MAAM,4BAA4B,WAAW,CAAC,qBAAqB,EAAE,CAC5H,CAAA;QACH,KAAK,CAAC,eAAe,GAAG,IAAA,6BAAc,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,kCAAmB,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,6BAAc,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,4BAAsB,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,4BAAsB,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QAC3F,IAAI,CAAC,KAAK,CAAC,eAAe;YAAE,MAAM,IAAI,4BAAsB,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;YACL,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;YAEnC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,4BAAsB,CAAC,UAAU,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;QACvF,CAAC;QAAC,OAAO,EAAW,EAAE,CAAC;YACrB,MAAM,CAAC,GAAG,iBAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACrC,MAAM,IAAI,4BAAsB,CAAC,UAAU,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QACtF,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AtomicBEEF, CreateActionResult, OutpointString, SendWithResult, SignableTransaction,
|
|
2
|
-
import { Script
|
|
1
|
+
import { AtomicBEEF, CreateActionResult, OutpointString, SendWithResult, SignableTransaction, TXIDHexString } from '@bsv/sdk';
|
|
2
|
+
import { Script } from '@bsv/sdk';
|
|
3
3
|
import { PendingSignAction, sdk, Wallet } from '../../index.client';
|
|
4
4
|
import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces';
|
|
5
5
|
export interface CreateActionResultX extends CreateActionResult {
|
|
@@ -15,6 +15,5 @@ export declare function createAction(wallet: Wallet, auth: sdk.AuthId, vargs: sd
|
|
|
15
15
|
* Derive a change output locking script
|
|
16
16
|
*/
|
|
17
17
|
export declare function makeChangeLock(out: sdk.StorageCreateTransactionSdkOutput, dctr: sdk.StorageCreateActionResult, args: sdk.ValidCreateActionArgs, changeKeys: sdk.KeyPair, wallet: Wallet): Script;
|
|
18
|
-
export declare function completeSignedTransaction(prior: PendingSignAction, spends: Record<number, SignActionSpend>, wallet: Wallet): Promise<Transaction>;
|
|
19
18
|
export declare function processAction(prior: PendingSignAction | undefined, wallet: Wallet, auth: sdk.AuthId, vargs: sdk.ValidProcessActionArgs): Promise<sdk.StorageProcessActionResults>;
|
|
20
19
|
//# sourceMappingURL=createAction.d.ts.map
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createAction = createAction;
|
|
4
4
|
exports.makeChangeLock = makeChangeLock;
|
|
5
|
-
exports.completeSignedTransaction = completeSignedTransaction;
|
|
6
5
|
exports.processAction = processAction;
|
|
7
6
|
const sdk_1 = require("@bsv/sdk");
|
|
8
7
|
const sdk_2 = require("@bsv/sdk");
|
|
9
8
|
const index_client_1 = require("../../index.client");
|
|
10
9
|
const buildSignableTransaction_1 = require("./buildSignableTransaction");
|
|
10
|
+
const completeSignedTransaction_1 = require("./completeSignedTransaction");
|
|
11
11
|
async function createAction(wallet, auth, vargs) {
|
|
12
12
|
var _a;
|
|
13
13
|
const r = {};
|
|
@@ -17,11 +17,16 @@ async function createAction(wallet, auth, vargs) {
|
|
|
17
17
|
if (vargs.isSignAction) {
|
|
18
18
|
return makeSignableTransactionResult(prior, wallet, vargs);
|
|
19
19
|
}
|
|
20
|
-
prior.tx = await completeSignedTransaction(prior, {}, wallet);
|
|
20
|
+
prior.tx = await (0, completeSignedTransaction_1.completeSignedTransaction)(prior, {}, wallet);
|
|
21
21
|
r.txid = prior.tx.id('hex');
|
|
22
|
+
const beef = new sdk_1.Beef();
|
|
23
|
+
if (prior.dcr.inputBeef)
|
|
24
|
+
beef.mergeBeef(prior.dcr.inputBeef);
|
|
25
|
+
beef.mergeTransaction(prior.tx);
|
|
26
|
+
(0, completeSignedTransaction_1.verifyUnlockScripts)(r.txid, beef);
|
|
22
27
|
r.noSendChange = (_a = prior.dcr.noSendChangeOutputVouts) === null || _a === void 0 ? void 0 : _a.map(vout => `${r.txid}.${vout}`);
|
|
23
28
|
if (!vargs.options.returnTXIDOnly)
|
|
24
|
-
r.tx =
|
|
29
|
+
r.tx = beef.toBinaryAtomic(r.txid);
|
|
25
30
|
}
|
|
26
31
|
const { sendWithResults, notDelayedResults } = await processAction(prior, wallet, auth, vargs);
|
|
27
32
|
r.sendWithResults = sendWithResults;
|
|
@@ -77,49 +82,6 @@ function makeChangeLock(out, dctr, args, changeKeys, wallet) {
|
|
|
77
82
|
const lockingScript = sabppp.lock(changeKeys.privateKey, changeKeys.publicKey);
|
|
78
83
|
return lockingScript;
|
|
79
84
|
}
|
|
80
|
-
async function completeSignedTransaction(prior, spends, wallet) {
|
|
81
|
-
/////////////////////
|
|
82
|
-
// Insert the user provided unlocking scripts from "spends" arg
|
|
83
|
-
/////////////////////
|
|
84
|
-
for (const [key, spend] of Object.entries(spends)) {
|
|
85
|
-
const vin = Number(key);
|
|
86
|
-
const createInput = prior.args.inputs[vin];
|
|
87
|
-
const input = prior.tx.inputs[vin];
|
|
88
|
-
if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
|
|
89
|
-
throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend does not correspond to prior input with valid unlockingScriptLength.`);
|
|
90
|
-
if (spend.unlockingScript.length / 2 > createInput.unlockingScriptLength)
|
|
91
|
-
throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`);
|
|
92
|
-
input.unlockingScript = (0, index_client_1.asBsvSdkScript)(spend.unlockingScript);
|
|
93
|
-
if (spend.sequenceNumber !== undefined)
|
|
94
|
-
input.sequence = spend.sequenceNumber;
|
|
95
|
-
}
|
|
96
|
-
const results = {
|
|
97
|
-
sdk: {}
|
|
98
|
-
};
|
|
99
|
-
/////////////////////
|
|
100
|
-
// Insert SABPPP unlock templates for storage signed inputs
|
|
101
|
-
/////////////////////
|
|
102
|
-
for (const pdi of prior.pdi) {
|
|
103
|
-
const sabppp = new index_client_1.ScriptTemplateBRC29({
|
|
104
|
-
derivationPrefix: pdi.derivationPrefix,
|
|
105
|
-
derivationSuffix: pdi.derivationSuffix,
|
|
106
|
-
keyDeriver: wallet.keyDeriver
|
|
107
|
-
});
|
|
108
|
-
const keys = wallet.getClientChangeKeyPair();
|
|
109
|
-
const lockerPrivKey = keys.privateKey;
|
|
110
|
-
const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey;
|
|
111
|
-
const sourceSatoshis = pdi.sourceSatoshis;
|
|
112
|
-
const lockingScript = (0, index_client_1.asBsvSdkScript)(pdi.lockingScript);
|
|
113
|
-
const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript);
|
|
114
|
-
const input = prior.tx.inputs[pdi.vin];
|
|
115
|
-
input.unlockingScriptTemplate = unlockTemplate;
|
|
116
|
-
}
|
|
117
|
-
/////////////////////
|
|
118
|
-
// Sign storage signed inputs making transaction fully valid.
|
|
119
|
-
/////////////////////
|
|
120
|
-
await prior.tx.sign();
|
|
121
|
-
return prior.tx;
|
|
122
|
-
}
|
|
123
85
|
function removeUnlockScripts(args) {
|
|
124
86
|
let storageArgs = args;
|
|
125
87
|
if (!storageArgs.inputs.every(i => i.unlockingScript === undefined)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/createAction.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"createAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/createAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AtomicBEEF,
|
|
2
|
-
import {
|
|
1
|
+
import { AtomicBEEF, SendWithResult, SignActionArgs, SignActionResult, TXIDHexString } from '@bsv/sdk';
|
|
2
|
+
import { sdk, Wallet } from '../../index.client';
|
|
3
3
|
import { ReviewActionResult } from '../../sdk/WalletStorage.interfaces';
|
|
4
4
|
export interface SignActionResultX extends SignActionResult {
|
|
5
5
|
txid?: TXIDHexString;
|
|
@@ -8,6 +8,4 @@ export interface SignActionResultX extends SignActionResult {
|
|
|
8
8
|
notDelayedResults?: ReviewActionResult[];
|
|
9
9
|
}
|
|
10
10
|
export declare function signAction(wallet: Wallet, auth: sdk.AuthId, args: SignActionArgs): Promise<SignActionResultX>;
|
|
11
|
-
export declare function makeAtomicBeef(tx: BsvTransaction, beef: number[] | Beef): number[];
|
|
12
|
-
export declare function completeSignedTransaction(prior: PendingSignAction, spends: Record<number, SignActionSpend>, wallet: Wallet): Promise<BsvTransaction>;
|
|
13
11
|
//# sourceMappingURL=signAction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signAction.d.ts","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
3
|
exports.signAction = signAction;
|
|
5
|
-
exports.makeAtomicBeef = makeAtomicBeef;
|
|
6
|
-
exports.completeSignedTransaction = completeSignedTransaction;
|
|
7
4
|
const sdk_1 = require("@bsv/sdk");
|
|
8
5
|
const index_client_1 = require("../../index.client");
|
|
9
6
|
const createAction_1 = require("./createAction");
|
|
10
7
|
const sdk_2 = require("../../sdk");
|
|
8
|
+
const completeSignedTransaction_1 = require("./completeSignedTransaction");
|
|
11
9
|
async function signAction(wallet, auth, args) {
|
|
12
10
|
const prior = wallet.pendingSignActions[args.reference];
|
|
13
11
|
if (!prior)
|
|
@@ -15,65 +13,20 @@ async function signAction(wallet, auth, args) {
|
|
|
15
13
|
if (!prior.dcr.inputBeef)
|
|
16
14
|
throw new index_client_1.sdk.WERR_INTERNAL('prior.dcr.inputBeef must be valid');
|
|
17
15
|
const vargs = mergePriorOptions(prior.args, args);
|
|
18
|
-
prior.tx = await completeSignedTransaction(prior, vargs.spends, wallet);
|
|
16
|
+
prior.tx = await (0, completeSignedTransaction_1.completeSignedTransaction)(prior, vargs.spends, wallet);
|
|
19
17
|
const { sendWithResults, notDelayedResults } = await (0, createAction_1.processAction)(prior, wallet, auth, vargs);
|
|
18
|
+
const txid = prior.tx.id('hex');
|
|
19
|
+
const beef = sdk_1.Beef.fromBinary(prior.dcr.inputBeef);
|
|
20
|
+
beef.mergeTransaction(prior.tx);
|
|
21
|
+
(0, completeSignedTransaction_1.verifyUnlockScripts)(txid, beef);
|
|
20
22
|
const r = {
|
|
21
23
|
txid: prior.tx.id('hex'),
|
|
22
|
-
tx: vargs.options.returnTXIDOnly ? undefined :
|
|
24
|
+
tx: vargs.options.returnTXIDOnly ? undefined : beef.toBinaryAtomic(txid),
|
|
23
25
|
sendWithResults,
|
|
24
26
|
notDelayedResults
|
|
25
27
|
};
|
|
26
28
|
return r;
|
|
27
29
|
}
|
|
28
|
-
function makeAtomicBeef(tx, beef) {
|
|
29
|
-
if (Array.isArray(beef))
|
|
30
|
-
beef = sdk_1.Beef.fromBinary(beef);
|
|
31
|
-
beef.mergeTransaction(tx);
|
|
32
|
-
return beef.toBinaryAtomic(tx.id('hex'));
|
|
33
|
-
}
|
|
34
|
-
async function completeSignedTransaction(prior, spends, wallet) {
|
|
35
|
-
/////////////////////
|
|
36
|
-
// Insert the user provided unlocking scripts from "spends" arg
|
|
37
|
-
/////////////////////
|
|
38
|
-
for (const [key, spend] of Object.entries(spends)) {
|
|
39
|
-
const vin = Number(key);
|
|
40
|
-
const createInput = prior.args.inputs[vin];
|
|
41
|
-
const input = prior.tx.inputs[vin];
|
|
42
|
-
if (!createInput || !input || createInput.unlockingScript || !Number.isInteger(createInput.unlockingScriptLength))
|
|
43
|
-
throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend does not correspond to prior input with valid unlockingScriptLength.`);
|
|
44
|
-
if (spend.unlockingScript.length / 2 > createInput.unlockingScriptLength)
|
|
45
|
-
throw new index_client_1.sdk.WERR_INVALID_PARAMETER('args', `spend unlockingScript length ${spend.unlockingScript.length} exceeds expected length ${createInput.unlockingScriptLength}`);
|
|
46
|
-
input.unlockingScript = (0, index_client_1.asBsvSdkScript)(spend.unlockingScript);
|
|
47
|
-
if (spend.sequenceNumber !== undefined)
|
|
48
|
-
input.sequence = spend.sequenceNumber;
|
|
49
|
-
}
|
|
50
|
-
const results = {
|
|
51
|
-
sdk: {}
|
|
52
|
-
};
|
|
53
|
-
/////////////////////
|
|
54
|
-
// Insert SABPPP unlock templates for wallet signed inputs
|
|
55
|
-
/////////////////////
|
|
56
|
-
for (const pdi of prior.pdi) {
|
|
57
|
-
const sabppp = new index_client_1.ScriptTemplateBRC29({
|
|
58
|
-
derivationPrefix: pdi.derivationPrefix,
|
|
59
|
-
derivationSuffix: pdi.derivationSuffix,
|
|
60
|
-
keyDeriver: wallet.keyDeriver
|
|
61
|
-
});
|
|
62
|
-
const keys = wallet.getClientChangeKeyPair();
|
|
63
|
-
const lockerPrivKey = keys.privateKey;
|
|
64
|
-
const unlockerPubKey = pdi.unlockerPubKey || keys.publicKey;
|
|
65
|
-
const sourceSatoshis = pdi.sourceSatoshis;
|
|
66
|
-
const lockingScript = (0, index_client_1.asBsvSdkScript)(pdi.lockingScript);
|
|
67
|
-
const unlockTemplate = sabppp.unlock(lockerPrivKey, unlockerPubKey, sourceSatoshis, lockingScript);
|
|
68
|
-
const input = prior.tx.inputs[pdi.vin];
|
|
69
|
-
input.unlockingScriptTemplate = unlockTemplate;
|
|
70
|
-
}
|
|
71
|
-
/////////////////////
|
|
72
|
-
// Sign wallet signed inputs making transaction fully valid.
|
|
73
|
-
/////////////////////
|
|
74
|
-
await prior.tx.sign();
|
|
75
|
-
return prior.tx;
|
|
76
|
-
}
|
|
77
30
|
function mergePriorOptions(caVargs, saArgs) {
|
|
78
31
|
const saOptions = (saArgs.options || (saArgs.options = {}));
|
|
79
32
|
if (saOptions.acceptDelayedBroadcast === undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signAction.js","sourceRoot":"","sources":["../../../../src/signer/methods/signAction.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageKnex.d.ts","sourceRoot":"","sources":["../../../src/storage/StorageKnex.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"StorageKnex.d.ts","sourceRoot":"","sources":["../../../src/storage/StorageKnex.ts"],"names":[],"mappings":"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"}
|
|
@@ -454,7 +454,8 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
|
|
|
454
454
|
case 'monitor_events':
|
|
455
455
|
sortColumn = 'id';
|
|
456
456
|
break;
|
|
457
|
-
default:
|
|
457
|
+
default:
|
|
458
|
+
break;
|
|
458
459
|
}
|
|
459
460
|
if (sortColumn !== '') {
|
|
460
461
|
q.orderBy(sortColumn, 'desc');
|
|
@@ -1052,7 +1053,11 @@ class StorageKnex extends StorageProvider_1.StorageProvider {
|
|
|
1052
1053
|
async adminStats(adminIdentityKey) {
|
|
1053
1054
|
if (this.dbtype !== 'MySQL')
|
|
1054
1055
|
throw new index_all_1.sdk.WERR_NOT_IMPLEMENTED('adminStats, only MySQL is supported');
|
|
1055
|
-
const monitorEvent = (0, index_all_1.verifyOneOrNone)(await this.findMonitorEvents({
|
|
1056
|
+
const monitorEvent = (0, index_all_1.verifyOneOrNone)(await this.findMonitorEvents({
|
|
1057
|
+
partial: { event: 'MonitorCallHistory' },
|
|
1058
|
+
orderDescending: true,
|
|
1059
|
+
paged: { limit: 1 }
|
|
1060
|
+
}));
|
|
1056
1061
|
const monitorStats = monitorEvent ? JSON.parse(monitorEvent.details) : undefined;
|
|
1057
1062
|
const servicesStats = this.getServices().getServicesCallHistory(true);
|
|
1058
1063
|
await this.insertMonitorEvent({
|