@kaspacom/kcc20-tx-builder 0.6.1 → 0.6.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.2
+
+- Reuse authenticated profile scripts during native holder consolidation, including the independent Argent implementation.
+- Use each authenticated token profile's consolidation input limit: eight for platform KCC20 and three for Argent. Keep transaction mass and signature checks. Wrapped orderbook limits are unchanged.
+- Native consolidation planning now requires `tokenProfileId` from authenticated token readiness; unknown profiles fail before signing. The engine independently authenticates source scripts and does not trust requested limits.
+
+
 ## 0.6.0
 
 - Remove manual token profile review and funded proof flags from runtime capability checks.

package/dist/cjs/engine.js

@@ -427,7 +427,7 @@ function createKcc20PsktBuilderEngine(options) {
             }
             requireMatchingCovenantId(rootEntry, rootId, "active FeeTicket root UTXO");
             const rootOutputIndex = 0;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 1;
             const fundingChangeOutputIndex = 1;
             const fundingChange = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
@@ -619,7 +619,7 @@ function createKcc20PsktBuilderEngine(options) {
                     utilityInputSompi +
                     10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 2;
             const change = rootInputSompi +
                 utilityInputSompi +
@@ -797,7 +797,7 @@ function createKcc20PsktBuilderEngine(options) {
                 return entry;
             });
             const outputs = entries.map((entry, index) => new TransactionOutput((0, sale_common_js_1.utxoAmountSompi)(entry), (0, sale_common_js_1.p2pkScriptPubKey)(kw, (0, sale_common_js_1.bytesToHex)(states[index].ownerIdentifier))));
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [], request.params?.fundingOutpoint);
             const fundingInputIndex = entries.length;
             const fundingChangeOutputIndex = outputs.length;
             const fundingChange = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
@@ -947,7 +947,7 @@ function createKcc20PsktBuilderEngine(options) {
                 ownerIdentifier: (0, sale_common_js_1.hexToBytes)(recipientOwner),
             }));
             const outputs = entries.map((entry, index) => new TransactionOutput((0, sale_common_js_1.utxoAmountSompi)(entry), payToScriptHashScript((0, sale_common_js_1.buildKcc20FeeTicketScriptForState)(artifactInfos[index].artifact.script, recipientStates[index])), new CovenantBinding(index, new Hash(ticketId))));
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [], request.params?.fundingOutpoint);
             const fundingInputIndex = entries.length;
             const fundingChangeOutputIndex = outputs.length;
             const fundingChange = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
@@ -1749,7 +1749,7 @@ function createKcc20PsktBuilderEngine(options) {
                     evidence.address)
                 throw new Error("token evidence script does not match RPC");
             const utxos = await getUtxosByAddresses(rpc, [walletAddress]);
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(utxos.entries, deploySompi * 2n + priorityFee + 10000000n);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(utxos.entries, deploySompi * 2n + priorityFee + 10000000n, [], request.params?.fundingOutpoint);
             const fundingChangeOutputIndex = 2;
             const change = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - deploySompi * 2n - priorityFee;
             if (change <= 10000n) {
@@ -2037,7 +2037,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > covenantInputSompi
                 ? outputSompi + priorityFee - covenantInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 2;
             const change = covenantInputSompi +
                 (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) -
@@ -2332,7 +2332,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > covenantInputSompi
                 ? outputSompi + priorityFee - covenantInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 3;
             const change = covenantInputSompi +
                 (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) -
@@ -2608,7 +2608,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > covenantInputSompi
                 ? outputSompi + priorityFee - covenantInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 1;
             const change = covenantInputSompi +
                 (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) -
@@ -2890,7 +2890,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > covenantInputSompi
                 ? outputSompi + priorityFee - covenantInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const ticketInputIndex = ticketEntry ? 1 : -1;
             const fundingInputIndex = ticketEntry ? 2 : 1;
             const change = covenantInputSompi +
@@ -3247,7 +3247,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > covenantInputSompi
                 ? outputSompi + priorityFee - covenantInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const ticketInputIndex = ticketEntry ? 2 : -1;
             const fundingInputIndex = ticketEntry ? 3 : 2;
             const change = covenantInputSompi +
@@ -3628,7 +3628,7 @@ function createKcc20PsktBuilderEngine(options) {
                     covenantInputSompi +
                     MIN_FUNDING_CHANGE_SOMPI
                 : priorityFee + MIN_FUNDING_CHANGE_SOMPI;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = resolvedLegs.length + (sharedTicketEntry ? 1 : 0);
             const change = covenantInputSompi +
                 (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) -
@@ -4082,7 +4082,7 @@ function createKcc20PsktBuilderEngine(options) {
                 : priorityFee + 10000n;
             let fundingEntry;
             try {
-                fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+                fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             }
             catch (error) {
                 if (totalSellerFundedHolderTopUpSompi > 0n) {
@@ -4568,7 +4568,7 @@ function createKcc20PsktBuilderEngine(options) {
                 : priorityFee + 10000n;
             let fundingEntry;
             try {
-                fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+                fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             }
             catch (error) {
                 if (totalSellerFundedHolderTopUpSompi > 0n) {
@@ -4891,7 +4891,7 @@ function createKcc20PsktBuilderEngine(options) {
                 new TransactionOutput(refundSompi, payToAddressScript(walletAddress)),
             ];
             const requiredFunding = priorityFee + MIN_FUNDING_CHANGE_SOMPI;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = entries.length;
             const change = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
             let fundingChangeOutputIndex = -1;
@@ -5267,7 +5267,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + transactionFeeReserve > covenantInputSompi
                 ? outputSompi + transactionFeeReserve - covenantInputSompi + 10000n
                 : transactionFeeReserve + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const ticketInputIndex = ticketEntry ? 2 : -1;
             const fundingInputIndex = ticketEntry ? 3 : 2;
             const change = covenantInputSompi +
@@ -5546,7 +5546,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > covenantInputSompi
                 ? outputSompi + priorityFee - covenantInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 1;
             const change = covenantInputSompi +
                 (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) -
@@ -5789,7 +5789,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > minterInputSompi
                 ? outputSompi + priorityFee - minterInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 1;
             const change = minterInputSompi +
                 BigInt(fundingEntry.amount) -
@@ -6064,7 +6064,7 @@ function createKcc20PsktBuilderEngine(options) {
                     minterInputSompi: BigInt(minterEntry.amount),
                 };
             });
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [], request.params?.fundingOutpoint);
             const fundingInputIndex = resolvedLanes.length;
             const fundingChange = BigInt(fundingEntry.amount) - priorityFee;
             const outputs = resolvedLanes.map((lane, laneIndex) => tokenOutput(kaspaWasm, lane.resolvedArtifact.artifact, lane.outputState, lane.minterInputSompi, lane.spendCovenantId, laneIndex));
@@ -6206,8 +6206,16 @@ function createKcc20PsktBuilderEngine(options) {
         const holderUtxos = Array.isArray(params.activeHolderUtxos)
             ? params.activeHolderUtxos
             : [];
-        if (holderUtxos.length < 2 || holderUtxos.length > 3) {
-            throw new Error("between two and three KCC20 holder UTXOs are required");
+        if (holderUtxos.length < 2) {
+            throw new Error("at least two KCC20 holder UTXOs are required");
+        }
+        const maximumProfileInputs = Math.max(0, ...tokenProfiles.profiles.map((p) => p.maxTokenInputs));
+        if (holderUtxos.length > maximumProfileInputs) {
+            throw new Error(`consolidation exceeds the token profile input bound (${maximumProfileInputs})`);
+        }
+        const sourceOutpoints = holderUtxos.map((u) => `${(0, sale_common_js_1.requireHex32)(u.txidHex, "holder txid")}:${parseVout(u.vout, "holder vout")}`);
+        if (new Set(sourceOutpoints).size !== holderUtxos.length) {
+            throw new Error("consolidation requires distinct holder outpoints");
         }
         const covenantId = (0, sale_common_js_1.requireHex32)(params.activeHolderNativeCovenantId || params.covenantId, "canonical covenant id");
         const appCanonicalTokenId = (0, sale_common_js_1.requireHex32)(params.appCanonicalCovenantId || params.covenantId || covenantId, "app canonical token id");
@@ -6231,7 +6239,7 @@ function createKcc20PsktBuilderEngine(options) {
         }
         const profile = resolvedArtifacts[0].profile;
         if (holderUtxos.length > profile.maxTokenInputs) {
-            throw new Error("consolidation exceeds the token profile input bound");
+            throw new Error(`consolidation exceeds the token profile input bound (${profile.maxTokenInputs})`);
         }
         const artifact = resolvedArtifacts[0].artifact;
         for (const peerState of states.slice(1)) {
@@ -6247,7 +6255,8 @@ function createKcc20PsktBuilderEngine(options) {
             const txid = (0, sale_common_js_1.requireHex32)(utxo.txidHex, `holder ${index} txid`);
             const vout = parseVout(utxo.vout, `holder ${index} vout`);
             const address = requireKaspaAddress(utxo.address);
-            const script = (0, sale_common_js_1.buildNativeKcc20ScriptForState)(artifact.script, states[index]);
+            // Resolution already authenticated this profile's complete state layout.
+            const script = resolvedArtifacts[index].script;
             assertScriptAddress(kw, script, address, network, `holder ${index} UTXO address`);
             return { txid, vout, address, script };
         });
@@ -6290,7 +6299,7 @@ function createKcc20PsktBuilderEngine(options) {
                 new TransactionOutput(refundSompi, payToAddressScript(walletAddress)),
             ];
             const requiredFunding = priorityFee + MIN_FUNDING_CHANGE_SOMPI;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = entries.length;
             const change = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
             let fundingChangeOutputIndex = -1;
@@ -6431,7 +6440,7 @@ function createKcc20PsktBuilderEngine(options) {
                 tokenOutput(kw, artifact, inputState, tokenOutputSompi, spendCovenantId, 0),
             ];
             const requiredFunding = priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 1;
             const change = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
             let fundingChangeOutputIndex = -1;
@@ -6622,7 +6631,7 @@ function createKcc20PsktBuilderEngine(options) {
             const requiredFunding = outputSompi + priorityFee > tokenInputSompi
                 ? outputSompi + priorityFee - tokenInputSompi + 10000n
                 : priorityFee + 10000n;
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, requiredFunding, [], request.params?.fundingOutpoint);
             const fundingInputIndex = 1;
             const change = tokenInputSompi +
                 (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) -
@@ -7017,7 +7026,7 @@ function createKcc20PsktBuilderEngine(options) {
         await rpc.connect();
         try {
             const utxos = await getUtxosByAddresses(rpc, [walletAddress]);
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(utxos.entries, deploySompi + priorityFee + 10000000n);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(utxos.entries, deploySompi + priorityFee + 10000000n, [], request.params?.fundingOutpoint);
             const created = await createTransactions({
                 entries: [fundingEntry],
                 outputs: [{ address: contractAddress, amount: deploySompi }],