@1sat/actions 0.0.132 → 0.0.133
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/dist/addresses/index.d.ts +2 -2
- package/dist/addresses/index.d.ts.map +1 -1
- package/dist/addresses/index.js +3 -3
- package/dist/addresses/index.js.map +1 -1
- package/dist/cosign/types.d.ts +4 -1
- package/dist/cosign/types.d.ts.map +1 -1
- package/dist/cosign/types.js +6 -2
- package/dist/cosign/types.js.map +1 -1
- package/dist/identity/index.d.ts.map +1 -1
- package/dist/identity/index.js +19 -11
- package/dist/identity/index.js.map +1 -1
- package/dist/inscriptions/index.d.ts.map +1 -1
- package/dist/inscriptions/index.js +9 -4
- package/dist/inscriptions/index.js.map +1 -1
- package/dist/locks/index.d.ts.map +1 -1
- package/dist/locks/index.js +5 -1
- package/dist/locks/index.js.map +1 -1
- package/dist/mnee/index.d.ts.map +1 -1
- package/dist/mnee/index.js +3 -3
- package/dist/mnee/index.js.map +1 -1
- package/dist/signing/aip.d.ts +3 -2
- package/dist/signing/aip.d.ts.map +1 -1
- package/dist/signing/aip.js +9 -5
- package/dist/signing/aip.js.map +1 -1
- package/dist/signing/sigma.d.ts.map +1 -1
- package/dist/signing/sigma.js +5 -3
- package/dist/signing/sigma.js.map +1 -1
- package/dist/social/index.d.ts.map +1 -1
- package/dist/social/index.js +9 -4
- package/dist/social/index.js.map +1 -1
- package/dist/sweep/index.d.ts +1 -0
- package/dist/sweep/index.d.ts.map +1 -1
- package/dist/sweep/index.js +2 -0
- package/dist/sweep/index.js.map +1 -1
- package/dist/sweep/sweepDeposit.d.ts +26 -0
- package/dist/sweep/sweepDeposit.d.ts.map +1 -0
- package/dist/sweep/sweepDeposit.js +133 -0
- package/dist/sweep/sweepDeposit.js.map +1 -0
- package/dist/sync/index.js +2 -2
- package/dist/sync/index.js.map +1 -1
- package/dist/utils/createTrackedAction.d.ts.map +1 -1
- package/dist/utils/createTrackedAction.js +16 -0
- package/dist/utils/createTrackedAction.js.map +1 -1
- package/dist/utils/internalizeBeef.js +15 -15
- package/dist/utils/internalizeBeef.js.map +1 -1
- package/dist/utils/placeholders.d.ts +38 -0
- package/dist/utils/placeholders.d.ts.map +1 -0
- package/dist/utils/placeholders.js +48 -0
- package/dist/utils/placeholders.js.map +1 -0
- package/package.json +6 -6
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*
|
|
8
8
|
* Used by both address sync (external deposits) and message box sync (paymail payments).
|
|
9
9
|
*/
|
|
10
|
-
import {
|
|
10
|
+
import { DEPOSIT_BASKET, P1SAT_PROTOCOL } from '@1sat/types';
|
|
11
11
|
import { Bsv21Indexer, CosignIndexer, FundIndexer, InscriptionIndexer, MapIndexer, OpNSIndexer, OriginIndexer, Outpoint, SigmaIndexer, } from '@1sat/wallet';
|
|
12
12
|
import { Beef, Transaction, } from '@bsv/sdk';
|
|
13
13
|
import { randomActionId } from './createTrackedAction';
|
|
@@ -188,7 +188,8 @@ function buildInternalizeOutput(txo, derivation, actionId) {
|
|
|
188
188
|
},
|
|
189
189
|
};
|
|
190
190
|
}
|
|
191
|
-
// P2PKH ordinals/tokens
|
|
191
|
+
// P2PKH 1Sat asset (ordinals/tokens) — basket insertion so the wallet
|
|
192
|
+
// records the spend protocol/keyID for later signing under P1SAT.
|
|
192
193
|
if (txo.basket && txo.basket !== 'fund') {
|
|
193
194
|
const tags = [...collectTags(txo), idTag];
|
|
194
195
|
const nameTag = tags.find((t) => t.startsWith('name:'));
|
|
@@ -200,28 +201,27 @@ function buildInternalizeOutput(txo, derivation, actionId) {
|
|
|
200
201
|
basket: txo.basket,
|
|
201
202
|
tags,
|
|
202
203
|
customInstructions: JSON.stringify({
|
|
203
|
-
protocolID:
|
|
204
|
+
protocolID: P1SAT_PROTOCOL,
|
|
204
205
|
keyID: `${derivation.derivationPrefix} ${derivation.derivationSuffix}`,
|
|
205
|
-
// senderIdentityKey is the counterparty from this wallet's
|
|
206
|
-
// perspective — needed at spend time so signP2PKHInput can
|
|
207
|
-
// derive the correct shared key (BRC-29 symmetry).
|
|
208
|
-
...(derivation.senderIdentityKey && {
|
|
209
|
-
counterparty: derivation.senderIdentityKey,
|
|
210
|
-
}),
|
|
211
206
|
...(nameTag && { name: nameTag.slice(5).slice(0, 64) }),
|
|
212
207
|
...(sym && { sym }),
|
|
213
208
|
}),
|
|
214
209
|
},
|
|
215
210
|
};
|
|
216
211
|
}
|
|
217
|
-
//
|
|
212
|
+
// Plain BSV at the user's deposit address — park in the deposit basket
|
|
213
|
+
// for the sweep helper to pick up. Custom instructions record P1SAT so
|
|
214
|
+
// the sweep tx can sign under the right protocol.
|
|
218
215
|
return {
|
|
219
216
|
outputIndex: vout,
|
|
220
|
-
protocol: '
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
217
|
+
protocol: 'basket insertion',
|
|
218
|
+
insertionRemittance: {
|
|
219
|
+
basket: DEPOSIT_BASKET,
|
|
220
|
+
tags: [idTag],
|
|
221
|
+
customInstructions: JSON.stringify({
|
|
222
|
+
protocolID: P1SAT_PROTOCOL,
|
|
223
|
+
keyID: `${derivation.derivationPrefix} ${derivation.derivationSuffix}`,
|
|
224
|
+
}),
|
|
225
225
|
},
|
|
226
226
|
};
|
|
227
227
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internalizeBeef.js","sourceRoot":"","sources":["../../src/utils/internalizeBeef.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"internalizeBeef.js","sourceRoot":"","sources":["../../src/utils/internalizeBeef.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Placeholder helpers for the 1Sat permission module.
|
|
3
|
+
*
|
|
4
|
+
* Bucket B actions (BSocial posts, BAP-signed inscriptions, BAP chain ops)
|
|
5
|
+
* traditionally compute their AIP/Sigma signatures BEFORE calling
|
|
6
|
+
* createAction. Under the new permission flow, that pre-signature call
|
|
7
|
+
* goes through the module with no captured commitment and prompts the
|
|
8
|
+
* user — leading to two prompts per action.
|
|
9
|
+
*
|
|
10
|
+
* Instead, the action constructs the locking script with all data pushes
|
|
11
|
+
* EXCEPT the AIP/Sigma signature, then appends a placeholder marker push.
|
|
12
|
+
* The module's onRequest handler detects the placeholder, strips it,
|
|
13
|
+
* computes the real signature internally (via direct underlying-wallet
|
|
14
|
+
* calls that bypass the permission manager), and writes the modified
|
|
15
|
+
* locking script back to the createAction args. The user sees one prompt
|
|
16
|
+
* covering the full intent.
|
|
17
|
+
*/
|
|
18
|
+
import { type Script } from '@bsv/sdk';
|
|
19
|
+
/**
|
|
20
|
+
* Append the AIP placeholder push to a locking script. The module will
|
|
21
|
+
* substitute the real AIP suffix (`| AIP_PREFIX BITCOIN_ECDSA <addr> <sig>`)
|
|
22
|
+
* before the wallet sees the createAction args.
|
|
23
|
+
*
|
|
24
|
+
* @param script - locking script to append the placeholder to (mutated and returned)
|
|
25
|
+
* @param keyID - optional explicit BAP keyID (e.g. `'identity-0'` for the
|
|
26
|
+
* root key during identity publish). Omit to use the current
|
|
27
|
+
* rotated signing key.
|
|
28
|
+
*/
|
|
29
|
+
export declare function appendAipPlaceholder(script: Script, keyID?: string): Script;
|
|
30
|
+
/**
|
|
31
|
+
* Append the Sigma placeholder push to a locking script.
|
|
32
|
+
*
|
|
33
|
+
* @param targetVout - which output of the new tx the signature covers
|
|
34
|
+
* (typically the index of this output)
|
|
35
|
+
* @param refVin - which input of the new tx anchors the input hash
|
|
36
|
+
*/
|
|
37
|
+
export declare function appendSigmaPlaceholder(script: Script, targetVout: number, refVin: number): Script;
|
|
38
|
+
//# sourceMappingURL=placeholders.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"placeholders.d.ts","sourceRoot":"","sources":["../../src/utils/placeholders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAOH,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,UAAU,CAAA;AAE7C;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACZ,MAAM,CAQR"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Placeholder helpers for the 1Sat permission module.
|
|
3
|
+
*
|
|
4
|
+
* Bucket B actions (BSocial posts, BAP-signed inscriptions, BAP chain ops)
|
|
5
|
+
* traditionally compute their AIP/Sigma signatures BEFORE calling
|
|
6
|
+
* createAction. Under the new permission flow, that pre-signature call
|
|
7
|
+
* goes through the module with no captured commitment and prompts the
|
|
8
|
+
* user — leading to two prompts per action.
|
|
9
|
+
*
|
|
10
|
+
* Instead, the action constructs the locking script with all data pushes
|
|
11
|
+
* EXCEPT the AIP/Sigma signature, then appends a placeholder marker push.
|
|
12
|
+
* The module's onRequest handler detects the placeholder, strips it,
|
|
13
|
+
* computes the real signature internally (via direct underlying-wallet
|
|
14
|
+
* calls that bypass the permission manager), and writes the modified
|
|
15
|
+
* locking script back to the createAction args. The user sees one prompt
|
|
16
|
+
* covering the full intent.
|
|
17
|
+
*/
|
|
18
|
+
import { P1SAT_AIP_PLACEHOLDER, P1SAT_AIP_PLACEHOLDER_PREFIX, P1SAT_SIGMA_PLACEHOLDER_PREFIX, } from '@1sat/types';
|
|
19
|
+
import { Utils } from '@bsv/sdk';
|
|
20
|
+
/**
|
|
21
|
+
* Append the AIP placeholder push to a locking script. The module will
|
|
22
|
+
* substitute the real AIP suffix (`| AIP_PREFIX BITCOIN_ECDSA <addr> <sig>`)
|
|
23
|
+
* before the wallet sees the createAction args.
|
|
24
|
+
*
|
|
25
|
+
* @param script - locking script to append the placeholder to (mutated and returned)
|
|
26
|
+
* @param keyID - optional explicit BAP keyID (e.g. `'identity-0'` for the
|
|
27
|
+
* root key during identity publish). Omit to use the current
|
|
28
|
+
* rotated signing key.
|
|
29
|
+
*/
|
|
30
|
+
export function appendAipPlaceholder(script, keyID) {
|
|
31
|
+
const marker = keyID
|
|
32
|
+
? `${P1SAT_AIP_PLACEHOLDER_PREFIX}${keyID}`
|
|
33
|
+
: P1SAT_AIP_PLACEHOLDER;
|
|
34
|
+
script.writeBin(Utils.toArray(marker, 'utf8'));
|
|
35
|
+
return script;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Append the Sigma placeholder push to a locking script.
|
|
39
|
+
*
|
|
40
|
+
* @param targetVout - which output of the new tx the signature covers
|
|
41
|
+
* (typically the index of this output)
|
|
42
|
+
* @param refVin - which input of the new tx anchors the input hash
|
|
43
|
+
*/
|
|
44
|
+
export function appendSigmaPlaceholder(script, targetVout, refVin) {
|
|
45
|
+
script.writeBin(Utils.toArray(`${P1SAT_SIGMA_PLACEHOLDER_PREFIX}${targetVout}:${refVin}`, 'utf8'));
|
|
46
|
+
return script;
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=placeholders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"placeholders.js","sourceRoot":"","sources":["../../src/utils/placeholders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACN,qBAAqB,EACrB,4BAA4B,EAC5B,8BAA8B,GAC9B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAe,KAAK,EAAE,MAAM,UAAU,CAAA;AAE7C;;;;;;;;;GASG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAc,EAAE,KAAc;IAClE,MAAM,MAAM,GAAG,KAAK;QACnB,CAAC,CAAC,GAAG,4BAA4B,GAAG,KAAK,EAAE;QAC3C,CAAC,CAAC,qBAAqB,CAAA;IACxB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC9C,OAAO,MAAM,CAAA;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACrC,MAAc,EACd,UAAkB,EAClB,MAAc;IAEd,MAAM,CAAC,QAAQ,CACd,KAAK,CAAC,OAAO,CACZ,GAAG,8BAA8B,GAAG,UAAU,IAAI,MAAM,EAAE,EAC1D,MAAM,CACN,CACD,CAAA;IACD,OAAO,MAAM,CAAA;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@1sat/actions",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.133",
|
|
4
4
|
"description": "Action definitions for the 1Sat SDK",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
],
|
|
30
30
|
"license": "MIT",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@1sat/client": "0.0.
|
|
33
|
-
"@1sat/types": "0.0.
|
|
34
|
-
"@1sat/utils": "0.0.
|
|
35
|
-
"@1sat/wallet": "0.0.
|
|
36
|
-
"@1sat/templates": "0.0.
|
|
32
|
+
"@1sat/client": "0.0.29",
|
|
33
|
+
"@1sat/types": "0.0.22",
|
|
34
|
+
"@1sat/utils": "0.0.17",
|
|
35
|
+
"@1sat/wallet": "0.0.71",
|
|
36
|
+
"@1sat/templates": "0.0.13",
|
|
37
37
|
"@bsv/p2p": "^1.1.6"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|