@theliem/xmarket-sdk 3.25.0 → 3.27.0

package/dist/index.js

@@ -195,6 +195,14 @@ var PDA = class {
       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");
@@ -1504,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,
@@ -2749,6 +2801,236 @@ ${logs.join("\n")}`);
     const alt = opts?.lookupTable ?? await this.buildAltForCollectBatch(condition, payer, collateralMint, signedOrders, outcomeIndex);
     return this._buildUnsignedVtx([...hookInitIxs, collectIx], alt, payer);
   }
+  // ─── Register RedeemFeeOrder ─────────────────────────────────────────────────
+  /**
+   * 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 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.
@@ -3304,6 +3586,17 @@ var MarketOracleClient = class {
       return null;
     }
   }
+  /**
+   * Derive marketOracleVault from presaleAddress and return its USDS balance.
+   * presaleAddress is used as the questionId seed in the question PDA.
+   */
+  async getOracleVaultBalance(presaleAddress, qmConfigPda, collateralMint) {
+    const [questionPda] = PDA.question(qmConfigPda, presaleAddress.toBytes(), this.programIds);
+    const [marketOraclePda] = PDA.marketOraclePda(questionPda, this.programIds);
+    const vault = splToken.getAssociatedTokenAddressSync(collateralMint, marketOraclePda, true);
+    const bal = await this.program.provider.connection.getTokenAccountBalance(vault);
+    return bal.value.uiAmount ?? 0;
+  }
   async fetchUserClaimRecord(marketOraclePda, user) {
     try {
       const pda = this.userClaimRecordPda(marketOraclePda, user);
@@ -9752,70 +10045,372 @@ 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,
-                  114,
-                  100
+                  110,
+                  102,
+                  105,
+                  103
                 ]
-              },
-              {
-                kind: "account",
-                path: "maker"
-              },
-              {
-                kind: "arg",
-                path: "nonce"
               }
             ]
           }
         },
         {
-          name: "system_program",
-          address: "11111111111111111111111111111111"
-        }
-      ],
-      args: [
+          name: "condition",
+          writable: true
+        },
         {
-          name: "nonce",
-          type: "u64"
+          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 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"
+        }
+      ],
+      args: [
+        {
+          name: "order_count",
+          type: "u8"
+        }
+      ]
+    },
+    {
+      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: [
+        240,
+        238,
+        168,
+        110,
+        84,
+        41,
+        165,
+        2
+      ],
+      accounts: [
+        {
+          name: "operator",
+          signer: true
+        },
+        {
+          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"
         }
       ]
     },
@@ -10911,6 +11506,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: [
@@ -11101,6 +11797,19 @@ var clob_exchange_default = {
         3
       ]
     },
+    {
+      name: "RedeemFeeOrderRecord",
+      discriminator: [
+        88,
+        3,
+        122,
+        192,
+        131,
+        243,
+        143,
+        146
+      ]
+    },
     {
       name: "SignedOrderRecord",
       discriminator: [
@@ -11576,6 +12285,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: [
@@ -18176,6 +18936,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;
@@ -18187,6 +18948,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;