@kaspacom/kcc20-tx-builder 0.8.0-fee.3 → 0.8.0-fee.4

package/docs/COMPATIBILITY.json

@@ -1,6 +1,6 @@
 {
   "schema": "kcc20-example-compatibility/v1",
-  "packageVersion": "0.8.0-fee.3",
+  "packageVersion": "0.8.0-fee.4",
   "contractsRepository": "https://github.com/KASPACOM/kaspa-covenants",
   "contractsCommit": "5deb1769e69142595576ef7c573af9f433a48a3c",
   "compiler": {

package/docs/escrow-fees.md

@@ -10,7 +10,8 @@ disabled, and this change does not publish a package.
 genesis output and a separate wallet change output. The caller supplies the
 native token ID and account principal in sompi. The connected wallet's Schnorr
 public key controls the account. The builder pins the escrow artifact, checks
-the key, computes the account covenant ID, and checks the signed transaction's
+that this key matches the funding wallet's Schnorr address, computes the account
+covenant ID, and checks the signed transaction's
 fee and mass before returning the PSKT. The wallet signs the funding input.
 
 The creation result includes `metadata.accountGenesisHint`. Save it with the
@@ -24,6 +25,7 @@ lineage, outpoint and principal against the pinned artifact. The wallet signs
 the account input and a separate funding input. The bound output keeps the
 same account ID and exact principal. Binding is a one-time operation; later
 authority changes use the contract's rotation path.
+The account outpoint cannot also serve as the funding input.
 
 These operations prepare wallet-signable transactions. They do not broadcast
 or establish funded TN10 execution. Account creation and binding are only the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspacom/kcc20-tx-builder",
-  "version": "0.8.0-fee.3",
+  "version": "0.8.0-fee.4",
   "description": "Runtime-independent KCC20 covenant transaction and PSKT construction primitives.",
   "license": "Apache-2.0",
   "author": "KaspaCom",

package/src/engine.ts

@@ -617,6 +617,7 @@ export function createKcc20PsktBuilderEngine(
     const principalSompi = parseU64(params.principalSompi, "fee account principal");
     const network = request.network || env.KASPA_NETWORK || "testnet-10";
     const walletAddress = requireKaspaAddress(request.owner?.walletAddress);
+    assertFeeAccountSchnorrWalletOwner(walletAddress, owner);
     const priorityFee = parseU64(
       env.KCC20_FEE_ACCOUNT_PRIORITY_FEE_SOMPI || DEFAULT_PRIORITY_FEE.toString(),
       "priorityFee",
@@ -748,6 +749,7 @@ export function createKcc20PsktBuilderEngine(
     }
     const network = request.network || env.KASPA_NETWORK || "testnet-10";
     const walletAddress = requireKaspaAddress(request.owner?.walletAddress);
+    assertFeeAccountSchnorrWalletOwner(walletAddress, owner);
     const accountAddress = requireKaspaAddress(indexed.address);
     const priorityFee = parseU64(
       env.KCC20_FEE_ACCOUNT_PRIORITY_FEE_SOMPI || DEFAULT_PRIORITY_FEE.toString(),
@@ -801,7 +803,7 @@ export function createKcc20PsktBuilderEngine(
       const fundingEntry = selectFundingEntry(
         walletUtxos.entries,
         priorityFee + 10_000n,
-        [],
+        [accountEntry.outpoint],
         params.fundingOutpoint,
       );
       const fundingAmount = utxoAmountSompi(fundingEntry);
@@ -832,6 +834,7 @@ export function createKcc20PsktBuilderEngine(
       });
       setVersionOneInputMassFields(unsignedTx, computeBudget);
       unsignedTx.inputs[1].computeBudget = 30;
+      assertUniqueTransactionInputOutpoints(unsignedTx, "fee account binding");
       const scripts = [{
         inputIndex: 0,
         scriptHex: bytesToHex(plan.currentRedeemScript),
@@ -13745,6 +13748,17 @@ export function createKcc20PsktBuilderEngine(
     return address;
   }
 
+  function assertFeeAccountSchnorrWalletOwner(walletAddress, owner) {
+    const script = String(kaspaWasm.payToAddressScript(walletAddress).script)
+      .toLowerCase();
+    const publicKey = /^20([0-9a-f]{64})ac$/.exec(script)?.[1];
+    if (!publicKey || publicKey !== owner) {
+      throw new Error(
+        "fee account owner must match the connected Schnorr wallet address",
+      );
+    }
+  }
+
   return {
     build: buildInProcessPskt,
     buildInProcessPskt,