@kaspacom/kcc20-tx-builder 0.8.0-fee.10 → 0.8.0-fee.11

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.8.0-fee.10 (unreleased)
+## 0.8.0-fee.11 (unreleased)
+
+- Build the pinned recipient covenant, delegated fee claims and rotation back to wallet control through the shared PSKT flow.
+- Revalidate recipient authority and live UTXOs; preserve account and recipient principals and the other party's fees.
+- Execute signed recipient claims and rotation in pinned consensus, including re-signed invalid payout rejection.
+
+## 0.8.0-fee.10
 
 - Add fee-market crossed settlement to the backend-only matcher, with exact payouts, preserved order deposits and one receipt.
 - Require a positive total matcher spending limit and reject mismatched or stale sources before submission.

package/dist/cjs/engine.js

@@ -5,6 +5,7 @@ exports.createKcc20PsktBuilderEngine = createKcc20PsktBuilderEngine;
 const token_authorization_js_1 = require("./token-authorization.js");
 const sha256_1 = require("@noble/hashes/sha256");
 const blake3_1 = require("@noble/hashes/blake3");
+const blake2b_1 = require("@noble/hashes/blake2b");
 const token_profiles_js_1 = require("./token-profiles.js");
 const transfer_payload_js_1 = require("./transfer-payload.js");
 const token_profiles_generated_js_1 = require("./token-profiles.generated.js");
@@ -17,6 +18,7 @@ const escrow_market_artifacts_js_1 = require("./escrow-market-artifacts.js");
 const escrow_fee_js_1 = require("./escrow-fee.js");
 const escrow_policy_js_1 = require("./escrow-policy.js");
 const escrow_group_js_1 = require("./escrow-group.js");
+const escrow_recipient_js_1 = require("./escrow-recipient.js");
 const escrow_receipt_js_1 = require("./escrow-receipt.js");
 const escrow_receipt_js_2 = require("./escrow-receipt.js");
 const escrow_claim_plan_js_1 = require("./escrow-claim-plan.js");
@@ -355,6 +357,7 @@ function createKcc20PsktBuilderEngine(options) {
         "fee-ticket.burn": buildFeeTicketBurnPskt,
         "fee-ticket.transfer": buildFeeTicketTransferPskt,
         "kcc20fee.create-account": buildFeeAccountCreatePskt,
+        "kcc20fee.create-recipient": buildFeeAccountCreatePskt,
         "kcc20fee.bind-account": buildFeeAccountBindPskt,
         "kcc20fee.deploy-market-genesis": buildFeeMarketGenesisPskt,
         "kcc20fee.bind-market": buildFeeMarketBindPskt,
@@ -410,6 +413,7 @@ function createKcc20PsktBuilderEngine(options) {
     async function buildFeeAccountCreatePskt(input) {
         const request = input.request || {};
         const params = request.params || {};
+        const recipient = request.builderKey === "kcc20fee.create-recipient";
         const tokenId = (0, sale_common_js_1.requireHex32)(params.tokenId, "fee account token id");
         const owner = (0, sale_common_js_1.requireHex32)(request.owner?.kcc20Owner, "fee account owner");
         const principalSompi = parseU64(params.principalSompi, "fee account principal");
@@ -417,12 +421,16 @@ function createKcc20PsktBuilderEngine(options) {
         const walletAddress = requireKaspaAddress(request.owner?.walletAddress);
         assertFeeAccountSchnorrWalletOwner(walletAddress, owner);
         const priorityFee = parseU64(env.KCC20_FEE_ACCOUNT_PRIORITY_FEE_SOMPI || DEFAULT_PRIORITY_FEE.toString(), "priorityFee");
-        const artifactKey = "KCC20FeeEscrowV1.placeholder.json";
+        const artifactKey = recipient ? "KCC20FeeRecipientV1.placeholder.json" : "KCC20FeeEscrowV1.placeholder.json";
         const supplied = options.artifacts?.[artifactKey] ?? await options.artifactProvider?.(artifactKey);
         const artifact = supplied?.artifact ?? supplied;
         if (!artifact)
             throw new Error("missing pinned fee escrow artifact");
-        const initial = (0, escrow_account_setup_js_1.buildKcc20InitialFeeAccount)({
+        const initial = recipient ? (0, escrow_recipient_js_1.buildKcc20InitialFeeRecipient)({
+            artifact, tokenId, ownerSchnorrPublicKey: owner, principalSompi,
+            marketId: (0, sale_common_js_1.requireHex32)(params.marketId, "recipient market"),
+            policyId: (0, sale_common_js_1.requireHex32)(params.policyId, "recipient policy"),
+        }) : (0, escrow_account_setup_js_1.buildKcc20InitialFeeAccount)({
             artifact, tokenId, ownerSchnorrPublicKey: owner, principalSompi,
         });
         const kw = kaspaWasm;
@@ -490,21 +498,21 @@ function createKcc20PsktBuilderEngine(options) {
                 scripts: [],
                 submitTransactionSupported: true,
                 metadata: {
-                    builderKey: "kcc20fee.create-account",
-                    operation: "create-fee-account",
+                    builderKey: request.builderKey,
+                    operation: recipient ? "create-fee-recipient" : "create-fee-account",
                     action: "genesis",
-                    contract: "KCC20FeeEscrowV1",
+                    contract: recipient ? "KCC20FeeRecipientV1" : "KCC20FeeEscrowV1",
                     network, walletAddress, tokenId, owner, accountId,
                     accountPrincipalSompi: principalSompi.toString(),
                     // Attach the broadcast txid to this hint before binding. The first
                     // spend reveals the script; until then the indexer sees only P2SH.
-                    accountGenesisHint: {
+                    [recipient ? "recipientGenesisHint" : "accountGenesisHint"]: {
                         vout: 0,
                         address: kw.addressFromScriptPublicKey(payToScriptHashScript(initial.redeemScript), network).toString(),
                         covenantIdHex: accountId,
                         scriptHashHex: initial.scriptHash,
                         amountSompiExact: principalSompi.toString(),
-                        state: { ...initial.state, roleName: "account" },
+                        state: { ...initial.state, roleName: recipient ? "recipient" : "account" },
                     },
                 },
             };
@@ -4407,6 +4415,7 @@ function createKcc20PsktBuilderEngine(options) {
             throw new Error("creator claim is disabled by this market policy");
         const indexedReceipts = params.receipts;
         const indexedAccount = params.account;
+        const indexedRecipient = params.recipient;
         if (!Array.isArray(indexedReceipts) || indexedReceipts.length < 1 ||
             indexedReceipts.length > 5 || !indexedAccount) {
             throw new Error("fee-market claim requires one to five receipts and an account");
@@ -4417,12 +4426,17 @@ function createKcc20PsktBuilderEngine(options) {
         const accountOwnerScheme = Number(indexedAccount.state?.owner_scheme);
         const accountOwner = accountOwnerScheme === 1
             ? (0, sale_common_js_1.bytesToHex)((0, blake3_1.blake3)((0, sale_common_js_1.hexToBytes)(owner))) : owner;
-        if ((accountOwnerScheme !== 0 && accountOwnerScheme !== 1) ||
-            String(indexedAccount.state?.owner).toLowerCase() !== accountOwner) {
+        const delegated = accountOwnerScheme === 4;
+        if ((!delegated && ((accountOwnerScheme !== 0 && accountOwnerScheme !== 1) ||
+            String(indexedAccount.state?.owner).toLowerCase() !== accountOwner)) ||
+            (delegated && !indexedRecipient)) {
             throw new Error("fee account is not controlled by the signing wallet");
         }
         const network = request.network || env.KASPA_NETWORK || "testnet-10";
         const artifact = (await readFeeMarketArtifacts()).receipt;
+        const recipientKey = "KCC20FeeRecipientV1.placeholder.json";
+        const recipientSupplied = delegated ? (options.artifacts?.[recipientKey] ?? await options.artifactProvider?.(recipientKey)) : null;
+        const recipientArtifact = recipientSupplied?.artifact ?? recipientSupplied;
         const kw = kaspaWasm;
         const { CovenantBinding, Encoding, Hash, RpcClient, Transaction, TransactionOutput, payToAddressScript, payToScriptHashScript } = kw;
         const payoutSpk = payToAddressScript(walletAddress);
@@ -4431,7 +4445,7 @@ function createKcc20PsktBuilderEngine(options) {
         new DataView(payoutBytes.buffer).setUint16(0, Number(payoutSpk.version), true);
         payoutBytes.set(payoutScript, 2);
         const priorityFee = parseU64(env.KCC20_FEE_MARKET_CLAIM_PRIORITY_FEE_SOMPI || DEFAULT_PRIORITY_FEE.toString(), "priorityFee");
-        const sourceAddresses = [...indexedReceipts, indexedAccount]
+        const sourceAddresses = [...indexedReceipts, indexedAccount, ...(delegated ? [indexedRecipient] : [])]
             .map(item => requireKaspaAddress(item.address));
         const rpc = new RpcClient({ url: env.KASPA_WRPC_URL || DEFAULT_WRPC_URL,
             encoding: Encoding.Borsh, networkId: network });
@@ -4472,17 +4486,29 @@ function createKcc20PsktBuilderEngine(options) {
                 escrowTemplate: checkedAccount.escrowTemplate,
                 payoutScriptPublicKey: payoutBytes,
             });
+            const recipientLive = delegated ? getLive(indexedRecipient, "fee recipient") : null;
+            const approval = delegated ? (0, escrow_recipient_js_1.planKcc20FeeRecipientApproval)({
+                artifact: recipientArtifact, indexed: indexedRecipient, live: recipientLive.live,
+                account: checkedAccount.account, nextAccount: transition.successorAccountState,
+                signingOwner: owner, action: 1,
+            }) : null;
+            if (approval)
+                assertScriptAddress(kw, approval.currentRedeemScript, indexedRecipient.address, network, "fee recipient address");
             const successor = (0, escrow_receipt_js_1.buildKcc20FeeEscrowScript)(artifact, transition.successorAccountState);
             const remainder = transition.remainderReceiptState
                 ? (0, escrow_receipt_js_1.buildKcc20FeeEscrowScript)(artifact, transition.remainderReceiptState)
                 : null;
             const accountInputIndex = checkedReceipts.length;
-            const fundingInputIndex = accountInputIndex + 1;
+            const recipientInputIndex = delegated ? accountInputIndex + 1 : -1;
+            const fundingInputIndex = accountInputIndex + 1 + Number(delegated);
             const outputs = [new TransactionOutput(transition.claimSompi, payoutSpk),
                 new TransactionOutput(transition.accountPrincipalSompi, payToScriptHashScript(successor.redeemScript), new CovenantBinding(accountInputIndex, new Hash(accountId)))];
             if (remainder)
                 outputs.push(new TransactionOutput(transition.remainderSompi, payToScriptHashScript(remainder.redeemScript), new CovenantBinding(0, new Hash(marketId))));
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [...checkedReceipts.map(item => item.entry.outpoint), accountEntry.outpoint], params.fundingOutpoint);
+            const recipientOutputIndex = delegated ? outputs.length : -1;
+            if (approval)
+                outputs.push(new TransactionOutput(approval.principalSompi, payToScriptHashScript(approval.successorRedeemScript), new CovenantBinding(recipientInputIndex, new Hash(approval.covenantId))));
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [...checkedReceipts.map(item => item.entry.outpoint), accountEntry.outpoint, ...(recipientLive ? [recipientLive.entry.outpoint] : [])], params.fundingOutpoint);
             const fundingChangeIndex = outputs.length;
             outputs.push(new TransactionOutput((0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee, payoutSpk));
             const inputs = [
@@ -4492,6 +4518,8 @@ function createKcc20PsktBuilderEngine(options) {
                 })),
                 { previousOutpoint: accountEntry.outpoint, utxo: accountEntry,
                     sequence: 0n, sigOpCount: 0, computeBudget: 100 },
+                ...(recipientLive ? [{ previousOutpoint: recipientLive.entry.outpoint, utxo: recipientLive.entry,
+                        sequence: 0n, sigOpCount: 0, computeBudget: 100 }] : []),
                 { previousOutpoint: fundingEntry.outpoint, utxo: fundingEntry,
                     sequence: 0n, sigOpCount: 0, computeBudget: 30 },
             ];
@@ -4504,6 +4532,8 @@ function createKcc20PsktBuilderEngine(options) {
             });
             transaction.inputs[accountInputIndex].computeBudget = 100;
             transaction.inputs[fundingInputIndex].computeBudget = 30;
+            if (delegated)
+                transaction.inputs[recipientInputIndex].computeBudget = 100;
             assertUniqueTransactionInputOutpoints(transaction, "fee-market claim");
             for (const [index, checked] of checkedReceipts.entries()) {
                 const prefix = covenantScriptBuilder(kw);
@@ -4515,7 +4545,13 @@ function createKcc20PsktBuilderEngine(options) {
                 prefix.addData((0, abi_js_1.dispatchTagFor)(artifact, "claim"));
                 transaction.inputs[index].signatureScript = encodeCovenantP2shSignatureScript(prefix.drain(), checked.redeemScript);
             }
-            const scripts = [{ inputIndex: accountInputIndex,
+            const scripts = delegated ? [{ inputIndex: recipientInputIndex,
+                    scriptHex: (0, sale_common_js_1.bytesToHex)(approval.currentRedeemScript), signType: 1,
+                    signatureScript: { mode: "ordered-args", args: [
+                            { type: "signature" }, ...feeAccountStateTemplateArgs(approval.nextState),
+                            i64TemplateArg(recipientOutputIndex),
+                            dataTemplateArg((0, abi_js_1.dispatchTagFor)(recipientArtifact, "approveFeeAccountAction")),
+                        ] } }] : [{ inputIndex: accountInputIndex,
                     scriptHex: (0, sale_common_js_1.bytesToHex)(checkedAccount.redeemScript), signType: 1,
                     signatureScript: { mode: "ordered-args", args: [
                             i64TemplateArg(1),
@@ -4528,6 +4564,24 @@ function createKcc20PsktBuilderEngine(options) {
                             dataTemplateArg(new Uint8Array(0)),
                             dataTemplateArg((0, abi_js_1.dispatchTagFor)(artifact, "authorize")),
                         ] } }];
+            if (approval) {
+                const accountWitness = covenantScriptBuilder(kw);
+                const args = [i64TemplateArg(1), ...feeAccountStateTemplateArgs(transition.successorAccountState),
+                    i64TemplateArg(1), dataTemplateArg(new Uint8Array(0)),
+                    i64TemplateArg(recipientInputIndex), i64TemplateArg(recipientOutputIndex),
+                    ...feeAccountStateTemplateArgs(approval.nextState),
+                    dataTemplateArg(approval.templatePrefix), dataTemplateArg(approval.templateSuffix),
+                    dataTemplateArg((0, abi_js_1.dispatchTagFor)(artifact, "authorize"))];
+                for (const arg of args) {
+                    if (arg.type === "i64")
+                        accountWitness.addI64(BigInt(arg.value));
+                    else if (arg.type === "byte")
+                        addExplicitByte(accountWitness, arg.value);
+                    else
+                        accountWitness.addData((0, sale_common_js_1.hexToBytes)(arg.hex));
+                }
+                transaction.inputs[accountInputIndex].signatureScript = encodeCovenantP2shSignatureScript(accountWitness.drain(), checkedAccount.redeemScript);
+            }
             const feeResult = transactionWithPredictedSignedFeeChange(kw, transaction, fundingChangeIndex, network, "fee-market claim", candidate => {
                 const serialized = candidate.serializeToSafeJSON();
                 if (typeof serialized !== "string")
@@ -4554,6 +4608,13 @@ function createKcc20PsktBuilderEngine(options) {
                 metadata: { builderKey: "kcc20fee.claim", operation: "fee-market-claim",
                     network, walletAddress, tokenId, marketId, policyId, party, accountId,
                     receiptCount: checkedReceipts.length,
+                    recipientInputIndex, recipientOutputIndex,
+                    ...(approval ? { recipientContinuation: {
+                            covenantIdHex: approval.covenantId, vout: recipientOutputIndex,
+                            address: kw.addressFromScriptPublicKey(payToScriptHashScript(approval.successorRedeemScript), network).toString(),
+                            scriptHashHex: (0, sale_common_js_1.bytesToHex)((0, blake2b_1.blake2b)(approval.successorRedeemScript, { dkLen: 32 })),
+                            amountSompiExact: approval.principalSompi.toString(), state: { ...approval.nextState, roleName: "recipient" },
+                        } } : {}),
                     claimSompi: transition.claimSompi.toString(),
                     remainderSompi: transition.remainderSompi.toString(),
                     payoutOutputIndex: 0, accountOutputIndex: 1,
@@ -4575,6 +4636,7 @@ function createKcc20PsktBuilderEngine(options) {
         const policyId = (0, sale_common_js_1.requireHex32)(params.policyId, "fee-market policy ID");
         const accountId = (0, sale_common_js_1.requireHex32)(params.accountId, "fee account ID");
         const indexedAccount = params.account;
+        const indexedRecipient = params.recipient;
         if (!indexedAccount)
             throw new Error("current fee account UTXO is required");
         const walletAddress = requireKaspaAddress(request.owner?.walletAddress);
@@ -4583,8 +4645,10 @@ function createKcc20PsktBuilderEngine(options) {
         const accountOwnerScheme = Number(indexedAccount.state?.owner_scheme);
         const accountOwner = accountOwnerScheme === 1
             ? (0, sale_common_js_1.bytesToHex)((0, blake3_1.blake3)((0, sale_common_js_1.hexToBytes)(currentOwner))) : currentOwner;
-        if ((accountOwnerScheme !== 0 && accountOwnerScheme !== 1) ||
-            String(indexedAccount.state?.owner).toLowerCase() !== accountOwner) {
+        const delegated = accountOwnerScheme === 4;
+        if ((!delegated && ((accountOwnerScheme !== 0 && accountOwnerScheme !== 1) ||
+            String(indexedAccount.state?.owner).toLowerCase() !== accountOwner)) ||
+            (delegated && !indexedRecipient)) {
             throw new Error("fee account is not controlled by the signing wallet");
         }
         const newOwner = (0, sale_common_js_1.requireHex32)(params.newOwner, "new fee account owner");
@@ -4609,7 +4673,7 @@ function createKcc20PsktBuilderEngine(options) {
             (newScheme === 4 && (guardTemplate === zero || guardPrefix === 0n || guardSuffix === 0n))) {
             throw new Error("new fee account authority guard is invalid");
         }
-        if (newOwner === accountOwner && newScheme === accountOwnerScheme &&
+        if (newOwner === String(indexedAccount.state.owner).toLowerCase() && newScheme === accountOwnerScheme &&
             guardTemplate === String(indexedAccount.state.guard_template).toLowerCase() &&
             guardPrefix === BigInt(indexedAccount.state.guard_prefix) &&
             guardSuffix === BigInt(indexedAccount.state.guard_suffix)) {
@@ -4617,6 +4681,9 @@ function createKcc20PsktBuilderEngine(options) {
         }
         const network = request.network || env.KASPA_NETWORK || "testnet-10";
         const artifact = (await readFeeMarketArtifacts()).receipt;
+        const recipientKey = "KCC20FeeRecipientV1.placeholder.json";
+        const recipientSupplied = delegated ? (options.artifacts?.[recipientKey] ?? await options.artifactProvider?.(recipientKey)) : null;
+        const recipientArtifact = recipientSupplied?.artifact ?? recipientSupplied;
         const kw = kaspaWasm;
         if (newScheme === 3) {
             const redeemHex = String(params.newOwnerP2shRedeemScriptHex || "");
@@ -4636,7 +4703,7 @@ function createKcc20PsktBuilderEngine(options) {
         await rpc.connect();
         try {
             const [accountUtxos, walletUtxos] = await Promise.all([
-                getUtxosByAddresses(rpc, [accountAddress]),
+                getUtxosByAddresses(rpc, [accountAddress, ...(delegated ? [requireKaspaAddress(indexedRecipient.address)] : [])]),
                 getUtxosByAddresses(rpc, [walletAddress]),
             ]);
             const accountEntry = findUtxoEntry(accountUtxos.entries, (0, sale_common_js_1.requireHex32)(indexedAccount.txidHex, "account txid"), parseVout(indexedAccount.vout, "account vout"));
@@ -4657,25 +4724,43 @@ function createKcc20PsktBuilderEngine(options) {
                 owner_scheme: newScheme, guard_template: guardTemplate,
                 guard_prefix: guardPrefix.toString(), guard_suffix: guardSuffix.toString(),
                 action_hash: zero };
+            const recipientEntry = delegated ? findUtxoEntry(accountUtxos.entries, (0, sale_common_js_1.requireHex32)(indexedRecipient.txidHex, "recipient txid"), parseVout(indexedRecipient.vout, "recipient vout")) : null;
+            if (delegated && !recipientEntry)
+                throw new Error("fee recipient is spent or unavailable");
+            const recipientSpk = recipientEntry?.scriptPublicKey ?? recipientEntry?.entry?.scriptPublicKey ?? recipientEntry?.utxoEntry?.scriptPublicKey;
+            const approval = delegated ? (0, escrow_recipient_js_1.planKcc20FeeRecipientApproval)({ artifact: recipientArtifact,
+                indexed: indexedRecipient, live: { outpoint: recipientEntry.outpoint, amountSompi: (0, sale_common_js_1.utxoAmountSompi)(recipientEntry),
+                    covenantIdHex: requireMatchingCovenantId(recipientEntry, indexedRecipient.covenantIdHex, "recipient live"),
+                    scriptPublicKey: { version: Number(recipientSpk?.version), scriptHex: String(recipientSpk?.script).toLowerCase() } },
+                account: checked.account, nextAccount: nextState, signingOwner: currentOwner, action: 2 }) : null;
+            if (approval)
+                assertScriptAddress(kw, approval.currentRedeemScript, indexedRecipient.address, network, "fee recipient address");
+            const fundingInputIndex = delegated ? 2 : 1;
+            const fundingChangeIndex = delegated ? 2 : 1;
             const successor = (0, escrow_receipt_js_1.buildKcc20FeeEscrowScript)(artifact, nextState);
-            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [accountEntry.outpoint], params.fundingOutpoint);
+            const fundingEntry = (0, sale_common_js_1.selectFundingEntry)(walletUtxos.entries, priorityFee + 10000n, [accountEntry.outpoint, ...(recipientEntry ? [recipientEntry.outpoint] : [])], params.fundingOutpoint);
             const fundingChange = (0, sale_common_js_1.utxoAmountSompi)(fundingEntry) - priorityFee;
             if (fundingChange <= 10000n)
                 throw new Error("fee account rotation funding is too small");
             const outputs = [new TransactionOutput(checked.account.principalSompi, payToScriptHashScript(successor.redeemScript), new CovenantBinding(0, new Hash(accountId))),
+                ...(approval ? [new TransactionOutput(approval.principalSompi, payToScriptHashScript(approval.successorRedeemScript), new CovenantBinding(1, new Hash(approval.covenantId)))] : []),
                 new TransactionOutput(fundingChange, payToAddressScript(walletAddress))];
             const transaction = new Transaction({ version: 1, lockTime: 0n,
                 inputs: [
                     { previousOutpoint: accountEntry.outpoint, utxo: accountEntry,
                         sequence: 0n, sigOpCount: 0, computeBudget: 100 },
+                    ...(recipientEntry ? [{ previousOutpoint: recipientEntry.outpoint, utxo: recipientEntry,
+                            sequence: 0n, sigOpCount: 0, computeBudget: 100 }] : []),
                     { previousOutpoint: fundingEntry.outpoint, utxo: fundingEntry,
                         sequence: 0n, sigOpCount: 0, computeBudget: 30 },
                 ], outputs, subnetworkId: sale_common_js_1.SUBNETWORK_ID_NATIVE, gas: 0n, payload: "",
             });
             (0, sale_common_js_1.setVersionOneInputMassFields)(transaction, 100);
-            transaction.inputs[1].computeBudget = 30;
+            transaction.inputs[fundingInputIndex].computeBudget = 30;
             assertUniqueTransactionInputOutpoints(transaction, "fee account rotation");
-            const scripts = [{ inputIndex: 0, scriptHex: (0, sale_common_js_1.bytesToHex)(checked.redeemScript),
+            const scripts = approval ? [{ inputIndex: 1, scriptHex: (0, sale_common_js_1.bytesToHex)(approval.currentRedeemScript), signType: 1,
+                    signatureScript: { mode: "ordered-args", args: [{ type: "signature" }, ...feeAccountStateTemplateArgs(approval.nextState),
+                            i64TemplateArg(1), dataTemplateArg((0, abi_js_1.dispatchTagFor)(recipientArtifact, "approveFeeAccountAction"))] } }] : [{ inputIndex: 0, scriptHex: (0, sale_common_js_1.bytesToHex)(checked.redeemScript),
                     signType: 1, signatureScript: { mode: "ordered-args", args: [
                             i64TemplateArg(2), ...feeAccountStateTemplateArgs(nextState),
                             i64TemplateArg(0), { type: "signature",
@@ -4686,12 +4771,28 @@ function createKcc20PsktBuilderEngine(options) {
                             dataTemplateArg(new Uint8Array(0)),
                             dataTemplateArg((0, abi_js_1.dispatchTagFor)(artifact, "authorize")),
                         ] } }];
-            const feeResult = transactionWithPredictedSignedFeeChange(kw, transaction, 1, network, "fee account rotation", candidate => {
+            if (approval) {
+                const witness = covenantScriptBuilder(kw);
+                const args = [i64TemplateArg(2), ...feeAccountStateTemplateArgs(nextState), i64TemplateArg(0),
+                    dataTemplateArg(new Uint8Array(0)), i64TemplateArg(1), i64TemplateArg(1),
+                    ...feeAccountStateTemplateArgs(approval.nextState), dataTemplateArg(approval.templatePrefix),
+                    dataTemplateArg(approval.templateSuffix), dataTemplateArg((0, abi_js_1.dispatchTagFor)(artifact, "authorize"))];
+                for (const arg of args) {
+                    if (arg.type === "i64")
+                        witness.addI64(BigInt(arg.value));
+                    else if (arg.type === "byte")
+                        addExplicitByte(witness, arg.value);
+                    else
+                        witness.addData((0, sale_common_js_1.hexToBytes)(arg.hex));
+                }
+                transaction.inputs[0].signatureScript = encodeCovenantP2shSignatureScript(witness.drain(), checked.redeemScript);
+            }
+            const feeResult = transactionWithPredictedSignedFeeChange(kw, transaction, fundingChangeIndex, network, "fee account rotation", candidate => {
                 const serialized = candidate.serializeToSafeJSON();
                 if (typeof serialized !== "string")
                     throw new Error("rotation preflight serialization failed");
                 const predictedJson = transactionJsonWithScriptHints(kw, JSON.parse(serialized), scripts);
-                predictedJson.inputs[1].signatureScript = encodeP2pkSignatureScript((0, sale_common_js_1.bytesToHex)(dummySignatureBytes()));
+                predictedJson.inputs[fundingInputIndex].signatureScript = encodeP2pkSignatureScript((0, sale_common_js_1.bytesToHex)(dummySignatureBytes()));
                 return typeof kw.Transaction.deserializeFromSafeJSON === "function"
                     ? kw.Transaction.deserializeFromSafeJSON(JSON.stringify(predictedJson))
                     : kw.Transaction.deserializeFromJSON(JSON.stringify(predictedJson));
@@ -4706,13 +4807,14 @@ function createKcc20PsktBuilderEngine(options) {
             }
             return { schema: OUTPUT_SCHEMA,
                 psktTransactionJson: feeResult.transaction.serializeToSafeJSON(),
-                signInputs: [{ index: 1, sighashType: 1 }], scripts,
+                signInputs: [{ index: fundingInputIndex, sighashType: 1 }], scripts,
                 submitTransactionSupported: true,
                 metadata: { builderKey: "kcc20fee.rotate-account",
                     operation: "fee-market-rotate-account", network, walletAddress,
                     tokenId, marketId, policyId, accountId, newOwner,
                     newOwnerScheme: newScheme, accountOutputIndex: 0,
                     transfersAllUnclaimedEntitlements: true,
+                    recipientInputIndex: delegated ? 1 : -1, recipientOutputIndex: delegated ? 1 : -1,
                     signedMass: { compute: signedMass.computeMass.toString(),
                         transient: signedMass.transientMass.toString(),
                         storage: storageMass.toString() } },