@cogcoin/client 0.5.12 → 0.5.14

package/dist/wallet/tx/register.js

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

package/dist/wallet/tx/reputation.js

@@ -8,7 +8,7 @@ import { resolveWalletRuntimePathsForTesting } from "../runtime.js";
 import { createDefaultWalletSecretProvider, } from "../state/provider.js";
 import { serializeRepCommit, serializeRepRevoke, validateDomainName, } from "../cogop/index.js";
 import { openWalletReadContext } from "../read/index.js";
-import { assertWalletMutationContextReady, buildWalletMutationTransaction, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
+import { assertFixedInputPrefixMatches, assertFundingInputsAfterFixedPrefix, assertWalletMutationContextReady, buildWalletMutationTransactionWithReserveFallback, formatCogAmount, isAlreadyAcceptedError, isBroadcastUnknownError, outpointKey, pauseMiningForWalletMutation, saveWalletStatePreservingUnlock, unlockTemporaryBuilderLocks, updateMutationRecord, } from "./common.js";
 import { confirmTypedAcknowledgement as confirmSharedTypedAcknowledgement, confirmYesNo as confirmSharedYesNo, } from "./confirm.js";
 import { getCanonicalIdentitySelector } from "./identity-selector.js";
 import { findPendingMutationByIntent, upsertPendingMutation } from "./journal.js";
@@ -162,9 +162,8 @@ function buildPlanForReputationOperation(options) {
     return {
         sender: options.sender,
         changeAddress: options.state.funding.address,
-        inputs: [
+        fixedInputs: [
             { txid: anchorUtxo.txid, vout: anchorUtxo.vout },
-            ...fundingUtxos.map((entry) => ({ txid: entry.txid, vout: entry.vout })),
         ],
         outputs: [
             { data: Buffer.from(options.opReturnData).toString("hex") },
@@ -175,6 +174,7 @@ function buildPlanForReputationOperation(options) {
         expectedAnchorScriptHex: options.sender.scriptPubKeyHex,
         expectedAnchorValueSats: BigInt(options.state.anchorValueSats),
         allowedFundingScriptPubKeyHex: options.state.funding.scriptPubKeyHex,
+        eligibleFundingOutpointKeys: new Set(fundingUtxos.map((entry) => outpointKey({ txid: entry.txid, vout: entry.vout }))),
         errorPrefix: options.errorPrefix,
     };
 }
@@ -184,14 +184,17 @@ function validateFundedDraft(decoded, funded, plan) {
     if (inputs.length === 0) {
         throw new Error(`${plan.errorPrefix}_missing_sender_input`);
     }
+    assertFixedInputPrefixMatches(inputs, plan.fixedInputs, `${plan.errorPrefix}_sender_input_mismatch`);
     if (inputs[0]?.prevout?.scriptPubKey?.hex !== plan.sender.scriptPubKeyHex) {
         throw new Error(`${plan.errorPrefix}_sender_input_mismatch`);
     }
-    for (let index = 1; index < inputs.length; index += 1) {
-        if (inputs[index]?.prevout?.scriptPubKey?.hex !== plan.allowedFundingScriptPubKeyHex) {
-            throw new Error(`${plan.errorPrefix}_unexpected_funding_input`);
-        }
-    }
+    assertFundingInputsAfterFixedPrefix({
+        inputs,
+        fixedInputs: plan.fixedInputs,
+        allowedFundingScriptPubKeyHex: plan.allowedFundingScriptPubKeyHex,
+        eligibleFundingOutpointKeys: plan.eligibleFundingOutpointKeys,
+        errorCode: `${plan.errorPrefix}_unexpected_funding_input`,
+    });
     if (outputs[0]?.scriptPubKey?.hex !== plan.expectedOpReturnScriptHex) {
         throw new Error(`${plan.errorPrefix}_opreturn_mismatch`);
     }
@@ -215,13 +218,15 @@ function validateFundedDraft(decoded, funded, plan) {
     }
 }
 async function buildTransaction(options) {
-    return buildWalletMutationTransaction({
+    return buildWalletMutationTransactionWithReserveFallback({
         rpc: options.rpc,
         walletName: options.walletName,
+        state: options.state,
         plan: options.plan,
         validateFundedDraft,
         finalizeErrorCode: `${options.plan.errorPrefix}_finalize_failed`,
         mempoolRejectPrefix: `${options.plan.errorPrefix}_mempool_rejected`,
+        reserveCandidates: options.state.proactiveReserveOutpoints,
     });
 }
 function createDraftMutation(options) {
@@ -635,6 +640,7 @@ async function submitReputationMutation(options) {
             const built = await buildTransaction({
                 rpc,
                 walletName,
+                state: nextState,
                 plan: buildPlanForReputationOperation({
                     state: nextState,
                     allUtxos: await rpc.listUnspent(walletName, 1),

package/dist/wallet/types.d.ts

@@ -142,6 +142,8 @@ export interface WalletStateV1 {
     walletRootId: string;
     network: WalletNetwork;
     anchorValueSats: number;
+    proactiveReserveSats: number;
+    proactiveReserveOutpoints: OutpointRecord[];
     nextDedicatedIndex: number;
     fundingIndex: 0;
     mnemonic: {
@@ -191,6 +193,8 @@ export interface PortableWalletArchivePayloadV1 {
     walletRootId: string;
     network: WalletNetwork;
     anchorValueSats: number;
+    proactiveReserveSats: number;
+    proactiveReserveOutpoints: OutpointRecord[];
     nextDedicatedIndex: number;
     fundingIndex: 0;
     mnemonic: {

package/package.json

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