@cogcoin/client 0.5.13 → 0.5.14

package/dist/wallet/tx/anchor.js

@@ -5,7 +5,6 @@ import { attachOrStartManagedBitcoindService } from "../../bitcoind/service.js";
 import { createRpcClient } from "../../bitcoind/node.js";
 import { acquireFileLock } from "../fs/lock.js";
 import { deriveWalletIdentityMaterial, } from "../material.js";
-import { computeDesignatedProactiveReserveOutpoints } from "../coin-control.js";
 import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { serializeDomainAnchor, serializeDomainTransfer, validateDomainName, } from "../cogop/index.js";
@@ -116,6 +115,11 @@ function findActiveAnchorFamilyByDomain(state, domainName) {
         && family.domainName === domainName
         && ACTIVE_FAMILY_STATUSES.has(family.status)) ?? null;
 }
+function isClearableReservedAnchorFamily(family) {
+    return family?.type === "anchor"
+        && family.status === "draft"
+        && family.currentStep === "reserved";
+}
 function findAnchorFamilyById(state, familyId) {
     return state.proactiveFamilies.find((family) => family.familyId === familyId) ?? null;
 }
@@ -216,6 +220,35 @@ function encodeFoundingMessage(foundingMessageText) {
         throw new Error(error instanceof Error ? `wallet_anchor_invalid_message_${error.message}` : "wallet_anchor_invalid_message");
     });
 }
+function extractAnchorInvalidMessageReason(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (message === "wallet_anchor_invalid_message") {
+        return null;
+    }
+    if (!message.startsWith("wallet_anchor_invalid_message_")) {
+        return null;
+    }
+    const reason = message.slice("wallet_anchor_invalid_message_".length).trim();
+    return reason === "" ? null : reason;
+}
+async function resolveFoundingMessage(options) {
+    if (!options.promptForFoundingMessageWhenMissing || options.foundingMessageText != null) {
+        return encodeFoundingMessage(options.foundingMessageText ?? null);
+    }
+    for (;;) {
+        const answer = await options.prompter.prompt("Founding message (optional, press Enter to skip): ");
+        try {
+            return await encodeFoundingMessage(answer);
+        }
+        catch (error) {
+            const reason = extractAnchorInvalidMessageReason(error);
+            options.prompter.writeLine("Founding message cannot be encoded in canonical Coglex.");
+            if (reason !== null) {
+                options.prompter.writeLine(`Reason: ${reason}`);
+            }
+        }
+    }
+}
 function resolveAnchorOutpointForSender(state, senderIndex) {
     const anchoredDomain = state.domains.find((domain) => domain.currentOwnerLocalIndex === senderIndex
         && domain.canonicalChainStatus === "anchored"
@@ -457,14 +490,10 @@ function buildTx1Plan(options) {
         { [options.operation.targetIdentity.address]: satsToBtcNumber(BigInt(options.state.anchorValueSats)) },
     ];
     if (options.operation.sourceAnchorOutpoint === null) {
-        if (fundingUtxos.length === 0) {
-            throw new Error("wallet_anchor_sender_utxo_unavailable");
-        }
-        const senderInput = fundingUtxos[0];
         return {
             sender: options.operation.sourceSender,
             changeAddress: options.state.funding.address,
-            fixedInputs: [{ txid: senderInput.txid, vout: senderInput.vout }],
+            fixedInputs: [],
             outputs,
             changePosition: 2,
             expectedOpReturnScriptHex: encodeOpReturnScript(serializeDomainTransfer(options.operation.chainDomain.domainId, Buffer.from(options.operation.targetIdentity.scriptPubKeyHex, "hex")).opReturnData),
@@ -473,9 +502,7 @@ function buildTx1Plan(options) {
             expectedReplacementAnchorScriptHex: null,
             expectedReplacementAnchorValueSats: null,
             allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
-            eligibleFundingOutpointKeys: new Set(fundingUtxos
-                .filter((entry) => !(entry.txid === senderInput.txid && entry.vout === senderInput.vout))
-                .map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
+            eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
             requiredSenderOutpoint: null,
             requiredProvisionalOutpoint: null,
             errorPrefix: "wallet_anchor_tx1",
@@ -653,7 +680,6 @@ function validateTx2Draft(decoded, funded, plan) {
     }
 }
 async function buildTx1(options) {
-    const reserveCandidates = computeDesignatedProactiveReserveOutpoints(options.state, await options.rpc.listUnspent(options.walletName, 1));
     return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
@@ -662,11 +688,10 @@ async function buildTx1(options) {
         validateFundedDraft: validateTx1Draft,
         finalizeErrorCode: "wallet_anchor_tx1_finalize_failed",
         mempoolRejectPrefix: "wallet_anchor_tx1_mempool_rejected",
-        reserveCandidates,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 async function buildTx2(options) {
-    const reserveCandidates = computeDesignatedProactiveReserveOutpoints(options.state, await options.rpc.listUnspent(options.walletName, 1));
     return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
@@ -675,7 +700,7 @@ async function buildTx2(options) {
         validateFundedDraft: validateTx2Draft,
         finalizeErrorCode: "wallet_anchor_tx2_finalize_failed",
         mempoolRejectPrefix: "wallet_anchor_tx2_mempool_rejected",
-        reserveCandidates,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 async function relockAnchorOutpoint(rpc, walletName, outpoint) {
@@ -1107,6 +1132,7 @@ async function submitTx2(options) {
         dedicatedIndex: options.operation.targetIdentity.localIndex,
         status: finalStatus,
         reusedExisting: false,
+        foundingMessageText: options.operation.foundingMessageText,
     };
 }
 function ensureSameTipHeight(context, bestHeight, errorCode) {
@@ -1131,7 +1157,11 @@ export async function anchorDomain(options) {
             paths,
             reason: "wallet-anchor",
         });
-        const message = await encodeFoundingMessage(options.foundingMessageText ?? null);
+        const message = await resolveFoundingMessage({
+            foundingMessageText: options.foundingMessageText,
+            promptForFoundingMessageWhenMissing: options.promptForFoundingMessageWhenMissing,
+            prompter: options.prompter,
+        });
         const readContext = await (options.openReadContext ?? openWalletReadContext)({
             dataDir: options.dataDir,
             databasePath: options.databasePath,
@@ -1144,6 +1174,9 @@ export async function anchorDomain(options) {
             const initialFamily = createDraftAnchorFamily(operation, nowUnixMs);
             const existingFamily = findAnchorFamilyByIntent(operation.state, initialFamily.intentFingerprintHex);
             const conflictingFamily = findActiveAnchorFamilyByDomain(operation.state, normalizedDomainName);
+            if (existingFamily === null && isClearableReservedAnchorFamily(conflictingFamily)) {
+                throw new Error(`wallet_anchor_clear_pending_first_${conflictingFamily.domainName}`);
+            }
             if (existingFamily === null && conflictingFamily !== null) {
                 throw new Error("wallet_anchor_prior_family_unresolved");
             }
@@ -1185,6 +1218,7 @@ export async function anchorDomain(options) {
                         dedicatedIndex: reconciled.family.reservedDedicatedIndex ?? existingTargetIdentity.localIndex,
                         status: reconciled.resolution,
                         reusedExisting: true,
+                        foundingMessageText: reconciled.family.foundingMessageText,
                     };
                 }
                 if (reconciled.resolution === "repair-required") {
@@ -1336,6 +1370,7 @@ export async function anchorDomain(options) {
             return {
                 ...result,
                 reusedExisting: resumedExisting,
+                foundingMessageText: result.foundingMessageText ?? operation.foundingMessageText,
             };
         }
         finally {

package/dist/wallet/tx/cog.js

@@ -7,7 +7,7 @@ import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { serializeCogClaim, serializeCogLock, serializeCogTransfer, } from "../cogop/index.js";
 import { openWalletReadContext } from "../read/index.js";
-import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, 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";
@@ -248,28 +248,17 @@ function buildPlanForCogOperation(options) {
         && entry.safe !== false);
     const outputs = [{ data: Buffer.from(options.opReturnData).toString("hex") }];
     if (options.anchorOutpoint === null) {
-        const senderUtxo = options.allUtxos.find((entry) => entry.scriptPubKey === options.sender.scriptPubKeyHex
-            && entry.confirmations >= 1
-            && entry.spendable !== false
-            && entry.safe !== false);
-        if (senderUtxo === undefined) {
-            throw new Error(`${options.errorPrefix}_sender_utxo_unavailable`);
-        }
         return {
             sender: options.sender,
             changeAddress: options.state.funding.address,
-            fixedInputs: [
-                { txid: senderUtxo.txid, vout: senderUtxo.vout },
-            ],
+            fixedInputs: [],
             outputs,
             changePosition: 1,
             expectedOpReturnScriptHex: encodeOpReturnScript(options.opReturnData),
             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 }))),
+            eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
             errorPrefix: options.errorPrefix,
         };
     }
@@ -344,7 +333,7 @@ function validateFundedDraft(decoded, funded, plan) {
     }
 }
 async function buildTransaction(options) {
-    return buildWalletMutationTransaction({
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
         state: options.state,
@@ -352,6 +341,7 @@ async function buildTransaction(options) {
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 function createDraftMutation(options) {

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

@@ -95,6 +95,8 @@ export declare function buildWalletMutationTransaction<TPlan>(options: {
         outputs: unknown[];
         changeAddress: string;
         changePosition: number;
+        allowedFundingScriptPubKeyHex: string;
+        eligibleFundingOutpointKeys: Set<string>;
     };
     validateFundedDraft(decoded: RpcDecodedPsbt, funded: RpcWalletCreateFundedPsbtResult, plan: TPlan): void;
     finalizeErrorCode: string;
@@ -111,6 +113,8 @@ export declare function buildWalletMutationTransactionWithReserveFallback<TPlan>
         outputs: unknown[];
         changeAddress: string;
         changePosition: number;
+        allowedFundingScriptPubKeyHex: string;
+        eligibleFundingOutpointKeys: Set<string>;
     };
     validateFundedDraft(decoded: RpcDecodedPsbt, funded: RpcWalletCreateFundedPsbtResult, plan: TPlan): void;
     finalizeErrorCode: string;

package/dist/wallet/tx/common.js

@@ -5,6 +5,14 @@ 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 btcNumberToSats(value) {
+    return BigInt(Math.round(value * 100_000_000));
+}
+function valueToSats(value) {
+    return typeof value === "string"
+        ? BigInt(Math.round(Number(value) * 100_000_000))
+        : btcNumberToSats(value);
+}
 function createUnlockSessionState(state, unlockUntilUnixMs, nowUnixMs) {
     return {
         schemaVersion: 1,
@@ -40,6 +48,12 @@ export function formatCogAmount(value) {
 export function outpointKey(outpoint) {
     return `${outpoint.txid}:${outpoint.vout}`;
 }
+function isSpendableConfirmedFundingUtxo(entry, fundingScriptPubKeyHex) {
+    return entry.scriptPubKey === fundingScriptPubKeyHex
+        && entry.confirmations >= 1
+        && entry.spendable !== false
+        && entry.safe !== false;
+}
 export function updateMutationRecord(mutation, status, nowUnixMs, options = {}) {
     return {
         ...mutation,
@@ -132,6 +146,34 @@ export function isInsufficientFundsError(error) {
     const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
     return message.includes("insufficient funds");
 }
+function isReserveFloorFundingError(error) {
+    const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+    return message.includes("insufficient_funding_after_reserve");
+}
+function computeRemainingFundingValueSats(options) {
+    let remaining = 0n;
+    for (const value of options.availableFundingValueByKey.values()) {
+        remaining += value;
+    }
+    for (const input of options.transaction.vin) {
+        const scriptPubKeyHex = getDecodedInputScriptPubKeyHex(input);
+        const vout = getDecodedInputVout(input);
+        if (scriptPubKeyHex !== options.fundingScriptPubKeyHex || vout === null || typeof input.txid !== "string") {
+            continue;
+        }
+        remaining -= options.availableFundingValueByKey.get(outpointKey({
+            txid: input.txid,
+            vout,
+        })) ?? 0n;
+    }
+    for (const output of options.transaction.vout) {
+        if (output.scriptPubKey?.hex !== options.fundingScriptPubKeyHex) {
+            continue;
+        }
+        remaining += valueToSats(output.value);
+    }
+    return remaining;
+}
 export function assertWalletMutationContextReady(context, errorPrefix) {
     if (context.localState.availability === "uninitialized") {
         throw new Error("wallet_uninitialized");
@@ -169,6 +211,19 @@ export async function buildWalletMutationTransaction(options) {
         fixedInputs: options.plan.fixedInputs,
         temporarilyUnlockedOutpoints: options.temporarilyUnlockedPolicyOutpoints,
     });
+    const availableFundingUtxos = (await options.rpc.listUnspent(options.walletName, 1))
+        .filter((entry) => isSpendableConfirmedFundingUtxo(entry, options.plan.allowedFundingScriptPubKeyHex));
+    const availableFundingValueByKey = new Map(availableFundingUtxos.map((entry) => [
+        outpointKey({ txid: entry.txid, vout: entry.vout }),
+        btcNumberToSats(entry.amount),
+    ]));
+    const validationPlan = {
+        ...options.plan,
+        eligibleFundingOutpointKeys: new Set([
+            ...options.plan.eligibleFundingOutpointKeys,
+            ...availableFundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout })),
+        ]),
+    };
     const lockedBefore = await options.rpc.listLockUnspent(options.walletName);
     let temporaryBuilderLockedOutpoints = [];
     try {
@@ -186,7 +241,17 @@ export async function buildWalletMutationTransaction(options) {
         const lockedAfter = await options.rpc.listLockUnspent(options.walletName);
         temporaryBuilderLockedOutpoints = diffTemporaryLockedOutpoints(lockedBefore, lockedAfter);
         const decoded = await options.rpc.decodePsbt(funded.psbt);
-        options.validateFundedDraft(decoded, funded, options.plan);
+        options.validateFundedDraft(decoded, funded, validationPlan);
+        if (options.state.proactiveReserveSats > 0) {
+            const remainingFundingValueSats = computeRemainingFundingValueSats({
+                transaction: decoded.tx,
+                fundingScriptPubKeyHex: options.plan.allowedFundingScriptPubKeyHex,
+                availableFundingValueByKey,
+            });
+            if (remainingFundingValueSats < BigInt(options.state.proactiveReserveSats)) {
+                throw new Error("wallet_mutation_insufficient_funding_after_reserve");
+            }
+        }
         const signed = await options.rpc.walletProcessPsbt(options.walletName, funded.psbt, true, "DEFAULT");
         const finalized = await options.rpc.finalizePsbt(signed.psbt, true);
         if (!finalized.complete || finalized.hex == null) {
@@ -254,7 +319,7 @@ export async function buildWalletMutationTransactionWithReserveFallback(options)
         }
         catch (error) {
             lastError = error;
-            if (!isInsufficientFundsError(error) || attempt === options.reserveCandidates.length) {
+            if ((!isInsufficientFundsError(error) && !isReserveFloorFundingError(error)) || attempt === options.reserveCandidates.length) {
                 throw error;
             }
         }

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 { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, 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";
@@ -189,7 +189,7 @@ function validateFundedDraft(decoded, funded, plan) {
     }
 }
 async function buildTransaction(options) {
-    return buildWalletMutationTransaction({
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
         state: options.state,
@@ -197,6 +197,7 @@ async function buildTransaction(options) {
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 function createDraftMutation(options) {

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 { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, 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";
@@ -248,28 +248,17 @@ function buildPlanForDomainOperation(options) {
         && entry.safe !== false);
     const outputs = [{ data: Buffer.from(options.opReturnData).toString("hex") }];
     if (options.anchorOutpoint === null) {
-        const senderUtxo = options.allUtxos.find((entry) => entry.scriptPubKey === options.sender.scriptPubKeyHex
-            && entry.confirmations >= 1
-            && entry.spendable !== false
-            && entry.safe !== false);
-        if (senderUtxo === undefined) {
-            throw new Error(`${options.errorPrefix}_sender_utxo_unavailable`);
-        }
         return {
             sender: options.sender,
             changeAddress: options.state.funding.address,
-            fixedInputs: [
-                { txid: senderUtxo.txid, vout: senderUtxo.vout },
-            ],
+            fixedInputs: [],
             outputs,
             changePosition: 1,
             expectedOpReturnScriptHex: encodeOpReturnScript(options.opReturnData),
             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 }))),
+            eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
             errorPrefix: options.errorPrefix,
         };
     }
@@ -344,7 +333,7 @@ function validateFundedDraft(decoded, funded, plan) {
     }
 }
 async function buildTransaction(options) {
-    return buildWalletMutationTransaction({
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
         state: options.state,
@@ -352,6 +341,7 @@ async function buildTransaction(options) {
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 function createDraftMutation(options) {

package/dist/wallet/tx/field.js

@@ -5,7 +5,6 @@ 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";
@@ -332,7 +331,6 @@ function validateFieldDraft(decoded, funded, plan) {
     }
 }
 async function buildFieldTransaction(options) {
-    const reserveCandidates = computeDesignatedProactiveReserveOutpoints(options.state, await options.rpc.listUnspent(options.walletName, 1));
     return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
@@ -341,7 +339,7 @@ async function buildFieldTransaction(options) {
         validateFundedDraft: validateFieldDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
-        reserveCandidates,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 async function saveUpdatedState(options) {

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 { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, 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";
@@ -459,20 +459,11 @@ function buildRegisterPlan(options) {
             anchorValueSats: options.anchorOutpoint === null ? null : options.anchorValueSats,
         });
         if (options.anchorOutpoint === null) {
-            if (fundingUtxos.length === 0) {
-                throw new Error("wallet_register_sender_utxo_unavailable");
-            }
-            const senderInput = fundingUtxos[0];
-            const additionalFunding = fundingUtxos
-                .slice(1)
-                .map((entry) => ({ txid: entry.txid, vout: entry.vout }));
             return {
                 registerKind: "root",
                 sender: options.sender,
                 changeAddress: options.state.funding.address,
-                fixedInputs: [
-                    { txid: senderInput.txid, vout: senderInput.vout },
-                ],
+                fixedInputs: [],
                 outputs: rootOutputs.outputs,
                 changePosition: rootOutputs.changePosition,
                 expectedOpReturnScriptHex: rootOutputs.expectedOpReturnScriptHex,
@@ -483,7 +474,7 @@ function buildRegisterPlan(options) {
                 expectedAnchorScriptHex: null,
                 expectedAnchorValueSats: null,
                 allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
-                eligibleFundingOutpointKeys: new Set(additionalFunding.map((entry) => outpointKey(entry))),
+                eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey(entry))),
             };
         }
         const anchorUtxo = options.allUtxos.find((entry) => entry.txid === options.anchorOutpoint?.txid
@@ -550,7 +541,7 @@ function buildRegisterPlan(options) {
     };
 }
 async function buildRegisterTransaction(options) {
-    return buildWalletMutationTransaction({
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
         state: options.state,
@@ -558,6 +549,7 @@ async function buildRegisterTransaction(options) {
         validateFundedDraft,
         finalizeErrorCode: "wallet_register_finalize_failed",
         mempoolRejectPrefix: "wallet_register_mempool_rejected",
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 async function reconcilePendingRegisterMutation(options) {

package/dist/wallet/tx/reputation.js

@@ -8,7 +8,7 @@ import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { serializeRepCommit, serializeRepRevoke, validateDomainName, } from "../cogop/index.js";
 import { openWalletReadContext } from "../read/index.js";
-import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransaction, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, formatCogAmount, 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";
@@ -218,7 +218,7 @@ function validateFundedDraft(decoded, funded, plan) {
     }
 }
 async function buildTransaction(options) {
-    return buildWalletMutationTransaction({
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
         state: options.state,
@@ -226,6 +226,7 @@ async function buildTransaction(options) {
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 function createDraftMutation(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cogcoin/client",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "description": "Store-backed Cogcoin client with wallet flows, SQLite persistence, and managed Bitcoin Core integration.",
   "license": "MIT",
   "type": "module",