@theliem/xmarket-sdk 3.23.0 → 3.26.0

package/dist/index.js

@@ -187,6 +187,22 @@ var PDA = class {
       programIds.clobExchange
     );
   }
+  static collectFeeOrderRecord(user, nonce, programIds) {
+    const nonceBuf = Buffer.alloc(8);
+    nonceBuf.writeBigUInt64LE(BigInt(nonce.toString()));
+    return web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("collect_order"), user.toBuffer(), nonceBuf],
+      programIds.clobExchange
+    );
+  }
+  static redeemFeeOrderRecord(user, nonce, programIds) {
+    const nonceBuf = Buffer.alloc(8);
+    nonceBuf.writeBigUInt64LE(BigInt(nonce.toString()));
+    return web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("redeem_fee_order"), user.toBuffer(), nonceBuf],
+      programIds.clobExchange
+    );
+  }
   // ─── Fee Management ─────────────────────────────────────────────────────────
   static feeConfig(owner, programIds) {
     if (!programIds.feeManagement) throw new Error("feeManagement program ID not configured");
@@ -1496,6 +1512,50 @@ function buildBatchedCollectFeeEd25519Instruction(orders) {
     data
   });
 }
+function serializeRedeemFeeOrderToBytes(order) {
+  const buf = new Uint8Array(128);
+  buf.set(order.user.toBytes(), 0);
+  buf.set(order.condition.toBytes(), 32);
+  buf.set(order.tokenMint.toBytes(), 64);
+  buf.set(order.amount.toArrayLike(Buffer, "le", 8), 96);
+  buf.set(order.takerAmount.toArrayLike(Buffer, "le", 8), 104);
+  buf.set(order.nonce.toArrayLike(Buffer, "le", 8), 112);
+  buf.set(order.expiry.toArrayLike(Buffer, "le", 8), 120);
+  return buf;
+}
+function buildBatchedRedeemFeeEd25519Instruction(orders) {
+  const N = orders.length;
+  if (N === 0) throw new Error("At least 1 order required");
+  const MSG_SIZE = 128;
+  const SIG_SIZE = 64;
+  const PK_SIZE = 32;
+  const HEADER = 2 + N * 14;
+  const sigBase = HEADER;
+  const pkBase = sigBase + N * SIG_SIZE;
+  const msgBase = pkBase + N * PK_SIZE;
+  const totalSize = msgBase + N * MSG_SIZE;
+  const data = Buffer.alloc(totalSize);
+  data[0] = N;
+  data[1] = 0;
+  for (let i = 0; i < N; i++) {
+    const e = 2 + i * 14;
+    data.writeUInt16LE(sigBase + i * SIG_SIZE, e);
+    data.writeUInt16LE(65535, e + 2);
+    data.writeUInt16LE(pkBase + i * PK_SIZE, e + 4);
+    data.writeUInt16LE(65535, e + 6);
+    data.writeUInt16LE(msgBase + i * MSG_SIZE, e + 8);
+    data.writeUInt16LE(MSG_SIZE, e + 10);
+    data.writeUInt16LE(65535, e + 12);
+    data.set(orders[i].signature, sigBase + i * SIG_SIZE);
+    data.set(orders[i].order.user.toBytes(), pkBase + i * PK_SIZE);
+    data.set(serializeRedeemFeeOrderToBytes(orders[i].order), msgBase + i * MSG_SIZE);
+  }
+  return new web3_js.TransactionInstruction({
+    keys: [],
+    programId: web3_js.Ed25519Program.programId,
+    data
+  });
+}
 function buildOrder(params) {
   return {
     maker: params.maker,
@@ -1644,6 +1704,39 @@ var ClobClient = class {
     this._marketOracleVaultCache.set(key, vault);
     return vault;
   }
+  /**
+   * Returns a createATA ix for the oracle vault when:
+   *   - takerFee > 0
+   *   - marketFeeOverride exists for the condition
+   *   - oracle vault ATA is not yet initialized
+   * Idempotent — safe to call every tx; returns null if vault already exists.
+   */
+  async buildInitOracleVaultIfNeeded(condition, collateralMint, takerFee, payer) {
+    if (takerFee.isZero()) return null;
+    if (!this.feeConfigOwner || !this.programIds.feeManagement) return null;
+    if (!this.ctfClient || !this.qmConfigPda || !this.programIds.marketOracle) return null;
+    const companyAddr = await this.companyAddress();
+    const refVault = await this.referralVault();
+    if (!companyAddr || !refVault) return null;
+    const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
+    const cond = await this.ctfClient.fetchCondition(condition);
+    if (!cond) return null;
+    const [questionPda] = PDA.question(this.qmConfigPda, cond.questionId, this.programIds);
+    const [marketOraclePda] = PDA.marketOraclePda(questionPda, this.programIds);
+    const vault = splToken.getAssociatedTokenAddressSync(collateralMint, marketOraclePda, true);
+    const [feeOverrideInfo, vaultInfo] = await Promise.all([
+      this.provider.connection.getAccountInfo(feeOverridePda),
+      this.provider.connection.getAccountInfo(vault)
+    ]);
+    if (!feeOverrideInfo) return null;
+    if (vaultInfo) return null;
+    return splToken.createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      vault,
+      marketOraclePda,
+      collateralMint
+    );
+  }
   get walletPubkey() {
     return this.provider.wallet.publicKey;
   }
@@ -1782,8 +1875,8 @@ var ClobClient = class {
   async _sendLegacyTxSig(instructions) {
     const { connection } = this.provider;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    const { Transaction: Transaction11 } = await import('@solana/web3.js');
-    const tx = new Transaction11();
+    const { Transaction: Transaction12 } = await import('@solana/web3.js');
+    const tx = new Transaction12();
     tx.recentBlockhash = blockhash;
     tx.feePayer = this.walletPubkey;
     tx.add(...instructions);
@@ -1809,10 +1902,10 @@ ${logs.join("\n")}`);
       connection.getAccountInfo(clobYesAta),
       connection.getAccountInfo(clobNoAta)
     ]);
-    const { createAssociatedTokenAccountIdempotentInstruction: createAssociatedTokenAccountIdempotentInstruction4 } = await import('@solana/spl-token');
+    const { createAssociatedTokenAccountIdempotentInstruction: createAssociatedTokenAccountIdempotentInstruction5 } = await import('@solana/spl-token');
     const ixs = [];
     if (!yesInfo) {
-      ixs.push(createAssociatedTokenAccountIdempotentInstruction4(
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction5(
         this.walletPubkey,
         clobYesAta,
         clobConfig,
@@ -1821,7 +1914,7 @@ ${logs.join("\n")}`);
       ));
     }
     if (!noInfo) {
-      ixs.push(createAssociatedTokenAccountIdempotentInstruction4(
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction5(
         this.walletPubkey,
         clobNoAta,
         clobConfig,
@@ -1904,6 +1997,49 @@ ${logs.join("\n")}`);
       await this.registerOrder(signed);
     }
   }
+  // ─── Register CollectFeeOrder ────────────────────────────────────────────────
+  /**
+   * Build a legacy Transaction to register a CollectFeeOrder on-chain.
+   * Must be signed and sent before calling buildBatchCollectRedeemEarlyTx.
+   *
+   * Flow: [Ed25519 ix (1 user sig) + register_collect_fee_order ix]
+   * Caller signs with payer keypair and sends.
+   */
+  async buildRegisterCollectFeeOrderTx(signedOrder, payer) {
+    const { order } = signedOrder;
+    const [collectFeeOrderRecord] = PDA.collectFeeOrderRecord(order.user, order.nonce, this.programIds);
+    const ed25519Ix = buildBatchedCollectFeeEd25519Instruction([signedOrder]);
+    const registerIx = await this.program.methods.registerCollectFeeOrder(order.nonce).accounts({
+      payer,
+      clobConfig: this.configPda(),
+      ixSysvar: IX_SYSVAR,
+      orderSigner: order.user,
+      collectFeeOrderRecord,
+      systemProgram: web3_js.SystemProgram.programId
+    }).instruction();
+    const { blockhash } = await this.provider.connection.getLatestBlockhash();
+    const tx = new web3_js.Transaction();
+    tx.recentBlockhash = blockhash;
+    tx.feePayer = payer;
+    tx.add(ed25519Ix, registerIx);
+    return tx;
+  }
+  /**
+   * Register a CollectFeeOrder on-chain and send immediately (operator-signed flow).
+   * Idempotent — skips if PDA already exists.
+   */
+  async registerCollectFeeOrderIfNeeded(signedOrder) {
+    const [pda] = PDA.collectFeeOrderRecord(
+      signedOrder.order.user,
+      signedOrder.order.nonce,
+      this.programIds
+    );
+    const existing = await this.program.account.collectFeeOrderRecord?.fetchNullable(pda);
+    if (!existing) {
+      const tx = await this.buildRegisterCollectFeeOrderTx(signedOrder, this.walletPubkey);
+      await this._sendLegacyTx(tx.instructions);
+    }
+  }
   /** Cancel an order — closes its OrderRecord PDA and returns rent to maker. */
   async cancelOrder(nonce) {
     const [orderRecord] = PDA.orderRecord(this.walletPubkey, nonce, this.programIds);
@@ -2486,6 +2622,13 @@ ${logs.join("\n")}`);
       if (yIx) hookInitIxs.push(yIx);
       if (nIx) hookInitIxs.push(nIx);
     }
+    const oracleVaultInitIx = await this.buildInitOracleVaultIfNeeded(
+      t.condition,
+      collateralMint,
+      t.fee,
+      payer
+    );
+    const preIxs = oracleVaultInitIx ? [...hookInitIxs, oracleVaultInitIx] : hookInitIxs;
     if (t.tokenId === m0.tokenId) {
       let buySignedOrder, sellCandidates;
       if (t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_SELL)) {
@@ -2505,7 +2648,7 @@ ${logs.join("\n")}`);
           opts,
           false
         );
-        return this._buildUnsignedVtx([...hookInitIxs, ...ixs3], alt, payer);
+        return this._buildUnsignedVtx([...preIxs, ...ixs3], alt, payer);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
@@ -2521,7 +2664,7 @@ ${logs.join("\n")}`);
         operator,
         opts
       );
-      return this._buildUnsignedVtx([...hookInitIxs, ...ixs2], alt, payer);
+      return this._buildUnsignedVtx([...preIxs, ...ixs2], alt, payer);
     }
     const allBuy = t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_BUY);
     const allSell = t.side === SIDE_SELL && makers.every((m) => m.order.side === SIDE_SELL);
@@ -2542,7 +2685,7 @@ ${logs.join("\n")}`);
       ]);
       await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
       const ix = allBuy ? await this._buildMintIx(taker, makers, collateralMint, operator, payer) : await this._buildMergeIx(taker, makers, collateralMint, operator, payer, opts);
-      return this._buildUnsignedVtx([...hookInitIxs, ix], alt, payer);
+      return this._buildUnsignedVtx([...preIxs, ix], alt, payer);
     }
     await Promise.all([
       this.registerOrderIfNeeded(taker),
@@ -2554,17 +2697,19 @@ ${logs.join("\n")}`);
       const ix = allBuy ? await this._buildMintIx(yesMaker, [taker], collateralMint, operator, payer) : await this._buildMergeIx(yesMaker, [taker], collateralMint, operator, payer, opts);
       ixs.push(ix);
     }
-    return this._buildUnsignedVtx([...hookInitIxs, ...ixs], alt, payer);
+    return this._buildUnsignedVtx([...preIxs, ...ixs], alt, payer);
   }
   // ─── batchCollectRedeemEarly ─────────────────────────────────────────────────
   /**
    * Build VersionedTransaction for batchCollectRedeemEarly.
    *
-   * Flow: Ed25519 ix (user sigs) + batchCollectRedeemEarly ix.
-   * Each SignedCollectFeeOrder authorizes CLOB to collect `amount` winning tokens
-   * from that user, redeem via CTF, then distribute as fees.
+   * Prerequisite: each user's CollectFeeOrder must be registered on-chain via
+   * buildRegisterCollectFeeOrderTx (one tx per user).
    *
-   * @param signedOrders  - Array of { order, signature } from winning users
+   * Flow: batchCollectRedeemEarly ix reads CollectFeeOrderRecord PDAs — no Ed25519 inline.
+   * No tx-size limit from signatures, supports 10+ orders in one tx.
+   *
+   * @param signedOrders  - Array of { order, signature } (used to derive record PDAs)
    * @param condition     - Market condition PDA
    * @param outcomeIndex  - 0 = NO wins, 1 = YES wins
    * @param operator      - Whitelisted operator pubkey (must sign)
@@ -2590,9 +2735,11 @@ ${logs.join("\n")}`);
     const [clobNoPosition] = PDA.position(condition, 0, clobConfig, this.programIds);
     const userAccounts = [];
     for (const { order } of signedOrders) {
+      const [collectFeeOrderRecord] = PDA.collectFeeOrderRecord(order.user, order.nonce, this.programIds);
       const userTokenAta = splToken.getAssociatedTokenAddressSync(outcomeMint, order.user, false, splToken.TOKEN_2022_PROGRAM_ID);
       const [userPosition] = PDA.position(condition, outcomeIndex, order.user, this.programIds);
       userAccounts.push(
+        { pubkey: collectFeeOrderRecord, isSigner: false, isWritable: true },
         { pubkey: order.user, isSigner: false, isWritable: false },
         { pubkey: userTokenAta, isSigner: false, isWritable: true },
         { pubkey: userPosition, isSigner: false, isWritable: true }
@@ -2629,11 +2776,7 @@ ${logs.join("\n")}`);
       const ix = await this.hookClient.buildInitHookIxIfNeeded(outcomeMint, payer);
       if (ix) hookInitIxs.push(ix);
     }
-    const ed25519Ix = buildBatchedCollectFeeEd25519Instruction(signedOrders);
-    const ed25519IxIndex = 2 + hookInitIxs.length;
     const collectIx = await this.program.methods.batchCollectRedeemEarly(
-      ed25519IxIndex,
-      // ix_index: adjusted for any prepended hook init ixs
       signedOrders.length,
       outcomeIndex
     ).accounts({
@@ -2650,44 +2793,273 @@ ${logs.join("\n")}`);
       clobNoAta,
       clobYesPosition,
       clobNoPosition,
-      ixSysvar: IX_SYSVAR,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
     }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
-    const alt = opts?.lookupTable ?? this._altCache.get(condition.toBase58()) ?? await this.buildAltForCondition(condition, payer, collateralMint);
-    return this._buildUnsignedVtx([...hookInitIxs, ed25519Ix, collectIx], alt, payer);
+    const alt = opts?.lookupTable ?? await this.buildAltForCollectBatch(condition, payer, collateralMint, signedOrders, outcomeIndex);
+    return this._buildUnsignedVtx([...hookInitIxs, collectIx], alt, payer);
   }
+  // ─── Register RedeemFeeOrder ─────────────────────────────────────────────────
   /**
-   * Build ALT with static accounts for a condition — no order-specific PDAs needed.
-   * Use before buildBatchCollectRedeemEarlyTx when no prior buildMatchOrdersTx ran in this session.
+   * Build a Transaction to register a RedeemFeeOrder on-chain (Ed25519 verify + PDA).
+   * Must be sent before calling buildBatchRedeemWithFeeTx / buildBatchMergeWithFeeTx.
+   *
+   * ix[0]: batched Ed25519 { pubkey=order.user, sig, msg=128 bytes }
+   * ix[1]: register_redeem_fee_order(nonce)
    */
-  async buildAltForCondition(condition, _payer, collateralMint) {
-    const cacheKey = condition.toBase58();
+  async buildRegisterRedeemFeeOrderTx(signedOrder, payer) {
+    const { order } = signedOrder;
+    const [redeemFeeOrderRecord] = PDA.redeemFeeOrderRecord(order.user, order.nonce, this.programIds);
+    const ed25519Ix = buildBatchedRedeemFeeEd25519Instruction([signedOrder]);
+    const registerIx = await this.program.methods.registerRedeemFeeOrder(order.nonce).accounts({
+      payer,
+      clobConfig: this.configPda(),
+      ixSysvar: IX_SYSVAR,
+      orderSigner: order.user,
+      redeemFeeOrderRecord,
+      systemProgram: anchor5__namespace.web3.SystemProgram.programId
+    }).instruction();
+    const tx = new anchor5__namespace.web3.Transaction();
+    tx.add(ed25519Ix, registerIx);
+    return tx;
+  }
+  // ─── batchRedeemWithFee ───────────────────────────────────────────────────────
+  /**
+   * Build a VersionedTransaction for batchRedeemWithFee.
+   * Each pair has a YES order + NO order for the same user (same signer or different).
+   * After resolution: YES holder taker_amount > 0, NO holder taker_amount = 0 (or vice versa).
+   *
+   * Prerequisite: each order's RedeemFeeOrderRecord must be registered via buildRegisterRedeemFeeOrderTx.
+   */
+  async buildBatchRedeemWithFeeTx(orderPairs, condition, operator, payer, opts) {
+    if (orderPairs.length === 0) throw new InvalidParamError("At least 1 order pair required");
+    const collateralMint = this.networkConfig.defaultCollateral.mint;
+    const cfg = await this.fetchConfig();
+    if (!cfg) throw new InvalidParamError("CLOB config not found on-chain");
+    const clobConfig = this.configPda();
+    const [yesMint] = PDA.yesMint(condition, this.programIds);
+    const [noMint] = PDA.noMint(condition, this.programIds);
+    const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
+    const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
+    const [yesExtraMeta] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [noExtraMeta] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const [clobYesPosition] = PDA.position(condition, 1, clobConfig, this.programIds);
+    const [clobNoPosition] = PDA.position(condition, 0, clobConfig, this.programIds);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const userAccounts = [];
+    for (const { yes, no } of orderPairs) {
+      const [yesRecord] = PDA.redeemFeeOrderRecord(yes.order.user, yes.order.nonce, this.programIds);
+      const [noRecord] = PDA.redeemFeeOrderRecord(no.order.user, no.order.nonce, this.programIds);
+      const userYesAta = splToken.getAssociatedTokenAddressSync(yesMint, yes.order.user, false, splToken.TOKEN_2022_PROGRAM_ID);
+      const userNoAta = splToken.getAssociatedTokenAddressSync(noMint, no.order.user, false, splToken.TOKEN_2022_PROGRAM_ID);
+      const [userYesPos] = PDA.position(condition, 1, yes.order.user, this.programIds);
+      const [userNoPos] = PDA.position(condition, 0, no.order.user, this.programIds);
+      const yesCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, yes.order.user);
+      const noCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, no.order.user);
+      userAccounts.push(
+        { pubkey: yesRecord, isSigner: false, isWritable: true },
+        { pubkey: noRecord, isSigner: false, isWritable: true },
+        { pubkey: yes.order.user, isSigner: false, isWritable: false },
+        { pubkey: no.order.user, isSigner: false, isWritable: false },
+        { pubkey: userYesAta, isSigner: false, isWritable: true },
+        { pubkey: userNoAta, isSigner: false, isWritable: true },
+        { pubkey: userYesPos, isSigner: false, isWritable: true },
+        { pubkey: userNoPos, isSigner: false, isWritable: true },
+        { pubkey: yesCollateral, isSigner: false, isWritable: true },
+        { pubkey: noCollateral, isSigner: false, isWritable: true }
+      );
+    }
+    const hookAccounts = [
+      { pubkey: yesExtraMeta, isSigner: false, isWritable: false },
+      { pubkey: noExtraMeta, isSigner: false, isWritable: false },
+      { pubkey: hookConfig, isSigner: false, isWritable: false },
+      { pubkey: this.programIds.hook, isSigner: false, isWritable: false }
+    ];
+    let feeAccounts = [];
+    if (this.programIds.feeManagement && this.feeConfigOwner) {
+      const companyAddr = await this.companyAddress();
+      const refVault = await this.referralVault();
+      if (companyAddr && refVault) {
+        const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
+        const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
+        if (feeOverrideExists) {
+          const oracleVault = opts?.marketOracleVault ?? await this.getMarketOracleVault(condition, collateralMint) ?? payer;
+          feeAccounts = [
+            { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
+            { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
+            { pubkey: feeOverridePda, isSigner: false, isWritable: false },
+            { pubkey: splToken.getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
+            { pubkey: oracleVault, isSigner: false, isWritable: true },
+            { pubkey: refVault, isSigner: false, isWritable: true }
+          ];
+        }
+      }
+    }
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
+    const hookInitIxs = [];
+    if (this.hookClient) {
+      for (const mint of [yesMint, noMint]) {
+        const ix = await this.hookClient.buildInitHookIxIfNeeded(mint, payer);
+        if (ix) hookInitIxs.push(ix);
+      }
+    }
+    const redeemIx = await this.program.methods.batchRedeemWithFee(orderPairs.length).accounts({
+      operator,
+      payer,
+      clobConfig,
+      condition,
+      collateralVault,
+      vaultTokenAccount,
+      feeRecipient: cfg.feeRecipient,
+      yesMint,
+      noMint,
+      clobYesAta,
+      clobNoAta,
+      clobYesPosition,
+      clobNoPosition,
+      conditionalTokensProgram: this.programIds.conditionalTokens,
+      tokenProgram: splToken.TOKEN_PROGRAM_ID,
+      token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
+      systemProgram: anchor5__namespace.web3.SystemProgram.programId
+    }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
+    const alt = opts?.lookupTable ?? await this.buildAltForCondition(condition, payer, collateralMint);
+    return this._buildUnsignedVtx([...hookInitIxs, redeemIx], alt, payer);
+  }
+  // ─── batchMergeWithFee ────────────────────────────────────────────────────────
+  /**
+   * Build a VersionedTransaction for batchMergeWithFee (pre-resolution merge with fee).
+   * Each pair: YES order + NO order with equal amounts for the same user.
+   * Only yes_signer receives net USDS (mirrors EVM _matchMergeOrder).
+   *
+   * Prerequisite: each order's RedeemFeeOrderRecord must be registered via buildRegisterRedeemFeeOrderTx.
+   */
+  async buildBatchMergeWithFeeTx(orderPairs, condition, operator, payer, opts) {
+    if (orderPairs.length === 0) throw new InvalidParamError("At least 1 order pair required");
+    const collateralMint = this.networkConfig.defaultCollateral.mint;
+    const cfg = await this.fetchConfig();
+    if (!cfg) throw new InvalidParamError("CLOB config not found on-chain");
+    const clobConfig = this.configPda();
+    const [yesMint] = PDA.yesMint(condition, this.programIds);
+    const [noMint] = PDA.noMint(condition, this.programIds);
+    const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
+    const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
+    const [yesExtraMeta] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [noExtraMeta] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const [clobYesPosition] = PDA.position(condition, 1, clobConfig, this.programIds);
+    const [clobNoPosition] = PDA.position(condition, 0, clobConfig, this.programIds);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const userAccounts = [];
+    for (const { yes, no } of orderPairs) {
+      const [yesRecord] = PDA.redeemFeeOrderRecord(yes.order.user, yes.order.nonce, this.programIds);
+      const [noRecord] = PDA.redeemFeeOrderRecord(no.order.user, no.order.nonce, this.programIds);
+      const userYesAta = splToken.getAssociatedTokenAddressSync(yesMint, yes.order.user, false, splToken.TOKEN_2022_PROGRAM_ID);
+      const userNoAta = splToken.getAssociatedTokenAddressSync(noMint, no.order.user, false, splToken.TOKEN_2022_PROGRAM_ID);
+      const [userYesPos] = PDA.position(condition, 1, yes.order.user, this.programIds);
+      const [userNoPos] = PDA.position(condition, 0, no.order.user, this.programIds);
+      const yesCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, yes.order.user);
+      userAccounts.push(
+        { pubkey: yesRecord, isSigner: false, isWritable: true },
+        { pubkey: noRecord, isSigner: false, isWritable: true },
+        { pubkey: yes.order.user, isSigner: false, isWritable: false },
+        { pubkey: no.order.user, isSigner: false, isWritable: false },
+        { pubkey: userYesAta, isSigner: false, isWritable: true },
+        { pubkey: userNoAta, isSigner: false, isWritable: true },
+        { pubkey: userYesPos, isSigner: false, isWritable: true },
+        { pubkey: userNoPos, isSigner: false, isWritable: true },
+        { pubkey: yesCollateral, isSigner: false, isWritable: true }
+      );
+    }
+    const hookAccounts = [
+      { pubkey: yesExtraMeta, isSigner: false, isWritable: false },
+      { pubkey: noExtraMeta, isSigner: false, isWritable: false },
+      { pubkey: hookConfig, isSigner: false, isWritable: false },
+      { pubkey: this.programIds.hook, isSigner: false, isWritable: false }
+    ];
+    let feeAccounts = [];
+    if (this.programIds.feeManagement && this.feeConfigOwner) {
+      const companyAddr = await this.companyAddress();
+      const refVault = await this.referralVault();
+      if (companyAddr && refVault) {
+        const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
+        const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
+        if (feeOverrideExists) {
+          const oracleVault = opts?.marketOracleVault ?? await this.getMarketOracleVault(condition, collateralMint) ?? payer;
+          feeAccounts = [
+            { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
+            { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
+            { pubkey: feeOverridePda, isSigner: false, isWritable: false },
+            { pubkey: splToken.getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
+            { pubkey: oracleVault, isSigner: false, isWritable: true },
+            { pubkey: refVault, isSigner: false, isWritable: true }
+          ];
+        }
+      }
+    }
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
+    const hookInitIxs = [];
+    if (this.hookClient) {
+      for (const mint of [yesMint, noMint]) {
+        const ix = await this.hookClient.buildInitHookIxIfNeeded(mint, payer);
+        if (ix) hookInitIxs.push(ix);
+      }
+    }
+    const mergeIx = await this.program.methods.batchMergeWithFee(orderPairs.length).accounts({
+      operator,
+      payer,
+      clobConfig,
+      condition,
+      collateralVault,
+      vaultTokenAccount,
+      feeRecipient: cfg.feeRecipient,
+      yesMint,
+      noMint,
+      clobYesAta,
+      clobNoAta,
+      clobYesPosition,
+      clobNoPosition,
+      conditionalTokensProgram: this.programIds.conditionalTokens,
+      tokenProgram: splToken.TOKEN_PROGRAM_ID,
+      token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
+      systemProgram: anchor5__namespace.web3.SystemProgram.programId
+    }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
+    const alt = opts?.lookupTable ?? await this.buildAltForCondition(condition, payer, collateralMint);
+    return this._buildUnsignedVtx([...hookInitIxs, mergeIx], alt, payer);
+  }
+  /**
+   * Build ALT for batchCollectRedeemEarly — includes per-user accounts so all
+   * remaining_accounts fit as 1-byte ALT indices instead of 32-byte inline addresses.
+   */
+  async buildAltForCollectBatch(condition, payer, collateralMint, signedOrders, outcomeIndex) {
+    const userKeys = signedOrders.map((o) => o.order.user.toBase58()).sort((a, b) => a.localeCompare(b)).join(",");
+    const cacheKey = `${condition.toBase58()}:collect:${userKeys}`;
     if (this._altCache.has(cacheKey)) return this._altCache.get(cacheKey);
-    const mint = collateralMint ?? this.networkConfig.defaultCollateral.mint;
-    const payer = this.walletPubkey;
     const { connection } = this.provider;
     const clobConfigPda = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
-    const [extraAccountMeta] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const outcomeMint = outcomeIndex === 1 ? yesMint : noMint;
+    const [extraAccountMeta] = PDA.extraAccountMetaList(outcomeMint, this.programIds);
     const [hookConfig] = PDA.hookConfig(this.programIds);
-    const [collateralVault] = PDA.collateralVault(mint, this.programIds);
-    const [vaultTokenAccount] = PDA.vaultToken(mint, this.programIds);
+    const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
+    const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
     const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
     const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfigPda, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfigPda, this.programIds);
     const feeRecipientAddr = (await this.fetchConfig())?.feeRecipient;
     const addresses = [
-      web3_js.Ed25519Program.programId,
       this.programIds.clobExchange,
       this.programIds.conditionalTokens,
       this.programIds.hook,
       splToken.TOKEN_PROGRAM_ID,
       splToken.TOKEN_2022_PROGRAM_ID,
       web3_js.SystemProgram.programId,
-      web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
       clobConfigPda,
       hookConfig,
       condition,
@@ -2697,7 +3069,9 @@ ${logs.join("\n")}`);
       collateralVault,
       vaultTokenAccount,
       clobYesAta,
-      clobNoAta
+      clobNoAta,
+      clobYesPos,
+      clobNoPos
     ];
     if (feeRecipientAddr) addresses.push(feeRecipientAddr);
     if (this.feeConfigOwner && this.programIds.feeManagement) {
@@ -2706,11 +3080,17 @@ ${logs.join("\n")}`);
       addresses.push(this.programIds.feeManagement);
       addresses.push(PDA.feeConfig(this.feeConfigOwner, this.programIds)[0]);
       addresses.push(PDA.marketFeeOverride(condition, this.programIds)[0]);
-      if (companyAddr) addresses.push(splToken.getAssociatedTokenAddressSync(mint, companyAddr));
+      if (companyAddr) addresses.push(splToken.getAssociatedTokenAddressSync(collateralMint, companyAddr));
       if (refVault) addresses.push(refVault);
-      const oracleVault = await this.getMarketOracleVault(condition, mint) ?? payer;
+      const oracleVault = await this.getMarketOracleVault(condition, collateralMint) ?? payer;
       addresses.push(oracleVault);
     }
+    for (const { order } of signedOrders) {
+      const [collectFeeOrderRecord] = PDA.collectFeeOrderRecord(order.user, order.nonce, this.programIds);
+      const userTokenAta = splToken.getAssociatedTokenAddressSync(outcomeMint, order.user, false, splToken.TOKEN_2022_PROGRAM_ID);
+      const [userPosition] = PDA.position(condition, outcomeIndex, order.user, this.programIds);
+      addresses.push(collectFeeOrderRecord, order.user, userTokenAta, userPosition);
+    }
     const slot = await connection.getSlot("finalized");
     const [createIx, altAddress] = web3_js.AddressLookupTableProgram.createLookupTable(
       { authority: payer, payer, recentSlot: slot }
@@ -2734,11 +3114,86 @@ ${logs.join("\n")}`);
     }
     throw new Error(`ALT ${altAddress.toBase58()} not active after 30s`);
   }
-  // ─── Queries ─────────────────────────────────────────────────────────────────
-  async fetchConfig() {
-    try {
-      const acc = await this.program.account.clobConfig.fetch(this.configPda());
-      return {
+  /**
+   * Build ALT with static accounts for a condition — no order-specific PDAs needed.
+   * Use before buildBatchCollectRedeemEarlyTx when no prior buildMatchOrdersTx ran in this session.
+   */
+  async buildAltForCondition(condition, _payer, collateralMint) {
+    const cacheKey = condition.toBase58();
+    if (this._altCache.has(cacheKey)) return this._altCache.get(cacheKey);
+    const mint = collateralMint ?? this.networkConfig.defaultCollateral.mint;
+    const payer = this.walletPubkey;
+    const { connection } = this.provider;
+    const clobConfigPda = this.configPda();
+    const [yesMint] = PDA.yesMint(condition, this.programIds);
+    const [noMint] = PDA.noMint(condition, this.programIds);
+    const [extraAccountMeta] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const [collateralVault] = PDA.collateralVault(mint, this.programIds);
+    const [vaultTokenAccount] = PDA.vaultToken(mint, this.programIds);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const feeRecipientAddr = (await this.fetchConfig())?.feeRecipient;
+    const addresses = [
+      web3_js.Ed25519Program.programId,
+      this.programIds.clobExchange,
+      this.programIds.conditionalTokens,
+      this.programIds.hook,
+      splToken.TOKEN_PROGRAM_ID,
+      splToken.TOKEN_2022_PROGRAM_ID,
+      web3_js.SystemProgram.programId,
+      web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
+      clobConfigPda,
+      hookConfig,
+      condition,
+      yesMint,
+      noMint,
+      extraAccountMeta,
+      collateralVault,
+      vaultTokenAccount,
+      clobYesAta,
+      clobNoAta
+    ];
+    if (feeRecipientAddr) addresses.push(feeRecipientAddr);
+    if (this.feeConfigOwner && this.programIds.feeManagement) {
+      const companyAddr = await this.companyAddress();
+      const refVault = await this.referralVault();
+      addresses.push(this.programIds.feeManagement);
+      addresses.push(PDA.feeConfig(this.feeConfigOwner, this.programIds)[0]);
+      addresses.push(PDA.marketFeeOverride(condition, this.programIds)[0]);
+      if (companyAddr) addresses.push(splToken.getAssociatedTokenAddressSync(mint, companyAddr));
+      if (refVault) addresses.push(refVault);
+      const oracleVault = await this.getMarketOracleVault(condition, mint) ?? payer;
+      addresses.push(oracleVault);
+    }
+    const slot = await connection.getSlot("finalized");
+    const [createIx, altAddress] = web3_js.AddressLookupTableProgram.createLookupTable(
+      { authority: payer, payer, recentSlot: slot }
+    );
+    const BATCH = 30;
+    const extendIxs = [];
+    for (let i = 0; i < addresses.length; i += BATCH) {
+      extendIxs.push(web3_js.AddressLookupTableProgram.extendLookupTable(
+        { payer, authority: payer, lookupTable: altAddress, addresses: addresses.slice(i, i + BATCH) }
+      ));
+    }
+    await this._sendLegacyTx([createIx, extendIxs[0]]);
+    for (let i = 1; i < extendIxs.length; i++) await this._sendLegacyTx([extendIxs[i]]);
+    for (let attempt = 0; attempt < 30; attempt++) {
+      await new Promise((r) => setTimeout(r, 1e3));
+      const res = await connection.getAddressLookupTable(altAddress);
+      if (res.value && res.value.state.addresses.length === addresses.length) {
+        this._altCache.set(cacheKey, res.value);
+        return res.value;
+      }
+    }
+    throw new Error(`ALT ${altAddress.toBase58()} not active after 30s`);
+  }
+  // ─── Queries ─────────────────────────────────────────────────────────────────
+  async fetchConfig() {
+    try {
+      const acc = await this.program.account.clobConfig.fetch(this.configPda());
+      return {
         owner: acc.owner,
         operators: acc.operators,
         operatorsLen: acc.operatorsLen,
@@ -9420,7 +9875,8 @@ var clob_exchange_default = {
       name: "batch_collect_redeem_early",
       docs: [
         "Batch collect fee tokens from winning users after question resolution,",
-        "redeem them via CTF, and distribute USDS via fee_management."
+        "redeem them via CTF, and distribute USDS via fee_management.",
+        "Requires each user's CollectFeeOrderRecord to be registered via register_collect_fee_order."
       ],
       discriminator: [
         87,
@@ -9530,7 +9986,7 @@ var clob_exchange_default = {
         {
           name: "clob_yes_ata",
           docs: [
-            "CLOB's YES ATA (Token-2022) \u2014 must be pre-initialized (created during prior matchOrders)."
+            "CLOB's YES ATA (Token-2022) \u2014 must be pre-initialized."
           ],
           writable: true
         },
@@ -9549,9 +10005,6 @@ var clob_exchange_default = {
           name: "clob_no_position",
           writable: true
         },
-        {
-          name: "ix_sysvar"
-        },
         {
           name: "conditional_tokens_program",
           address: "A6N1F8MRsdgcojAx8p6FaECvw8mo8w6qJcWsbKQBANK4"
@@ -9570,10 +10023,6 @@ var clob_exchange_default = {
         }
       ],
       args: [
-        {
-          name: "ix_index",
-          type: "u8"
-        },
         {
           name: "order_count",
           type: "u8"
@@ -9585,61 +10034,144 @@ var clob_exchange_default = {
       ]
     },
     {
-      name: "cancel_order",
+      name: "batch_merge_with_fee",
       docs: [
-        "Cancel an order \u2014 close OrderRecord PDA, return rent to maker."
+        "Batch merge YES+NO tokens before resolution. Returns net USDS to yes_signer, keeps fee.",
+        "Mirrors EVM _matchMergeOrder flow."
       ],
       discriminator: [
-        95,
-        129,
-        237,
-        240,
-        8,
-        49,
-        223,
-        132
+        56,
+        127,
+        113,
+        232,
+        208,
+        177,
+        157,
+        230
       ],
       accounts: [
         {
-          name: "maker",
-          docs: [
-            "Must be the order maker/signer"
-          ],
+          name: "operator",
           signer: true
         },
         {
-          name: "order_record",
+          name: "payer",
+          writable: true,
+          signer: true
+        },
+        {
+          name: "clob_config",
           writable: true,
           pda: {
             seeds: [
               {
                 kind: "const",
                 value: [
+                  99,
+                  108,
                   111,
-                  114,
-                  100,
-                  101,
-                  114,
+                  98,
                   95,
-                  114,
-                  101,
                   99,
                   111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "condition",
+          writable: true
+        },
+        {
+          name: "collateral_vault",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  111,
+                  108,
+                  108,
+                  97,
+                  116,
+                  101,
                   114,
-                  100
+                  97,
+                  108,
+                  95,
+                  118,
+                  97,
+                  117,
+                  108,
+                  116
                 ]
               },
               {
                 kind: "account",
-                path: "maker"
-              },
-              {
-                kind: "arg",
-                path: "nonce"
+                path: "condition.collateral_mint",
+                account: "Condition"
               }
-            ]
+            ],
+            program: {
+              kind: "account",
+              path: "conditional_tokens_program"
+            }
           }
         },
+        {
+          name: "vault_token_account",
+          writable: true
+        },
+        {
+          name: "fee_recipient",
+          docs: [
+            "CLOB USDS ATA \u2014 receives USDS from merge, distributes to users + fee."
+          ],
+          writable: true
+        },
+        {
+          name: "yes_mint",
+          writable: true
+        },
+        {
+          name: "no_mint",
+          writable: true
+        },
+        {
+          name: "clob_yes_ata",
+          writable: true
+        },
+        {
+          name: "clob_no_ata",
+          writable: true
+        },
+        {
+          name: "clob_yes_position",
+          writable: true
+        },
+        {
+          name: "clob_no_position",
+          writable: true
+        },
+        {
+          name: "conditional_tokens_program",
+          address: "A6N1F8MRsdgcojAx8p6FaECvw8mo8w6qJcWsbKQBANK4"
+        },
+        {
+          name: "token_program",
+          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+        },
+        {
+          name: "token_2022_program",
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -9647,38 +10179,257 @@ var clob_exchange_default = {
       ],
       args: [
         {
-          name: "nonce",
-          type: "u64"
+          name: "order_count",
+          type: "u8"
         }
       ]
     },
     {
-      name: "force_reset_clob",
+      name: "batch_redeem_with_fee",
+      docs: [
+        "Batch redeem YES+NO tokens after resolution. Returns net USDS to users, keeps fee.",
+        "Mirrors EVM _matchRedeemOrder flow."
+      ],
       discriminator: [
-        96,
-        95,
-        187,
-        95,
-        65,
-        135,
-        120,
-        204
+        240,
+        238,
+        168,
+        110,
+        84,
+        41,
+        165,
+        2
       ],
       accounts: [
         {
-          name: "upgrade_authority",
-          docs: [
-            "Must be the upgrade authority (deployer). Checked in handler via",
-            "programdata account so we don't hardcode the pubkey."
-          ],
-          writable: true,
+          name: "operator",
           signer: true
         },
         {
-          name: "program_data",
-          docs: [
-            "The clob_exchange programdata account (BPF loader stores the upgrade authority here)."
-          ]
+          name: "payer",
+          writable: true,
+          signer: true
+        },
+        {
+          name: "clob_config",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  108,
+                  111,
+                  98,
+                  95,
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "condition",
+          writable: true
+        },
+        {
+          name: "collateral_vault",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  111,
+                  108,
+                  108,
+                  97,
+                  116,
+                  101,
+                  114,
+                  97,
+                  108,
+                  95,
+                  118,
+                  97,
+                  117,
+                  108,
+                  116
+                ]
+              },
+              {
+                kind: "account",
+                path: "condition.collateral_mint",
+                account: "Condition"
+              }
+            ],
+            program: {
+              kind: "account",
+              path: "conditional_tokens_program"
+            }
+          }
+        },
+        {
+          name: "vault_token_account",
+          writable: true
+        },
+        {
+          name: "fee_recipient",
+          docs: [
+            "CLOB USDS ATA \u2014 receives USDS from redeem, distributes to users + fee."
+          ],
+          writable: true
+        },
+        {
+          name: "yes_mint",
+          writable: true
+        },
+        {
+          name: "no_mint",
+          writable: true
+        },
+        {
+          name: "clob_yes_ata",
+          writable: true
+        },
+        {
+          name: "clob_no_ata",
+          writable: true
+        },
+        {
+          name: "clob_yes_position",
+          writable: true
+        },
+        {
+          name: "clob_no_position",
+          writable: true
+        },
+        {
+          name: "conditional_tokens_program",
+          address: "A6N1F8MRsdgcojAx8p6FaECvw8mo8w6qJcWsbKQBANK4"
+        },
+        {
+          name: "token_program",
+          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+        },
+        {
+          name: "token_2022_program",
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        }
+      ],
+      args: [
+        {
+          name: "order_count",
+          type: "u8"
+        }
+      ]
+    },
+    {
+      name: "cancel_order",
+      docs: [
+        "Cancel an order \u2014 close OrderRecord PDA, return rent to maker."
+      ],
+      discriminator: [
+        95,
+        129,
+        237,
+        240,
+        8,
+        49,
+        223,
+        132
+      ],
+      accounts: [
+        {
+          name: "maker",
+          docs: [
+            "Must be the order maker/signer"
+          ],
+          signer: true
+        },
+        {
+          name: "order_record",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  111,
+                  114,
+                  100,
+                  101,
+                  114,
+                  95,
+                  114,
+                  101,
+                  99,
+                  111,
+                  114,
+                  100
+                ]
+              },
+              {
+                kind: "account",
+                path: "maker"
+              },
+              {
+                kind: "arg",
+                path: "nonce"
+              }
+            ]
+          }
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        }
+      ],
+      args: [
+        {
+          name: "nonce",
+          type: "u64"
+        }
+      ]
+    },
+    {
+      name: "force_reset_clob",
+      discriminator: [
+        96,
+        95,
+        187,
+        95,
+        65,
+        135,
+        120,
+        204
+      ],
+      accounts: [
+        {
+          name: "upgrade_authority",
+          docs: [
+            "Must be the upgrade authority (deployer). Checked in handler via",
+            "programdata account so we don't hardcode the pubkey."
+          ],
+          writable: true,
+          signer: true
+        },
+        {
+          name: "program_data",
+          docs: [
+            "The clob_exchange programdata account (BPF loader stores the upgrade authority here)."
+          ]
         },
         {
           name: "clob_config",
@@ -10520,27 +11271,25 @@ var clob_exchange_default = {
       ]
     },
     {
-      name: "register_order",
+      name: "register_collect_fee_order",
       docs: [
-        "Register a signed order on-chain (Ed25519 verify at registration time).",
-        "ix[0] must be Ed25519 precompile with 1 entry for order.signer."
+        "Register a signed CollectFeeOrder on-chain (Ed25519 verify at registration time).",
+        "ix[0] must be Ed25519 precompile with 1 entry for order.user.",
+        "Call once per user before batch_collect_redeem_early."
       ],
       discriminator: [
-        92,
-        37,
-        29,
-        46,
-        77,
-        250,
-        219,
-        6
+        63,
+        26,
+        202,
+        98,
+        195,
+        2,
+        211,
+        36
       ],
       accounts: [
         {
           name: "payer",
-          docs: [
-            "Operator pays rent for the OrderRecord PDA."
-          ],
           writable: true,
           signer: true
         },
@@ -10575,27 +11324,128 @@ var clob_exchange_default = {
           name: "order_signer"
         },
         {
-          name: "order_record",
+          name: "collect_fee_order_record",
           writable: true,
           pda: {
             seeds: [
               {
                 kind: "const",
                 value: [
+                  99,
                   111,
-                  114,
-                  100,
-                  101,
-                  114,
-                  95,
-                  114,
+                  108,
+                  108,
                   101,
                   99,
+                  116,
+                  95,
                   111,
                   114,
-                  100
-                ]
-              },
+                  100,
+                  101,
+                  114
+                ]
+              },
+              {
+                kind: "account",
+                path: "order_signer"
+              },
+              {
+                kind: "arg",
+                path: "nonce"
+              }
+            ]
+          }
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        }
+      ],
+      args: [
+        {
+          name: "nonce",
+          type: "u64"
+        }
+      ]
+    },
+    {
+      name: "register_order",
+      docs: [
+        "Register a signed order on-chain (Ed25519 verify at registration time).",
+        "ix[0] must be Ed25519 precompile with 1 entry for order.signer."
+      ],
+      discriminator: [
+        92,
+        37,
+        29,
+        46,
+        77,
+        250,
+        219,
+        6
+      ],
+      accounts: [
+        {
+          name: "payer",
+          docs: [
+            "Operator pays rent for the OrderRecord PDA."
+          ],
+          writable: true,
+          signer: true
+        },
+        {
+          name: "clob_config",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  108,
+                  111,
+                  98,
+                  95,
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "ix_sysvar",
+          address: "Sysvar1nstructions1111111111111111111111111"
+        },
+        {
+          name: "order_signer"
+        },
+        {
+          name: "order_record",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  111,
+                  114,
+                  100,
+                  101,
+                  114,
+                  95,
+                  114,
+                  101,
+                  99,
+                  111,
+                  114,
+                  100
+                ]
+              },
               {
                 kind: "account",
                 path: "order_signer"
@@ -10645,6 +11495,107 @@ var clob_exchange_default = {
         }
       ]
     },
+    {
+      name: "register_redeem_fee_order",
+      docs: [
+        "Register a signed RedeemFeeOrder on-chain (Ed25519 verify + PDA creation).",
+        "Prerequisite for batch_redeem_with_fee and batch_merge_with_fee."
+      ],
+      discriminator: [
+        129,
+        167,
+        199,
+        14,
+        217,
+        12,
+        76,
+        162
+      ],
+      accounts: [
+        {
+          name: "payer",
+          writable: true,
+          signer: true
+        },
+        {
+          name: "clob_config",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  108,
+                  111,
+                  98,
+                  95,
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "ix_sysvar",
+          address: "Sysvar1nstructions1111111111111111111111111"
+        },
+        {
+          name: "order_signer"
+        },
+        {
+          name: "redeem_fee_order_record",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  114,
+                  101,
+                  100,
+                  101,
+                  101,
+                  109,
+                  95,
+                  102,
+                  101,
+                  101,
+                  95,
+                  111,
+                  114,
+                  100,
+                  101,
+                  114
+                ]
+              },
+              {
+                kind: "account",
+                path: "order_signer"
+              },
+              {
+                kind: "arg",
+                path: "nonce"
+              }
+            ]
+          }
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        }
+      ],
+      args: [
+        {
+          name: "nonce",
+          type: "u64"
+        }
+      ]
+    },
     {
       name: "reinit_clob",
       discriminator: [
@@ -10809,6 +11760,19 @@ var clob_exchange_default = {
         160
       ]
     },
+    {
+      name: "CollectFeeOrderRecord",
+      discriminator: [
+        145,
+        140,
+        193,
+        74,
+        12,
+        98,
+        74,
+        130
+      ]
+    },
     {
       name: "OrderStatus",
       discriminator: [
@@ -10822,6 +11786,19 @@ var clob_exchange_default = {
         3
       ]
     },
+    {
+      name: "RedeemFeeOrderRecord",
+      discriminator: [
+        88,
+        3,
+        122,
+        192,
+        131,
+        243,
+        143,
+        146
+      ]
+    },
     {
       name: "SignedOrderRecord",
       discriminator: [
@@ -11018,6 +11995,53 @@ var clob_exchange_default = {
         ]
       }
     },
+    {
+      name: "CollectFeeOrderRecord",
+      docs: [
+        "On-chain record of a signed CollectFeeOrder.",
+        "Created by `register_collect_fee_order` after Ed25519 verification.",
+        "Read and marked collected by `batch_collect_redeem_early`.",
+        "",
+        'PDA seeds: [b"collect_order", user, nonce_le_bytes]'
+      ],
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "user",
+            type: "pubkey"
+          },
+          {
+            name: "condition",
+            type: "pubkey"
+          },
+          {
+            name: "token_mint",
+            type: "pubkey"
+          },
+          {
+            name: "amount",
+            type: "u64"
+          },
+          {
+            name: "nonce",
+            type: "u64"
+          },
+          {
+            name: "expiry",
+            type: "i64"
+          },
+          {
+            name: "is_collected",
+            type: "bool"
+          },
+          {
+            name: "bump",
+            type: "u8"
+          }
+        ]
+      }
+    },
     {
       name: "ComplementaryMatchEvent",
       type: {
@@ -11250,6 +12274,57 @@ var clob_exchange_default = {
         ]
       }
     },
+    {
+      name: "RedeemFeeOrderRecord",
+      docs: [
+        "On-chain record of a signed RedeemFeeOrder.",
+        "Created by `register_redeem_fee_order` after Ed25519 verification.",
+        "Read and marked collected by `batch_redeem_with_fee` / `batch_merge_with_fee`.",
+        "",
+        'PDA seeds: [b"redeem_fee_order", user, nonce_le_bytes]'
+      ],
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "user",
+            type: "pubkey"
+          },
+          {
+            name: "condition",
+            type: "pubkey"
+          },
+          {
+            name: "token_mint",
+            type: "pubkey"
+          },
+          {
+            name: "amount",
+            type: "u64"
+          },
+          {
+            name: "taker_amount",
+            type: "u64"
+          },
+          {
+            name: "nonce",
+            type: "u64"
+          },
+          {
+            name: "expiry",
+            type: "i64"
+          },
+          {
+            name: "is_collected",
+            type: "bool"
+          },
+          {
+            name: "bump",
+            type: "u8"
+          }
+        ]
+      }
+    },
     {
       name: "SignedOrderRecord",
       docs: [
@@ -17850,6 +18925,7 @@ exports.buildApproveAllOutcomeTokensTx = buildApproveAllOutcomeTokensTx;
 exports.buildApproveCollateralTx = buildApproveCollateralTx;
 exports.buildBatchedCollectFeeEd25519Instruction = buildBatchedCollectFeeEd25519Instruction;
 exports.buildBatchedEd25519Instruction = buildBatchedEd25519Instruction;
+exports.buildBatchedRedeemFeeEd25519Instruction = buildBatchedRedeemFeeEd25519Instruction;
 exports.buildCreateUserAtasTx = buildCreateUserAtasTx;
 exports.buildOrder = buildOrder;
 exports.buildOrderFromPrice = buildOrderFromPrice;
@@ -17861,6 +18937,7 @@ exports.getOrderSignBytes = getOrderSignBytes;
 exports.orderAmountsFromPrice = orderAmountsFromPrice;
 exports.serializeCollectFeeOrderToBytes = serializeCollectFeeOrderToBytes;
 exports.serializeOrderToBytes = serializeOrderToBytes;
+exports.serializeRedeemFeeOrderToBytes = serializeRedeemFeeOrderToBytes;
 exports.serializeSignedOrder = serializeSignedOrder;
 exports.signOrder = signOrder;
 exports.signOrderWithKeypair = signOrderWithKeypair;