@theliem/xmarket-sdk 4.1.1 → 4.2.0

package/dist/index.d.mts

@@ -25,10 +25,26 @@ interface NetworkConfig {
     rpcUrl: string;
     programIds: ProgramIds;
     defaultCollateral: CollateralConfig;
+    /**
+     * Owner pubkey used to derive question_market config PDA: ["config", owner].
+     * Pass to XMarketSDK as the 3rd constructor arg when set.
+     */
+    marketOwner?: PublicKey;
     /** Owner of the fee_config PDA — used to auto-derive fee distribution accounts */
     feeConfigOwner?: PublicKey;
 }
 type NetworkName = string;
+/** pm-svm v2 program IDs (same on devnet redeploy and mainnet). */
+declare const V2_PROGRAM_IDS: ProgramIds;
+/** Devnet question_market config owner (= config PDA seed). */
+declare const DEVNET_MARKET_OWNER: PublicKey;
+/** Devnet question_market config PDA for DEVNET_MARKET_OWNER + V2 questionMarket program. */
+declare const DEVNET_QUESTION_MARKET_CONFIG: PublicKey;
+declare const DEVNET_USDC_MINT: PublicKey;
+declare const MAINNET_USDC_MINT: PublicKey;
+/** Default devnet config — override rpcUrl if using a private RPC (e.g. Chainstack). */
+declare const DEVNET_CONFIG: NetworkConfig;
+declare const MAINNET_CONFIG: NetworkConfig;
 
 interface TxResult {
     signature: string;
@@ -418,7 +434,11 @@ declare class MarketClient {
     growConfig(owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     restoreConfig(snapshot: Buffer, owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     bumpPresaleCount(count: number, authority: PublicKey): Promise<Transaction>;
+    private configNotFoundMessage;
     fetchConfig(): Promise<QuestionMarketConfig | null>;
+    /** Like fetchConfig but throws with a hint when the config account is missing or invalid. */
+    fetchConfigOrThrow(): Promise<QuestionMarketConfig>;
+    private mapQuestionMarketConfig;
     /** Check if address is in question_market whitelist (can call createQuestion) */
     isWhitelisted(address: PublicKey): Promise<boolean>;
     fetchQuestion(questionPda: PublicKey): Promise<Question | null>;
@@ -437,9 +457,10 @@ declare class MarketClient {
      * Any user creates a presale + initial buy (question-market::create_presale).
      * Reads agents_rev / company_rev from fee_config.
      *
-     * @param feeConfig   fee_management fee_config PDA (owner = feeConfigOwner)
-     * @param currencyMint collateral token (e.g. USDC)
-     * @param presaleIndex config.presale_count — fetch config first or pass 0 for first presale
+     * Presale PDA seeds (presale program): ["presale", config, presale_index]
+     * where presale_index must equal config.presale_count at execution time.
+     *
+     * @param presaleIndex config.presale_count — fetch config first via fetchConfig()
      */
     createPresale(params: {
         price: anchor.BN;
@@ -1139,7 +1160,8 @@ declare class DisputeClient {
  *   - No HookClient (hook program removed entirely)
  *
  * Usage:
- *   const sdk = new XMarketSDK(DEVNET_CONFIG, wallet, marketOwner);
+ *   const sdk = new XMarketSDK({ ...DEVNET_CONFIG, rpcUrl: YOUR_RPC }, wallet);
+ *   // marketOwner defaults to config.marketOwner (required for fetchConfig / createPresale)
  *   await sdk.market.createQuestionAdmin(params, oracle);  // no hookProgram
  *   await sdk.clob.matchOrders(taker, makers);             // no hook in remainingAccounts
  */
@@ -1159,6 +1181,8 @@ declare class XMarketSDK {
     private _referral?;
     private _dispute?;
     constructor(config: NetworkConfig, wallet: anchor.Wallet, marketOwner?: PublicKey);
+    /** Question market config PDA derived from marketOwner + questionMarket program. */
+    get questionMarketConfigPda(): PublicKey;
     private _withAddress;
     get oracle(): OracleClient;
     get market(): MarketClient;
@@ -1225,6 +1249,7 @@ declare class PDA {
     static feeConfig(owner: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static questionFee(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static marketFeeOverride(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
+    /** seeds: ["presale", questionMarketConfig, presale_index u64 LE] under presale program */
     static presale(questionMarketConfig: PublicKey, presaleIndex: BN, programIds: Pick<ProgramIds, "presale">): [PublicKey, number];
     static qtMint(presalePda: PublicKey, programIds: Pick<ProgramIds, "presale">): [PublicKey, number];
     static qtAuthority(presalePda: PublicKey, programIds: Pick<ProgramIds, "presale">): [PublicKey, number];
@@ -1462,4 +1487,4 @@ declare function buildApproveCollateralTx(collateralMint: PublicKey, signer: Pub
  */
 declare function buildApproveAllOutcomeTokensTx(condition: PublicKey, signer: PublicKey, payer: PublicKey, delegate: PublicKey, programIds: ProgramIds, amount?: BN): Transaction;
 
-export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type CollectFeeOrder, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, DisputeClient, type DisputeConfigInfo, type DisputeMarketInfo, FEE_DENOMINATOR, FeeManagementClient, type FeesShareEstimate, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, type RedeemFeeOrder, type RedeemFeeOrderPair, ReferralClient, type ReferralConfigInfo, SEEDS, type SignedCollectFeeOrder, type SignedOrder, type SignedRedeemFeeOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, type UserDisputeInfo, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedCollectFeeEd25519Instruction, buildBatchedEd25519Instruction, buildBatchedRedeemFeeEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeCollectFeeOrderToBytes, serializeOrderToBytes, serializeRedeemFeeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type CollectFeeOrder, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, DEVNET_CONFIG, DEVNET_MARKET_OWNER, DEVNET_QUESTION_MARKET_CONFIG, DEVNET_USDC_MINT, DisputeClient, type DisputeConfigInfo, type DisputeMarketInfo, FEE_DENOMINATOR, FeeManagementClient, type FeesShareEstimate, IX_SYSVAR, InvalidParamError, MAINNET_CONFIG, MAINNET_USDC_MINT, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, type RedeemFeeOrder, type RedeemFeeOrderPair, ReferralClient, type ReferralConfigInfo, SEEDS, type SignedCollectFeeOrder, type SignedOrder, type SignedRedeemFeeOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, type UserDisputeInfo, V2_PROGRAM_IDS, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedCollectFeeEd25519Instruction, buildBatchedEd25519Instruction, buildBatchedRedeemFeeEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeCollectFeeOrderToBytes, serializeOrderToBytes, serializeRedeemFeeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };

package/dist/index.d.ts

@@ -25,10 +25,26 @@ interface NetworkConfig {
     rpcUrl: string;
     programIds: ProgramIds;
     defaultCollateral: CollateralConfig;
+    /**
+     * Owner pubkey used to derive question_market config PDA: ["config", owner].
+     * Pass to XMarketSDK as the 3rd constructor arg when set.
+     */
+    marketOwner?: PublicKey;
     /** Owner of the fee_config PDA — used to auto-derive fee distribution accounts */
     feeConfigOwner?: PublicKey;
 }
 type NetworkName = string;
+/** pm-svm v2 program IDs (same on devnet redeploy and mainnet). */
+declare const V2_PROGRAM_IDS: ProgramIds;
+/** Devnet question_market config owner (= config PDA seed). */
+declare const DEVNET_MARKET_OWNER: PublicKey;
+/** Devnet question_market config PDA for DEVNET_MARKET_OWNER + V2 questionMarket program. */
+declare const DEVNET_QUESTION_MARKET_CONFIG: PublicKey;
+declare const DEVNET_USDC_MINT: PublicKey;
+declare const MAINNET_USDC_MINT: PublicKey;
+/** Default devnet config — override rpcUrl if using a private RPC (e.g. Chainstack). */
+declare const DEVNET_CONFIG: NetworkConfig;
+declare const MAINNET_CONFIG: NetworkConfig;
 
 interface TxResult {
     signature: string;
@@ -418,7 +434,11 @@ declare class MarketClient {
     growConfig(owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     restoreConfig(snapshot: Buffer, owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     bumpPresaleCount(count: number, authority: PublicKey): Promise<Transaction>;
+    private configNotFoundMessage;
     fetchConfig(): Promise<QuestionMarketConfig | null>;
+    /** Like fetchConfig but throws with a hint when the config account is missing or invalid. */
+    fetchConfigOrThrow(): Promise<QuestionMarketConfig>;
+    private mapQuestionMarketConfig;
     /** Check if address is in question_market whitelist (can call createQuestion) */
     isWhitelisted(address: PublicKey): Promise<boolean>;
     fetchQuestion(questionPda: PublicKey): Promise<Question | null>;
@@ -437,9 +457,10 @@ declare class MarketClient {
      * Any user creates a presale + initial buy (question-market::create_presale).
      * Reads agents_rev / company_rev from fee_config.
      *
-     * @param feeConfig   fee_management fee_config PDA (owner = feeConfigOwner)
-     * @param currencyMint collateral token (e.g. USDC)
-     * @param presaleIndex config.presale_count — fetch config first or pass 0 for first presale
+     * Presale PDA seeds (presale program): ["presale", config, presale_index]
+     * where presale_index must equal config.presale_count at execution time.
+     *
+     * @param presaleIndex config.presale_count — fetch config first via fetchConfig()
      */
     createPresale(params: {
         price: anchor.BN;
@@ -1139,7 +1160,8 @@ declare class DisputeClient {
  *   - No HookClient (hook program removed entirely)
  *
  * Usage:
- *   const sdk = new XMarketSDK(DEVNET_CONFIG, wallet, marketOwner);
+ *   const sdk = new XMarketSDK({ ...DEVNET_CONFIG, rpcUrl: YOUR_RPC }, wallet);
+ *   // marketOwner defaults to config.marketOwner (required for fetchConfig / createPresale)
  *   await sdk.market.createQuestionAdmin(params, oracle);  // no hookProgram
  *   await sdk.clob.matchOrders(taker, makers);             // no hook in remainingAccounts
  */
@@ -1159,6 +1181,8 @@ declare class XMarketSDK {
     private _referral?;
     private _dispute?;
     constructor(config: NetworkConfig, wallet: anchor.Wallet, marketOwner?: PublicKey);
+    /** Question market config PDA derived from marketOwner + questionMarket program. */
+    get questionMarketConfigPda(): PublicKey;
     private _withAddress;
     get oracle(): OracleClient;
     get market(): MarketClient;
@@ -1225,6 +1249,7 @@ declare class PDA {
     static feeConfig(owner: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static questionFee(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static marketFeeOverride(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
+    /** seeds: ["presale", questionMarketConfig, presale_index u64 LE] under presale program */
     static presale(questionMarketConfig: PublicKey, presaleIndex: BN, programIds: Pick<ProgramIds, "presale">): [PublicKey, number];
     static qtMint(presalePda: PublicKey, programIds: Pick<ProgramIds, "presale">): [PublicKey, number];
     static qtAuthority(presalePda: PublicKey, programIds: Pick<ProgramIds, "presale">): [PublicKey, number];
@@ -1462,4 +1487,4 @@ declare function buildApproveCollateralTx(collateralMint: PublicKey, signer: Pub
  */
 declare function buildApproveAllOutcomeTokensTx(condition: PublicKey, signer: PublicKey, payer: PublicKey, delegate: PublicKey, programIds: ProgramIds, amount?: BN): Transaction;
 
-export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type CollectFeeOrder, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, DisputeClient, type DisputeConfigInfo, type DisputeMarketInfo, FEE_DENOMINATOR, FeeManagementClient, type FeesShareEstimate, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, type RedeemFeeOrder, type RedeemFeeOrderPair, ReferralClient, type ReferralConfigInfo, SEEDS, type SignedCollectFeeOrder, type SignedOrder, type SignedRedeemFeeOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, type UserDisputeInfo, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedCollectFeeEd25519Instruction, buildBatchedEd25519Instruction, buildBatchedRedeemFeeEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeCollectFeeOrderToBytes, serializeOrderToBytes, serializeRedeemFeeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type CollectFeeOrder, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, DEVNET_CONFIG, DEVNET_MARKET_OWNER, DEVNET_QUESTION_MARKET_CONFIG, DEVNET_USDC_MINT, DisputeClient, type DisputeConfigInfo, type DisputeMarketInfo, FEE_DENOMINATOR, FeeManagementClient, type FeesShareEstimate, IX_SYSVAR, InvalidParamError, MAINNET_CONFIG, MAINNET_USDC_MINT, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, type RedeemFeeOrder, type RedeemFeeOrderPair, ReferralClient, type ReferralConfigInfo, SEEDS, type SignedCollectFeeOrder, type SignedOrder, type SignedRedeemFeeOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, type UserDisputeInfo, V2_PROGRAM_IDS, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedCollectFeeEd25519Instruction, buildBatchedEd25519Instruction, buildBatchedRedeemFeeEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeCollectFeeOrderToBytes, serializeOrderToBytes, serializeRedeemFeeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };

package/dist/index.js

@@ -211,6 +211,7 @@ var PDA = class {
     );
   }
   // ─── Presale ─────────────────────────────────────────────────────────────────
+  /** seeds: ["presale", questionMarketConfig, presale_index u64 LE] under presale program */
   static presale(questionMarketConfig, presaleIndex, programIds) {
     if (!programIds.presale) throw new Error("presale program ID not configured");
     const idxBuf = Buffer.alloc(8);
@@ -633,28 +634,52 @@ var MarketClient = class {
     return this.program.methods.bumpPresaleCount(new anchor6__namespace.BN(count)).accounts({ authority, config: this.configPda }).transaction();
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
+  configNotFoundMessage() {
+    return `Question market config not found at ${this.configPda.toBase58()}. Check NetworkConfig.programIds.questionMarket (v2 FkpHo3...) and marketOwner (config owner pubkey \u2014 not the user wallet). Devnet: use DEVNET_CONFIG or marketOwner DEVNET_MARKET_OWNER.`;
+  }
   async fetchConfig() {
+    const info = await this.provider.connection.getAccountInfo(this.configPda);
+    if (!info) return null;
     try {
       const acc = await this.program.account.questionMarketConfig.fetch(this.configPda);
-      return {
-        owner: acc.owner,
-        admin: acc.admin,
-        oracle: acc.oracle,
-        oracleProgram: acc.oracleProgram,
-        conditionalTokensProgram: acc.conditionalTokensProgram,
-        questionCount: acc.questionCount.toNumber(),
-        approvedCount: acc.approvedCount.toNumber(),
-        rejectedCount: acc.rejectedCount.toNumber(),
-        presaleCount: acc.presaleCount.toNumber(),
-        whitelist: acc.whitelist.slice(0, acc.whitelistLen),
-        whitelistLen: acc.whitelistLen,
-        isPaused: acc.isPaused,
-        bump: acc.bump
-      };
+      return this.mapQuestionMarketConfig(acc);
     } catch {
       return null;
     }
   }
+  /** Like fetchConfig but throws with a hint when the config account is missing or invalid. */
+  async fetchConfigOrThrow() {
+    const info = await this.provider.connection.getAccountInfo(this.configPda);
+    if (!info) {
+      throw new Error(this.configNotFoundMessage());
+    }
+    try {
+      const acc = await this.program.account.questionMarketConfig.fetch(this.configPda);
+      return this.mapQuestionMarketConfig(acc);
+    } catch (e) {
+      throw new Error(
+        `${this.configNotFoundMessage()} Deserialize failed: ${e instanceof Error ? e.message : e}`
+      );
+    }
+  }
+  mapQuestionMarketConfig(acc) {
+    const accAny = acc;
+    return {
+      owner: accAny.owner,
+      admin: accAny.admin,
+      oracle: accAny.oracle,
+      oracleProgram: accAny.oracleProgram,
+      conditionalTokensProgram: accAny.conditionalTokensProgram,
+      questionCount: Number(accAny.questionCount.toString()),
+      approvedCount: Number(accAny.approvedCount.toString()),
+      rejectedCount: Number(accAny.rejectedCount.toString()),
+      presaleCount: Number(accAny.presaleCount.toString()),
+      whitelist: accAny.whitelist.slice(0, accAny.whitelistLen),
+      whitelistLen: accAny.whitelistLen,
+      isPaused: accAny.isPaused,
+      bump: accAny.bump
+    };
+  }
   /** Check if address is in question_market whitelist (can call createQuestion) */
   async isWhitelisted(address) {
     const cfg = await this.fetchConfig();
@@ -707,9 +732,10 @@ var MarketClient = class {
    * Any user creates a presale + initial buy (question-market::create_presale).
    * Reads agents_rev / company_rev from fee_config.
    *
-   * @param feeConfig   fee_management fee_config PDA (owner = feeConfigOwner)
-   * @param currencyMint collateral token (e.g. USDC)
-   * @param presaleIndex config.presale_count — fetch config first or pass 0 for first presale
+   * Presale PDA seeds (presale program): ["presale", config, presale_index]
+   * where presale_index must equal config.presale_count at execution time.
+   *
+   * @param presaleIndex config.presale_count — fetch config first via fetchConfig()
    */
   async createPresale(params, feeConfig, currencyMint, presaleIndex, creator = this.walletPubkey, payer = creator) {
     if (!this.programIds.presale) throw new Error("presale program ID not configured");
@@ -2108,7 +2134,7 @@ ${logs.join("\n")}`);
    * remaining_accounts per NO maker (6):
    *   [maker, order_record, buyer_no_token, buyer_no_collateral, buyer_no_position, no_order_status]
    */
-  async _buildMintIx(yesSigned, noMakers, collateralMint, operator, payer) {
+  async _buildMintIx(yesSigned, noMakers, collateralMint, operator, payer, feeRecipient, opts) {
     const condition = yesSigned.order.condition;
     const taker = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
@@ -2146,6 +2172,26 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    if (yesSigned.order.fee.gtn(0) && 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;
+          remainingAccounts.push(
+            { 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 }
+          );
+        }
+      }
+    }
+    const resolvedFeeRecipient = feeRecipient ?? clobUsdcAta;
     return this.program.methods.matchMintOrders(takerNonce, fillAmount, true).accounts({
       operator,
       payer,
@@ -2157,6 +2203,7 @@ ${logs.join("\n")}`);
       takerYesToken,
       takerYesPosition,
       takerOrderStatus,
+      feeRecipient: resolvedFeeRecipient,
       clobUsdcAta,
       clobYesAta,
       clobNoAta,
@@ -2186,7 +2233,7 @@ ${logs.join("\n")}`);
     const [noMint] = PDA.noMint(condition, this.programIds);
     const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfig, true, splToken.TOKEN_PROGRAM_ID);
     const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfig, true, splToken.TOKEN_PROGRAM_ID);
-    const matchIx = await this._buildMintIx(yesSigned, noMakers, collateralMint, operatorWallet.publicKey, this.walletPubkey);
+    const matchIx = await this._buildMintIx(yesSigned, noMakers, collateralMint, operatorWallet.publicKey, this.walletPubkey, _feeRecipient);
     await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
@@ -7210,13 +7257,6 @@ var question_market_default = {
             ],
             type: "pubkey"
           },
-          {
-            name: "oracle_program",
-            docs: [
-              "Oracle program ID \u2014 pinned for CPI validation in resolve_question"
-            ],
-            type: "pubkey"
-          },
           {
             name: "question_count",
             docs: [
@@ -7278,6 +7318,14 @@ var question_market_default = {
             ],
             type: "u64"
           },
+          {
+            name: "oracle_program",
+            docs: [
+              "Oracle program ID \u2014 pinned for CPI validation in resolve_question",
+              "Placed at end of meaningful fields to avoid layout shift on old accounts."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             docs: [
@@ -18068,7 +18116,11 @@ var XMarketSDK = class {
     );
     anchor6__namespace.setProvider(this.provider);
     this._programIds = config.programIds;
-    this._marketOwner = marketOwner ?? wallet.publicKey;
+    this._marketOwner = marketOwner ?? config.marketOwner ?? wallet.publicKey;
+  }
+  /** Question market config PDA derived from marketOwner + questionMarket program. */
+  get questionMarketConfigPda() {
+    return this.market.configPda;
   }
   _withAddress(idl, address) {
     return { ...idl, address: address.toBase58() };
@@ -18158,6 +18210,44 @@ var XMarketSDK = class {
     return this._dispute;
   }
 };
+var V2_PROGRAM_IDS = {
+  oracle: new web3_js.PublicKey("8uNiLDZnarxyFyoCi1bE1qkBMsLs2Tpyohtdzdvjkg8j"),
+  conditionalTokens: new web3_js.PublicKey("xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"),
+  questionMarket: new web3_js.PublicKey("FkpHo3zb5h2nNS5n6tWAvDwXPTXR2qqVLjDmEkMayott"),
+  clobExchange: new web3_js.PublicKey("AFT8SM1Vv8g8AQTf81LoE5oLteUTyhWzWTLj7SKZjkY1"),
+  feeManagement: new web3_js.PublicKey("8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm"),
+  presale: new web3_js.PublicKey("CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"),
+  marketOracle: new web3_js.PublicKey("Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit"),
+  adminContract: new web3_js.PublicKey("2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i"),
+  referral: new web3_js.PublicKey("9kyNMtUEFR6hDeZHUTbRKH3t1EJisfSvWQKKUev7ujoC"),
+  dispute: new web3_js.PublicKey("8gqHPY1WtGFGmYNbrGrPVoct1kqPL6cCaUtJ17EHSsFp")
+};
+var DEVNET_MARKET_OWNER = new web3_js.PublicKey(
+  "7eGpbyRpcM7WpNKQtd6XkteNQWHbWXP7icZjKzNK2aTk"
+);
+var DEVNET_QUESTION_MARKET_CONFIG = new web3_js.PublicKey(
+  "7n8y2oQYmxTp9fn2Wf2dFE1pC7ZESXYJ4yXSbYSEuRn5"
+);
+var DEVNET_USDC_MINT = new web3_js.PublicKey(
+  "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
+);
+var MAINNET_USDC_MINT = new web3_js.PublicKey(
+  "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+);
+var DEVNET_CONFIG = {
+  name: "devnet",
+  rpcUrl: "https://api.devnet.solana.com",
+  programIds: V2_PROGRAM_IDS,
+  defaultCollateral: { mint: DEVNET_USDC_MINT, decimals: 6 },
+  marketOwner: DEVNET_MARKET_OWNER,
+  feeConfigOwner: DEVNET_MARKET_OWNER
+};
+var MAINNET_CONFIG = {
+  name: "mainnet",
+  rpcUrl: "https://api.mainnet-beta.solana.com",
+  programIds: V2_PROGRAM_IDS,
+  defaultCollateral: { mint: MAINNET_USDC_MINT, decimals: 6 }
+};
 var MAX_APPROVE_AMOUNT = new BN4__default.default("18446744073709551615");
 function buildCreateUserAtasTx(condition, user, payer, programIds) {
   const [yesMint] = PDA.yesMint(condition, programIds);
@@ -18231,11 +18321,17 @@ exports.AccountNotFoundError = AccountNotFoundError;
 exports.AdminClient = AdminClient;
 exports.ClobClient = ClobClient;
 exports.CtfClient = CtfClient;
+exports.DEVNET_CONFIG = DEVNET_CONFIG;
+exports.DEVNET_MARKET_OWNER = DEVNET_MARKET_OWNER;
+exports.DEVNET_QUESTION_MARKET_CONFIG = DEVNET_QUESTION_MARKET_CONFIG;
+exports.DEVNET_USDC_MINT = DEVNET_USDC_MINT;
 exports.DisputeClient = DisputeClient;
 exports.FEE_DENOMINATOR = FEE_DENOMINATOR;
 exports.FeeManagementClient = FeeManagementClient;
 exports.IX_SYSVAR = IX_SYSVAR;
 exports.InvalidParamError = InvalidParamError;
+exports.MAINNET_CONFIG = MAINNET_CONFIG;
+exports.MAINNET_USDC_MINT = MAINNET_USDC_MINT;
 exports.MAX_APPROVE_AMOUNT = MAX_APPROVE_AMOUNT;
 exports.MarketClient = MarketClient;
 exports.MarketOracleClient = MarketOracleClient;
@@ -18246,6 +18342,7 @@ exports.QuestionStatus = QuestionStatus;
 exports.ReferralClient = ReferralClient;
 exports.SEEDS = SEEDS;
 exports.UnauthorizedError = UnauthorizedError;
+exports.V2_PROGRAM_IDS = V2_PROGRAM_IDS;
 exports.XMarketError = XMarketError;
 exports.XMarketSDK = XMarketSDK;
 exports.buildApproveAllOutcomeTokensTx = buildApproveAllOutcomeTokensTx;