@cogcoin/client 0.5.15 → 1.0.1

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, 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 { confirmYesNo } from "./confirm.js";
 import { getCanonicalIdentitySelector } from "./identity-selector.js";
 import { findPendingMutationByIntent, upsertPendingMutation } from "./journal.js";
@@ -71,17 +71,6 @@ function createIntentFingerprint(parts) {
         .update(parts.map((part) => String(part)).join("\n"))
         .digest("hex");
 }
-function resolveAnchorOutpointForSender(state, sender, errorPrefix) {
-    const anchoredDomain = state.domains.find((domain) => domain.currentOwnerLocalIndex === sender.index
-        && domain.canonicalChainStatus === "anchored") ?? null;
-    if (anchoredDomain?.currentCanonicalAnchorOutpoint === null || anchoredDomain === null) {
-        throw new Error(`${errorPrefix}_anchor_outpoint_unavailable`);
-    }
-    return {
-        txid: anchoredDomain.currentCanonicalAnchorOutpoint.txid,
-        vout: anchoredDomain.currentCanonicalAnchorOutpoint.vout,
-    };
-}
 function resolveAnchoredDomainOperation(context, domainName, errorPrefix, options = {}) {
     assertWalletMutationContextReady(context, errorPrefix);
     const chainDomain = lookupDomain(context.snapshot.state, domainName);
@@ -95,24 +84,14 @@ function resolveAnchoredDomainOperation(context, domainName, errorPrefix, option
         throw new Error(`${errorPrefix}_root_domain_required`);
     }
     const ownerHex = Buffer.from(chainDomain.ownerScriptPubKey).toString("hex");
-    const ownerIdentity = context.model.identities.find((identity) => identity.scriptPubKeyHex === ownerHex) ?? null;
-    if (ownerIdentity === null || ownerIdentity.address === null) {
+    if (ownerHex !== context.localState.state.funding.scriptPubKeyHex || context.model.walletAddress == null) {
         throw new Error(`${errorPrefix}_owner_not_locally_controlled`);
     }
-    if ((options.rejectReadOnly ?? true) && ownerIdentity.readOnly) {
-        throw new Error(`${errorPrefix}_owner_read_only`);
-    }
     return {
         readContext: context,
         state: context.localState.state,
-        unlockUntilUnixMs: context.localState.unlockUntilUnixMs,
-        sender: {
-            localIndex: ownerIdentity.index,
-            scriptPubKeyHex: ownerIdentity.scriptPubKeyHex,
-            address: ownerIdentity.address,
-        },
-        senderSelector: getCanonicalIdentitySelector(ownerIdentity),
-        anchorOutpoint: resolveAnchorOutpointForSender(context.localState.state, ownerIdentity, errorPrefix),
+        sender: createFundingMutationSender(context.localState.state),
+        senderSelector: context.model.walletAddress,
         chainDomain,
     };
 }
@@ -121,29 +100,13 @@ function buildPlanForDomainAdminOperation(options) {
         && entry.confirmations >= 1
         && entry.spendable !== false
         && entry.safe !== false);
-    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`);
-    }
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        fixedInputs: [
-            { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-        ],
-        outputs: [
-            { data: Buffer.from(options.opReturnData).toString("hex") },
-            { [options.sender.address]: satsToBtcNumber(BigInt(options.state.anchorValueSats)) },
-        ],
-        changePosition: 2,
+        fixedInputs: [],
+        outputs: [{ data: Buffer.from(options.opReturnData).toString("hex") }],
+        changePosition: 1,
         expectedOpReturnScriptHex: encodeOpReturnScript(options.opReturnData),
-        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,33 +118,16 @@ 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 (outputs[1]?.scriptPubKey?.hex !== plan.expectedAnchorScriptHex) {
-        throw new Error(`${plan.errorPrefix}_anchor_output_mismatch`);
-    }
-    if (valueToSats(outputs[1]?.value ?? 0) !== plan.expectedAnchorValueSats) {
-        throw new Error(`${plan.errorPrefix}_anchor_value_mismatch`);
-    }
     if (funded.changepos === -1) {
-        if (outputs.length !== 2) {
+        if (outputs.length !== 1) {
             throw new Error(`${plan.errorPrefix}_unexpected_output_count`);
         }
         return;
     }
-    if (funded.changepos !== plan.changePosition || outputs.length !== 3) {
+    if (funded.changepos !== plan.changePosition || outputs.length !== 2) {
         throw new Error(`${plan.errorPrefix}_change_position_mismatch`);
     }
     if (outputs[funded.changepos]?.scriptPubKey?.hex !== plan.allowedFundingScriptPubKeyHex) {
@@ -197,7 +143,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) {
@@ -214,6 +160,7 @@ function createDraftMutation(options) {
             lastUpdatedAtUnixMs: options.nowUnixMs,
             attemptedTxid: null,
             attemptedWtxid: null,
+            ...createWalletMutationFeeMetadata(options.feeSelection),
             temporaryBuilderLockedOutpoints: [],
         };
     }
@@ -232,6 +179,7 @@ function createDraftMutation(options) {
         lastUpdatedAtUnixMs: options.nowUnixMs,
         attemptedTxid: null,
         attemptedWtxid: null,
+        ...createWalletMutationFeeMetadata(options.feeSelection),
         temporaryBuilderLockedOutpoints: [],
     };
 }
@@ -244,7 +192,6 @@ async function saveUpdatedMutationState(options) {
     await saveWalletStatePreservingUnlock({
         state: nextState,
         provider: options.provider,
-        unlockUntilUnixMs: options.unlockUntilUnixMs,
         nowUnixMs: options.nowUnixMs,
         paths: options.paths,
     });
@@ -310,7 +257,6 @@ async function reconcilePendingAdminMutation(options) {
         nextState = await saveUpdatedMutationState({
             state: nextState,
             provider: options.provider,
-            unlockUntilUnixMs: options.unlockUntilUnixMs,
             nowUnixMs: options.nowUnixMs,
             paths: options.paths,
         });
@@ -325,7 +271,6 @@ async function reconcilePendingAdminMutation(options) {
         nextState = await saveUpdatedMutationState({
             state: nextState,
             provider: options.provider,
-            unlockUntilUnixMs: options.unlockUntilUnixMs,
             nowUnixMs: options.nowUnixMs,
             paths: options.paths,
         });
@@ -343,7 +288,6 @@ async function reconcilePendingAdminMutation(options) {
         nextState = await saveUpdatedMutationState({
             state: nextState,
             provider: options.provider,
-            unlockUntilUnixMs: options.unlockUntilUnixMs,
             nowUnixMs: options.nowUnixMs,
             paths: options.paths,
         });
@@ -360,7 +304,6 @@ async function reconcilePendingAdminMutation(options) {
         nextState = await saveUpdatedMutationState({
             state: nextState,
             provider: options.provider,
-            unlockUntilUnixMs: options.unlockUntilUnixMs,
             nowUnixMs: options.nowUnixMs,
             paths: options.paths,
         });
@@ -483,7 +426,6 @@ async function sendBuiltTransaction(options) {
     nextState = await saveUpdatedMutationState({
         state: nextState,
         provider: options.provider,
-        unlockUntilUnixMs: options.unlockUntilUnixMs,
         nowUnixMs: options.nowUnixMs,
         paths: options.paths,
     });
@@ -506,7 +448,6 @@ async function sendBuiltTransaction(options) {
                 nextState = await saveUpdatedMutationState({
                     state: nextState,
                     provider: options.provider,
-                    unlockUntilUnixMs: options.unlockUntilUnixMs,
                     nowUnixMs: options.nowUnixMs,
                     paths: options.paths,
                 });
@@ -522,7 +463,6 @@ async function sendBuiltTransaction(options) {
             nextState = await saveUpdatedMutationState({
                 state: nextState,
                 provider: options.provider,
-                unlockUntilUnixMs: options.unlockUntilUnixMs,
                 nowUnixMs: options.nowUnixMs,
                 paths: options.paths,
             });
@@ -539,7 +479,6 @@ async function sendBuiltTransaction(options) {
     nextState = await saveUpdatedMutationState({
         state: nextState,
         provider: options.provider,
-        unlockUntilUnixMs: options.unlockUntilUnixMs,
         nowUnixMs: options.nowUnixMs,
         paths: options.paths,
     });
@@ -583,46 +522,63 @@ async function submitDomainAdminMutation(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 reconcilePendingAdminMutation({
                     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: options.kind,
-                        domainName: normalizedDomainName,
-                        txid: reconciled.mutation.attemptedTxid ?? "unknown",
-                        status: reconciled.resolution,
-                        reusedExisting: true,
-                        recipientScriptPubKeyHex: payload.recipientScriptPubKeyHex ?? null,
-                        endpointValueHex: payload.endpointValueHex ?? null,
-                        resolved: {
-                            sender: resolvedSender,
-                            target: payload.resolvedTarget,
-                            effect: payload.resolvedEffect,
-                        },
-                    };
+                    const reuse = await resolvePendingMutationReuseDecision({
+                        rpc,
+                        walletName,
+                        mutation: reconciled.mutation,
+                        nextFeeSelection: feeSelection,
+                    });
+                    if (reuse.reuseExisting) {
+                        return {
+                            kind: options.kind,
+                            domainName: normalizedDomainName,
+                            txid: reconciled.mutation.attemptedTxid ?? "unknown",
+                            status: reconciled.resolution,
+                            reusedExisting: true,
+                            recipientScriptPubKeyHex: payload.recipientScriptPubKeyHex ?? null,
+                            endpointValueHex: payload.endpointValueHex ?? null,
+                            resolved: {
+                                sender: resolvedSender,
+                                target: payload.resolvedTarget,
+                                effect: payload.resolvedEffect,
+                            },
+                            fees: reuse.fees,
+                        };
+                    }
+                    replacementFixedInputs = reuse.replacementFixedInputs;
                 }
                 if (reconciled.resolution === "repair-required") {
                     throw new Error(`${options.errorPrefix}_repair_required`);
                 }
             }
             await options.confirm(operation);
-            let nextState = upsertPendingMutation(operation.state, createDraftMutation({
+            let nextState = upsertPendingMutation(workingState, createDraftMutation({
                 kind: options.kind,
                 domainName: normalizedDomainName,
                 sender: operation.sender,
                 intentFingerprintHex,
                 nowUnixMs,
+                feeSelection,
                 recipientScriptPubKeyHex: payload.recipientScriptPubKeyHex ?? null,
                 endpointValueHex: payload.endpointValueHex ?? null,
                 existing: existingMutation,
@@ -630,22 +586,25 @@ async function submitDomainAdminMutation(options) {
             nextState = await saveUpdatedMutationState({
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
             });
+            const adminPlan = buildPlanForDomainAdminOperation({
+                state: nextState,
+                allUtxos: await rpc.listUnspent(walletName, 1),
+                sender: operation.sender,
+                opReturnData: payload.opReturnData,
+                errorPrefix: options.errorPrefix,
+            });
             const built = await buildTransaction({
                 rpc,
                 walletName,
                 state: nextState,
-                plan: buildPlanForDomainAdminOperation({
-                    state: nextState,
-                    allUtxos: await rpc.listUnspent(walletName, 1),
-                    sender: operation.sender,
-                    anchorOutpoint: operation.anchorOutpoint,
-                    opReturnData: payload.opReturnData,
-                    errorPrefix: options.errorPrefix,
-                }),
+                plan: {
+                    ...adminPlan,
+                    fixedInputs: mergeFixedWalletInputs(adminPlan.fixedInputs, replacementFixedInputs),
+                },
+                feeRateSatVb: feeSelection.feeRateSatVb,
             });
             const final = await sendBuiltTransaction({
                 rpc,
@@ -655,7 +614,6 @@ async function submitDomainAdminMutation(options) {
                 mutation: nextState.pendingMutations.find((mutation) => mutation.intentFingerprintHex === intentFingerprintHex),
                 state: nextState,
                 provider,
-                unlockUntilUnixMs: operation.unlockUntilUnixMs,
                 nowUnixMs,
                 paths,
                 errorPrefix: options.errorPrefix,
@@ -673,6 +631,10 @@ async function submitDomainAdminMutation(options) {
                     target: payload.resolvedTarget,
                     effect: payload.resolvedEffect,
                 },
+                fees: createBuiltWalletMutationFeeSummary({
+                    selection: feeSelection,
+                    built,
+                }),
             };
         }
         finally {

package/dist/wallet/tx/domain-market.d.ts

@@ -5,7 +5,7 @@ import type { WalletPrompter } from "../lifecycle.js";
 import { type WalletRuntimePaths } from "../runtime.js";
 import { type WalletSecretProvider } from "../state/provider.js";
 import { openWalletReadContext } from "../read/index.js";
-import { type WalletMutationRpcClient } from "./common.js";
+import { type WalletMutationFeeSummary, type WalletMutationRpcClient } from "./common.js";
 type DomainMarketKind = "transfer" | "sell" | "buy";
 interface DomainMarketRpcClient extends WalletMutationRpcClient {
     getBlockchainInfo(): Promise<{
@@ -54,6 +54,7 @@ export interface DomainMarketResolvedSummary {
 export interface TransferDomainOptions {
     domainName: string;
     target: string;
+    feeRateSatVb?: number | null;
     dataDir: string;
     databasePath: string;
     provider?: WalletSecretProvider;
@@ -68,6 +69,7 @@ export interface TransferDomainOptions {
 export interface SellDomainOptions {
     domainName: string;
     listedPriceCogtoshi: bigint;
+    feeRateSatVb?: number | null;
     dataDir: string;
     databasePath: string;
     provider?: WalletSecretProvider;
@@ -82,6 +84,7 @@ export interface SellDomainOptions {
 export interface BuyDomainOptions {
     domainName: string;
     fromIdentity?: string | null;
+    feeRateSatVb?: number | null;
     dataDir: string;
     databasePath: string;
     provider?: WalletSecretProvider;
@@ -104,6 +107,7 @@ export interface DomainMarketMutationResult {
     resolved?: DomainMarketResolvedSummary | null;
     resolvedBuyer?: DomainMarketResolvedBuyerSummary | null;
     resolvedSeller?: DomainMarketResolvedSellerSummary | null;
+    fees: WalletMutationFeeSummary;
 }
 export declare function parseCogAmountToCogtoshi(raw: string): bigint;
 export declare function transferDomain(options: TransferDomainOptions): Promise<DomainMarketMutationResult>;