@cogcoin/client 0.5.15 → 1.0.0

package/dist/cli/commands/wallet-mutation.js

@@ -1,7 +1,7 @@
 import { parseCogAmountToCogtoshi, } from "../../wallet/tx/index.js";
-import { buildAnchorMutationData, buildAnchorClearMutationData, buildCogMutationData, buildDomainAdminMutationData, buildDomainMarketMutationData, buildFieldMutationData, buildRegisterMutationData, buildReputationMutationData, } from "../mutation-json.js";
-import { buildAnchorPreviewData, buildAnchorClearPreviewData, buildCogPreviewData, buildDomainAdminPreviewData, buildDomainMarketPreviewData, buildFieldPreviewData, buildRegisterPreviewData, buildReputationPreviewData, } from "../preview-json.js";
-import { isAnchorClearMutationCommand, isAnchorMutationCommand, isBuyMutationCommand, isClaimMutationCommand, isReclaimMutationCommand, isRegisterMutationCommand, isReputationMutationCommand, isSellOrUnsellMutationCommand, isSendMutationCommand, isTransferMutationCommand, isUnsellMutationCommand, isWalletMutationCommand, } from "../mutation-command-groups.js";
+import { buildAnchorMutationData, buildBitcoinTransferData, buildCogMutationData, buildDomainAdminMutationData, buildDomainMarketMutationData, buildFieldMutationData, buildRegisterMutationData, buildReputationMutationData, } from "../mutation-json.js";
+import { buildAnchorPreviewData, buildCogPreviewData, buildDomainAdminPreviewData, buildDomainMarketPreviewData, buildFieldPreviewData, buildRegisterPreviewData, buildReputationPreviewData, } from "../preview-json.js";
+import { isAnchorMutationCommand, isBuyMutationCommand, isClaimMutationCommand, isReclaimMutationCommand, isRegisterMutationCommand, isReputationMutationCommand, isSellOrUnsellMutationCommand, isSendMutationCommand, isTransferMutationCommand, isUnsellMutationCommand, isWalletMutationCommand, } from "../mutation-command-groups.js";
 import { commandMutationNextSteps, workflowMutationNextSteps, writeMutationCommandSuccess, } from "../mutation-success.js";
 import { writeLine } from "../io.js";
 import { formatBuyBuyerSummary, formatBuySellerSummary, formatBuySettlementSummary, formatCogClaimPath, formatCogSenderSummary, formatDomainAdminEffect, formatDomainAdminPayloadSummary, formatDomainAdminSenderSummary, formatDomainAdminTargetSummary, formatDomainMarketEconomicEffect, formatDomainMarketRecipientSummary, formatDomainMarketSenderSummary, formatFieldEffect, formatFieldPath, formatFieldSenderSummary, formatFieldValueSummary, formatRegisterEconomicEffect, formatRegisterSenderSummary, formatReputationEffect, formatReputationReviewSummary, formatReputationSenderSummary, } from "../mutation-text-format.js";
@@ -9,6 +9,7 @@ import { createTerminalPrompter } from "../prompt.js";
 import { writeHandledCliError } from "../output.js";
 import { getAnchorNextSteps, getRegisterNextSteps, } from "../workflow-hints.js";
 import { createOwnedLockCleanupSignalWatcher, waitForCompletionOrStop, } from "../signals.js";
+import { withInteractiveWalletSecretProvider } from "../../wallet/state/provider.js";
 function createFieldValueSource(parsed) {
     if (parsed.endpointText !== null) {
         return { kind: "text", value: parsed.endpointText };
@@ -40,7 +41,7 @@ export async function runWalletMutationCommand(parsed, context) {
     ]);
     try {
         const outcome = await waitForCompletionOrStop((async () => {
-            if (!isWalletMutationCommand(parsed.command)) {
+            if (parsed.command !== "bitcoin-transfer" && !isWalletMutationCommand(parsed.command)) {
                 writeLine(context.stderr, `wallet mutation command not implemented: ${parsed.command}`);
                 return 1;
             }
@@ -48,35 +49,33 @@ export async function runWalletMutationCommand(parsed, context) {
             const dbPath = parsed.dbPath ?? context.resolveDefaultClientDatabasePath();
             const prompter = createCommandPrompter(parsed, context);
             const interactive = prompter.isInteractive;
-            if (isAnchorClearMutationCommand(parsed.command)) {
-                const result = await context.clearPendingAnchor({
-                    domainName: parsed.args[0],
+            const provider = withInteractiveWalletSecretProvider(context.walletSecretProvider, prompter);
+            if (parsed.command === "bitcoin-transfer") {
+                const result = await context.transferBitcoin({
+                    amountSatsText: parsed.args[0],
+                    target: parsed.transferTarget,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
                 });
-                const nextSteps = result.cleared
-                    ? workflowMutationNextSteps([`cogcoin show ${result.domainName}`, `cogcoin anchor ${result.domainName}`])
-                    : commandMutationNextSteps(`cogcoin show ${result.domainName}`);
                 return writeMutationCommandSuccess(parsed, context, {
-                    data: buildAnchorClearMutationData(result),
-                    previewData: buildAnchorClearPreviewData(result),
+                    data: buildBitcoinTransferData(result),
                     reusedExisting: false,
                     reusedMessage: "",
                     interactive,
-                    outcome: result.cleared ? "cleared" : "noop",
-                    nextSteps,
+                    explorerTxid: result.txid,
+                    nextSteps: workflowMutationNextSteps([]),
                     text: {
-                        heading: result.cleared ? "Pending anchor cleared." : "No pending anchor to clear.",
+                        heading: "Bitcoin transfer submitted.",
                         fields: [
-                            { label: "Domain", value: result.domainName },
-                            { label: "Cleared", value: result.cleared ? "yes" : "no" },
-                            { label: "Previous status", value: result.previousFamilyStatus ?? "", when: result.previousFamilyStatus !== null },
-                            { label: "Previous step", value: result.previousFamilyStep ?? "", when: result.previousFamilyStep !== null },
-                            { label: "Released dedicated index", value: String(result.releasedDedicatedIndex), when: result.releasedDedicatedIndex !== null },
+                            { label: "Sender", value: result.senderAddress },
+                            { label: "Recipient", value: result.recipientAddress },
+                            { label: "Amount", value: `${result.amountSats.toString()} sats` },
+                            { label: "Fee", value: `${result.feeSats.toString()} sats` },
+                            { label: "Txid", value: result.txid },
                         ],
                     },
                 });
@@ -86,9 +85,10 @@ export async function runWalletMutationCommand(parsed, context) {
                     domainName: parsed.args[0],
                     foundingMessageText: parsed.anchorMessage,
                     promptForFoundingMessageWhenMissing: parsed.anchorMessage === null,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     paths: runtimePaths,
                 });
@@ -101,18 +101,17 @@ export async function runWalletMutationCommand(parsed, context) {
                         foundingMessageText: result.foundingMessageText ?? parsed.anchorMessage,
                     }),
                     reusedExisting: result.reusedExisting,
-                    reusedMessage: "The existing anchor family was reconciled instead of creating a duplicate.",
+                    reusedMessage: "The existing pending anchor was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
-                    explorerTxid: result.tx2Txid,
+                    explorerTxid: result.txid,
                     nextSteps: workflowMutationNextSteps(nextSteps),
                     text: {
-                        heading: "Anchor family submitted.",
+                        heading: "Anchor submitted.",
                         fields: [
                             { label: "Domain", value: result.domainName },
-                            { label: "Dedicated index", value: String(result.dedicatedIndex) },
                             { label: "Status", value: result.status },
-                            { label: "Tx1", value: result.tx1Txid },
-                            { label: "Tx2", value: result.tx2Txid },
+                            { label: "Txid", value: result.txid },
                         ],
                     },
                 });
@@ -120,11 +119,11 @@ export async function runWalletMutationCommand(parsed, context) {
             if (isRegisterMutationCommand(parsed.command)) {
                 const result = await context.registerDomain({
                     domainName: parsed.args[0],
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
                     forceRace: parsed.forceRace,
-                    fromIdentity: parsed.fromIdentity,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -133,14 +132,13 @@ export async function runWalletMutationCommand(parsed, context) {
                 return writeMutationCommandSuccess(parsed, context, {
                     data: buildRegisterMutationData(result, {
                         forceRace: parsed.forceRace,
-                        fromIdentity: parsed.fromIdentity,
                     }),
                     previewData: buildRegisterPreviewData(result, {
                         forceRace: parsed.forceRace,
-                        fromIdentity: parsed.fromIdentity,
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending registration was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: workflowMutationNextSteps(nextSteps),
@@ -162,9 +160,10 @@ export async function runWalletMutationCommand(parsed, context) {
                 const result = await context.transferDomain({
                     domainName: parsed.args[0],
                     target: parsed.transferTarget,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -178,6 +177,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending transfer was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),
@@ -201,9 +201,10 @@ export async function runWalletMutationCommand(parsed, context) {
                 const result = await context.sellDomain({
                     domainName: parsed.args[0],
                     listedPriceCogtoshi,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -217,6 +218,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending listing mutation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),
@@ -242,18 +244,20 @@ export async function runWalletMutationCommand(parsed, context) {
                             : parsed.endpointJson !== null
                                 ? { kind: "json", value: parsed.endpointJson }
                                 : { kind: "bytes", value: parsed.endpointBytes },
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
                     })
                     : await context.clearDomainEndpoint({
                         domainName: parsed.args[0],
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
@@ -267,6 +271,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending endpoint mutation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),
@@ -288,18 +293,20 @@ export async function runWalletMutationCommand(parsed, context) {
                     ? await context.setDomainDelegate({
                         domainName: parsed.args[0],
                         target: parsed.args[1],
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
                     })
                     : await context.clearDomainDelegate({
                         domainName: parsed.args[0],
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
@@ -313,6 +320,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending delegate mutation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),
@@ -334,18 +342,20 @@ export async function runWalletMutationCommand(parsed, context) {
                     ? await context.setDomainMiner({
                         domainName: parsed.args[0],
                         target: parsed.args[1],
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
                     })
                     : await context.clearDomainMiner({
                         domainName: parsed.args[0],
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
@@ -359,6 +369,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending miner mutation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),
@@ -378,9 +389,10 @@ export async function runWalletMutationCommand(parsed, context) {
             if (parsed.command === "domain-canonical") {
                 const result = await context.setDomainCanonical({
                     domainName: parsed.args[0],
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -394,6 +406,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending canonical mutation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),
@@ -414,15 +427,10 @@ export async function runWalletMutationCommand(parsed, context) {
                     domainName: parsed.args[0],
                     fieldName: parsed.args[1],
                     permanent: parsed.fieldPermanent,
-                    source: (parsed.endpointText !== null
-                        || parsed.endpointJson !== null
-                        || parsed.endpointBytes !== null
-                        || parsed.fieldFormat !== null)
-                        ? createFieldValueSource(parsed)
-                        : null,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -431,14 +439,16 @@ export async function runWalletMutationCommand(parsed, context) {
                     data: buildFieldMutationData(result),
                     previewData: buildFieldPreviewData(result),
                     reusedExisting: result.reusedExisting,
-                    reusedMessage: result.family
-                        ? "The existing pending field family was reconciled instead of creating a duplicate."
-                        : "The existing pending field creation was reconciled instead of creating a duplicate.",
+                    reusedMessage: "The existing pending field creation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
-                    explorerTxid: result.family ? (result.tx2Txid ?? null) : result.txid,
-                    nextSteps: commandMutationNextSteps(`cogcoin field show ${result.domainName} ${result.fieldName}`),
+                    explorerTxid: result.txid,
+                    nextSteps: workflowMutationNextSteps([
+                        `cogcoin field show ${result.domainName} ${result.fieldName}`,
+                        `cogcoin field set ${result.domainName} ${result.fieldName} --text <value>`,
+                    ]),
                     text: {
-                        heading: result.family ? "Field create+write family submitted." : "Field creation submitted.",
+                        heading: "Field creation submitted.",
                         fields: [
                             { label: "Domain", value: result.domainName },
                             { label: "Field", value: result.fieldName },
@@ -447,9 +457,7 @@ export async function runWalletMutationCommand(parsed, context) {
                             { label: "Value", value: formatFieldValueSummary(result), when: result.resolved?.value !== null && result.resolved?.value !== undefined },
                             { label: "Effect", value: formatFieldEffect(result) },
                             { label: "Status", value: result.status },
-                            { label: "Tx1", value: result.tx1Txid ?? "unknown", when: result.family },
-                            { label: "Tx2", value: result.tx2Txid ?? "unknown", when: result.family },
-                            { label: "Txid", value: result.txid, when: !result.family },
+                            { label: "Txid", value: result.txid },
                         ],
                     },
                 });
@@ -459,9 +467,10 @@ export async function runWalletMutationCommand(parsed, context) {
                     domainName: parsed.args[0],
                     fieldName: parsed.args[1],
                     source: createFieldValueSource(parsed),
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -471,6 +480,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     previewData: buildFieldPreviewData(result),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending field update was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin field show ${result.domainName} ${result.fieldName}`),
@@ -492,9 +502,10 @@ export async function runWalletMutationCommand(parsed, context) {
                 const result = await context.clearField({
                     domainName: parsed.args[0],
                     fieldName: parsed.args[1],
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -504,6 +515,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     previewData: buildFieldPreviewData(result),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending field clear was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin field show ${result.domainName} ${result.fieldName}`),
@@ -524,10 +536,10 @@ export async function runWalletMutationCommand(parsed, context) {
                 const result = await context.sendCog({
                     amountCogtoshi: parseCogAmountToCogtoshi(parsed.args[0]),
                     target: parsed.transferTarget,
-                    fromIdentity: parsed.fromIdentity,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -535,14 +547,13 @@ export async function runWalletMutationCommand(parsed, context) {
                 return writeMutationCommandSuccess(parsed, context, {
                     data: buildCogMutationData(result, {
                         commandKind: "send",
-                        fromIdentity: parsed.fromIdentity,
                     }),
                     previewData: buildCogPreviewData(result, {
                         commandKind: "send",
-                        fromIdentity: parsed.fromIdentity,
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending COG transfer was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps("cogcoin balance"),
@@ -562,13 +573,13 @@ export async function runWalletMutationCommand(parsed, context) {
                 const result = await context.lockCogToDomain({
                     amountCogtoshi: parseCogAmountToCogtoshi(parsed.args[0]),
                     recipientDomainName: parsed.lockRecipientDomain,
-                    fromIdentity: parsed.fromIdentity,
                     timeoutBlocksOrDuration: parsed.unlockFor,
                     timeoutHeight: parsed.untilHeight === null ? null : Number.parseInt(parsed.untilHeight, 10),
                     conditionHex: parsed.conditionHex,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -576,20 +587,19 @@ export async function runWalletMutationCommand(parsed, context) {
                 return writeMutationCommandSuccess(parsed, context, {
                     data: buildCogMutationData(result, {
                         commandKind: "cog-lock",
-                        fromIdentity: parsed.fromIdentity,
                         timeoutBlocksOrDuration: parsed.unlockFor,
                         timeoutHeight: parsed.untilHeight,
                         conditionHex: parsed.conditionHex,
                     }),
                     previewData: buildCogPreviewData(result, {
                         commandKind: "cog-lock",
-                        fromIdentity: parsed.fromIdentity,
                         timeoutBlocksOrDuration: parsed.unlockFor,
                         timeoutHeight: parsed.untilHeight,
                         conditionHex: parsed.conditionHex,
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending lock was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps("cogcoin locks"),
@@ -609,23 +619,23 @@ export async function runWalletMutationCommand(parsed, context) {
                 const result = await context.claimCogLock({
                     lockId: Number.parseInt(parsed.args[0], 10),
                     preimageHex: parsed.preimageHex,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     paths: runtimePaths,
                 });
                 return writeMutationCommandSuccess(parsed, context, {
                     data: buildCogMutationData(result, {
                         commandKind: "claim",
-                        fromIdentity: null,
                     }),
                     previewData: buildCogPreviewData(result, {
                         commandKind: "claim",
-                        fromIdentity: null,
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending claim was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps("cogcoin locks --claimable"),
@@ -645,23 +655,23 @@ export async function runWalletMutationCommand(parsed, context) {
             if (isReclaimMutationCommand(parsed.command)) {
                 const result = await context.reclaimCogLock({
                     lockId: Number.parseInt(parsed.args[0], 10),
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     paths: runtimePaths,
                 });
                 return writeMutationCommandSuccess(parsed, context, {
                     data: buildCogMutationData(result, {
                         commandKind: "reclaim",
-                        fromIdentity: null,
                     }),
                     previewData: buildCogPreviewData(result, {
                         commandKind: "reclaim",
-                        fromIdentity: null,
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending reclaim was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps("cogcoin locks --reclaimable"),
@@ -685,9 +695,10 @@ export async function runWalletMutationCommand(parsed, context) {
                         targetDomainName: parsed.args[1],
                         amountCogtoshi: parseCogAmountToCogtoshi(parsed.args[2]),
                         reviewText: parsed.reviewText,
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
@@ -697,9 +708,10 @@ export async function runWalletMutationCommand(parsed, context) {
                         targetDomainName: parsed.args[1],
                         amountCogtoshi: parseCogAmountToCogtoshi(parsed.args[2]),
                         reviewText: parsed.reviewText,
+                        feeRateSatVb: parsed.satvb,
                         dataDir,
                         databasePath: dbPath,
-                        provider: context.walletSecretProvider,
+                        provider,
                         prompter,
                         assumeYes: parsed.assumeYes,
                         paths: runtimePaths,
@@ -709,6 +721,7 @@ export async function runWalletMutationCommand(parsed, context) {
                     previewData: buildReputationPreviewData(result),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending reputation mutation was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.targetDomainName}`),
@@ -730,10 +743,10 @@ export async function runWalletMutationCommand(parsed, context) {
             if (isBuyMutationCommand(parsed.command)) {
                 const result = await context.buyDomain({
                     domainName: parsed.args[0],
-                    fromIdentity: parsed.fromIdentity,
+                    feeRateSatVb: parsed.satvb,
                     dataDir,
                     databasePath: dbPath,
-                    provider: context.walletSecretProvider,
+                    provider,
                     prompter,
                     assumeYes: parsed.assumeYes,
                     paths: runtimePaths,
@@ -741,14 +754,13 @@ export async function runWalletMutationCommand(parsed, context) {
                 return writeMutationCommandSuccess(parsed, context, {
                     data: buildDomainMarketMutationData(result, {
                         commandKind: "buy",
-                        fromIdentity: parsed.fromIdentity,
                     }),
                     previewData: buildDomainMarketPreviewData(result, {
                         commandKind: "buy",
-                        fromIdentity: parsed.fromIdentity,
                     }),
                     reusedExisting: result.reusedExisting,
                     reusedMessage: "The existing pending purchase was reconciled instead of creating a duplicate.",
+                    fees: result.fees,
                     interactive,
                     explorerTxid: result.txid,
                     nextSteps: commandMutationNextSteps(`cogcoin show ${result.domainName}`),

package/dist/cli/commands/wallet-read.js

@@ -6,6 +6,7 @@ import { filterWalletDomains } from "../../wallet/read/index.js";
 import { createErrorEnvelope, createSuccessEnvelope, describeCanonicalCommand, normalizeListPage, writeJsonValue, } from "../output.js";
 import { buildAddressJson, buildBalanceJson, buildDomainsJson, buildFieldJson, buildFieldsJson, buildIdsJson, buildLocksJson, buildShowJson, buildWalletStatusJson, listFieldsForJson, listLocksForJson, } from "../read-json.js";
 import { formatNextStepLines, getAddressNextSteps, getFundingQuickstartGuidance, getIdsNextSteps, getLocksNextSteps, } from "../workflow-hints.js";
+import { withInteractiveWalletSecretProvider } from "../../wallet/state/provider.js";
 function createUnknownPage(parsed, defaultLimit) {
     return {
         limit: parsed.listAll ? null : (parsed.listLimit ?? defaultLimit),
@@ -41,10 +42,13 @@ export async function runWalletReadCommand(parsed, context) {
     const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
     const runtimePaths = context.resolveWalletRuntimePaths(parsed.seedName);
     await context.ensureDirectory(dirname(dbPath));
+    const provider = parsed.outputMode === "text"
+        ? withInteractiveWalletSecretProvider(context.walletSecretProvider, context.createPrompter())
+        : context.walletSecretProvider;
     const readContext = await context.openWalletReadContext({
         dataDir,
         databasePath: dbPath,
-        secretProvider: context.walletSecretProvider,
+        secretProvider: provider,
         paths: runtimePaths,
     });
     try {
@@ -61,10 +65,10 @@ export async function runWalletReadCommand(parsed, context) {
                     return emitJson(context, parsed, "cogcoin/address/v1", buildAddressJson(readContext));
                 }
                 writeLine(context.stdout, formatFundingAddressReport(readContext));
-                if (readContext.model?.fundingIdentity?.address !== null && readContext.model?.fundingIdentity?.address !== undefined) {
+                if (readContext.model?.walletAddress !== null && readContext.model?.walletAddress !== undefined) {
                     writeLine(context.stdout, `Quickstart: ${getFundingQuickstartGuidance()}`);
                 }
-                for (const line of formatNextStepLines(getAddressNextSteps(readContext, readContext.model?.fundingIdentity?.address ?? null))) {
+                for (const line of formatNextStepLines(getAddressNextSteps(readContext, readContext.model?.walletAddress ?? null))) {
                     writeLine(context.stdout, line);
                 }
                 return 0;
@@ -72,27 +76,20 @@ export async function runWalletReadCommand(parsed, context) {
             case "ids": {
                 const defaultLimit = 100;
                 if (parsed.outputMode === "json") {
-                    if (readContext.model === null) {
-                        return emitJson(context, parsed, "cogcoin/ids/v1", buildIdsJson(readContext, createUnknownPage(parsed, defaultLimit), []));
-                    }
-                    const { items, page } = normalizeListPage(readContext.model.identities, {
-                        limit: parsed.listLimit,
-                        all: parsed.listAll,
-                        defaultLimit,
-                    });
-                    return emitJson(context, parsed, "cogcoin/ids/v1", buildIdsJson(readContext, page, items));
+                    return emitJson(context, parsed, "cogcoin/ids/v1", buildIdsJson(readContext, readContext.model === null
+                        ? createUnknownPage(parsed, defaultLimit)
+                        : normalizeListPage([readContext.model.walletAddress ?? `spk:${readContext.model.walletScriptPubKeyHex}`], {
+                            limit: parsed.listLimit,
+                            all: parsed.listAll,
+                            defaultLimit,
+                        }).page));
                 }
                 writeLine(context.stdout, formatIdentityListReport(readContext, {
                     limit: parsed.listAll ? null : (parsed.listLimit ?? defaultLimit),
                     all: parsed.listAll,
                 }));
                 if (readContext.model !== null) {
-                    const { items } = normalizeListPage(readContext.model.identities, {
-                        limit: parsed.listLimit,
-                        all: parsed.listAll,
-                        defaultLimit,
-                    });
-                    for (const line of formatNextStepLines(getIdsNextSteps(items))) {
+                    for (const line of formatNextStepLines(getIdsNextSteps(readContext.model.walletAddress))) {
                         writeLine(context.stdout, line);
                     }
                 }