@cogcoin/client 0.5.15 → 1.0.0

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

@@ -4,14 +4,47 @@ import { attachOrStartManagedBitcoindService } from "../../bitcoind/service.js";
 import { createRpcClient } from "../../bitcoind/node.js";
 import { acquireFileLock } from "../fs/lock.js";
 import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
+import { reconcilePersistentPolicyLocks as reconcileWalletCoinControlLocks } from "../coin-control.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, buildWalletMutationTransactionWithReserveFallback, getDecodedInputScriptPubKeyHex, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, createBuiltWalletMutationFeeSummary, createFundingMutationSender, createWalletMutationFeeMetadata, getDecodedInputScriptPubKeyHex, isLocalWalletScript, isAlreadyAcceptedError, isBroadcastUnknownError, mergeFixedWalletInputs, outpointKey, pauseMiningForWalletMutation, resolvePendingMutationReuseDecision, resolveWalletMutationFeeSelection, 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";
 import { normalizeBtcTarget } from "./targets.js";
+async function prepareDomainMarketBuildState(options) {
+    if (!options.preflightCoinControl) {
+        return {
+            state: options.state,
+            allUtxos: (await options.rpc.listUnspent(options.walletName, 1)).slice(),
+        };
+    }
+    const reconciled = await reconcileWalletCoinControlLocks({
+        rpc: options.rpc,
+        walletName: options.walletName,
+        state: options.state,
+    });
+    const nextState = reconciled.changed
+        ? {
+            ...reconciled.state,
+            stateRevision: reconciled.state.stateRevision + 1,
+            lastWrittenAtUnixMs: options.nowUnixMs,
+        }
+        : reconciled.state;
+    if (reconciled.changed) {
+        await saveWalletStatePreservingUnlock({
+            state: nextState,
+            provider: options.provider,
+            nowUnixMs: options.nowUnixMs,
+            paths: options.paths,
+        });
+    }
+    return {
+        state: nextState,
+        allUtxos: (await options.rpc.listUnspent(options.walletName, 1)).slice(),
+    };
+}
 function normalizeDomainName(domainName) {
     const normalized = domainName.trim().toLowerCase();
     if (normalized.length === 0) {
@@ -61,12 +94,6 @@ function createIntentFingerprint(parts) {
         .update(parts.join("\n"))
         .digest("hex");
 }
-function replaceAssignedDomainNames(identity, nextAssignedDomainNames) {
-    return {
-        ...identity,
-        assignedDomainNames: nextAssignedDomainNames.slice().sort((left, right) => left.localeCompare(right)),
-    };
-}
 function reserveTransferredDomainRecord(options) {
     const existing = options.state.domains.find((domain) => domain.name === options.domainName) ?? null;
     const domains = options.state.domains.some((domain) => domain.name === options.domainName)
@@ -78,9 +105,7 @@ function reserveTransferredDomainRecord(options) {
                 ...domain,
                 domainId: options.domainId ?? domain.domainId,
                 currentOwnerScriptPubKeyHex: options.currentOwnerScriptPubKeyHex,
-                currentOwnerLocalIndex: options.currentOwnerLocalIndex,
                 canonicalChainStatus: "registered-unanchored",
-                currentCanonicalAnchorOutpoint: null,
                 birthTime: domain.birthTime ?? Math.floor(options.nowUnixMs / 1000),
             };
         })
@@ -89,27 +114,15 @@ function reserveTransferredDomainRecord(options) {
             {
                 name: options.domainName,
                 domainId: options.domainId,
-                dedicatedIndex: null,
                 currentOwnerScriptPubKeyHex: options.currentOwnerScriptPubKeyHex,
-                currentOwnerLocalIndex: options.currentOwnerLocalIndex,
                 canonicalChainStatus: "registered-unanchored",
-                localAnchorIntent: "none",
-                currentCanonicalAnchorOutpoint: null,
                 foundingMessageText: existing?.foundingMessageText ?? null,
                 birthTime: Math.floor(options.nowUnixMs / 1000),
             },
         ];
-    const identities = options.state.identities.map((identity) => {
-        const filtered = identity.assignedDomainNames.filter((domainName) => domainName !== options.domainName);
-        if (identity.index === options.currentOwnerLocalIndex) {
-            return replaceAssignedDomainNames(identity, [...filtered, options.domainName]);
-        }
-        return replaceAssignedDomainNames(identity, filtered);
-    });
     return {
         ...options.state,
         domains,
-        identities,
     };
 }
 function createResolvedDomainMarketSenderSummary(sender, selector) {
@@ -145,21 +158,6 @@ function createSellEconomicEffectSummary(listedPriceCogtoshi) {
         listedPriceCogtoshi: listedPriceCogtoshi.toString(),
     };
 }
-function resolveAnchorOutpointForSender(state, sender, errorPrefix) {
-    const anchoredDomains = state.domains.filter((domain) => domain.currentOwnerLocalIndex === sender.index
-        && domain.canonicalChainStatus === "anchored");
-    if (anchoredDomains.length === 0) {
-        return null;
-    }
-    const anchoredDomain = anchoredDomains[0];
-    if (anchoredDomain.currentCanonicalAnchorOutpoint === null) {
-        throw new Error(`${errorPrefix}_anchor_outpoint_unavailable`);
-    }
-    return {
-        txid: anchoredDomain.currentCanonicalAnchorOutpoint.txid,
-        vout: anchoredDomain.currentCanonicalAnchorOutpoint.vout,
-    };
-}
 function resolveOwnedDomainOperation(context, domainName, errorPrefix) {
     assertWalletMutationContextReady(context, errorPrefix);
     const chainDomain = lookupDomain(context.snapshot.state, domainName);
@@ -170,24 +168,14 @@ function resolveOwnedDomainOperation(context, domainName, errorPrefix) {
         throw new Error(`${errorPrefix}_domain_anchored`);
     }
     const ownerHex = Buffer.from(chainDomain.ownerScriptPubKey).toString("hex");
-    const senderIdentity = context.model.identities.find((identity) => identity.scriptPubKeyHex === ownerHex) ?? null;
-    if (senderIdentity === null || senderIdentity.address === null) {
+    if (ownerHex !== context.localState.state.funding.scriptPubKeyHex || context.model.walletAddress == null) {
         throw new Error(`${errorPrefix}_owner_not_locally_controlled`);
     }
-    if (senderIdentity.readOnly) {
-        throw new Error(`${errorPrefix}_owner_read_only`);
-    }
     return {
         readContext: context,
         state: context.localState.state,
-        unlockUntilUnixMs: context.localState.unlockUntilUnixMs,
-        sender: {
-            localIndex: senderIdentity.index,
-            scriptPubKeyHex: senderIdentity.scriptPubKeyHex,
-            address: senderIdentity.address,
-        },
-        senderSelector: getCanonicalIdentitySelector(senderIdentity),
-        anchorOutpoint: resolveAnchorOutpointForSender(context.localState.state, senderIdentity, errorPrefix),
+        sender: createFundingMutationSender(context.localState.state),
+        senderSelector: context.model.walletAddress,
         chainDomain,
     };
 }
@@ -204,41 +192,24 @@ function resolveBuyOperation(context, domainName, fromIdentity = null) {
     if (listing === null) {
         throw new Error("wallet_buy_domain_not_listed");
     }
-    const selectedIdentity = fromIdentity === null
-        ? context.model.fundingIdentity
-        : resolveIdentityBySelector(context, fromIdentity, "wallet_buy");
-    if (selectedIdentity === null) {
+    if (context.model.walletAddress === null) {
         throw new Error("wallet_buy_funding_identity_unavailable");
     }
-    if (selectedIdentity.address === null) {
-        throw new Error(fromIdentity === null
-            ? "wallet_buy_funding_identity_unavailable"
-            : "wallet_buy_sender_address_unavailable");
-    }
-    if (selectedIdentity.readOnly) {
-        throw new Error("wallet_buy_sender_read_only");
-    }
     const ownerHex = Buffer.from(chainDomain.ownerScriptPubKey).toString("hex");
-    if (ownerHex === selectedIdentity.scriptPubKeyHex) {
+    if (ownerHex === context.localState.state.funding.scriptPubKeyHex) {
         throw new Error("wallet_buy_already_owner");
     }
-    if (getBalance(context.snapshot.state, selectedIdentity.scriptPubKeyHex) < listing.priceCogtoshi) {
+    if (getBalance(context.snapshot.state, context.localState.state.funding.scriptPubKeyHex) < listing.priceCogtoshi) {
         throw new Error("wallet_buy_insufficient_cog_balance");
     }
     return {
         readContext: context,
         state: context.localState.state,
-        unlockUntilUnixMs: context.localState.unlockUntilUnixMs,
-        sender: {
-            localIndex: selectedIdentity.index,
-            scriptPubKeyHex: selectedIdentity.scriptPubKeyHex,
-            address: selectedIdentity.address,
-        },
-        senderSelector: getCanonicalIdentitySelector(selectedIdentity),
-        anchorOutpoint: resolveAnchorOutpointForSender(context.localState.state, selectedIdentity, "wallet_buy"),
+        sender: createFundingMutationSender(context.localState.state),
+        senderSelector: context.model.walletAddress,
         chainDomain,
         listingPriceCogtoshi: listing.priceCogtoshi,
-        buyerSelector: getCanonicalIdentitySelector(selectedIdentity),
+        buyerSelector: context.model.walletAddress,
     };
 }
 function buildPlanForDomainOperation(options) {
@@ -246,45 +217,13 @@ function buildPlanForDomainOperation(options) {
         && entry.confirmations >= 1
         && entry.spendable !== false
         && entry.safe !== false);
-    const outputs = [{ data: Buffer.from(options.opReturnData).toString("hex") }];
-    if (options.anchorOutpoint === null) {
-        return {
-            sender: options.sender,
-            changeAddress: options.state.funding.address,
-            fixedInputs: [],
-            outputs,
-            changePosition: 1,
-            expectedOpReturnScriptHex: encodeOpReturnScript(options.opReturnData),
-            expectedAnchorScriptHex: null,
-            expectedAnchorValueSats: null,
-            allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
-            eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
-            errorPrefix: options.errorPrefix,
-        };
-    }
-    const anchorUtxo = options.allUtxos.find((entry) => entry.txid === options.anchorOutpoint?.txid
-        && entry.vout === options.anchorOutpoint.vout
-        && entry.scriptPubKey === options.sender.scriptPubKeyHex
-        && entry.confirmations >= 1
-        && entry.spendable !== false
-        && entry.safe !== false);
-    if (anchorUtxo === undefined) {
-        throw new Error(`${options.errorPrefix}_anchor_utxo_missing`);
-    }
-    outputs.push({
-        [options.sender.address]: satsToBtcNumber(options.anchorValueSats),
-    });
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        fixedInputs: [
-            { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-        ],
-        outputs,
-        changePosition: 2,
+        fixedInputs: [],
+        outputs: [{ data: Buffer.from(options.opReturnData).toString("hex") }],
+        changePosition: 1,
         expectedOpReturnScriptHex: encodeOpReturnScript(options.opReturnData),
-        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,
@@ -296,29 +235,10 @@ 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 (getDecodedInputScriptPubKeyHex(decoded, 0) !== plan.sender.scriptPubKeyHex) {
-        throw new Error(`${plan.errorPrefix}_sender_input_mismatch`);
-    }
-    assertFundingInputsAfterFixedPrefix({
-        decoded,
-        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`);
     }
-    if (plan.expectedAnchorScriptHex !== null) {
-        if (outputs[1]?.scriptPubKey?.hex !== plan.expectedAnchorScriptHex) {
-            throw new Error(`${plan.errorPrefix}_anchor_output_mismatch`);
-        }
-        if (valueToSats(outputs[1]?.value ?? 0) !== (plan.expectedAnchorValueSats ?? 0n)) {
-            throw new Error(`${plan.errorPrefix}_anchor_value_mismatch`);
-        }
-    }
-    const expectedWithoutChange = plan.expectedAnchorScriptHex === null ? 1 : 2;
+    const expectedWithoutChange = 1;
     if (funded.changepos === -1) {
         if (outputs.length !== expectedWithoutChange) {
             throw new Error(`${plan.errorPrefix}_unexpected_output_count`);
@@ -341,7 +261,7 @@ async function buildTransaction(options) {
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
-        reserveCandidates: options.state.proactiveReserveOutpoints,
+        feeRate: options.feeRateSatVb,
     });
 }
 function createDraftMutation(options) {
@@ -358,6 +278,7 @@ function createDraftMutation(options) {
             lastUpdatedAtUnixMs: options.nowUnixMs,
             attemptedTxid: null,
             attemptedWtxid: null,
+            ...createWalletMutationFeeMetadata(options.feeSelection),
             temporaryBuilderLockedOutpoints: [],
         };
     }
@@ -376,6 +297,7 @@ function createDraftMutation(options) {
         lastUpdatedAtUnixMs: options.nowUnixMs,
         attemptedTxid: null,
         attemptedWtxid: null,
+        ...createWalletMutationFeeMetadata(options.feeSelection),
         temporaryBuilderLockedOutpoints: [],
     };
 }
@@ -436,13 +358,11 @@ async function reconcilePendingMutation(options) {
                     domainName: options.mutation.domainName,
                     domainId: chainDomain.domainId,
                     currentOwnerScriptPubKeyHex: ownerHex,
-                    currentOwnerLocalIndex: options.context.model?.identities.find((identity) => identity.scriptPubKeyHex === ownerHex)?.index ?? null,
                     nowUnixMs: options.nowUnixMs,
                 });
                 await saveWalletStatePreservingUnlock({
                     state: nextState,
                     provider: options.provider,
-                    unlockUntilUnixMs: options.unlockUntilUnixMs,
                     nowUnixMs: options.nowUnixMs,
                     paths: options.paths,
                 });
@@ -456,7 +376,6 @@ async function reconcilePendingMutation(options) {
                 await saveWalletStatePreservingUnlock({
                     state: nextState,
                     provider: options.provider,
-                    unlockUntilUnixMs: options.unlockUntilUnixMs,
                     nowUnixMs: options.nowUnixMs,
                     paths: options.paths,
                 });
@@ -475,7 +394,6 @@ async function reconcilePendingMutation(options) {
                     await saveWalletStatePreservingUnlock({
                         state: nextState,
                         provider: options.provider,
-                        unlockUntilUnixMs: options.unlockUntilUnixMs,
                         nowUnixMs: options.nowUnixMs,
                         paths: options.paths,
                     });
@@ -490,7 +408,6 @@ async function reconcilePendingMutation(options) {
                     await saveWalletStatePreservingUnlock({
                         state: nextState,
                         provider: options.provider,
-                        unlockUntilUnixMs: options.unlockUntilUnixMs,
                         nowUnixMs: options.nowUnixMs,
                         paths: options.paths,
                     });
@@ -505,7 +422,6 @@ async function reconcilePendingMutation(options) {
                 await saveWalletStatePreservingUnlock({
                     state: nextState,
                     provider: options.provider,
-                    unlockUntilUnixMs: options.unlockUntilUnixMs,
                     nowUnixMs: options.nowUnixMs,
                     paths: options.paths,
                 });
@@ -523,13 +439,11 @@ async function reconcilePendingMutation(options) {
                     domainName: options.mutation.domainName,
                     domainId: chainDomain.domainId,
                     currentOwnerScriptPubKeyHex: ownerHex,
-                    currentOwnerLocalIndex: options.context.model?.identities.find((identity) => identity.scriptPubKeyHex === ownerHex)?.index ?? null,
                     nowUnixMs: options.nowUnixMs,
                 });
                 await saveWalletStatePreservingUnlock({
                     state: nextState,
                     provider: options.provider,
-                    unlockUntilUnixMs: options.unlockUntilUnixMs,
                     nowUnixMs: options.nowUnixMs,
                     paths: options.paths,
                 });
@@ -543,7 +457,6 @@ async function reconcilePendingMutation(options) {
                 await saveWalletStatePreservingUnlock({
                     state: nextState,
                     provider: options.provider,
-                    unlockUntilUnixMs: options.unlockUntilUnixMs,
                     nowUnixMs: options.nowUnixMs,
                     paths: options.paths,
                 });
@@ -567,16 +480,12 @@ async function reconcilePendingMutation(options) {
                     currentOwnerScriptPubKeyHex: live.kind === "transfer"
                         ? (live.recipientScriptPubKeyHex ?? live.senderScriptPubKeyHex)
                         : live.senderScriptPubKeyHex,
-                    currentOwnerLocalIndex: live.kind === "transfer"
-                        ? options.context.model?.identities.find((identity) => identity.scriptPubKeyHex === live.recipientScriptPubKeyHex)?.index ?? null
-                        : live.senderLocalIndex,
                     nowUnixMs: options.nowUnixMs,
                 });
             }
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider: options.provider,
-                unlockUntilUnixMs: options.unlockUntilUnixMs,
                 nowUnixMs: options.nowUnixMs,
                 paths: options.paths,
             });
@@ -595,7 +504,6 @@ async function reconcilePendingMutation(options) {
         await saveWalletStatePreservingUnlock({
             state: nextState,
             provider: options.provider,
-            unlockUntilUnixMs: options.unlockUntilUnixMs,
             nowUnixMs: options.nowUnixMs,
             paths: options.paths,
         });
@@ -705,46 +613,63 @@ export async function transferDomain(options) {
             });
             const rpc = (options.rpcFactory ?? createRpcClient)(node.rpc);
             const walletName = operation.state.managedCoreWallet.walletName;
+            const feeSelection = await resolveWalletMutationFeeSelection({
+                rpc,
+                feeRateSatVb: options.feeRateSatVb ?? null,
+            });
             const existingMutation = findPendingMutationByIntent(operation.state, intentFingerprintHex);
+            let workingState = operation.state;
+            let replacementFixedInputs = null;
             if (existingMutation !== null) {
                 const reconciled = await reconcilePendingMutation({
                     state: operation.state,
                     mutation: existingMutation,
                     provider,
-                    unlockUntilUnixMs: operation.unlockUntilUnixMs,
                     nowUnixMs,
                     paths,
                     rpc,
                     walletName,
                     context: readContext,
                 });
+                workingState = reconciled.state;
                 if (reconciled.resolution === "confirmed" || reconciled.resolution === "live") {
-                    return {
-                        kind: "transfer",
-                        domainName: normalizedDomainName,
-                        txid: reconciled.mutation.attemptedTxid ?? "unknown",
-                        status: reconciled.resolution,
-                        reusedExisting: true,
-                        recipientScriptPubKeyHex: recipient.scriptPubKeyHex,
-                        resolved: {
-                            sender: resolvedSender,
-                            recipient: resolvedRecipient,
-                            economicEffect: resolvedEconomicEffect,
-                        },
-                    };
+                    const reuse = await resolvePendingMutationReuseDecision({
+                        rpc,
+                        walletName,
+                        mutation: reconciled.mutation,
+                        nextFeeSelection: feeSelection,
+                    });
+                    if (reuse.reuseExisting) {
+                        return {
+                            kind: "transfer",
+                            domainName: normalizedDomainName,
+                            txid: reconciled.mutation.attemptedTxid ?? "unknown",
+                            status: reconciled.resolution,
+                            reusedExisting: true,
+                            recipientScriptPubKeyHex: recipient.scriptPubKeyHex,
+                            resolved: {
+                                sender: resolvedSender,
+                                recipient: resolvedRecipient,
+                                economicEffect: resolvedEconomicEffect,
+                            },
+                            fees: reuse.fees,
+                        };
+                    }
+                    replacementFixedInputs = reuse.replacementFixedInputs;
                 }
                 if (reconciled.resolution === "repair-required") {
                     throw new Error("wallet_transfer_repair_required");
                 }
             }
             await confirmTransfer(options.prompter, normalizedDomainName, resolvedSender, resolvedRecipient, resolvedEconomicEffect, options.assumeYes);
-            let nextState = upsertPendingMutation(operation.state, createDraftMutation({
+            let nextState = upsertPendingMutation(workingState, createDraftMutation({
                 kind: "transfer",
                 domainName: normalizedDomainName,
                 sender: operation.sender,
                 recipientScriptPubKeyHex: recipient.scriptPubKeyHex,
                 intentFingerprintHex,
                 nowUnixMs,
+                feeSelection,
                 existing: existingMutation,
             }));
             nextState = {
@@ -755,23 +680,35 @@ export async function transferDomain(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
+            const buildPreparation = await prepareDomainMarketBuildState({
+                rpc,
+                walletName,
+                state: nextState,
+                provider,
+                nowUnixMs,
+                paths,
+                preflightCoinControl: false,
+            });
+            nextState = buildPreparation.state;
+            const transferPlan = buildPlanForDomainOperation({
+                state: nextState,
+                allUtxos: buildPreparation.allUtxos,
+                sender: operation.sender,
+                opReturnData: serializeDomainTransfer(operation.chainDomain.domainId, Buffer.from(recipient.scriptPubKeyHex, "hex")).opReturnData,
+                errorPrefix: "wallet_transfer",
+            });
             const built = await buildTransaction({
                 rpc,
                 walletName,
                 state: nextState,
-                plan: buildPlanForDomainOperation({
-                    state: nextState,
-                    allUtxos: await rpc.listUnspent(walletName, 1),
-                    sender: operation.sender,
-                    anchorOutpoint: operation.anchorOutpoint,
-                    opReturnData: serializeDomainTransfer(operation.chainDomain.domainId, Buffer.from(recipient.scriptPubKeyHex, "hex")).opReturnData,
-                    anchorValueSats: BigInt(nextState.anchorValueSats),
-                    errorPrefix: "wallet_transfer",
-                }),
+                plan: {
+                    ...transferPlan,
+                    fixedInputs: mergeFixedWalletInputs(transferPlan.fixedInputs, replacementFixedInputs),
+                },
+                feeRateSatVb: feeSelection.feeRateSatVb,
             });
             const broadcasting = updateMutationRecord(nextState.pendingMutations.find((mutation) => mutation.intentFingerprintHex === intentFingerprintHex), "broadcasting", nowUnixMs, {
                 attemptedTxid: built.txid,
@@ -786,7 +723,6 @@ export async function transferDomain(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
@@ -813,7 +749,6 @@ export async function transferDomain(options) {
                         await saveWalletStatePreservingUnlock({
                             state: nextState,
                             provider,
-                            unlockUntilUnixMs: operation.unlockUntilUnixMs,
                             nowUnixMs,
                             paths,
                         });
@@ -833,7 +768,6 @@ export async function transferDomain(options) {
                     await saveWalletStatePreservingUnlock({
                         state: nextState,
                         provider,
-                        unlockUntilUnixMs: operation.unlockUntilUnixMs,
                         nowUnixMs,
                         paths,
                     });
@@ -856,7 +790,6 @@ export async function transferDomain(options) {
                 domainName: normalizedDomainName,
                 domainId: operation.chainDomain.domainId,
                 currentOwnerScriptPubKeyHex: recipient.scriptPubKeyHex,
-                currentOwnerLocalIndex: model.identities.find((identity) => identity.scriptPubKeyHex === recipient.scriptPubKeyHex)?.index ?? null,
                 nowUnixMs,
             });
             nextState = {
@@ -867,7 +800,6 @@ export async function transferDomain(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
@@ -883,6 +815,10 @@ export async function transferDomain(options) {
                     recipient: resolvedRecipient,
                     economicEffect: resolvedEconomicEffect,
                 },
+                fees: createBuiltWalletMutationFeeSummary({
+                    selection: feeSelection,
+                    built,
+                }),
             };
         }
         finally {
@@ -935,32 +871,48 @@ async function runSellMutation(options) {
             });
             const rpc = (options.rpcFactory ?? createRpcClient)(node.rpc);
             const walletName = operation.state.managedCoreWallet.walletName;
+            const feeSelection = await resolveWalletMutationFeeSelection({
+                rpc,
+                feeRateSatVb: options.feeRateSatVb ?? null,
+            });
             const existingMutation = findPendingMutationByIntent(operation.state, intentFingerprintHex);
+            let workingState = operation.state;
+            let replacementFixedInputs = null;
             if (existingMutation !== null) {
                 const reconciled = await reconcilePendingMutation({
                     state: operation.state,
                     mutation: existingMutation,
                     provider,
-                    unlockUntilUnixMs: operation.unlockUntilUnixMs,
                     nowUnixMs,
                     paths,
                     rpc,
                     walletName,
                     context: readContext,
                 });
+                workingState = reconciled.state;
                 if (reconciled.resolution === "confirmed" || reconciled.resolution === "live") {
-                    return {
-                        kind: "sell",
-                        domainName: normalizedDomainName,
-                        txid: reconciled.mutation.attemptedTxid ?? "unknown",
-                        status: reconciled.resolution,
-                        reusedExisting: true,
-                        listedPriceCogtoshi: options.listedPriceCogtoshi,
-                        resolved: {
-                            sender: resolvedSender,
-                            economicEffect: resolvedEconomicEffect,
-                        },
-                    };
+                    const reuse = await resolvePendingMutationReuseDecision({
+                        rpc,
+                        walletName,
+                        mutation: reconciled.mutation,
+                        nextFeeSelection: feeSelection,
+                    });
+                    if (reuse.reuseExisting) {
+                        return {
+                            kind: "sell",
+                            domainName: normalizedDomainName,
+                            txid: reconciled.mutation.attemptedTxid ?? "unknown",
+                            status: reconciled.resolution,
+                            reusedExisting: true,
+                            listedPriceCogtoshi: options.listedPriceCogtoshi,
+                            resolved: {
+                                sender: resolvedSender,
+                                economicEffect: resolvedEconomicEffect,
+                            },
+                            fees: reuse.fees,
+                        };
+                    }
+                    replacementFixedInputs = reuse.replacementFixedInputs;
                 }
                 if (reconciled.resolution === "repair-required") {
                     throw new Error("wallet_sell_repair_required");
@@ -969,13 +921,14 @@ async function runSellMutation(options) {
             if (options.listedPriceCogtoshi > 0n) {
                 await confirmSell(options.prompter, normalizedDomainName, resolvedSender, options.listedPriceCogtoshi, options.assumeYes);
             }
-            let nextState = upsertPendingMutation(operation.state, createDraftMutation({
+            let nextState = upsertPendingMutation(workingState, createDraftMutation({
                 kind: "sell",
                 domainName: normalizedDomainName,
                 sender: operation.sender,
                 priceCogtoshi: options.listedPriceCogtoshi,
                 intentFingerprintHex,
                 nowUnixMs,
+                feeSelection,
                 existing: existingMutation,
             }));
             nextState = {
@@ -986,23 +939,35 @@ async function runSellMutation(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
+            const buildPreparation = await prepareDomainMarketBuildState({
+                rpc,
+                walletName,
+                state: nextState,
+                provider,
+                nowUnixMs,
+                paths,
+                preflightCoinControl: false,
+            });
+            nextState = buildPreparation.state;
+            const sellPlan = buildPlanForDomainOperation({
+                state: nextState,
+                allUtxos: buildPreparation.allUtxos,
+                sender: operation.sender,
+                opReturnData: serializeDomainSell(operation.chainDomain.domainId, options.listedPriceCogtoshi).opReturnData,
+                errorPrefix: "wallet_sell",
+            });
             const built = await buildTransaction({
                 rpc,
                 walletName,
                 state: nextState,
-                plan: buildPlanForDomainOperation({
-                    state: nextState,
-                    allUtxos: await rpc.listUnspent(walletName, 1),
-                    sender: operation.sender,
-                    anchorOutpoint: operation.anchorOutpoint,
-                    opReturnData: serializeDomainSell(operation.chainDomain.domainId, options.listedPriceCogtoshi).opReturnData,
-                    anchorValueSats: BigInt(nextState.anchorValueSats),
-                    errorPrefix: "wallet_sell",
-                }),
+                plan: {
+                    ...sellPlan,
+                    fixedInputs: mergeFixedWalletInputs(sellPlan.fixedInputs, replacementFixedInputs),
+                },
+                feeRateSatVb: feeSelection.feeRateSatVb,
             });
             const broadcasting = updateMutationRecord(nextState.pendingMutations.find((mutation) => mutation.intentFingerprintHex === intentFingerprintHex), "broadcasting", nowUnixMs, {
                 attemptedTxid: built.txid,
@@ -1017,7 +982,6 @@ async function runSellMutation(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
@@ -1044,7 +1008,6 @@ async function runSellMutation(options) {
                         await saveWalletStatePreservingUnlock({
                             state: nextState,
                             provider,
-                            unlockUntilUnixMs: operation.unlockUntilUnixMs,
                             nowUnixMs,
                             paths,
                         });
@@ -1064,7 +1027,6 @@ async function runSellMutation(options) {
                     await saveWalletStatePreservingUnlock({
                         state: nextState,
                         provider,
-                        unlockUntilUnixMs: operation.unlockUntilUnixMs,
                         nowUnixMs,
                         paths,
                     });
@@ -1091,7 +1053,6 @@ async function runSellMutation(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
@@ -1106,6 +1067,10 @@ async function runSellMutation(options) {
                     sender: resolvedSender,
                     economicEffect: resolvedEconomicEffect,
                 },
+                fees: createBuiltWalletMutationFeeSummary({
+                    selection: feeSelection,
+                    built,
+                }),
             };
         }
         finally {
@@ -1149,7 +1114,7 @@ export async function buyDomain(options) {
             const snapshot = readContext.snapshot;
             const model = readContext.model;
             const sellerScriptPubKeyHex = Buffer.from(operation.chainDomain.ownerScriptPubKey).toString("hex");
-            const sellerAddress = model.identities.find((identity) => identity.scriptPubKeyHex === sellerScriptPubKeyHex)?.address ?? null;
+            const sellerAddress = sellerScriptPubKeyHex === model.walletScriptPubKeyHex ? model.walletAddress : null;
             const resolvedBuyer = {
                 selector: operation.buyerSelector,
                 localIndex: operation.sender.localIndex,
@@ -1175,43 +1140,60 @@ export async function buyDomain(options) {
             });
             const rpc = (options.rpcFactory ?? createRpcClient)(node.rpc);
             const walletName = operation.state.managedCoreWallet.walletName;
+            const feeSelection = await resolveWalletMutationFeeSelection({
+                rpc,
+                feeRateSatVb: options.feeRateSatVb ?? null,
+            });
             const existingMutation = findPendingMutationByIntent(operation.state, intentFingerprintHex);
+            let workingState = operation.state;
+            let replacementFixedInputs = null;
             if (existingMutation !== null) {
                 const reconciled = await reconcilePendingMutation({
                     state: operation.state,
                     mutation: existingMutation,
                     provider,
-                    unlockUntilUnixMs: operation.unlockUntilUnixMs,
                     nowUnixMs,
                     paths,
                     rpc,
                     walletName,
                     context: readContext,
                 });
+                workingState = reconciled.state;
                 if (reconciled.resolution === "confirmed" || reconciled.resolution === "live") {
-                    return {
-                        kind: "buy",
-                        domainName: normalizedDomainName,
-                        txid: reconciled.mutation.attemptedTxid ?? "unknown",
-                        status: reconciled.resolution,
-                        reusedExisting: true,
-                        listedPriceCogtoshi: operation.listingPriceCogtoshi,
-                        resolvedBuyer,
-                        resolvedSeller,
-                    };
+                    const reuse = await resolvePendingMutationReuseDecision({
+                        rpc,
+                        walletName,
+                        mutation: reconciled.mutation,
+                        nextFeeSelection: feeSelection,
+                    });
+                    if (reuse.reuseExisting) {
+                        return {
+                            kind: "buy",
+                            domainName: normalizedDomainName,
+                            txid: reconciled.mutation.attemptedTxid ?? "unknown",
+                            status: reconciled.resolution,
+                            reusedExisting: true,
+                            listedPriceCogtoshi: operation.listingPriceCogtoshi,
+                            resolvedBuyer,
+                            resolvedSeller,
+                            fees: reuse.fees,
+                        };
+                    }
+                    replacementFixedInputs = reuse.replacementFixedInputs;
                 }
                 if (reconciled.resolution === "repair-required") {
                     throw new Error("wallet_buy_repair_required");
                 }
             }
             await confirmBuy(options.prompter, normalizedDomainName, operation.buyerSelector, operation.sender, sellerScriptPubKeyHex, sellerAddress, operation.listingPriceCogtoshi, options.assumeYes);
-            let nextState = upsertPendingMutation(operation.state, createDraftMutation({
+            let nextState = upsertPendingMutation(workingState, createDraftMutation({
                 kind: "buy",
                 domainName: normalizedDomainName,
                 sender: operation.sender,
                 priceCogtoshi: operation.listingPriceCogtoshi,
                 intentFingerprintHex,
                 nowUnixMs,
+                feeSelection,
                 existing: existingMutation,
             }));
             nextState = {
@@ -1222,23 +1204,35 @@ export async function buyDomain(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
+            const buildPreparation = await prepareDomainMarketBuildState({
+                rpc,
+                walletName,
+                state: nextState,
+                provider,
+                nowUnixMs,
+                paths,
+                preflightCoinControl: false,
+            });
+            nextState = buildPreparation.state;
+            const buyPlan = buildPlanForDomainOperation({
+                state: nextState,
+                allUtxos: buildPreparation.allUtxos,
+                sender: operation.sender,
+                opReturnData: serializeDomainBuy(operation.chainDomain.domainId, operation.listingPriceCogtoshi).opReturnData,
+                errorPrefix: "wallet_buy",
+            });
             const built = await buildTransaction({
                 rpc,
                 walletName,
                 state: nextState,
-                plan: buildPlanForDomainOperation({
-                    state: nextState,
-                    allUtxos: await rpc.listUnspent(walletName, 1),
-                    sender: operation.sender,
-                    anchorOutpoint: operation.anchorOutpoint,
-                    opReturnData: serializeDomainBuy(operation.chainDomain.domainId, operation.listingPriceCogtoshi).opReturnData,
-                    anchorValueSats: BigInt(nextState.anchorValueSats),
-                    errorPrefix: "wallet_buy",
-                }),
+                plan: {
+                    ...buyPlan,
+                    fixedInputs: mergeFixedWalletInputs(buyPlan.fixedInputs, replacementFixedInputs),
+                },
+                feeRateSatVb: feeSelection.feeRateSatVb,
             });
             const currentSellerHex = Buffer.from(operation.chainDomain.ownerScriptPubKey).toString("hex");
             if (currentSellerHex !== sellerScriptPubKeyHex) {
@@ -1258,7 +1252,6 @@ export async function buyDomain(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
@@ -1285,7 +1278,6 @@ export async function buyDomain(options) {
                         await saveWalletStatePreservingUnlock({
                             state: nextState,
                             provider,
-                            unlockUntilUnixMs: operation.unlockUntilUnixMs,
                             nowUnixMs,
                             paths,
                         });
@@ -1305,7 +1297,6 @@ export async function buyDomain(options) {
                     await saveWalletStatePreservingUnlock({
                         state: nextState,
                         provider,
-                        unlockUntilUnixMs: operation.unlockUntilUnixMs,
                         nowUnixMs,
                         paths,
                     });
@@ -1328,7 +1319,6 @@ export async function buyDomain(options) {
                 domainName: normalizedDomainName,
                 domainId: operation.chainDomain.domainId,
                 currentOwnerScriptPubKeyHex: operation.sender.scriptPubKeyHex,
-                currentOwnerLocalIndex: operation.sender.localIndex,
                 nowUnixMs,
             });
             nextState = {
@@ -1339,7 +1329,6 @@ export async function buyDomain(options) {
             await saveWalletStatePreservingUnlock({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
@@ -1352,6 +1341,10 @@ export async function buyDomain(options) {
                 listedPriceCogtoshi: operation.listingPriceCogtoshi,
                 resolvedBuyer,
                 resolvedSeller,
+                fees: createBuiltWalletMutationFeeSummary({
+                    selection: feeSelection,
+                    built,
+                }),
             };
         }
         finally {