@1sat/actions 0.0.230 → 0.0.232

package/dist/apply/opnsRegister.d.ts

@@ -1,10 +1,17 @@
 import { type CreateActionArgs, type WalletInterface } from '@bsv/sdk';
 /**
- * Replace the zeroed signature field of an `opns.register` lock with the real
- * one. The action emits the complete PushDrop script — identity key, profile
- * slots, and a zero-filled signature field of final length — so the only thing
- * left here is the signature. Uses the given wallet (must be base — never a
- * gated WPM wrapper).
+ * Put the real signature into an `opns.register` draft lock. The action emits
+ * the complete script — `<lock pubkey> CHECKSIG`, the key/value fields
+ * (`identity`, `profile`, …), a zero-filled signature push, the drops, and
+ * optionally an inscription envelope. Apply signs the fields and replaces the
+ * placeholder push (chunk `2 + fieldCount`) with the signature push; nothing
+ * else in the script changes. The DER signature may be shorter than the
+ * placeholder, so the push is re-encoded with its own length.
+ *
+ * The lock pubkey in the draft must be this wallet's key for the publish
+ * keyID, and the fields are checked before signing so only a well-formed
+ * publish (exactly one `identity` pair) is ever signed. Uses the given wallet
+ * (must be base — never a gated WPM wrapper).
  */
 export declare function applyOpnsRegister(wallet: WalletInterface, args: CreateActionArgs): Promise<void>;
 //# sourceMappingURL=opnsRegister.d.ts.map

package/dist/apply/opnsRegister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opnsRegister.d.ts","sourceRoot":"","sources":["../../src/apply/opnsRegister.ts"],"names":[],"mappings":"AAMA,OAAO,EACN,KAAK,gBAAgB,EAGrB,KAAK,eAAe,EACpB,MAAM,UAAU,CAAA;AAEjB;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACtC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,gBAAgB,GACpB,OAAO,CAAC,IAAI,CAAC,CAmCf"}
+{"version":3,"file":"opnsRegister.d.ts","sourceRoot":"","sources":["../../src/apply/opnsRegister.ts"],"names":[],"mappings":"AASA,OAAO,EACN,KAAK,gBAAgB,EAErB,KAAK,eAAe,EACpB,MAAM,UAAU,CAAA;AA6BjB;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CACtC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,gBAAgB,GACpB,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/apply/opnsRegister.js

@@ -1,11 +1,44 @@
-import { OPNS_BASKET, OPNS_REGISTER_COUNTERPARTY, P1SAT_PROTOCOL, opnsRegisterKeyId, } from '@1sat/types';
-import { LockingScript, PushDrop, } from '@bsv/sdk';
+import { IDENTITY_FIELD, OPNS_BASKET, OPNS_REGISTER_COUNTERPARTY, P1SAT_PROTOCOL, PROFILE_FIELD, opnsRegisterKeyId, } from '@1sat/types';
+import { decodeProfile, fieldPairs, isIdentityKey } from '@1sat/utils';
+import { LockingScript, } from '@bsv/sdk';
+import { pushDropDecode } from '../utils/pushdrop.js';
 /**
- * Replace the zeroed signature field of an `opns.register` lock with the real
- * one. The action emits the complete PushDrop script — identity key, profile
- * slots, and a zero-filled signature field of final length — so the only thing
- * left here is the signature. Uses the given wallet (must be base — never a
- * gated WPM wrapper).
+ * Check the key/value fields before signing them: exactly one `identity`
+ * (33-byte compressed key), at most one `profile` (valid DAG-CBOR profile).
+ * Unknown keys are allowed.
+ */
+function assertPublishFields(fields) {
+    let identities = 0;
+    let profiles = 0;
+    for (const [key, value] of fieldPairs(fields)) {
+        if (key === IDENTITY_FIELD) {
+            if (!isIdentityKey(value)) {
+                throw new Error('opns.register apply: identity is not a compressed key');
+            }
+            identities++;
+        }
+        else if (key === PROFILE_FIELD) {
+            decodeProfile(value);
+            profiles++;
+        }
+    }
+    if (identities !== 1 || profiles > 1) {
+        throw new Error('opns.register apply: fields need exactly one identity and at most one profile');
+    }
+}
+/**
+ * Put the real signature into an `opns.register` draft lock. The action emits
+ * the complete script — `<lock pubkey> CHECKSIG`, the key/value fields
+ * (`identity`, `profile`, …), a zero-filled signature push, the drops, and
+ * optionally an inscription envelope. Apply signs the fields and replaces the
+ * placeholder push (chunk `2 + fieldCount`) with the signature push; nothing
+ * else in the script changes. The DER signature may be shorter than the
+ * placeholder, so the push is re-encoded with its own length.
+ *
+ * The lock pubkey in the draft must be this wallet's key for the publish
+ * keyID, and the fields are checked before signing so only a well-formed
+ * publish (exactly one `identity` pair) is ever signed. Uses the given wallet
+ * (must be base — never a gated WPM wrapper).
  */
 export async function applyOpnsRegister(wallet, args) {
     const outputs = args.outputs;
@@ -22,12 +55,37 @@ export async function applyOpnsRegister(wallet, args) {
     if (!input?.outpoint) {
         throw new Error('opns.register apply: missing input outpoint');
     }
-    const fields = PushDrop.decode(LockingScript.fromHex(out.lockingScript)).fields.map((f) => [...f]);
+    const draft = LockingScript.fromHex(out.lockingScript);
+    const decoded = pushDropDecode(draft);
+    const fields = decoded.fields.map((f) => [...f]);
     const placeholder = fields.pop();
     if (!placeholder?.length || placeholder.some((b) => b !== 0)) {
         throw new Error('opns.register apply: signature field is not zeroed');
     }
-    const lockingScript = await new PushDrop(wallet).lock(fields, P1SAT_PROTOCOL, opnsRegisterKeyId(input.outpoint), OPNS_REGISTER_COUNTERPARTY, true, true);
-    out.lockingScript = lockingScript.toHex();
+    assertPublishFields(fields);
+    const keyID = opnsRegisterKeyId(input.outpoint);
+    const { publicKey } = await wallet.getPublicKey({
+        protocolID: P1SAT_PROTOCOL,
+        keyID,
+        counterparty: OPNS_REGISTER_COUNTERPARTY,
+        forSelf: true,
+    });
+    if (publicKey !== decoded.lockingPublicKey.toString()) {
+        throw new Error('opns.register apply: lock key does not match keyID');
+    }
+    const { signature } = await wallet.createSignature({
+        data: fields.flat(),
+        protocolID: P1SAT_PROTOCOL,
+        keyID,
+        counterparty: OPNS_REGISTER_COUNTERPARTY,
+    });
+    // Signatures are 70–72 bytes: always a direct push (opcode = length).
+    const chunks = [...draft.chunks];
+    const at = 2 + fields.length;
+    if (chunks[at]?.data?.length !== placeholder.length) {
+        throw new Error('opns.register apply: placeholder push not found');
+    }
+    chunks[at] = { op: signature.length, data: signature };
+    out.lockingScript = new LockingScript(chunks).toHex();
 }
 //# sourceMappingURL=opnsRegister.js.map

package/dist/apply/opnsRegister.js.map

@@ -1 +1 @@
-{"version":3,"file":"opnsRegister.js","sourceRoot":"","sources":["../../src/apply/opnsRegister.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,WAAW,EACX,0BAA0B,EAC1B,cAAc,EACd,iBAAiB,GACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAEN,aAAa,EACb,QAAQ,GAER,MAAM,UAAU,CAAA;AAEjB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACtC,MAAuB,EACvB,IAAsB;IAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IACxD,CAAC;IACD,MAAM,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC;QACrC,OAAO,CAAC,CAAC,CAAC,CAAA;IACX,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;IAC9B,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAC7B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CACxC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;IAChC,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;IACtE,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CACpD,MAAM,EACN,cAAc,EACd,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,EACjC,0BAA0B,EAC1B,IAAI,EACJ,IAAI,CACJ,CAAA;IACD,GAAG,CAAC,aAAa,GAAG,aAAa,CAAC,KAAK,EAAE,CAAA;AAC1C,CAAC"}
+{"version":3,"file":"opnsRegister.js","sourceRoot":"","sources":["../../src/apply/opnsRegister.ts"],"names":[],"mappings":"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"}

package/dist/funding/index.d.ts

@@ -22,4 +22,5 @@ export interface FundingResult {
     txid: string;
     tx: AtomicBEEF;
 }
+export { createWalletFundingProvider, FUNDING_BASKET, type WalletFundingProviderOptions, } from './walletFunding.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/funding/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE5D;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC/B;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;CACpD;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,UAAU,CAAA;CACd"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/funding/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE5D;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC/B;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;CACpD;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,UAAU,CAAA;CACd;AAED,OAAO,EACN,2BAA2B,EAC3B,cAAc,EACd,KAAK,4BAA4B,GACjC,MAAM,oBAAoB,CAAA"}

package/dist/funding/index.js

@@ -1,2 +1,2 @@
-export {};
+export { createWalletFundingProvider, FUNDING_BASKET, } from './walletFunding.js';
 //# sourceMappingURL=index.js.map

package/dist/funding/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/funding/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/funding/index.ts"],"names":[],"mappings":"AA2BA,OAAO,EACN,2BAA2B,EAC3B,cAAc,GAEd,MAAM,oBAAoB,CAAA"}

package/dist/funding/walletFunding.d.ts

@@ -0,0 +1,47 @@
+import { type AtomicBEEF, Transaction } from '@bsv/sdk';
+import type { OneSatContext } from '../types.js';
+import type { FundingProvider } from './index.js';
+/** The SDK's fee model interface (not exported by `@bsv/sdk` by name). */
+type FeeModel = Exclude<Parameters<Transaction['fee']>[0], number | undefined>;
+/** Basket the wallet files side-door funding UTXOs into. */
+export declare const FUNDING_BASKET = "funding";
+export interface WalletFundingProviderOptions {
+    /** Fee model for the target transaction. Default: the SDK's `LivePolicy`. */
+    feeModel?: FeeModel;
+    /** Basket for the funding UTXO. Default {@link FUNDING_BASKET}. */
+    basket?: string;
+    /**
+     * Broadcast step for the signed target transaction. Resolve on success,
+     * throw otherwise. Default: `ctx.services.postBeef`.
+     */
+    broadcast?: (beef: AtomicBEEF, txid: string) => Promise<void>;
+}
+/**
+ * A {@link FundingProvider} that pays from the caller's own wallet through a
+ * side door, so the target transaction can be internalized afterwards with
+ * tags that depend on its txid.
+ *
+ * 1. `createAction` one P2PKH funding UTXO to a wallet-derived key, sized to
+ *    the target's outputs plus its fee (normal broadcast), filed in
+ *    {@link FUNDING_BASKET} with the derivation in customInstructions.
+ * 2. Build the target transaction: the caller's inputs in the caller's order,
+ *    each with its unlocking script verbatim and its source transaction from
+ *    `args.inputBEEF`, then that UTXO appended as the last input, signed with
+ *    `getPublicKey` / `createSignature` for the stored derivation; the
+ *    caller's outputs in the caller's order. The UTXO is sized exactly, so
+ *    there is no change output.
+ * 3. Broadcast it with `options.broadcast` (default `ctx.services.postBeef`).
+ * 4. Return `{ txid, tx: AtomicBEEF }`.
+ *
+ * Not used by `deployMandala` (which is one createAction + one
+ * internalizeAction); kept as a reusable provider.
+ *
+ * Caller inputs must already carry their unlocking script, signed so the
+ * appended funding input does not invalidate it (`SIGHASH_ALL |
+ * ANYONECANPAY`); scripts are not re-signed or checked. An input with only
+ * `unlockingScriptLength` throws `wallet-funding-input-unsigned`: this
+ * provider cannot sign for the caller.
+ */
+export declare function createWalletFundingProvider(ctx: OneSatContext, options?: WalletFundingProviderOptions): FundingProvider;
+export {};
+//# sourceMappingURL=walletFunding.d.ts.map

package/dist/funding/walletFunding.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"walletFunding.d.ts","sourceRoot":"","sources":["../../src/funding/walletFunding.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,UAAU,EAMf,WAAW,EAIX,MAAM,UAAU,CAAA;AAEjB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAIhD,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAA;AAEhE,0EAA0E;AAC1E,KAAK,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;AAE9E,4DAA4D;AAC5D,eAAO,MAAM,cAAc,YAAY,CAAA;AAUvC,MAAM,WAAW,4BAA4B;IAC5C,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,2BAA2B,CAC1C,GAAG,EAAE,aAAa,EAClB,OAAO,GAAE,4BAAiC,GACxC,eAAe,CA8EjB"}

package/dist/funding/walletFunding.js

@@ -0,0 +1,162 @@
+import { parseOutpoint } from '@1sat/utils';
+import { Beef, LivePolicy, LockingScript, Transaction, UnlockingScript, } from '@bsv/sdk';
+import { P1SAT_PROTOCOL } from '../constants.js';
+import { executeTrackedAction } from '../utils/createTrackedAction.js';
+import { resolveDestination } from '../utils/resolveDestination.js';
+import { signP2PKHInput } from '../utils/signP2PKH.js';
+/** Basket the wallet files side-door funding UTXOs into. */
+export const FUNDING_BASKET = 'funding';
+/**
+ * Maximum P2PKH unlocking script length, used for fee sizing so the funding
+ * UTXO never under-pays: push opcode (1) + DER signature at most 72 bytes +
+ * sighash byte (1) + push opcode (1) + compressed pubkey (33) = 108 bytes.
+ * A shorter real signature over-pays by a byte or two.
+ */
+const P2PKH_UNLOCK_LENGTH = 108;
+/**
+ * A {@link FundingProvider} that pays from the caller's own wallet through a
+ * side door, so the target transaction can be internalized afterwards with
+ * tags that depend on its txid.
+ *
+ * 1. `createAction` one P2PKH funding UTXO to a wallet-derived key, sized to
+ *    the target's outputs plus its fee (normal broadcast), filed in
+ *    {@link FUNDING_BASKET} with the derivation in customInstructions.
+ * 2. Build the target transaction: the caller's inputs in the caller's order,
+ *    each with its unlocking script verbatim and its source transaction from
+ *    `args.inputBEEF`, then that UTXO appended as the last input, signed with
+ *    `getPublicKey` / `createSignature` for the stored derivation; the
+ *    caller's outputs in the caller's order. The UTXO is sized exactly, so
+ *    there is no change output.
+ * 3. Broadcast it with `options.broadcast` (default `ctx.services.postBeef`).
+ * 4. Return `{ txid, tx: AtomicBEEF }`.
+ *
+ * Not used by `deployMandala` (which is one createAction + one
+ * internalizeAction); kept as a reusable provider.
+ *
+ * Caller inputs must already carry their unlocking script, signed so the
+ * appended funding input does not invalidate it (`SIGHASH_ALL |
+ * ANYONECANPAY`); scripts are not re-signed or checked. An input with only
+ * `unlockingScriptLength` throws `wallet-funding-input-unsigned`: this
+ * provider cannot sign for the caller.
+ */
+export function createWalletFundingProvider(ctx, options = {}) {
+    const feeModel = options.feeModel ?? LivePolicy.getInstance();
+    const basket = options.basket ?? FUNDING_BASKET;
+    const broadcast = options.broadcast ??
+        (async (beef, txid) => {
+            if (!ctx.services)
+                throw new Error('services-required');
+            const [result] = await ctx.services.postBeef(Beef.fromBinary(beef), [
+                txid,
+            ]);
+            if (result?.status !== 'success') {
+                throw new Error(result?.error?.message ?? 'no result');
+            }
+        });
+    return {
+        async fund(args) {
+            if (!options.broadcast && !ctx.services) {
+                throw new Error('services-required');
+            }
+            const callerInputs = callerTransactionInputs(args);
+            const outputs = args.outputs ?? [];
+            const funding = await resolveDestination(ctx, undefined, {
+                protocolID: P1SAT_PROTOCOL,
+                keyIDPrefix: 'funding',
+            });
+            const derivation = funding.customInstructions;
+            if (!derivation)
+                throw new Error('funding-derivation-missing');
+            const unlock = walletP2PKHUnlock(ctx, derivation.protocolID, derivation.keyID);
+            // Size the fee on the target's final shape, before the input exists.
+            const draft = targetTransaction(callerInputs, outputs, unlock, {
+                sourceTXID: '00'.repeat(32),
+                sourceOutputIndex: 0,
+            });
+            const fee = await feeModel.computeFee(draft);
+            const fundingSats = outputs.reduce((sum, o) => sum + o.satoshis, 0) + fee;
+            const funded = await executeTrackedAction(ctx.wallet, {
+                description: 'Fund side-door transaction',
+                outputs: [
+                    {
+                        lockingScript: funding.lockingScript.toHex(),
+                        satoshis: fundingSats,
+                        outputDescription: 'Side-door funding',
+                        basket,
+                        customInstructions: JSON.stringify(derivation),
+                    },
+                ],
+                options: { randomizeOutputs: false },
+            });
+            if (funded.error)
+                throw new Error(funded.error);
+            if (!funded.tx)
+                throw new Error('funding-no-tx');
+            const fundingTx = Transaction.fromAtomicBEEF(funded.tx);
+            const tx = targetTransaction(callerInputs, outputs, unlock, {
+                sourceTransaction: fundingTx,
+                sourceOutputIndex: 0,
+            });
+            await tx.sign();
+            const txid = tx.id('hex');
+            const beef = tx.toAtomicBEEF();
+            try {
+                await broadcast(beef, txid);
+            }
+            catch (e) {
+                throw new Error(`funding-broadcast-failed: ${e instanceof Error ? e.message : String(e)}`);
+            }
+            return { txid, tx: beef };
+        },
+    };
+}
+/** The caller's signed inputs, in order, sourced from `args.inputBEEF`. */
+function callerTransactionInputs(args) {
+    const inputs = args.inputs ?? [];
+    const beef = inputs.length && args.inputBEEF
+        ? Beef.fromBinary(args.inputBEEF)
+        : undefined;
+    return inputs.map((input) => {
+        if (input.unlockingScript === undefined) {
+            throw new Error('wallet-funding-input-unsigned');
+        }
+        const { txid, vout } = parseOutpoint(input.outpoint);
+        const sourceTransaction = beef?.findTxid(txid)?.tx;
+        return {
+            ...(sourceTransaction ? { sourceTransaction } : { sourceTXID: txid }),
+            sourceOutputIndex: vout,
+            unlockingScript: UnlockingScript.fromHex(input.unlockingScript),
+            sequence: input.sequenceNumber ?? 0xffffffff,
+        };
+    });
+}
+function targetTransaction(callerInputs, outputs, unlock, source) {
+    const tx = new Transaction();
+    for (const input of callerInputs)
+        tx.addInput({ ...input });
+    tx.addInput({
+        ...source,
+        unlockingScriptTemplate: unlock,
+        sequence: 0xffffffff,
+    });
+    for (const o of outputs) {
+        tx.addOutput({
+            lockingScript: LockingScript.fromHex(o.lockingScript),
+            satoshis: o.satoshis,
+        });
+    }
+    return tx;
+}
+/** Unlocking template over {@link signP2PKHInput} (wallet-held derived key). */
+function walletP2PKHUnlock(ctx, protocolID, keyID) {
+    return {
+        sign: async (tx, inputIndex) => {
+            const hex = await signP2PKHInput(ctx, tx, inputIndex, protocolID, keyID);
+            if (typeof hex !== 'string')
+                throw new Error(hex.error);
+            return UnlockingScript.fromHex(hex);
+        },
+        estimateLength: async () => P2PKH_UNLOCK_LENGTH,
+    };
+}
+//# sourceMappingURL=walletFunding.js.map

package/dist/funding/walletFunding.js.map

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

package/dist/funding/walletFunding.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=walletFunding.test.d.ts.map

package/dist/funding/walletFunding.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"walletFunding.test.d.ts","sourceRoot":"","sources":["../../src/funding/walletFunding.test.ts"],"names":[],"mappings":""}

package/dist/funding/walletFunding.test.js

@@ -0,0 +1,225 @@
+import { describe, expect, test } from 'bun:test';
+import { LockingScript, MerklePath, P2PKH, PrivateKey, ProtoWallet, PublicKey, SatoshisPerKilobyte, Spend, Transaction, UnlockingScript, } from '@bsv/sdk';
+import { FUNDING_BASKET, createWalletFundingProvider } from './walletFunding.js';
+const feeModel = new SatoshisPerKilobyte(100);
+const proto = new ProtoWallet(PrivateKey.fromHex('01'.repeat(32)));
+const lockA = new P2PKH().lock(PrivateKey.fromHex('02'.repeat(32)).toPublicKey().toAddress());
+const lockB = new P2PKH().lock(PrivateKey.fromHex('03'.repeat(32)).toPublicKey().toAddress());
+/** A mined parent so AtomicBEEF can terminate in a proof. */
+function minedParent(lock = lockA) {
+    const parent = new Transaction();
+    parent.addInput({
+        sourceTXID: '11'.repeat(32),
+        sourceOutputIndex: 0,
+        unlockingScript: new UnlockingScript(),
+        sequence: 0xffffffff,
+    });
+    parent.addOutput({ lockingScript: lock, satoshis: 1_000_000 });
+    parent.merklePath = new MerklePath(100, [
+        [{ offset: 0, hash: parent.id('hex'), txid: true }],
+    ]);
+    return parent;
+}
+function fakeContext(opts = {}) {
+    const created = [];
+    const posted = [];
+    const wallet = {
+        getPublicKey: (a) => proto.getPublicKey(a),
+        createSignature: (a) => proto.createSignature(a),
+        createAction: async (args) => {
+            created.push(args);
+            const parent = minedParent();
+            const tx = new Transaction();
+            tx.addInput({
+                sourceTransaction: parent,
+                sourceOutputIndex: 0,
+                unlockingScript: new UnlockingScript(),
+                sequence: 0xffffffff,
+            });
+            for (const o of args.outputs ?? []) {
+                tx.addOutput({
+                    lockingScript: LockingScript.fromHex(o.lockingScript),
+                    satoshis: o.satoshis,
+                });
+            }
+            return { txid: tx.id('hex'), tx: tx.toAtomicBEEF() };
+        },
+    };
+    const ctx = {
+        wallet: wallet,
+        chain: 'main',
+        isBaseWallet: true,
+        services: {
+            postBeef: async (beef, txids) => {
+                posted.push({ beef, txids });
+                return [
+                    opts.broadcast === 'error'
+                        ? {
+                            name: 'fake',
+                            status: 'error',
+                            error: new Error('REJECTED'),
+                            txidResults: [],
+                        }
+                        : {
+                            name: 'fake',
+                            status: 'success',
+                            txidResults: [{ txid: txids[0], status: 'success' }],
+                        },
+                ];
+            },
+        },
+    };
+    return { ctx, created, posted };
+}
+const targetArgs = () => ({
+    description: 'Target transaction',
+    outputs: [
+        { lockingScript: lockA.toHex(), satoshis: 1, outputDescription: 'a' },
+        { lockingScript: lockB.toHex(), satoshis: 546, outputDescription: 'b' },
+    ],
+});
+describe('createWalletFundingProvider', () => {
+    test('funds, builds in caller order, signs, broadcasts, returns AtomicBEEF', async () => {
+        const { ctx, created, posted } = fakeContext();
+        const provider = createWalletFundingProvider(ctx, { feeModel });
+        const args = targetArgs();
+        const { txid, tx: beef } = await provider.fund(args);
+        // (a) one funding UTXO, P2PKH to a wallet-derived key, filed with its derivation
+        expect(created).toHaveLength(1);
+        const fundOut = created[0].outputs?.[0];
+        expect(created[0].outputs).toHaveLength(1);
+        expect(fundOut?.basket).toBe(FUNDING_BASKET);
+        const ci = JSON.parse(fundOut?.customInstructions ?? '{}');
+        expect(ci.protocolID).toBeDefined();
+        expect(ci.keyID).toStartWith('funding-');
+        const { publicKey } = await proto.getPublicKey({
+            protocolID: ci.protocolID,
+            keyID: ci.keyID,
+            counterparty: 'self',
+            forSelf: true,
+        });
+        expect(fundOut?.lockingScript).toBe(new P2PKH().lock(PublicKey.fromString(publicKey).toAddress()).toHex());
+        // (b) target: the funding UTXO in, caller outputs in caller order, no change
+        const tx = Transaction.fromAtomicBEEF(beef);
+        expect(tx.id('hex')).toBe(txid);
+        expect(tx.inputs).toHaveLength(1);
+        const fundingTx = tx.inputs[0].sourceTransaction;
+        expect(fundingTx.outputs[0].lockingScript.toHex()).toBe(fundOut?.lockingScript);
+        expect(tx.outputs.map((o) => [o.lockingScript.toHex(), o.satoshis])).toEqual((args.outputs ?? []).map((o) => [o.lockingScript, o.satoshis]));
+        // fee: funding = outputs + the model's fee at the maximum unlock length
+        const paid = (fundOut?.satoshis ?? 0) - 547;
+        expect(paid).toBeGreaterThan(0);
+        // sized at the maximum unlock length: never under-pays the signed tx
+        expect(paid).toBeGreaterThanOrEqual(await feeModel.computeFee(tx));
+        // signed with the derived key
+        const input = tx.inputs[0];
+        const spend = new Spend({
+            sourceTXID: fundingTx.id('hex'),
+            sourceOutputIndex: 0,
+            sourceSatoshis: fundingTx.outputs[0].satoshis,
+            lockingScript: fundingTx.outputs[0].lockingScript,
+            transactionVersion: tx.version,
+            otherInputs: [],
+            outputs: tx.outputs,
+            inputIndex: 0,
+            unlockingScript: input.unlockingScript,
+            inputSequence: input.sequence,
+            lockTime: tx.lockTime,
+        });
+        expect(spend.validate()).toBe(true);
+        // (c) broadcast through services.postBeef
+        expect(posted).toHaveLength(1);
+        expect(posted[0].txids).toEqual([txid]);
+        expect(posted[0].beef.findTxid(txid)).toBeDefined();
+    });
+    test('throws when the broadcast is not accepted', async () => {
+        const { ctx } = fakeContext({ broadcast: 'error' });
+        const provider = createWalletFundingProvider(ctx, { feeModel });
+        await expect(provider.fund(targetArgs())).rejects.toThrow('funding-broadcast-failed: REJECTED');
+    });
+    test('includes signed caller inputs first, verbatim, funding input last', async () => {
+        const { ctx } = fakeContext();
+        const provider = createWalletFundingProvider(ctx, { feeModel });
+        const callerKey = PrivateKey.fromHex('04'.repeat(32));
+        const callerSource = minedParent(new P2PKH().lock(callerKey.toPublicKey().toAddress()));
+        const args = targetArgs();
+        // The caller signs ALL|ANYONECANPAY over its own input and the outputs.
+        const signed = new Transaction();
+        signed.addInput({
+            sourceTransaction: callerSource,
+            sourceOutputIndex: 0,
+            unlockingScriptTemplate: new P2PKH().unlock(callerKey, 'all', true),
+            sequence: 0xffffffff,
+        });
+        for (const o of args.outputs ?? []) {
+            signed.addOutput({
+                lockingScript: LockingScript.fromHex(o.lockingScript),
+                satoshis: o.satoshis,
+            });
+        }
+        await signed.sign();
+        const callerScript = signed.inputs[0].unlockingScript?.toHex();
+        const { tx: beef } = await provider.fund({
+            ...args,
+            inputBEEF: callerSource.toBEEF(),
+            inputs: [
+                {
+                    outpoint: `${callerSource.id('hex')}.0`,
+                    unlockingScript: callerScript,
+                    inputDescription: 'caller',
+                },
+            ],
+        });
+        const tx = Transaction.fromAtomicBEEF(beef);
+        expect(tx.inputs).toHaveLength(2);
+        expect(tx.inputs[0].sourceTXID ?? tx.inputs[0].sourceTransaction?.id('hex')).toBe(callerSource.id('hex'));
+        expect(tx.inputs[0].unlockingScript?.toHex()).toBe(callerScript);
+        const fundingTx = tx.inputs[1].sourceTransaction;
+        expect(fundingTx.outputs[0].lockingScript.toHex()).toStartWith('76a914');
+        // both inputs still validate in the final transaction
+        for (const [i, src] of [callerSource, fundingTx].entries()) {
+            const input = tx.inputs[i];
+            const spend = new Spend({
+                sourceTXID: src.id('hex'),
+                sourceOutputIndex: 0,
+                sourceSatoshis: src.outputs[0].satoshis,
+                lockingScript: src.outputs[0].lockingScript,
+                transactionVersion: tx.version,
+                otherInputs: tx.inputs
+                    .filter((_, j) => j !== i)
+                    .map((inp) => ({
+                    sourceTXID: inp.sourceTXID ?? inp.sourceTransaction?.id('hex'),
+                    sourceOutputIndex: inp.sourceOutputIndex,
+                    sequence: inp.sequence,
+                })),
+                outputs: tx.outputs,
+                inputIndex: i,
+                unlockingScript: input.unlockingScript,
+                inputSequence: input.sequence,
+                lockTime: tx.lockTime,
+            });
+            expect(spend.validate()).toBe(true);
+        }
+        // fee covers both inputs: input value - outputs >= the signed tx's fee
+        const inSats = callerSource.outputs[0].satoshis +
+            fundingTx.outputs[0].satoshis;
+        const outSats = tx.outputs.reduce((n, o) => n + o.satoshis, 0);
+        expect(inSats - outSats).toBeGreaterThanOrEqual(await feeModel.computeFee(tx));
+    });
+    test('rejects a caller input with no unlocking script', async () => {
+        const { ctx, created } = fakeContext();
+        const provider = createWalletFundingProvider(ctx, { feeModel });
+        await expect(provider.fund({
+            ...targetArgs(),
+            inputs: [
+                {
+                    outpoint: `${'ab'.repeat(32)}.0`,
+                    unlockingScriptLength: 108,
+                    inputDescription: 'x',
+                },
+            ],
+        })).rejects.toThrow('wallet-funding-input-unsigned');
+        expect(created).toHaveLength(0);
+    });
+});
+//# sourceMappingURL=walletFunding.test.js.map

package/dist/funding/walletFunding.test.js.map

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