@theliem/xmarket-sdk 4.0.1 → 4.0.3

package/dist/index.d.mts

@@ -64,7 +64,6 @@ interface Condition {
     collateralVault: PublicKey;
     yesMint: PublicKey;
     noMint: PublicKey;
-    hookProgram: PublicKey;
     authorizedClob: PublicKey;
     isResolved: boolean;
     resolvedAt: number;
@@ -138,7 +137,7 @@ interface CtfConfig {
     bump: number;
 }
 interface ClobConfig {
-    owner: PublicKey;
+    admin: PublicKey;
     operators: PublicKey[];
     operatorsLen: number;
     feeRecipient: PublicKey;
@@ -391,11 +390,10 @@ declare class MarketClient {
     initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
     /**
      * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
-     * V2: no hookProgram param, uses TOKEN_PROGRAM_ID for YES/NO mints.
      * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
      * @param payer   - Fee payer (pays rent; can differ from creator)
      */
-    createQuestionAdmin(params: Omit<CreateQuestionParams, "hookProgram">, oracle: PublicKey, creator?: PublicKey, payer?: PublicKey): Promise<{
+    createQuestionAdmin(params: CreateQuestionParams, oracle: PublicKey, creator?: PublicKey, payer?: PublicKey): Promise<{
         tx: Transaction;
         questionPda: PublicKey;
         conditionPda: PublicKey;
@@ -452,7 +450,6 @@ declare class MarketClient {
     }>;
     /**
      * Whitelist-only: approve presale → creates question + CTF condition + market_oracle in one tx.
-     * V2: no hookProgram param — removes Token-2022 hook from CPI call.
      *
      * @param presalePda      the presale account
      * @param contentHash     32-byte hash for question content
@@ -727,6 +724,16 @@ declare class ClobClient {
      */
     private _buildMergeIx;
     private matchMergeOrders;
+    /**
+     * Build ixs for a mixed batch: some makers COMPLEMENTARY (same tokenId as taker),
+     * others MINT/MERGE (opposite tokenId). Packs all into a single ix array so the
+     * caller can send them in one atomic tx.
+     *
+     * Supported taker configurations:
+     *   YES BUY  + YES SELL makers + NO BUY  makers → COMP ixs + MINT ix
+     *   YES SELL + YES BUY  makers + NO SELL makers → COMP ixs + MERGE ix
+     */
+    private _buildMixedMatchIxs;
     /**
      * Auto-detect match type and execute 2-phase:
      *   Phase 1 — register all orders (taker + makers) on-chain in parallel.

package/dist/index.d.ts

@@ -64,7 +64,6 @@ interface Condition {
     collateralVault: PublicKey;
     yesMint: PublicKey;
     noMint: PublicKey;
-    hookProgram: PublicKey;
     authorizedClob: PublicKey;
     isResolved: boolean;
     resolvedAt: number;
@@ -138,7 +137,7 @@ interface CtfConfig {
     bump: number;
 }
 interface ClobConfig {
-    owner: PublicKey;
+    admin: PublicKey;
     operators: PublicKey[];
     operatorsLen: number;
     feeRecipient: PublicKey;
@@ -391,11 +390,10 @@ declare class MarketClient {
     initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
     /**
      * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
-     * V2: no hookProgram param, uses TOKEN_PROGRAM_ID for YES/NO mints.
      * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
      * @param payer   - Fee payer (pays rent; can differ from creator)
      */
-    createQuestionAdmin(params: Omit<CreateQuestionParams, "hookProgram">, oracle: PublicKey, creator?: PublicKey, payer?: PublicKey): Promise<{
+    createQuestionAdmin(params: CreateQuestionParams, oracle: PublicKey, creator?: PublicKey, payer?: PublicKey): Promise<{
         tx: Transaction;
         questionPda: PublicKey;
         conditionPda: PublicKey;
@@ -452,7 +450,6 @@ declare class MarketClient {
     }>;
     /**
      * Whitelist-only: approve presale → creates question + CTF condition + market_oracle in one tx.
-     * V2: no hookProgram param — removes Token-2022 hook from CPI call.
      *
      * @param presalePda      the presale account
      * @param contentHash     32-byte hash for question content
@@ -727,6 +724,16 @@ declare class ClobClient {
      */
     private _buildMergeIx;
     private matchMergeOrders;
+    /**
+     * Build ixs for a mixed batch: some makers COMPLEMENTARY (same tokenId as taker),
+     * others MINT/MERGE (opposite tokenId). Packs all into a single ix array so the
+     * caller can send them in one atomic tx.
+     *
+     * Supported taker configurations:
+     *   YES BUY  + YES SELL makers + NO BUY  makers → COMP ixs + MINT ix
+     *   YES SELL + YES BUY  makers + NO SELL makers → COMP ixs + MERGE ix
+     */
+    private _buildMixedMatchIxs;
     /**
      * Auto-detect match type and execute 2-phase:
      *   Phase 1 — register all orders (taker + makers) on-chain in parallel.

package/dist/index.js

@@ -518,7 +518,6 @@ var MarketClient = class {
   }
   /**
    * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
-   * V2: no hookProgram param, uses TOKEN_PROGRAM_ID for YES/NO mints.
    * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
    * @param payer   - Fee payer (pays rent; can differ from creator)
    */
@@ -755,7 +754,6 @@ var MarketClient = class {
   }
   /**
    * Whitelist-only: approve presale → creates question + CTF condition + market_oracle in one tx.
-   * V2: no hookProgram param — removes Token-2022 hook from CPI call.
    *
    * @param presalePda      the presale account
    * @param contentHash     32-byte hash for question content
@@ -1225,7 +1223,6 @@ var CtfClient = class {
         collateralVault: acc.collateralVault,
         yesMint: acc.yesMint,
         noMint: acc.noMint,
-        hookProgram: acc.hookProgram,
         authorizedClob: acc.authorizedClob,
         isResolved: acc.isResolved,
         resolvedAt: acc.resolvedAt?.toNumber() ?? 0,
@@ -2297,6 +2294,54 @@ ${logs.join("\n")}`);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
   }
+  /**
+   * Build ixs for a mixed batch: some makers COMPLEMENTARY (same tokenId as taker),
+   * others MINT/MERGE (opposite tokenId). Packs all into a single ix array so the
+   * caller can send them in one atomic tx.
+   *
+   * Supported taker configurations:
+   *   YES BUY  + YES SELL makers + NO BUY  makers → COMP ixs + MINT ix
+   *   YES SELL + YES BUY  makers + NO SELL makers → COMP ixs + MERGE ix
+   */
+  async _buildMixedMatchIxs(taker, complementaryMakers, mintMergeMakers, collateralMint, feeRecipient, operator, opts) {
+    const t = taker.order;
+    const SIDE_BUY = 0;
+    const SIDE_SELL = 1;
+    const useTakerPrice = t.side === SIDE_BUY;
+    const compIxs = await this.buildMatchComplementaryIxs(
+      taker,
+      complementaryMakers,
+      collateralMint,
+      feeRecipient,
+      operator,
+      opts,
+      useTakerPrice
+    );
+    const allBuy = t.side === SIDE_BUY && mintMergeMakers.every((m) => m.order.side === SIDE_BUY);
+    const allSell = t.side === SIDE_SELL && mintMergeMakers.every((m) => m.order.side === SIDE_SELL);
+    if (!allBuy && !allSell) {
+      throw new InvalidParamError("MINT/MERGE makers in mixed batch must all share taker side");
+    }
+    const condition = t.condition;
+    const clobConfig = this.configPda();
+    const [yesMint] = PDA.yesMint(condition, this.programIds);
+    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);
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
+    let mmIxs;
+    if (t.tokenId === 1) {
+      const ix = allBuy ? await this._buildMintIx(taker, mintMergeMakers, collateralMint, operator, this.walletPubkey) : await this._buildMergeIx(taker, mintMergeMakers, collateralMint, operator, this.walletPubkey, opts);
+      mmIxs = [ix];
+    } else {
+      mmIxs = [];
+      for (const yesMaker of mintMergeMakers) {
+        const ix = allBuy ? await this._buildMintIx(yesMaker, [taker], collateralMint, operator, this.walletPubkey) : await this._buildMergeIx(yesMaker, [taker], collateralMint, operator, this.walletPubkey, opts);
+        mmIxs.push(ix);
+      }
+    }
+    return [...compIxs, ...mmIxs];
+  }
   /**
    * Auto-detect match type and execute 2-phase:
    *   Phase 1 — register all orders (taker + makers) on-chain in parallel.
@@ -2325,9 +2370,28 @@ ${logs.join("\n")}`);
       makers
     );
     const t = taker.order;
-    const m0 = makers[0].order;
     const SIDE_BUY = 0;
     const SIDE_SELL = 1;
+    const complementaryMakers = makers.filter((m) => m.order.tokenId === t.tokenId);
+    const mintMergeMakers = makers.filter((m) => m.order.tokenId !== t.tokenId);
+    if (complementaryMakers.length > 0 && mintMergeMakers.length > 0) {
+      await Promise.all([
+        this.registerOrderIfNeeded(taker),
+        ...makers.map((m) => this.registerOrderIfNeeded(m))
+      ]);
+      const ixs = await this._buildMixedMatchIxs(
+        taker,
+        complementaryMakers,
+        mintMergeMakers,
+        collateralMint,
+        feeRecipient,
+        operatorWallet.publicKey,
+        opts
+      );
+      const sig = await this.sendMatchTx(ixs, alt, operatorWallet);
+      return { signature: sig };
+    }
+    const m0 = makers[0].order;
     if (t.tokenId === m0.tokenId) {
       let buySignedOrder, sellCandidates;
       if (t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_SELL)) {
@@ -2428,9 +2492,34 @@ ${logs.join("\n")}`);
     const feeRecipient = cfg.feeRecipient;
     const alt = await this.ensureAlt(taker.order.condition, collateralMint, taker, makers);
     const t = taker.order;
-    const m0 = makers[0].order;
     const SIDE_BUY = 0;
     const SIDE_SELL = 1;
+    const complementaryMakers = makers.filter((m) => m.order.tokenId === t.tokenId);
+    const mintMergeMakers = makers.filter((m) => m.order.tokenId !== t.tokenId);
+    if (complementaryMakers.length > 0 && mintMergeMakers.length > 0) {
+      await Promise.all([
+        this.registerOrderIfNeeded(taker),
+        ...makers.map((m) => this.registerOrderIfNeeded(m))
+      ]);
+      const oracleVaultInitIx2 = await this.buildInitOracleVaultIfNeeded(
+        t.condition,
+        collateralMint,
+        t.fee,
+        payer
+      );
+      const preIxs2 = oracleVaultInitIx2 ? [oracleVaultInitIx2] : [];
+      const ixs2 = await this._buildMixedMatchIxs(
+        taker,
+        complementaryMakers,
+        mintMergeMakers,
+        collateralMint,
+        feeRecipient,
+        operator,
+        opts
+      );
+      return this._buildUnsignedVtx([...preIxs2, ...ixs2], alt, payer);
+    }
+    const m0 = makers[0].order;
     const oracleVaultInitIx = await this.buildInitOracleVaultIfNeeded(
       t.condition,
       collateralMint,
@@ -2936,7 +3025,7 @@ ${logs.join("\n")}`);
     try {
       const acc = await this.program.account.clobConfig.fetch(this.configPda());
       return {
-        owner: acc.owner,
+        admin: acc.admin,
         operators: acc.operators,
         operatorsLen: acc.operatorsLen,
         feeRecipient: acc.feeRecipient,