@1sat/actions 0.0.197 → 0.0.198

package/dist/utils/loadBasketOutput.d.ts

@@ -8,7 +8,7 @@ export interface LoadBasketOutputResult {
 }
 /**
  * Load a single wallet-owned basket UTXO by tracking id.
- * Returns tags, customInstructions, outpoint; optionally BEEF for spending.
+ * Always returns plaintext customInstructions (peels WPM metadata encryption).
  */
 export declare function loadBasketOutput(wallet: WalletInterface, basket: string, id: string, opts?: {
     includeBeef?: boolean;

package/dist/utils/loadBasketOutput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadBasketOutput.d.ts","sourceRoot":"","sources":["../../src/utils/loadBasketOutput.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEnE,+CAA+C;AAC/C,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAI1C;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,YAAY,CAAA;IACpB,uCAAuC;IACvC,IAAI,CAAC,EAAE,IAAI,CAAA;CACX;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,OAAO,CAAC,sBAAsB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA2BrD;AAED,6CAA6C;AAC7C,wBAAsB,oBAAoB,CACzC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,GACR,OAAO,CAAC;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CASvE"}
+{"version":3,"file":"loadBasketOutput.d.ts","sourceRoot":"","sources":["../../src/utils/loadBasketOutput.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGnE,+CAA+C;AAC/C,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAI1C;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,YAAY,CAAA;IACpB,uCAAuC;IACvC,IAAI,CAAC,EAAE,IAAI,CAAA;CACX;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9B,OAAO,CAAC,sBAAsB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAsCrD;AAED,6CAA6C;AAC7C,wBAAsB,oBAAoB,CACzC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,GACR,OAAO,CAAC;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CASvE"}

package/dist/utils/loadBasketOutput.js

@@ -1,3 +1,4 @@
+import { ensurePlaintextCi } from './walletMetadataCi';
 /** Accept bare id value or full `id:…` tag. */
 export function toIdTag(id) {
     const t = id.trim();
@@ -7,7 +8,7 @@ export function toIdTag(id) {
 }
 /**
  * Load a single wallet-owned basket UTXO by tracking id.
- * Returns tags, customInstructions, outpoint; optionally BEEF for spending.
+ * Always returns plaintext customInstructions (peels WPM metadata encryption).
  */
 export async function loadBasketOutput(wallet, basket, id, opts) {
     let idTag;
@@ -26,10 +27,17 @@ export async function loadBasketOutput(wallet, basket, id, opts) {
         ...(opts?.includeBeef ? { include: 'entire transactions' } : {}),
         limit: 1,
     });
-    const output = result.outputs[0];
-    if (!output) {
+    const row = result.outputs[0];
+    if (!row) {
         return { error: `output-not-found:${idTag}` };
     }
+    const customInstructions = await ensurePlaintextCi(wallet, row.customInstructions);
+    const output = {
+        ...row,
+        ...(customInstructions !== undefined
+            ? { customInstructions }
+            : { customInstructions: undefined }),
+    };
     return {
         output,
         ...(opts?.includeBeef && result.BEEF ? { BEEF: result.BEEF } : {}),

package/dist/utils/loadBasketOutput.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadBasketOutput.js","sourceRoot":"","sources":["../../src/utils/loadBasketOutput.ts"],"names":[],"mappings":"AAEA,+CAA+C;AAC/C,MAAM,UAAU,OAAO,CAAC,EAAU;IACjC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;IACnB,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;IACnC,OAAO,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAA;AAC3C,CAAC;AAQD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,MAAuB,EACvB,MAAc,EACd,EAAU,EACV,IAAgC;IAEhC,IAAI,KAAa,CAAA;IACjB,IAAI,CAAC;QACJ,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;IAC7B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;QACvC,MAAM;QACN,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,IAAI;QACjB,yBAAyB,EAAE,IAAI;QAC/B,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,qBAA8B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,KAAK,EAAE,CAAC;KACR,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAChC,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,oBAAoB,KAAK,EAAE,EAAE,CAAA;IAC9C,CAAC;IAED,OAAO;QACN,MAAM;QACN,GAAG,CAAC,IAAI,EAAE,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClE,CAAA;AACF,CAAC;AAED,6CAA6C;AAC7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,MAAuB,EACvB,MAAc,EACd,EAAU;IAEV,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;QACzD,WAAW,EAAE,IAAI;KACjB,CAAC,CAAA;IACF,IAAI,OAAO,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IACpC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAC1B,OAAO,EAAE,KAAK,EAAE,WAAW,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,CAAA;IAC3C,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;AAChE,CAAC"}
+{"version":3,"file":"loadBasketOutput.js","sourceRoot":"","sources":["../../src/utils/loadBasketOutput.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD,+CAA+C;AAC/C,MAAM,UAAU,OAAO,CAAC,EAAU;IACjC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;IACnB,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;IACnC,OAAO,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAA;AAC3C,CAAC;AAQD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,MAAuB,EACvB,MAAc,EACd,EAAU,EACV,IAAgC;IAEhC,IAAI,KAAa,CAAA;IACjB,IAAI,CAAC;QACJ,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;IAC7B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;QACvC,MAAM;QACN,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,IAAI;QACjB,yBAAyB,EAAE,IAAI;QAC/B,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,qBAA8B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,KAAK,EAAE,CAAC;KACR,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,EAAE,KAAK,EAAE,oBAAoB,KAAK,EAAE,EAAE,CAAA;IAC9C,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CACjD,MAAM,EACN,GAAG,CAAC,kBAAkB,CACtB,CAAA;IACD,MAAM,MAAM,GAAiB;QAC5B,GAAG,GAAG;QACN,GAAG,CAAC,kBAAkB,KAAK,SAAS;YACnC,CAAC,CAAC,EAAE,kBAAkB,EAAE;YACxB,CAAC,CAAC,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC;KACrC,CAAA;IAED,OAAO;QACN,MAAM;QACN,GAAG,CAAC,IAAI,EAAE,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClE,CAAA;AACF,CAAC;AAED,6CAA6C;AAC7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,MAAuB,EACvB,MAAc,EACd,EAAU;IAEV,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;QACzD,WAAW,EAAE,IAAI;KACjB,CAAC,CAAA;IACF,IAAI,OAAO,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IACpC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAC1B,OAAO,EAAE,KAAK,EAAE,WAAW,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,CAAA;IAC3C,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;AAChE,CAAC"}

package/dist/utils/moveBasket.d.ts

@@ -0,0 +1,37 @@
+import type { WalletInterface } from '@bsv/sdk';
+export interface MoveBasketOptions {
+    /** Max outputs to move per call (default 1000). */
+    limit?: number;
+    /** Offset into listOutputs (default 0). */
+    offset?: number;
+}
+export interface MoveBasketResult {
+    from: string;
+    to: string;
+    moved: number;
+    skipped: number;
+    outpoints: string[];
+    errors: Array<{
+        outpoint: string;
+        error: string;
+    }>;
+}
+/**
+ * Re-file spendable outputs from one basket into another via
+ * `internalizeAction` basket insertion (merge updates `basketId` in place).
+ * Tags and customInstructions are preserved. No chain spend.
+ *
+ * Each outpoint is internalized with an AtomicBEEF for **its** tx — outputs
+ * from different txs cannot share one subject BEEF.
+ */
+export declare function moveBasketOutputs(wallet: WalletInterface, fromBasket: string, toBasket: string, opts?: MoveBasketOptions): Promise<MoveBasketResult>;
+export interface MigrateLegacyBasketsResult {
+    results: MoveBasketResult[];
+    totalMoved: number;
+}
+/**
+ * Move every known legacy `p 1sat …` basket into its preferred plain name.
+ * Idempotent when source baskets are empty.
+ */
+export declare function migrateLegacyP1SatBaskets(wallet: WalletInterface, opts?: MoveBasketOptions): Promise<MigrateLegacyBasketsResult>;
+//# sourceMappingURL=moveBasket.d.ts.map

package/dist/utils/moveBasket.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"moveBasket.d.ts","sourceRoot":"","sources":["../../src/utils/moveBasket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG/C,MAAM,WAAW,iBAAiB;IACjC,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAClD;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACtC,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,iBAAsB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAgG3B;AAED,MAAM,WAAW,0BAA0B;IAC1C,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,UAAU,EAAE,MAAM,CAAA;CAClB;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC9C,MAAM,EAAE,eAAe,EACvB,IAAI,GAAE,iBAAsB,GAC1B,OAAO,CAAC,0BAA0B,CAAC,CASrC"}

package/dist/utils/moveBasket.js

@@ -0,0 +1,115 @@
+import { LEGACY_P1SAT_BASKET_MIGRATIONS } from '@1sat/types';
+import { Beef } from '@bsv/sdk';
+/**
+ * Re-file spendable outputs from one basket into another via
+ * `internalizeAction` basket insertion (merge updates `basketId` in place).
+ * Tags and customInstructions are preserved. No chain spend.
+ *
+ * Each outpoint is internalized with an AtomicBEEF for **its** tx — outputs
+ * from different txs cannot share one subject BEEF.
+ */
+export async function moveBasketOutputs(wallet, fromBasket, toBasket, opts = {}) {
+    const from = fromBasket.trim();
+    const to = toBasket.trim();
+    if (!from || !to)
+        throw new Error('moveBasket: from and to baskets required');
+    if (from === to) {
+        return { from, to, moved: 0, skipped: 0, outpoints: [], errors: [] };
+    }
+    const listed = await wallet.listOutputs({
+        basket: from,
+        include: 'entire transactions',
+        includeTags: true,
+        includeCustomInstructions: true,
+        limit: opts.limit ?? 1000,
+        offset: opts.offset ?? 0,
+    });
+    const beefBin = listed.BEEF;
+    if (!beefBin?.length && listed.outputs.length > 0) {
+        throw new Error(`moveBasket: listOutputs returned no BEEF for basket ${from}`);
+    }
+    const beef = beefBin?.length ? Beef.fromBinary(Array.from(beefBin)) : null;
+    const errors = [];
+    const outpoints = [];
+    let moved = 0;
+    let skipped = 0;
+    for (const o of listed.outputs) {
+        const outpoint = o.outpoint;
+        if (!outpoint?.includes('.')) {
+            skipped++;
+            errors.push({ outpoint: outpoint ?? '?', error: 'bad-outpoint' });
+            continue;
+        }
+        const [txid, voutStr] = outpoint.split('.');
+        const vout = Number(voutStr);
+        if (!txid || !Number.isFinite(vout)) {
+            skipped++;
+            errors.push({ outpoint, error: 'bad-vout' });
+            continue;
+        }
+        if (!beef) {
+            skipped++;
+            errors.push({ outpoint, error: 'no-beef' });
+            continue;
+        }
+        let atomic;
+        try {
+            if (!beef.findTxid(txid)) {
+                skipped++;
+                errors.push({ outpoint, error: `beef-missing-txid:${txid.slice(0, 12)}` });
+                continue;
+            }
+            atomic = Array.from(beef.toBinaryAtomic(txid));
+        }
+        catch (e) {
+            skipped++;
+            errors.push({
+                outpoint,
+                error: e instanceof Error ? e.message : 'atomic-beef-failed',
+            });
+            continue;
+        }
+        try {
+            await wallet.internalizeAction({
+                tx: atomic,
+                outputs: [
+                    {
+                        outputIndex: vout,
+                        protocol: 'basket insertion',
+                        insertionRemittance: {
+                            basket: to,
+                            tags: o.tags ?? [],
+                            customInstructions: o.customInstructions,
+                        },
+                    },
+                ],
+                description: `move basket ${from} → ${to}`,
+            });
+            moved++;
+            outpoints.push(outpoint);
+        }
+        catch (err) {
+            skipped++;
+            errors.push({
+                outpoint,
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    return { from, to, moved, skipped, outpoints, errors };
+}
+/**
+ * Move every known legacy `p 1sat …` basket into its preferred plain name.
+ * Idempotent when source baskets are empty.
+ */
+export async function migrateLegacyP1SatBaskets(wallet, opts = {}) {
+    const results = [];
+    let totalMoved = 0;
+    for (const { from, to } of LEGACY_P1SAT_BASKET_MIGRATIONS) {
+        const r = await moveBasketOutputs(wallet, from, to, opts);
+        results.push(r);
+        totalMoved += r.moved;
+    }
+    return { results, totalMoved };
+}
+//# sourceMappingURL=moveBasket.js.map

package/dist/utils/moveBasket.js.map

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

package/dist/utils/ordinalRemittance.d.ts

@@ -0,0 +1,33 @@
+/**
+ * BRC-147 load-bearing remittance fields mirrored from filter tags
+ * (origin / content / app / collection). Outpoint values normalized to `_`.
+ */
+export declare function remittanceFromOrdinalTags(tags: string[] | undefined): {
+    origin?: string;
+    content?: string;
+    app?: string;
+    collection?: string;
+};
+/** Spend-derivation CI plus BRC-147 remittance dual-stamped from tags. */
+export declare function buildOrdinalCustomInstructions(opts: {
+    protocolID: unknown;
+    keyID: string;
+    counterparty?: string;
+    tags?: string[];
+    name?: string;
+    /** Extra fields merged last (e.g. listing metadata). */
+    extra?: Record<string, unknown>;
+}): string;
+export type OrdinalRemittanceFields = {
+    origin?: string;
+    content?: string;
+    app?: string;
+    collection?: string;
+    name?: string;
+};
+/**
+ * Overwrite BRC-147 remittance fields on existing CI JSON.
+ * Keeps derivation and any other keys. Only sets fields present on `auth`.
+ */
+export declare function overwriteOrdinalCiFields(existingJson: string, auth: OrdinalRemittanceFields): string;
+//# sourceMappingURL=ordinalRemittance.d.ts.map

package/dist/utils/ordinalRemittance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordinalRemittance.d.ts","sourceRoot":"","sources":["../../src/utils/ordinalRemittance.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,GACxB;IACF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB,CAwBA;AAED,0EAA0E;AAC1E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACpD,UAAU,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B,GAAG,MAAM,CAYT;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACvC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,uBAAuB,GAC3B,MAAM,CAWR"}

package/dist/utils/ordinalRemittance.js

@@ -0,0 +1,70 @@
+import { displayNameForCi, formatOrdinalOutpoint } from '@1sat/types';
+/**
+ * BRC-147 load-bearing remittance fields mirrored from filter tags
+ * (origin / content / app / collection). Outpoint values normalized to `_`.
+ */
+export function remittanceFromOrdinalTags(tags) {
+    if (!tags?.length)
+        return {};
+    let origin;
+    let content;
+    let app;
+    let collection;
+    for (const t of tags) {
+        const n = t.trim();
+        if (n.startsWith('origin:') && !origin) {
+            origin = formatOrdinalOutpoint(n.slice(7));
+        }
+        else if (n.startsWith('content:') && !content) {
+            content = formatOrdinalOutpoint(n.slice(8));
+        }
+        else if (n.startsWith('app:') && !app) {
+            app = n.slice(4);
+        }
+        else if (n.startsWith('collection:') && !collection) {
+            collection = formatOrdinalOutpoint(n.slice(11));
+        }
+    }
+    return {
+        ...(origin && { origin }),
+        ...(content && { content }),
+        ...(app && { app }),
+        ...(collection && { collection }),
+    };
+}
+/** Spend-derivation CI plus BRC-147 remittance dual-stamped from tags. */
+export function buildOrdinalCustomInstructions(opts) {
+    const name = displayNameForCi(opts.name);
+    return JSON.stringify({
+        protocolID: opts.protocolID,
+        keyID: opts.keyID,
+        ...(opts.counterparty !== undefined && {
+            counterparty: opts.counterparty,
+        }),
+        ...remittanceFromOrdinalTags(opts.tags),
+        ...(name && { name }),
+        ...opts.extra,
+    });
+}
+/**
+ * Overwrite BRC-147 remittance fields on existing CI JSON.
+ * Keeps derivation and any other keys. Only sets fields present on `auth`.
+ */
+export function overwriteOrdinalCiFields(existingJson, auth) {
+    const o = JSON.parse(existingJson);
+    if (auth.origin !== undefined)
+        o.origin = auth.origin;
+    if (auth.content !== undefined)
+        o.content = auth.content;
+    if (auth.app !== undefined)
+        o.app = auth.app;
+    if (auth.collection !== undefined)
+        o.collection = auth.collection;
+    if (auth.name !== undefined) {
+        const n = displayNameForCi(auth.name);
+        if (n)
+            o.name = n;
+    }
+    return JSON.stringify(o);
+}
+//# sourceMappingURL=ordinalRemittance.js.map

package/dist/utils/ordinalRemittance.js.map

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

package/dist/utils/ordinalSeedTags.d.ts

@@ -1,8 +1,10 @@
 import type { WalletOutput } from '@bsv/sdk';
 /**
- * Ordinal identity tags to file on a self-kept spend of `source`.
- * Bare `origin` promotes to `origin:<source.outpoint>`.
- * Does not include id:, listing markers, or domain flags (opns:published, …).
+ * Ordinal identity tags to file on a self-kept spend of `source` (BRC-147).
+ * - Bare `origin` → `origin:<spent outpoint>` (underscore form)
+ * - Copy `origin:…` / `content:…` / `collection:…` / `type:…` / `app:…` / `creator:…`
+ * - Does not copy `name:` (display name lives in CI)
+ * - Does not include id:, listing markers, or domain flags
  */
 export declare function ordinalSeedTags(source: WalletOutput): string[];
 //# sourceMappingURL=ordinalSeedTags.d.ts.map

package/dist/utils/ordinalSeedTags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ordinalSeedTags.d.ts","sourceRoot":"","sources":["../../src/utils/ordinalSeedTags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE5C;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,CAiB9D"}
+{"version":3,"file":"ordinalSeedTags.d.ts","sourceRoot":"","sources":["../../src/utils/ordinalSeedTags.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE5C;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,CAoC9D"}

package/dist/utils/ordinalSeedTags.js

@@ -1,24 +1,51 @@
+import { formatOrdinalOutpoint } from '@1sat/types';
 /**
- * Ordinal identity tags to file on a self-kept spend of `source`.
- * Bare `origin` promotes to `origin:<source.outpoint>`.
- * Does not include id:, listing markers, or domain flags (opns:published, …).
+ * Ordinal identity tags to file on a self-kept spend of `source` (BRC-147).
+ * - Bare `origin` → `origin:<spent outpoint>` (underscore form)
+ * - Copy `origin:…` / `content:…` / `collection:…` / `type:…` / `app:…` / `creator:…`
+ * - Does not copy `name:` (display name lives in CI)
+ * - Does not include id:, listing markers, or domain flags
  */
 export function ordinalSeedTags(source) {
     const out = [];
     for (const t of source.tags ?? []) {
         if (t === 'origin') {
-            const promoted = `origin:${source.outpoint}`;
+            const promoted = `origin:${formatOrdinalOutpoint(source.outpoint)}`;
             if (!out.includes(promoted))
                 out.push(promoted);
             continue;
         }
-        if (t.startsWith('origin:') ||
-            t.startsWith('type:') ||
-            t.startsWith('name:')) {
+        if (t.startsWith('origin:')) {
+            const normalized = `origin:${formatOrdinalOutpoint(t.slice(7))}`;
+            if (!out.includes(normalized))
+                out.push(normalized);
+            continue;
+        }
+        if (t.startsWith('content:')) {
+            const normalized = `content:${formatOrdinalOutpoint(t.slice(8))}`;
+            if (!out.includes(normalized))
+                out.push(normalized);
+            continue;
+        }
+        if (t.startsWith('collection:')) {
+            const normalized = `collection:${formatOrdinalOutpoint(t.slice(11))}`;
+            if (!out.includes(normalized))
+                out.push(normalized);
+            continue;
+        }
+        if (t.startsWith('type:') || t.startsWith('app:') || t.startsWith('creator:')) {
             if (!out.includes(t))
                 out.push(t);
         }
     }
+    // Drop hierarchical category-only type when a more specific type: exists
+    const types = out.filter((t) => t.startsWith('type:'));
+    if (types.length > 1) {
+        const full = types.filter((t) => t.includes('/'));
+        if (full.length > 0) {
+            return out.filter((t) => !t.startsWith('type:') || full.includes(t));
+        }
+    }
     return out;
 }
 //# sourceMappingURL=ordinalSeedTags.js.map

package/dist/utils/ordinalSeedTags.js.map

@@ -1 +1 @@
-{"version":3,"file":"ordinalSeedTags.js","sourceRoot":"","sources":["../../src/utils/ordinalSeedTags.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,MAAoB;IACnD,MAAM,GAAG,GAAa,EAAE,CAAA;IACxB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,UAAU,MAAM,CAAC,QAAQ,EAAE,CAAA;YAC5C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC/C,SAAQ;QACT,CAAC;QACD,IACC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;YACvB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;YACrB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EACpB,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAClC,CAAC;IACF,CAAC;IACD,OAAO,GAAG,CAAA;AACX,CAAC"}
+{"version":3,"file":"ordinalSeedTags.js","sourceRoot":"","sources":["../../src/utils/ordinalSeedTags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAGnD;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,MAAoB;IACnD,MAAM,GAAG,GAAa,EAAE,CAAA;IACxB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,UAAU,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAA;YACnE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC/C,SAAQ;QACT,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,UAAU,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAChE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACnD,SAAQ;QACT,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACjE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACnD,SAAQ;QACT,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,cAAc,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;YACrE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACnD,SAAQ;QACT,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/E,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAClC,CAAC;IACF,CAAC;IACD,yEAAyE;IACzE,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IACtD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QACjD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QACrE,CAAC;IACF,CAAC;IACD,OAAO,GAAG,CAAA;AACX,CAAC"}

package/dist/utils/resolveDestination.d.ts

@@ -37,13 +37,10 @@ export interface ResolveDestinationOptions {
     /** Prefix for the generated keyID — used for counterparty/self. */
     keyIDPrefix: string;
     /**
-     * Action id to derive the keyID from, so the derivation is recomputable
-     * from the action record. Callers should mint one with `randomActionId()`
-     * before building outputs and stamp it on the args via
-     * `buildActionIdLabel`, so `createTrackedAction` reuses the same value.
-     * Falls back to a wall-clock value, which is not recoverable.
+     * Optional keyID suffix. When omitted, a random hex suffix is minted
+     * (`${keyIDPrefix}-${hex}`). Not tied to the action/tracking id.
      */
-    actionId?: string;
+    keyIDSuffix?: string;
 }
 /**
  * Resolve a {@link Destination} into a locking script and (when applicable)

package/dist/utils/resolveDestination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDestination.d.ts","sourceRoot":"","sources":["../../src/utils/resolveDestination.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EACN,aAAa,EAGb,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,+CAA+C;IAC/C,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;;;;;;;;;;;;;OAgBG;IACH,kBAAkB,CAAC,EAAE;QACpB,UAAU,EAAE,cAAc,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,YAAY,CAAC,EAAE,kBAAkB,CAAA;QACjC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KACxB,CAAA;CACD;AAED,MAAM,WAAW,yBAAyB;IACzC,uEAAuE;IACvE,UAAU,EAAE,cAAc,CAAA;IAC1B,mEAAmE;IACnE,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACvC,GAAG,EAAE,aAAa,EAClB,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,IAAI,EAAE,yBAAyB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CA+D9B"}
+{"version":3,"file":"resolveDestination.d.ts","sourceRoot":"","sources":["../../src/utils/resolveDestination.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EACN,aAAa,EAGb,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,+CAA+C;IAC/C,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;;;;;;;;;;;;;OAgBG;IACH,kBAAkB,CAAC,EAAE;QACpB,UAAU,EAAE,cAAc,CAAA;QAC1B,KAAK,EAAE,MAAM,CAAA;QACb,YAAY,CAAC,EAAE,kBAAkB,CAAA;QACjC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KACxB,CAAA;CACD;AAED,MAAM,WAAW,yBAAyB;IACzC,uEAAuE;IACvE,UAAU,EAAE,cAAc,CAAA;IAC1B,mEAAmE;IACnE,WAAW,EAAE,MAAM,CAAA;IACnB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACvC,GAAG,EAAE,aAAa,EAClB,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,IAAI,EAAE,yBAAyB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CAoE9B"}

package/dist/utils/resolveDestination.js

@@ -49,7 +49,11 @@ export async function resolveDestination(ctx, destination, opts) {
     // counterparty path — also covers the default (undefined → 'self').
     const counterparty = destination?.counterparty ?? 'self';
     const isSelf = counterparty === 'self';
-    const keyID = `${opts.keyIDPrefix}-${opts.actionId ?? Date.now()}`;
+    const suffix = opts.keyIDSuffix ??
+        Array.from(crypto.getRandomValues(new Uint8Array(8)))
+            .map((b) => b.toString(16).padStart(2, '0'))
+            .join('');
+    const keyID = `${opts.keyIDPrefix}-${suffix}`;
     const { publicKey } = await ctx.wallet.getPublicKey({
         protocolID: opts.protocolID,
         keyID,

package/dist/utils/resolveDestination.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDestination.js","sourceRoot":"","sources":["../../src/utils/resolveDestination.ts"],"names":[],"mappings":"AACA,OAAO,EACN,aAAa,EACb,KAAK,EACL,SAAS,GAGT,MAAM,UAAU,CAAA;AAiDjB;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,GAAkB,EAClB,WAAoC,EACpC,IAA+B;IAE/B,IAAI,WAAW,EAAE,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9C,MAAM,EAAE,GACP,OAAO,WAAW,CAAC,aAAa,KAAK,QAAQ;YAC5C,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC;YAClD,CAAC,CAAE,WAAW,CAAC,aAA+B,CAAA;QAChD,oEAAoE;QACpE,iEAAiE;QACjE,mEAAmE;QACnE,oEAAoE;QACpE,+DAA+D;QAC/D,gEAAgE;QAChE,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,WAAW,CAAC,kBAA6C,CAAA;YACpE,MAAM,UAAU,GAAG,EAAE,CAAC,UAAwC,CAAA;YAC9D,MAAM,KAAK,GAAG,EAAE,CAAC,KAA2B,CAAA;YAC5C,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAA;gBACnE,OAAO;oBACN,aAAa,EAAE,EAAE;oBACjB,kBAAkB,EAAE;wBACnB,UAAU;wBACV,KAAK;wBACL,GAAG,CAAC,EAAE,CAAC,YAAY,KAAK,SAAS,IAAI;4BACpC,YAAY,EAAE,EAAE,CAAC,YAAkC;yBACnD,CAAC;wBACF,GAAG,IAAI;qBACP;iBACD,CAAA;YACF,CAAC;QACF,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,CAAA;IAC7B,CAAC;IAED,IAAI,WAAW,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO;YACN,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;SACpD,CAAA;IACF,CAAC;IAED,oEAAoE;IACpE,MAAM,YAAY,GAAG,WAAW,EAAE,YAAY,IAAI,MAAM,CAAA;IACxD,MAAM,MAAM,GAAG,YAAY,KAAK,MAAM,CAAA;IACtC,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;IAElE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QACnD,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,KAAK;QACL,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY;QAC5C,OAAO,EAAE,MAAM;KACf,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAA;IAE3D,MAAM,KAAK,GAAG,WAAW,EAAE,kBAAkB,IAAI,EAAE,CAAA;IACnD,OAAO;QACN,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;QACxC,kBAAkB,EAAE;YACnB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK;YACL,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC;YACnC,GAAG,KAAK;SACR;KACD,CAAA;AACF,CAAC"}
+{"version":3,"file":"resolveDestination.js","sourceRoot":"","sources":["../../src/utils/resolveDestination.ts"],"names":[],"mappings":"AACA,OAAO,EACN,aAAa,EACb,KAAK,EACL,SAAS,GAGT,MAAM,UAAU,CAAA;AA8CjB;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,GAAkB,EAClB,WAAoC,EACpC,IAA+B;IAE/B,IAAI,WAAW,EAAE,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9C,MAAM,EAAE,GACP,OAAO,WAAW,CAAC,aAAa,KAAK,QAAQ;YAC5C,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC;YAClD,CAAC,CAAE,WAAW,CAAC,aAA+B,CAAA;QAChD,oEAAoE;QACpE,iEAAiE;QACjE,mEAAmE;QACnE,oEAAoE;QACpE,+DAA+D;QAC/D,gEAAgE;QAChE,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,WAAW,CAAC,kBAA6C,CAAA;YACpE,MAAM,UAAU,GAAG,EAAE,CAAC,UAAwC,CAAA;YAC9D,MAAM,KAAK,GAAG,EAAE,CAAC,KAA2B,CAAA;YAC5C,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAA;gBACnE,OAAO;oBACN,aAAa,EAAE,EAAE;oBACjB,kBAAkB,EAAE;wBACnB,UAAU;wBACV,KAAK;wBACL,GAAG,CAAC,EAAE,CAAC,YAAY,KAAK,SAAS,IAAI;4BACpC,YAAY,EAAE,EAAE,CAAC,YAAkC;yBACnD,CAAC;wBACF,GAAG,IAAI;qBACP;iBACD,CAAA;YACF,CAAC;QACF,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,CAAA;IAC7B,CAAC;IAED,IAAI,WAAW,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO;YACN,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;SACpD,CAAA;IACF,CAAC;IAED,oEAAoE;IACpE,MAAM,YAAY,GAAG,WAAW,EAAE,YAAY,IAAI,MAAM,CAAA;IACxD,MAAM,MAAM,GAAG,YAAY,KAAK,MAAM,CAAA;IACtC,MAAM,MAAM,GACX,IAAI,CAAC,WAAW;QAChB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;aACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aAC3C,IAAI,CAAC,EAAE,CAAC,CAAA;IACX,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,MAAM,EAAE,CAAA;IAE7C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QACnD,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,KAAK;QACL,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY;QAC5C,OAAO,EAAE,MAAM;KACf,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAA;IAE3D,MAAM,KAAK,GAAG,WAAW,EAAE,kBAAkB,IAAI,EAAE,CAAA;IACnD,OAAO;QACN,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;QACxC,kBAAkB,EAAE;YACnB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK;YACL,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC;YACnC,GAAG,KAAK;SACR;KACD,CAAA;AACF,CAAC"}

package/dist/utils/signOrdinalInput.d.ts

@@ -10,6 +10,7 @@ export interface OrdinalCustomInstructions {
     protocolID: WalletProtocol;
     keyID: string;
     counterparty?: WalletCounterparty;
+    /** @deprecated ignored — script shape decides unlock */
     template?: string;
     name?: string;
 }
@@ -18,8 +19,8 @@ export declare function parseOrdinalCustomInstructions(customInstructions: strin
 };
 export declare function unlockingScriptLengthForInstructions(customInstructions: string | undefined): number;
 /**
- * Unlock an ordinal input using customInstructions.
- * PushDrop when template === 'pushdrop'; otherwise P2PKH.
+ * Unlock an ordinal input. Script shape decides PushDrop vs P2PKH;
+ * CI supplies key material only.
  */
 export declare function signOrdinalInput(ctx: OneSatContext, tx: Transaction, inputIndex: number, customInstructions: string): Promise<string | {
     error: string;

package/dist/utils/signOrdinalInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signOrdinalInput.d.ts","sourceRoot":"","sources":["../../src/utils/signOrdinalInput.ts"],"names":[],"mappings":"AACA,OAAO,EAGN,KAAK,WAAW,EAGhB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAG7C,8DAA8D;AAC9D,eAAO,MAAM,iBAAiB,aAAyB,CAAA;AAEvD,6DAA6D;AAC7D,eAAO,MAAM,sBAAsB,KAAK,CAAA;AAExC,8CAA8C;AAC9C,eAAO,MAAM,mBAAmB,MAAM,CAAA;AAEtC,MAAM,WAAW,yBAAyB;IACzC,UAAU,EAAE,cAAc,CAAA;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb;AAED,wBAAgB,8BAA8B,CAC7C,kBAAkB,EAAE,MAAM,GACxB,yBAAyB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAM/C;AAED,wBAAgB,oCAAoC,CACnD,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACpC,MAAM,CAOR;AAsED;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,aAAa,EAClB,EAAE,EAAE,WAAW,EACf,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BrC"}
+{"version":3,"file":"signOrdinalInput.d.ts","sourceRoot":"","sources":["../../src/utils/signOrdinalInput.ts"],"names":[],"mappings":"AACA,OAAO,EAIN,KAAK,WAAW,EAGhB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAG7C,8DAA8D;AAC9D,eAAO,MAAM,iBAAiB,aAAyB,CAAA;AAEvD,6DAA6D;AAC7D,eAAO,MAAM,sBAAsB,KAAK,CAAA;AAExC,8CAA8C;AAC9C,eAAO,MAAM,mBAAmB,MAAM,CAAA;AAEtC,MAAM,WAAW,yBAAyB;IACzC,UAAU,EAAE,cAAc,CAAA;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb;AAED,wBAAgB,8BAA8B,CAC7C,kBAAkB,EAAE,MAAM,GACxB,yBAAyB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAM/C;AAED,wBAAgB,oCAAoC,CACnD,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACpC,MAAM,CAKR;AAsED;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,GAAG,EAAE,aAAa,EAClB,EAAE,EAAE,WAAW,EACf,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAoCrC"}

package/dist/utils/signOrdinalInput.js

@@ -1,5 +1,5 @@
 import { OPNS_PUSHDROP_TEMPLATE } from '@1sat/types';
-import { Hash, Signature, TransactionSignature, UnlockingScript, } from '@bsv/sdk';
+import { Hash, PushDrop, Signature, TransactionSignature, UnlockingScript, } from '@bsv/sdk';
 import { signP2PKHInput } from './signP2PKH';
 /** @deprecated use OPNS_PUSHDROP_TEMPLATE from @1sat/types */
 export const PUSHDROP_TEMPLATE = OPNS_PUSHDROP_TEMPLATE;
@@ -16,14 +16,10 @@ export function parseOrdinalCustomInstructions(customInstructions) {
     }
 }
 export function unlockingScriptLengthForInstructions(customInstructions) {
-    if (!customInstructions)
-        return P2PKH_UNLOCK_LENGTH;
-    const ci = parseOrdinalCustomInstructions(customInstructions);
-    if ('error' in ci)
-        return P2PKH_UNLOCK_LENGTH;
-    return ci.template === OPNS_PUSHDROP_TEMPLATE
-        ? PUSHDROP_UNLOCK_LENGTH
-        : P2PKH_UNLOCK_LENGTH;
+    // Default P2PKH; callers with known PushDrop should pass length explicitly.
+    // CI template is no longer authoritative.
+    void customInstructions;
+    return P2PKH_UNLOCK_LENGTH;
 }
 /**
  * Unlock a PushDrop CHECKSIG input (OpNS published bind).
@@ -80,8 +76,8 @@ async function signPushDropInput(ctx, tx, inputIndex, protocolID, keyID, counter
     ]).toHex();
 }
 /**
- * Unlock an ordinal input using customInstructions.
- * PushDrop when template === 'pushdrop'; otherwise P2PKH.
+ * Unlock an ordinal input. Script shape decides PushDrop vs P2PKH;
+ * CI supplies key material only.
  */
 export async function signOrdinalInput(ctx, tx, inputIndex, customInstructions) {
     const ci = parseOrdinalCustomInstructions(customInstructions);
@@ -90,8 +86,17 @@ export async function signOrdinalInput(ctx, tx, inputIndex, customInstructions)
     if (!ci.protocolID || !ci.keyID) {
         return { error: 'missing-protocol-or-key-id' };
     }
-    if (ci.template === OPNS_PUSHDROP_TEMPLATE) {
-        return signPushDropInput(ctx, tx, inputIndex, ci.protocolID, ci.keyID, ci.counterparty ?? 'anyone');
+    const txInput = tx.inputs[inputIndex];
+    const sourceLockingScript = txInput?.sourceTransaction?.outputs[txInput.sourceOutputIndex]
+        ?.lockingScript;
+    if (sourceLockingScript) {
+        try {
+            PushDrop.decode(sourceLockingScript);
+            return signPushDropInput(ctx, tx, inputIndex, ci.protocolID, ci.keyID, ci.counterparty ?? 'anyone');
+        }
+        catch {
+            // not pushdrop
+        }
     }
     return signP2PKHInput(ctx, tx, inputIndex, ci.protocolID, ci.keyID, ci.counterparty ?? 'self');
 }

package/dist/utils/signOrdinalInput.js.map

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

package/dist/utils/stampBsv21OutputCi.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Authoritative BSV-21 CI stamp — shared by local apply and module embellish.
+ *
+ * For each output that already has CI and a BSV-21 locking script:
+ * - Start from caller CI (keep derivation / extras)
+ * - Overwrite load-bearing fields from script + spent-input carry
+ * - Preserve encryption state: plaintext in → plaintext out; ciphertext in →
+ *   peel → merge → re-encrypt (WPM encrypts before module onRequest)
+ */
+import { type CreateActionArgs, type WalletInterface } from '@bsv/sdk';
+/**
+ * Overwrite BSV-21 token fields on output CI from script + input carry.
+ * Call from {@link applyP1SatCreateAction} so local and module paths share it.
+ */
+export declare function stampBsv21OutputCustomInstructions(wallet: WalletInterface, args: CreateActionArgs): Promise<void>;
+//# sourceMappingURL=stampBsv21OutputCi.d.ts.map

package/dist/utils/stampBsv21OutputCi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stampBsv21OutputCi.d.ts","sourceRoot":"","sources":["../../src/utils/stampBsv21OutputCi.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EACN,KAAK,gBAAgB,EAErB,KAAK,eAAe,EACpB,MAAM,UAAU,CAAA;AAwCjB;;;GAGG;AACH,wBAAsB,kCAAkC,CACvD,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,gBAAgB,GACpB,OAAO,CAAC,IAAI,CAAC,CA8Cf"}