@1sat/actions 0.0.191 → 0.0.193

package/dist/tokens/index.d.ts

@@ -115,7 +115,7 @@ export interface MintBsv21Response extends TokenOperationResponse {
     /** Outpoint of the new auth UTXO, if one was emitted. */
     authOutpoint?: string;
 }
-/** Input for listTokens action */
+/** Input for listBsv21 action */
 export interface ListTokensInput {
     /** Max number of tokens to return */
     limit?: number;
@@ -124,8 +124,6 @@ export interface ListTokensInput {
  * List BSV21 token outputs from the wallet.
  */
 export declare const listBsv21: Action<ListTokensInput, WalletOutput[]>;
-/** @deprecated Use listBsv21 */
-export declare const listTokens: Action<ListTokensInput, WalletOutput[]>;
 /** Input for getBsv21Balances action (no required params) */
 export type GetBsv21BalancesInput = Record<string, never>;
 /**
@@ -165,7 +163,5 @@ export declare const deployBsv21Auth: Action<DeployBsv21AuthInput, DeployBsv21Au
  */
 export declare const mintBsv21: Action<MintBsv21Input, MintBsv21Response>;
 /** All token actions for registry */
-/** @deprecated Use buyBsv21 */
-export declare const purchaseBsv21: Action<PurchaseBsv21Request, TokenOperationResponse>;
 export declare const tokensActions: (Action<ListTokensInput, WalletOutput[]> | Action<GetBsv21BalancesInput, Bsv21Balance[]> | Action<SendBsv21Input, TokenOperationResponse> | Action<PurchaseBsv21Request, TokenOperationResponse> | Action<DeployBsv21MintInput, DeployBsv21Response> | Action<MintBsv21Input, MintBsv21Response>)[];
 //# sourceMappingURL=index.d.ts.map

package/dist/tokens/index.d.ts.map

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

package/dist/tokens/index.js

@@ -4,14 +4,28 @@
  * Actions for managing BSV21 tokens.
  */
 import { BSV21, OrdLock, P2MS } from '@1sat/templates';
-import { buildInputAssetLabel, buildTokenLabel, readAssetIdTag, } from '@1sat/types';
+import { BSV21_DEPLOY_TAG, P1SAT_INTENTS, buildInputAssetLabel, buildTokenLabel, readAssetIdTag, } from '@1sat/types';
 import { parseOutpoint } from '@1sat/utils';
-import { Beef, BigNumber, LockingScript, OP, P2PKH, PublicKey, Transaction, TransactionSignature, UnlockingScript, Utils, } from '@bsv/sdk';
-import { BSV21_AUTH_BASKET, BSV21_BASKET, BSV21_DEPLOY_FUNDING_BASKET, P1SAT_PROTOCOL, } from '../constants';
+import { BigNumber, LockingScript, OP, P2PKH, PublicKey, TransactionSignature, UnlockingScript, Utils, } from '@bsv/sdk';
+import { prepareP1SatArgs } from '../apply';
+import { BSV21_AUTH_BASKET, BSV21_BASKET, P1SAT_PROTOCOL, } from '../constants';
 import { executeTrackedAction } from '../utils/createTrackedAction';
 import { getDisplayValue } from '../utils/displayValue';
 import { resolveDestination } from '../utils/resolveDestination';
 import { signP2PKHInput } from '../utils/signP2PKH';
+/** tokenId from tags, or deploy outpoint when tagged bsv21:deploy. */
+function tokenIdFromOutput(o) {
+    const idTag = o.tags?.find((t) => t.startsWith('bsv21:') && t !== BSV21_DEPLOY_TAG);
+    if (idTag)
+        return idTag.slice(6);
+    if (o.tags?.includes(BSV21_DEPLOY_TAG)) {
+        return o.outpoint.replace('.', '_');
+    }
+    return undefined;
+}
+function matchesTokenId(o, tokenId) {
+    return tokenIdFromOutput(o) === tokenId;
+}
 // ============================================================================
 // Internal helpers
 // ============================================================================
@@ -90,8 +104,6 @@ export const listBsv21 = {
         return listTokensInternal(ctx, input.limit);
     },
 };
-/** @deprecated Use listBsv21 */
-export const listTokens = listBsv21;
 /**
  * Get aggregated BSV21 token balances.
  */
@@ -109,11 +121,10 @@ export const getBsv21Balances = {
         const outputs = await listTokensInternal(ctx);
         const balanceMap = new Map();
         for (const o of outputs) {
-            const idTag = o.tags?.find((t) => t.startsWith('bsv21:'));
+            const tokenId = tokenIdFromOutput(o);
             const amtTag = o.tags?.find((t) => t.startsWith('amt:'))?.slice(4);
-            if (!idTag || !amtTag)
+            if (!tokenId || !amtTag)
                 continue;
-            const tokenId = idTag.slice(6);
             const amt = BigInt(amtTag);
             const dec = Number.parseInt(o.tags?.find((t) => t.startsWith('dec:'))?.slice(4) || '0', 10);
             const symTag = getDisplayValue(o, 'sym', 'sym');
@@ -215,12 +226,7 @@ export const sendBsv21 = {
                 include: 'entire transactions',
                 limit: 10000,
             });
-            const tokenUtxos = listResult.outputs.filter((o) => {
-                const idTag = o.tags?.find((t) => t.startsWith('bsv21:'));
-                if (!idTag)
-                    return false;
-                return idTag.slice(6) === tokenId;
-            });
+            const tokenUtxos = listResult.outputs.filter((o) => matchesTokenId(o, tokenId));
             // Batch-validate all candidate outpoints against the overlay
             const validOutpoints = new Set();
             let overlayValidated = false;
@@ -284,13 +290,19 @@ export const sendBsv21 = {
                     ...(isSelf && {
                         basket: BSV21_BASKET,
                         tags: [...tokenTags, `amt:${r.amount}`],
-                        customInstructions: JSON.stringify({
-                            protocolID: P1SAT_PROTOCOL,
-                            keyID: recipientResolved.customInstructions?.keyID ??
-                                `${tokenId}-${Date.now()}`,
-                            counterparty: 'self',
-                            ...(tokenDetails.token.sym && {
-                                sym: tokenDetails.token.sym,
+                        // Only when the wallet actually derived the key. A literal
+                        // address or lockingScript destination has no derivation, and
+                        // inventing a keyID here would record a triple that was never
+                        // used to lock this output — leaving it unspendable from its
+                        // own record.
+                        ...(recipientResolved.customInstructions?.keyID && {
+                            customInstructions: JSON.stringify({
+                                protocolID: P1SAT_PROTOCOL,
+                                keyID: recipientResolved.customInstructions.keyID,
+                                counterparty: 'self',
+                                ...(tokenDetails.token.sym && {
+                                    sym: tokenDetails.token.sym,
+                                }),
                             }),
                         }),
                     }),
@@ -342,7 +354,7 @@ export const sendBsv21 = {
                 lockingScript: p2pkh.lock(fee_address).toHex(),
                 satoshis: fee_per_output * tokenOutputCount,
                 outputDescription: 'Overlay processing fee',
-                tags: [],
+                tags: ['fee:overlay'],
             });
             const symbol = tokenDetails.token.sym || tokenId.slice(0, 8);
             let inputBEEF = listResult.BEEF;
@@ -363,7 +375,7 @@ export const sendBsv21 = {
                 .map((o) => readAssetIdTag(o.tags))
                 .filter((id) => Boolean(id))
                 .map((id) => buildInputAssetLabel(BSV21_BASKET, id));
-            const result = await executeTrackedAction(ctx.wallet, {
+            const sendArgs = await prepareP1SatArgs(ctx, {
                 description: `Send ${symbol} to ${resolved.length} recipient${resolved.length > 1 ? 's' : ''}`,
                 labels: [buildTokenLabel(tokenId), ...inputLabels],
                 inputBEEF,
@@ -374,7 +386,8 @@ export const sendBsv21 = {
                 })),
                 outputs,
                 options: { randomizeOutputs: false },
-            }, input.fundingProvider, inputBEEF, async (tx) => {
+            }, P1SAT_INTENTS.BSV21_TRANSFER);
+            const result = await executeTrackedAction(ctx.wallet, sendArgs, input.fundingProvider, inputBEEF, async (tx) => {
                 const spends = {};
                 for (let i = 0; i < selected.length; i++) {
                     const utxo = selected[i];
@@ -493,7 +506,7 @@ export const buyBsv21 = {
                 await ctx.services.bsv21.validateOutput(tokenId, outpoint);
             }
             catch (e) {
-                console.error('[purchaseBsv21] overlay validation error:', e);
+                console.error('[buyBsv21] overlay validation error:', e);
                 return { error: 'listing-not-found-in-overlay' };
             }
             const tokenDetails = await ctx.services.bsv21.getTokenDetails(tokenId);
@@ -572,11 +585,11 @@ export const buyBsv21 = {
                     lockingScript: p2pkh.lock(tokenDetails.status.fee_address).toHex(),
                     satoshis: tokenDetails.status.fee_per_output,
                     outputDescription: 'Overlay processing fee',
-                    tags: [],
+                    tags: ['fee:overlay'],
                 });
             }
             const beefBinary = beef.toBinary();
-            const result = await executeTrackedAction(ctx.wallet, {
+            const buyArgs = await prepareP1SatArgs(ctx, {
                 description: `Purchase ${tokenAmount} tokens for ${payoutSatoshis} sats`,
                 labels: [buildTokenLabel(tokenId)],
                 inputBEEF: beefBinary,
@@ -589,7 +602,8 @@ export const buyBsv21 = {
                 ],
                 outputs,
                 options: { randomizeOutputs: false },
-            }, input.fundingProvider, beefBinary, async (tx) => {
+            }, P1SAT_INTENTS.BSV21_PURCHASE);
+            const result = await executeTrackedAction(ctx.wallet, buyArgs, input.fundingProvider, beefBinary, async (tx) => {
                 const unlockingScript = await buildPurchaseUnlockingScript(tx, 0, listingOutput.satoshis ?? 1, listingOutput.lockingScript);
                 return { 0: { unlockingScript: unlockingScript.toHex() } };
             });
@@ -597,16 +611,16 @@ export const buyBsv21 = {
             if (result.tx && ctx.services) {
                 try {
                     const overlayResult = await ctx.services.overlay.submitBsv21(result.tx, tokenId);
-                    console.log('[purchaseBsv21] Overlay submission result:', overlayResult);
+                    console.log('[buyBsv21] Overlay submission result:', overlayResult);
                 }
                 catch (overlayError) {
-                    console.warn('[purchaseBsv21] Overlay submission failed:', overlayError);
+                    console.warn('[buyBsv21] Overlay submission failed:', overlayError);
                 }
             }
             if (ctx.debug && ctx.log) {
                 ctx.log({
                     timestamp: new Date().toISOString(),
-                    action: 'purchaseBsv21',
+                    action: 'buyBsv21',
                     input: { tokenId, outpoint, amount: tokenAmount.toString() },
                     txid: result.txid,
                     rawtx: result.tx ? Utils.toHex(result.tx) : undefined,
@@ -624,11 +638,11 @@ export const buyBsv21 = {
             return result;
         }
         catch (error) {
-            console.error('[purchaseBsv21]', error);
+            console.error('[buyBsv21]', error);
             if (ctx.debug && ctx.log) {
                 ctx.log({
                     timestamp: new Date().toISOString(),
-                    action: 'purchaseBsv21',
+                    action: 'buyBsv21',
                     input: {
                         tokenId: input.tokenId,
                         outpoint: input.outpoint,
@@ -643,116 +657,13 @@ export const buyBsv21 = {
         }
     },
 };
-/** Miner fee rate used for manual deploy tx fee calculation. */
-const DEPLOY_FEE_PER_KB = 100;
-/**
- * Estimate the byte size of the manually-built deploy tx (1 input, 1 output, no
- * change). Conservative — sized for a typical signed P2PKH unlocking script.
- */
-function estimateDeployTxSize(deployScriptBytes) {
-    const overhead = 10; // version(4) + locktime(4) + inCount(1) + outCount(1)
-    const input = 148; // P2PKH spend: txid(32)+vout(4)+scriptLen(1)+script(~107)+seq(4)
-    const scriptLenVarint = deployScriptBytes < 0xfd ? 1 : deployScriptBytes < 0x10000 ? 3 : 5;
-    const output = 8 + scriptLenVarint + deployScriptBytes;
-    return overhead + input + output;
-}
 /**
- * Shared deploy flow:
- *   1. createAction a funding intermediate (wallet broadcasts via signAndProcess).
- *   2. Manually build + sign the deploy tx that spends the funding output.
- *   3. Synchronously broadcast the deploy via services.postBeef and require a
- *      success/processing arcade status before continuing. internalize alone
- *      only QUEUES a tx for later background broadcast — silent drops there
- *      have left tokens in a half-deployed state.
- *   4. internalizeAction adopts the deploy into the wallet basket so the auth
- *      UTXO becomes spendable.
- *
- * Used by both deployBsv21Mint and deployBsv21Auth — they only differ in the
- * deploy script (BSV21.deployMint vs BSV21.deployAuth) and target basket.
+ * Single createAction deploy. Tags include `bsv21:deploy` + metadata;
+ * tokenId is the resulting outpoint (`txid_0`). Balance queries treat
+ * deploy rows as that token when outpoint matches.
  */
 async function executeBsv21Deploy(args) {
     const { ctx, symbol, deployScript, basket } = args;
-    const deployScriptBin = deployScript.toBinary();
-    const txSize = estimateDeployTxSize(deployScriptBin.length);
-    const fee = Math.ceil((txSize * DEPLOY_FEE_PER_KB) / 1000);
-    // 1 sat for the deploy output + computed fee + small buffer for unlocking
-    // script size variance (low-S signatures can be a byte shorter, etc.)
-    const fundingValue = 1 + fee + 5;
-    const fundingKeyID = `bsv21-deploy-fund-${symbol}-${Date.now()}`;
-    const { publicKey: fundingPubKey } = await ctx.wallet.getPublicKey({
-        protocolID: P1SAT_PROTOCOL,
-        keyID: fundingKeyID,
-        counterparty: 'self',
-        forSelf: true,
-    });
-    const fundingAddress = PublicKey.fromString(fundingPubKey).toAddress();
-    const fundingScript = new P2PKH().lock(fundingAddress);
-    const fundingResult = await ctx.wallet.createAction({
-        description: `${args.description} (funding)`,
-        outputs: [
-            {
-                lockingScript: fundingScript.toHex(),
-                satoshis: fundingValue,
-                outputDescription: 'Deploy funding intermediate',
-                basket: BSV21_DEPLOY_FUNDING_BASKET,
-                customInstructions: JSON.stringify({
-                    protocolID: P1SAT_PROTOCOL,
-                    keyID: fundingKeyID,
-                }),
-            },
-        ],
-        options: { randomizeOutputs: false },
-    });
-    if (!fundingResult.txid || !fundingResult.tx) {
-        return { error: 'funding-failed' };
-    }
-    const fundingBeef = Beef.fromBinary(Array.from(fundingResult.tx));
-    const fundingTx = fundingBeef.findAtomicTransaction(fundingResult.txid);
-    if (!fundingTx) {
-        return { error: 'funding-tx-not-in-beef' };
-    }
-    const deployTx = new Transaction();
-    deployTx.addInput({
-        sourceTransaction: fundingTx,
-        // Setting sourceTXID is required so BeefTx.updateInputTxids picks up
-        // the dependency. Without it, the deploy's inputTxids is empty and
-        // Beef.sortTxs orders the deploy before its ancestors, which then get
-        // trimmed by toBinaryAtomic.
-        sourceTXID: fundingResult.txid,
-        sourceOutputIndex: 0,
-        unlockingScript: new UnlockingScript(),
-        sequence: 0xffffffff,
-    });
-    deployTx.addOutput({
-        lockingScript: deployScript,
-        satoshis: 1,
-    });
-    const sigResult = await signP2PKHInput(ctx, deployTx, 0, P1SAT_PROTOCOL, fundingKeyID);
-    if (typeof sigResult !== 'string') {
-        return { error: sigResult.error };
-    }
-    deployTx.inputs[0].unlockingScript = UnlockingScript.fromHex(sigResult);
-    const deployTxid = deployTx.id('hex');
-    const tokenId = `${deployTxid}_0`;
-    fundingBeef.mergeTransaction(deployTx);
-    const deployBeefBin = fundingBeef.toBinaryAtomic(deployTxid);
-    // Synchronous broadcast — internalize alone queues for background
-    // broadcast and has been observed to silently drop the deploy tx,
-    // stranding the funding output and leaving the wallet with a
-    // "deployed" record for a tx that never reached the network.
-    if (!ctx.services) {
-        return { error: 'broadcast-services-unavailable' };
-    }
-    const broadcastResults = await ctx.services.postBeef(fundingBeef, [
-        deployTxid,
-    ]);
-    const broadcastFailure = broadcastResults.find((r) => r.status !== 'success');
-    if (broadcastFailure) {
-        const reason = broadcastFailure.error?.message ??
-            broadcastFailure.error?.code ??
-            'broadcast-failed';
-        return { error: `deploy-broadcast-failed: ${reason}` };
-    }
     const customInstructions = args.destinationCustomInstructions
         ? JSON.stringify({
             protocolID: args.destinationCustomInstructions.protocolID,
@@ -763,25 +674,32 @@ async function executeBsv21Deploy(args) {
             sym: symbol,
         })
         : undefined;
-    await ctx.wallet.internalizeAction({
-        tx: deployBeefBin,
+    const tags = args.buildTags();
+    if (!tags.includes(BSV21_DEPLOY_TAG))
+        tags.push(BSV21_DEPLOY_TAG);
+    const caArgs = {
+        description: args.description,
         outputs: [
             {
-                outputIndex: 0,
-                protocol: 'basket insertion',
-                insertionRemittance: {
-                    basket,
-                    tags: args.buildTags(tokenId),
-                    customInstructions,
-                },
+                lockingScript: deployScript.toHex(),
+                satoshis: 1,
+                outputDescription: args.outputDescription,
+                basket,
+                tags,
+                customInstructions,
             },
         ],
-        description: args.description,
-    });
+        options: { randomizeOutputs: false },
+    };
+    const prepared = await prepareP1SatArgs(ctx, caArgs, P1SAT_INTENTS.BSV21_DEPLOY);
+    const result = await executeTrackedAction(ctx.wallet, prepared, args.fundingProvider);
+    if (!result.txid) {
+        return { error: 'deploy-no-txid' };
+    }
     return {
-        txid: deployTxid,
-        tx: deployBeefBin,
-        tokenId,
+        txid: result.txid,
+        tx: result.tx,
+        tokenId: `${result.txid}_0`,
     };
 }
 /**
@@ -836,9 +754,9 @@ export const deployBsv21Mint = {
                 basket: BSV21_BASKET,
                 description: `Deploy ${symbol} (${amount} fixed supply)`,
                 outputDescription: `Deploy ${symbol}`,
-                buildTags: (tokenId) => {
+                buildTags: () => {
                     const tags = [
-                        `bsv21:${tokenId}`,
+                        BSV21_DEPLOY_TAG,
                         `amt:${amount}`,
                         `dec:${decimals}`,
                         `sym:${symbol}`,
@@ -946,8 +864,8 @@ export const deployBsv21Auth = {
                 basket: BSV21_AUTH_BASKET,
                 description: `Deploy ${symbol} (mintable)`,
                 outputDescription: `Deploy ${symbol} auth`,
-                buildTags: (tokenId) => {
-                    const tags = [`bsv21:${tokenId}`, `dec:${decimals}`, `sym:${symbol}`];
+                buildTags: () => {
+                    const tags = [BSV21_DEPLOY_TAG, `dec:${decimals}`, `sym:${symbol}`];
                     if (icon)
                         tags.push(`icon:${icon}`);
                     return tags;
@@ -1151,7 +1069,7 @@ export const mintBsv21 = {
                         .toHex(),
                     satoshis: tokenDetails.status.fee_per_output * tokenOutputCount,
                     outputDescription: 'Overlay processing fee',
-                    tags: [],
+                    tags: ['fee:overlay'],
                 });
             }
             let inputBEEF = authList.BEEF;
@@ -1161,7 +1079,7 @@ export const mintBsv21 = {
             }
             const symbol = tokenDetails.token.sym || tokenId.slice(0, 8);
             const authInputId = readAssetIdTag(authUtxo.tags);
-            const result = await executeTrackedAction(ctx.wallet, {
+            const mintArgs = await prepareP1SatArgs(ctx, {
                 description: mint
                     ? `Mint ${mintAmount} ${symbol}`
                     : `Re-issue ${symbol} authority`,
@@ -1181,7 +1099,8 @@ export const mintBsv21 = {
                 ],
                 outputs,
                 options: { randomizeOutputs: false },
-            }, input.fundingProvider, inputBEEF, async (tx) => {
+            }, P1SAT_INTENTS.BSV21_MINT);
+            const result = await executeTrackedAction(ctx.wallet, mintArgs, input.fundingProvider, inputBEEF, async (tx) => {
                 if (authCI.multiSig === true) {
                     // 1-of-N P2MS auth: this wallet contributes its single
                     // portion. For M > 1 the prepare/finalize flow collects
@@ -1254,8 +1173,6 @@ export const mintBsv21 = {
 // Module exports
 // ============================================================================
 /** All token actions for registry */
-/** @deprecated Use buyBsv21 */
-export const purchaseBsv21 = buyBsv21;
 export const tokensActions = [
     listBsv21,
     getBsv21Balances,