@cogcoin/client 0.5.12 → 0.5.13

package/dist/wallet/tx/common.d.ts

@@ -1,4 +1,4 @@
-import type { RpcDecodedPsbt, RpcFinalizePsbtResult, RpcListUnspentEntry, RpcLockedUnspent, RpcTestMempoolAcceptResult, RpcTransaction, RpcWalletCreateFundedPsbtResult, RpcWalletProcessPsbtResult } from "../../bitcoind/types.js";
+import type { RpcDecodedPsbt, RpcFinalizePsbtResult, RpcListUnspentEntry, RpcLockedUnspent, RpcTestMempoolAcceptResult, RpcTransaction, RpcVin, RpcWalletCreateFundedPsbtResult, RpcWalletProcessPsbtResult } from "../../bitcoind/types.js";
 import { type WalletSecretProvider } from "../state/provider.js";
 import type { OutpointRecord, PendingMutationRecord, PendingMutationStatus, WalletStateV1 } from "../types.js";
 import type { WalletReadContext } from "../read/index.js";
@@ -33,6 +33,8 @@ export interface BuiltWalletMutationTransaction {
     wtxid: string | null;
     temporaryBuilderLockedOutpoints: OutpointRecord[];
 }
+export interface FixedWalletInput extends OutpointRecord {
+}
 export declare function saveWalletStatePreservingUnlock(options: {
     state: WalletStateV1;
     provider: WalletSecretProvider;
@@ -49,8 +51,28 @@ export declare function updateMutationRecord(mutation: PendingMutationRecord, st
 }): PendingMutationRecord;
 export declare function unlockTemporaryBuilderLocks(rpc: Pick<WalletMutationRpcClient, "lockUnspent">, walletName: string, outpoints: OutpointRecord[]): Promise<void>;
 export declare function diffTemporaryLockedOutpoints(before: RpcLockedUnspent[], after: RpcLockedUnspent[]): OutpointRecord[];
+export declare function getDecodedInputScriptPubKeyHex(input: RpcVin): string | null;
+export declare function getDecodedInputVout(input: RpcVin): number | null;
+export declare function inputMatchesOutpoint(input: RpcVin, outpoint: OutpointRecord): boolean;
+export declare function assertFixedInputPrefixMatches(inputs: RpcVin[], fixedInputs: FixedWalletInput[], errorCode: string): void;
+export declare function assertFundingInputsAfterFixedPrefix(options: {
+    inputs: RpcVin[];
+    fixedInputs: FixedWalletInput[];
+    allowedFundingScriptPubKeyHex: string;
+    eligibleFundingOutpointKeys: Set<string>;
+    errorCode: string;
+}): void;
+export declare function reconcilePersistentPolicyLocks(options: {
+    rpc: Pick<WalletMutationRpcClient, "listLockUnspent" | "lockUnspent" | "listUnspent">;
+    walletName: string;
+    state: WalletStateV1;
+    fixedInputs: FixedWalletInput[];
+    temporarilyUnlockedOutpoints?: readonly OutpointRecord[];
+    cleanupInactiveTemporaryBuilderLocks?: boolean;
+}): Promise<void>;
 export declare function isBroadcastUnknownError(error: unknown): boolean;
 export declare function isAlreadyAcceptedError(error: unknown): boolean;
+export declare function isInsufficientFundsError(error: unknown): boolean;
 export declare function assertWalletMutationContextReady(context: WalletReadContext, errorPrefix: string): asserts context is WalletReadContext & {
     localState: {
         availability: "ready";
@@ -67,11 +89,9 @@ export declare function pauseMiningForWalletMutation(options: {
 export declare function buildWalletMutationTransaction<TPlan>(options: {
     rpc: WalletMutationRpcClient;
     walletName: string;
+    state: WalletStateV1;
     plan: TPlan & {
-        inputs: Array<{
-            txid: string;
-            vout: number;
-        }>;
+        fixedInputs: FixedWalletInput[];
         outputs: unknown[];
         changeAddress: string;
         changePosition: number;
@@ -80,10 +100,21 @@ export declare function buildWalletMutationTransaction<TPlan>(options: {
     finalizeErrorCode: string;
     mempoolRejectPrefix: string;
     feeRate?: number;
-    builderOptions?: {
-        addInputs?: boolean;
-        includeUnsafe?: boolean;
-        minConf?: number;
-        lockUnspents?: boolean;
+    temporarilyUnlockedPolicyOutpoints?: readonly OutpointRecord[];
+}): Promise<BuiltWalletMutationTransaction>;
+export declare function buildWalletMutationTransactionWithReserveFallback<TPlan>(options: {
+    rpc: WalletMutationRpcClient;
+    walletName: string;
+    state: WalletStateV1;
+    plan: TPlan & {
+        fixedInputs: FixedWalletInput[];
+        outputs: unknown[];
+        changeAddress: string;
+        changePosition: number;
     };
+    validateFundedDraft(decoded: RpcDecodedPsbt, funded: RpcWalletCreateFundedPsbtResult, plan: TPlan): void;
+    finalizeErrorCode: string;
+    mempoolRejectPrefix: string;
+    feeRate?: number;
+    reserveCandidates: readonly OutpointRecord[];
 }): Promise<BuiltWalletMutationTransaction>;

package/dist/wallet/tx/common.js

@@ -2,6 +2,7 @@ import { randomBytes } from "node:crypto";
 import { saveUnlockSession } from "../state/session.js";
 import { saveWalletState } from "../state/storage.js";
 import { createWalletSecretReference, } from "../state/provider.js";
+import { reconcilePersistentPolicyLocks as reconcileWalletCoinControlLocks } from "../coin-control.js";
 import { requestMiningGenerationPreemption } from "../mining/coordination.js";
 export const DEFAULT_WALLET_MUTATION_FEE_RATE_SAT_VB = 10;
 function createUnlockSessionState(state, unlockUntilUnixMs, nowUnixMs) {
@@ -64,6 +65,53 @@ export function diffTemporaryLockedOutpoints(before, after) {
         vout: entry.vout,
     }));
 }
+export function getDecodedInputScriptPubKeyHex(input) {
+    return input.prevout?.scriptPubKey?.hex ?? null;
+}
+export function getDecodedInputVout(input) {
+    const vout = input.vout;
+    return typeof vout === "number" ? vout : null;
+}
+export function inputMatchesOutpoint(input, outpoint) {
+    return input.txid === outpoint.txid && getDecodedInputVout(input) === outpoint.vout;
+}
+export function assertFixedInputPrefixMatches(inputs, fixedInputs, errorCode) {
+    if (inputs.length < fixedInputs.length) {
+        throw new Error(errorCode);
+    }
+    for (const [index, fixedInput] of fixedInputs.entries()) {
+        if (!inputMatchesOutpoint(inputs[index], fixedInput)) {
+            throw new Error(errorCode);
+        }
+    }
+}
+export function assertFundingInputsAfterFixedPrefix(options) {
+    for (let index = options.fixedInputs.length; index < options.inputs.length; index += 1) {
+        const input = options.inputs[index];
+        const scriptPubKeyHex = getDecodedInputScriptPubKeyHex(input);
+        const vout = getDecodedInputVout(input);
+        if (scriptPubKeyHex !== options.allowedFundingScriptPubKeyHex || vout === null || typeof input.txid !== "string") {
+            throw new Error(options.errorCode);
+        }
+        const key = outpointKey({
+            txid: input.txid,
+            vout,
+        });
+        if (!options.eligibleFundingOutpointKeys.has(key)) {
+            throw new Error(options.errorCode);
+        }
+    }
+}
+export async function reconcilePersistentPolicyLocks(options) {
+    await reconcileWalletCoinControlLocks({
+        rpc: options.rpc,
+        walletName: options.walletName,
+        state: options.state,
+        fixedInputs: options.fixedInputs,
+        temporarilyUnlockedOutpoints: options.temporarilyUnlockedOutpoints,
+        cleanupInactiveTemporaryBuilderLocks: options.cleanupInactiveTemporaryBuilderLocks,
+    });
+}
 export function isBroadcastUnknownError(error) {
     const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
     return message.includes("timeout")
@@ -80,6 +128,10 @@ export function isAlreadyAcceptedError(error) {
         || message.includes("already in blockchain")
         || message.includes("txn-already-known");
 }
+export function isInsufficientFundsError(error) {
+    const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+    return message.includes("insufficient funds");
+}
 export function assertWalletMutationContextReady(context, errorPrefix) {
     if (context.localState.availability === "uninitialized") {
         throw new Error("wallet_uninitialized");
@@ -110,16 +162,23 @@ export async function pauseMiningForWalletMutation(options) {
     });
 }
 export async function buildWalletMutationTransaction(options) {
+    await reconcilePersistentPolicyLocks({
+        rpc: options.rpc,
+        walletName: options.walletName,
+        state: options.state,
+        fixedInputs: options.plan.fixedInputs,
+        temporarilyUnlockedOutpoints: options.temporarilyUnlockedPolicyOutpoints,
+    });
     const lockedBefore = await options.rpc.listLockUnspent(options.walletName);
     let temporaryBuilderLockedOutpoints = [];
     try {
-        const funded = await options.rpc.walletCreateFundedPsbt(options.walletName, options.plan.inputs, options.plan.outputs, 0, {
-            add_inputs: options.builderOptions?.addInputs ?? true,
-            include_unsafe: options.builderOptions?.includeUnsafe ?? false,
-            minconf: options.builderOptions?.minConf ?? 1,
+        const funded = await options.rpc.walletCreateFundedPsbt(options.walletName, options.plan.fixedInputs, options.plan.outputs, 0, {
+            add_inputs: true,
+            include_unsafe: false,
+            minconf: 1,
             changeAddress: options.plan.changeAddress,
             changePosition: options.plan.changePosition,
-            lockUnspents: options.builderOptions?.lockUnspents ?? true,
+            lockUnspents: true,
             fee_rate: options.feeRate ?? DEFAULT_WALLET_MUTATION_FEE_RATE_SAT_VB,
             replaceable: true,
             subtractFeeFromOutputs: [],
@@ -139,6 +198,14 @@ export async function buildWalletMutationTransaction(options) {
         if (accepted == null || !accepted.allowed) {
             throw new Error(`${options.mempoolRejectPrefix}_${accepted?.["reject-reason"] ?? "unknown"}`);
         }
+        if ((options.temporarilyUnlockedPolicyOutpoints?.length ?? 0) > 0) {
+            await reconcilePersistentPolicyLocks({
+                rpc: options.rpc,
+                walletName: options.walletName,
+                state: options.state,
+                fixedInputs: options.plan.fixedInputs,
+            });
+        }
         return {
             funded,
             decoded,
@@ -151,6 +218,46 @@ export async function buildWalletMutationTransaction(options) {
     }
     catch (error) {
         await unlockTemporaryBuilderLocks(options.rpc, options.walletName, temporaryBuilderLockedOutpoints);
+        if ((options.temporarilyUnlockedPolicyOutpoints?.length ?? 0) > 0) {
+            await reconcilePersistentPolicyLocks({
+                rpc: options.rpc,
+                walletName: options.walletName,
+                state: options.state,
+                fixedInputs: options.plan.fixedInputs,
+            });
+        }
         throw error;
     }
 }
+export async function buildWalletMutationTransactionWithReserveFallback(options) {
+    let unlockedReserveOutpoints = [];
+    let lastError = null;
+    for (let attempt = 0; attempt <= options.reserveCandidates.length; attempt += 1) {
+        if (attempt > 0) {
+            unlockedReserveOutpoints = [
+                ...unlockedReserveOutpoints,
+                options.reserveCandidates[attempt - 1],
+            ];
+        }
+        try {
+            return await buildWalletMutationTransaction({
+                rpc: options.rpc,
+                walletName: options.walletName,
+                state: options.state,
+                plan: options.plan,
+                validateFundedDraft: options.validateFundedDraft,
+                finalizeErrorCode: options.finalizeErrorCode,
+                mempoolRejectPrefix: options.mempoolRejectPrefix,
+                feeRate: options.feeRate,
+                temporarilyUnlockedPolicyOutpoints: unlockedReserveOutpoints,
+            });
+        }
+        catch (error) {
+            lastError = error;
+            if (!isInsufficientFundsError(error) || attempt === options.reserveCandidates.length) {
+                throw error;
+            }
+        }
+    }
+    throw lastError;
+}

package/dist/wallet/tx/domain-admin.js

@@ -9,7 +9,7 @@ import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { serializeSetCanonical, serializeSetDelegate, serializeSetEndpoint, serializeSetMiner, validateDomainName, } from "../cogop/index.js";
 import { openWalletReadContext } from "../read/index.js";
-import { assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
 import { confirmYesNo } from "./confirm.js";
 import { getCanonicalIdentitySelector } from "./identity-selector.js";
 import { findPendingMutationByIntent, upsertPendingMutation } from "./journal.js";
@@ -133,9 +133,8 @@ function buildPlanForDomainAdminOperation(options) {
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        inputs: [
+        fixedInputs: [
             { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-            ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
         ],
         outputs: [
             { data: Buffer.from(options.opReturnData).toString("hex") },
@@ -146,6 +145,7 @@ function buildPlanForDomainAdminOperation(options) {
         expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
         expectedAnchorValueSats: BigInt(options.state.anchorValueSats),
         allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+        eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
         errorPrefix: options.errorPrefix,
     };
 }
@@ -155,14 +155,17 @@ function validateFundedDraft(decoded, funded, plan) {
     if (inputs.length === 0) {
         throw new Error(`${plan.errorPrefix}_missing_sender_input`);
     }
+    assertFixedInputPrefixMatches(inputs, plan.fixedInputs, `${plan.errorPrefix}_sender_input_mismatch`);
     if (inputs[0]?.prevout?.scriptPubKey?.hex !== plan.sender.scriptPubKeyHex) {
         throw new Error(`${plan.errorPrefix}_sender_input_mismatch`);
     }
-    for (let index = 1; index < inputs.length; index += 1) {
-        if (inputs[index]?.prevout?.scriptPubKey?.hex !== plan.allowedFundingScriptPubKeyHex) {
-            throw new Error(`${plan.errorPrefix}_unexpected_funding_input`);
-        }
-    }
+    assertFundingInputsAfterFixedPrefix({
+        inputs,
+        fixedInputs: plan.fixedInputs,
+        allowedFundingScriptPubKeyHex: plan.allowedFundingScriptPubKeyHex,
+        eligibleFundingOutpointKeys: plan.eligibleFundingOutpointKeys,
+        errorCode: `${plan.errorPrefix}_unexpected_funding_input`,
+    });
     if (outputs[0]?.scriptPubKey?.hex !== plan.expectedOpReturnScriptHex) {
         throw new Error(`${plan.errorPrefix}_opreturn_mismatch`);
     }
@@ -189,6 +192,7 @@ async function buildTransaction(options) {
     return buildWalletMutationTransaction({
         rpc: options.rpc,
         walletName: options.walletName,
+        state: options.state,
         plan: options.plan,
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
@@ -632,6 +636,7 @@ async function submitDomainAdminMutation(options) {
             const built = await buildTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan: buildPlanForDomainAdminOperation({
                     state: nextState,
                     allUtxos: await rpc.listUnspent(walletName, 1),

package/dist/wallet/tx/domain-market.js

@@ -7,7 +7,7 @@ import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { serializeDomainBuy, serializeDomainSell, serializeDomainTransfer, validateDomainName, } from "../cogop/index.js";
 import { openWalletReadContext } from "../read/index.js";
-import { assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
 import { confirmTypedAcknowledgement, confirmYesNo } from "./confirm.js";
 import { getCanonicalIdentitySelector, resolveIdentityBySelector, } from "./identity-selector.js";
 import { findPendingMutationByIntent, upsertPendingMutation } from "./journal.js";
@@ -258,11 +258,8 @@ function buildPlanForDomainOperation(options) {
         return {
             sender: options.sender,
             changeAddress: options.state.funding.address,
-            inputs: [
+            fixedInputs: [
                 { txid: senderUtxo.txid, vout: senderUtxo.vout },
-                ...fundingUtxos
-                    .filter((entry) => !(entry.txid === senderUtxo.txid && entry.vout === senderUtxo.vout))
-                    .map((entry) => ({ txid: entry.txid, vout: entry.vout })),
             ],
             outputs,
             changePosition: 1,
@@ -270,6 +267,9 @@ function buildPlanForDomainOperation(options) {
             expectedAnchorScriptHex: null,
             expectedAnchorValueSats: null,
             allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+            eligibleFundingOutpointKeys: new Set(fundingUtxos
+                .filter((entry) => !(entry.txid === senderUtxo.txid && entry.vout === senderUtxo.vout))
+                .map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
             errorPrefix: options.errorPrefix,
         };
     }
@@ -288,9 +288,8 @@ function buildPlanForDomainOperation(options) {
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        inputs: [
+        fixedInputs: [
             { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-            ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
         ],
         outputs,
         changePosition: 2,
@@ -298,6 +297,7 @@ function buildPlanForDomainOperation(options) {
         expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
         expectedAnchorValueSats: options.anchorValueSats,
         allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+        eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
         errorPrefix: options.errorPrefix,
     };
 }
@@ -307,14 +307,17 @@ function validateFundedDraft(decoded, funded, plan) {
     if (inputs.length === 0) {
         throw new Error(`${plan.errorPrefix}_missing_sender_input`);
     }
+    assertFixedInputPrefixMatches(inputs, plan.fixedInputs, `${plan.errorPrefix}_sender_input_mismatch`);
     if (inputs[0]?.prevout?.scriptPubKey?.hex !== plan.sender.scriptPubKeyHex) {
         throw new Error(`${plan.errorPrefix}_sender_input_mismatch`);
     }
-    for (let index = 1; index < inputs.length; index += 1) {
-        if (inputs[index]?.prevout?.scriptPubKey?.hex !== plan.allowedFundingScriptPubKeyHex) {
-            throw new Error(`${plan.errorPrefix}_unexpected_funding_input`);
-        }
-    }
+    assertFundingInputsAfterFixedPrefix({
+        inputs,
+        fixedInputs: plan.fixedInputs,
+        allowedFundingScriptPubKeyHex: plan.allowedFundingScriptPubKeyHex,
+        eligibleFundingOutpointKeys: plan.eligibleFundingOutpointKeys,
+        errorCode: `${plan.errorPrefix}_unexpected_funding_input`,
+    });
     if (outputs[0]?.scriptPubKey?.hex !== plan.expectedOpReturnScriptHex) {
         throw new Error(`${plan.errorPrefix}_opreturn_mismatch`);
     }
@@ -344,6 +347,7 @@ async function buildTransaction(options) {
     return buildWalletMutationTransaction({
         rpc: options.rpc,
         walletName: options.walletName,
+        state: options.state,
         plan: options.plan,
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
@@ -768,6 +772,7 @@ export async function transferDomain(options) {
             const built = await buildTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan: buildPlanForDomainOperation({
                     state: nextState,
                     allUtxos: await rpc.listUnspent(walletName, 1),
@@ -998,6 +1003,7 @@ async function runSellMutation(options) {
             const built = await buildTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan: buildPlanForDomainOperation({
                     state: nextState,
                     allUtxos: await rpc.listUnspent(walletName, 1),
@@ -1233,6 +1239,7 @@ export async function buyDomain(options) {
             const built = await buildTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan: buildPlanForDomainOperation({
                     state: nextState,
                     allUtxos: await rpc.listUnspent(walletName, 1),

package/dist/wallet/tx/field.js

@@ -5,12 +5,13 @@ import { getBalance, lookupDomain, } from "@cogcoin/indexer/queries";
 import { attachOrStartManagedBitcoindService } from "../../bitcoind/service.js";
 import { createRpcClient } from "../../bitcoind/node.js";
 import { acquireFileLock } from "../fs/lock.js";
+import { computeDesignatedProactiveReserveOutpoints } from "../coin-control.js";
 import { resolveWalletRuntimePathsForTesting, } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { FIELD_FORMAT_BYTES, serializeDataUpdate, serializeFieldReg, } from "../cogop/index.js";
 import { validateFieldName } from "../cogop/validate-name.js";
 import { findDomainField, openWalletReadContext, } from "../read/index.js";
-import { assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
 import { confirmTypedAcknowledgement as confirmSharedTypedAcknowledgement, confirmYesNo as confirmSharedYesNo, } from "./confirm.js";
 import { getCanonicalIdentitySelector } from "./identity-selector.js";
 import { findPendingMutationByIntent, upsertPendingMutation } from "./journal.js";
@@ -253,9 +254,8 @@ function buildAnchoredFieldPlan(options) {
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        inputs: [
+        fixedInputs: [
             { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-            ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
         ],
         outputs: [
             { data: Buffer.from(options.opReturnData).toString("hex") },
@@ -266,6 +266,7 @@ function buildAnchoredFieldPlan(options) {
         expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
         expectedAnchorValueSats: BigInt(options.state.anchorValueSats),
         allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+        eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
         errorPrefix: options.errorPrefix,
     };
 }
@@ -277,10 +278,7 @@ function buildFieldFamilyTx2Plan(options) {
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        inputs: [
-            { txid: options.tx1Txid, vout: 1 },
-            ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
-        ],
+        fixedInputs: [{ txid: options.tx1Txid, vout: 1 }],
         outputs: [
             { data: Buffer.from(options.opReturnData).toString("hex") },
             { [options.sender.address]: satsToBtcNumber(BigInt(options.state.anchorValueSats)) },
@@ -290,6 +288,7 @@ function buildFieldFamilyTx2Plan(options) {
         expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
         expectedAnchorValueSats: BigInt(options.state.anchorValueSats),
         allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+        eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
         errorPrefix: "wallet_field_create_tx2",
     };
 }
@@ -299,14 +298,17 @@ function validateFieldDraft(decoded, funded, plan) {
     if (inputs.length === 0) {
         throw new Error(`${plan.errorPrefix}_missing_sender_input`);
     }
+    assertFixedInputPrefixMatches(inputs, plan.fixedInputs, `${plan.errorPrefix}_sender_input_mismatch`);
     if (inputs[0]?.prevout?.scriptPubKey?.hex !== plan.sender.scriptPubKeyHex) {
         throw new Error(`${plan.errorPrefix}_sender_input_mismatch`);
     }
-    for (let index = 1; index < inputs.length; index += 1) {
-        if (inputs[index]?.prevout?.scriptPubKey?.hex !== plan.allowedFundingScriptPubKeyHex) {
-            throw new Error(`${plan.errorPrefix}_unexpected_funding_input`);
-        }
-    }
+    assertFundingInputsAfterFixedPrefix({
+        inputs,
+        fixedInputs: plan.fixedInputs,
+        allowedFundingScriptPubKeyHex: plan.allowedFundingScriptPubKeyHex,
+        eligibleFundingOutpointKeys: plan.eligibleFundingOutpointKeys,
+        errorCode: `${plan.errorPrefix}_unexpected_funding_input`,
+    });
     if (outputs[0]?.scriptPubKey?.hex !== plan.expectedOpReturnScriptHex) {
         throw new Error(`${plan.errorPrefix}_opreturn_mismatch`);
     }
@@ -330,14 +332,16 @@ function validateFieldDraft(decoded, funded, plan) {
     }
 }
 async function buildFieldTransaction(options) {
-    return buildWalletMutationTransaction({
+    const reserveCandidates = computeDesignatedProactiveReserveOutpoints(options.state, await options.rpc.listUnspent(options.walletName, 1));
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
+        state: options.state,
         plan: options.plan,
         validateFundedDraft: validateFieldDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
-        builderOptions: options.builderOptions,
+        reserveCandidates,
     });
 }
 async function saveUpdatedState(options) {
@@ -1348,6 +1352,7 @@ async function submitStandaloneFieldMutation(options) {
             const built = await buildFieldTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan: buildAnchoredFieldPlan({
                     state: nextState,
                     allUtxos: await rpc.listUnspent(walletName, 1),
@@ -1544,6 +1549,7 @@ async function submitFieldCreateFamily(options) {
                 const tx1 = await buildFieldTransaction({
                     rpc,
                     walletName,
+                    state: nextState,
                     plan: buildAnchoredFieldPlan({
                         state: nextState,
                         allUtxos: await rpc.listUnspent(walletName, 1),
@@ -1576,6 +1582,7 @@ async function submitFieldCreateFamily(options) {
             const tx2 = await buildFieldTransaction({
                 rpc,
                 walletName,
+                state: workingState,
                 plan: buildFieldFamilyTx2Plan({
                     state: workingState,
                     allUtxos: await rpc.listUnspent(walletName, 1),
@@ -1583,10 +1590,6 @@ async function submitFieldCreateFamily(options) {
                     tx1Txid,
                     opReturnData: serializeDataUpdate(operation.chainDomain.domainId, resumedFamily.expectedFieldId ?? operation.chainDomain.nextFieldId, options.value.format, options.value.value).opReturnData,
                 }),
-                builderOptions: {
-                    includeUnsafe: true,
-                    minConf: 0,
-                },
             });
             const final = await sendFamilyTx2({
                 rpc,

package/dist/wallet/tx/register.js

@@ -8,7 +8,7 @@ import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { computeRootRegistrationPriceSats, serializeDomainReg } from "../cogop/index.js";
 import { openWalletReadContext } from "../read/index.js";
-import { assertWalletMutationContextReady, buildWalletMutationTransaction, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
 import { confirmTypedAcknowledgement, confirmYesNo } from "./confirm.js";
 import { getCanonicalIdentitySelector, resolveIdentityBySelector, } from "./identity-selector.js";
 import { findPendingMutationByIntent, upsertPendingMutation } from "./journal.js";
@@ -401,14 +401,17 @@ function validateFundedDraft(decoded, funded, plan) {
     if (inputs.length === 0) {
         throw new Error("wallet_register_missing_sender_input");
     }
+    assertFixedInputPrefixMatches(inputs, plan.fixedInputs, "wallet_register_sender_input_mismatch");
     if (inputs[0]?.prevout?.scriptPubKey?.hex !== plan.sender.scriptPubKeyHex) {
         throw new Error("wallet_register_sender_input_mismatch");
     }
-    for (let index = 1; index < inputs.length; index += 1) {
-        if (inputs[index]?.prevout?.scriptPubKey?.hex !== plan.allowedFundingScriptPubKeyHex) {
-            throw new Error("wallet_register_unexpected_funding_input");
-        }
-    }
+    assertFundingInputsAfterFixedPrefix({
+        inputs,
+        fixedInputs: plan.fixedInputs,
+        allowedFundingScriptPubKeyHex: plan.allowedFundingScriptPubKeyHex,
+        eligibleFundingOutpointKeys: plan.eligibleFundingOutpointKeys,
+        errorCode: "wallet_register_unexpected_funding_input",
+    });
     if (outputs[0]?.scriptPubKey?.hex !== plan.expectedOpReturnScriptHex) {
         throw new Error("wallet_register_opreturn_mismatch");
     }
@@ -467,9 +470,8 @@ function buildRegisterPlan(options) {
                 registerKind: "root",
                 sender: options.sender,
                 changeAddress: options.state.funding.address,
-                inputs: [
+                fixedInputs: [
                     { txid: senderInput.txid, vout: senderInput.vout },
-                    ...additionalFunding,
                 ],
                 outputs: rootOutputs.outputs,
                 changePosition: rootOutputs.changePosition,
@@ -481,6 +483,7 @@ function buildRegisterPlan(options) {
                 expectedAnchorScriptHex: null,
                 expectedAnchorValueSats: null,
                 allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+                eligibleFundingOutpointKeys: new Set(additionalFunding.map((entry) => outpointKey(entry))),
             };
         }
         const anchorUtxo = options.allUtxos.find((entry) => entry.txid === options.anchorOutpoint?.txid
@@ -494,9 +497,8 @@ function buildRegisterPlan(options) {
             registerKind: "root",
             sender: options.sender,
             changeAddress: options.state.funding.address,
-            inputs: [
+            fixedInputs: [
                 { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-                ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
             ],
             outputs: rootOutputs.outputs,
             changePosition: rootOutputs.changePosition,
@@ -508,6 +510,7 @@ function buildRegisterPlan(options) {
             expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
             expectedAnchorValueSats: options.anchorValueSats,
             allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+            eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey(entry))),
         };
     }
     const anchor = options.anchorOutpoint;
@@ -530,9 +533,8 @@ function buildRegisterPlan(options) {
         registerKind: "subdomain",
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        inputs: [
+        fixedInputs: [
             { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-            ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
         ],
         outputs: subdomainOutputs.outputs,
         changePosition: subdomainOutputs.changePosition,
@@ -544,12 +546,14 @@ function buildRegisterPlan(options) {
         expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
         expectedAnchorValueSats: options.anchorValueSats,
         allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+        eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey(entry))),
     };
 }
 async function buildRegisterTransaction(options) {
     return buildWalletMutationTransaction({
         rpc: options.rpc,
         walletName: options.walletName,
+        state: options.state,
         plan: options.plan,
         validateFundedDraft,
         finalizeErrorCode: "wallet_register_finalize_failed",
@@ -810,6 +814,7 @@ export async function registerDomain(options) {
             const built = await buildRegisterTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan,
             });
             const currentMutation = nextState.pendingMutations?.find((mutation) => mutation.intentFingerprintHex === intentFingerprintHex)