@1sat/actions 0.0.67 → 0.0.69

package/dist/utils/createTrackedAction.js

@@ -1,4 +1,5 @@
 import { Utils, } from '@bsv/sdk';
+import { completeSignedAction, } from './completeSignedAction';
 /**
  * Generate a random hex string for action tracking.
  */
@@ -25,12 +26,12 @@ function applyTrackingTags(args, actionId) {
  * into every output that has a basket. All outputs in the same action
  * share the same ID, allowing targeted lookups via listOutputs tag filter.
  *
- * Uses two-phase flow (createAction + signAction) so the wallet's
- * permission system can intercept between creation and signing.
+ * Only calls createAction(signAndProcess: false). Does NOT call signAction.
+ * All signAction calls go through completeSignedAction for abort protection.
  *
  * @param wallet - BRC-100 wallet
  * @param args - Standard createAction args
- * @returns The createAction result, plus the generated actionId
+ * @returns The createAction result with signableTransaction, plus the generated actionId
  */
 export async function createTrackedAction(wallet, args) {
     const actionId = randomActionId();
@@ -43,53 +44,58 @@ export async function createTrackedAction(wallet, args) {
             signAndProcess: false,
         },
     });
-    if (!createResult.signableTransaction) {
-        return { ...createResult, actionId };
-    }
-    const signResult = await wallet.signAction({
-        reference: createResult.signableTransaction.reference,
-        spends: {},
-        options: {
-            acceptDelayedBroadcast: options?.acceptDelayedBroadcast ?? false,
-        },
-    });
-    return { ...signResult, actionId };
+    return { ...createResult, actionId };
 }
+const noOpSign = async () => ({});
 /**
- * Execute a tracked action with optional external funding.
+ * Execute a tracked action end-to-end.
+ *
+ * If a fundingProvider is supplied, the provider builds, funds, and broadcasts
+ * the transaction externally. The result is then internalized into the wallet.
  *
- * If a fundingProvider is supplied, the full args are passed to the provider
- * to build, fund, and broadcast the transaction. The result is then
- * internalized into the wallet so it tracks the outputs.
- * Otherwise, delegates to createTrackedAction (wallet funds the transaction).
+ * Otherwise, creates the action via createTrackedAction then completes it
+ * via completeSignedAction (which handles signing, script verification,
+ * signAction, and abort on failure).
  *
  * @param wallet - BRC-100 wallet
  * @param args - Standard createAction args
- * @param fundingProvider - Optional external funder (e.g. Droplit)
+ * @param fundingProvider - Optional external funder
+ * @param inputBEEF - Optional BEEF for external inputs (merged with signable BEEF for verification)
+ * @param sign - Optional signing callback for caller-signed inputs. When omitted, no external spends are provided.
  * @returns The action result, plus the generated actionId
  */
-export async function executeTrackedAction(wallet, args, fundingProvider) {
-    if (!fundingProvider) {
-        return createTrackedAction(wallet, args);
+export async function executeTrackedAction(wallet, args, fundingProvider, inputBEEF, sign) {
+    if (fundingProvider) {
+        const actionId = randomActionId();
+        applyTrackingTags(args, actionId);
+        const funded = await fundingProvider.fund(args);
+        const internalizeOutputs = (args.outputs ?? []).map((o, i) => ({
+            outputIndex: i,
+            protocol: 'basket insertion',
+            insertionRemittance: {
+                basket: o.basket ?? 'default',
+                customInstructions: o.customInstructions,
+                tags: o.tags ?? [],
+            },
+        }));
+        await wallet.internalizeAction({
+            tx: funded.tx,
+            outputs: internalizeOutputs,
+            description: args.description,
+            labels: args.labels,
+        });
+        return { txid: funded.txid, actionId };
     }
-    const actionId = randomActionId();
-    applyTrackingTags(args, actionId);
-    const funded = await fundingProvider.fund(args);
-    const internalizeOutputs = (args.outputs ?? []).map((o, i) => ({
-        outputIndex: i,
-        protocol: 'basket insertion',
-        insertionRemittance: {
-            basket: o.basket ?? 'default',
-            customInstructions: o.customInstructions,
-            tags: o.tags ?? [],
-        },
-    }));
-    await wallet.internalizeAction({
-        tx: funded.tx,
-        outputs: internalizeOutputs,
-        description: args.description,
-        labels: args.labels,
-    });
-    return { txid: funded.txid, actionId };
+    const createResult = await createTrackedAction(wallet, args);
+    if (!createResult.signableTransaction) {
+        return {
+            txid: createResult.txid,
+            tx: createResult.tx ? Array.from(createResult.tx) : undefined,
+            noSendChange: createResult.noSendChange,
+            actionId: createResult.actionId,
+        };
+    }
+    const result = await completeSignedAction(wallet, createResult, inputBEEF, sign ?? noOpSign);
+    return { ...result, actionId: createResult.actionId };
 }
 //# sourceMappingURL=createTrackedAction.js.map

package/dist/utils/createTrackedAction.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@1sat/actions",
-	"version": "0.0.67",
+	"version": "0.0.69",
 	"description": "Action definitions for the 1Sat SDK",
 	"type": "module",
 	"main": "./dist/index.js",