@theliem/xmarket-sdk 4.0.2 → 4.1.0

package/dist/index.mjs

@@ -492,7 +492,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)
    */
@@ -729,7 +728,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
@@ -940,7 +938,7 @@ var CtfClient = class {
    * so that wallet can later sign reportPayouts.
    * payer covers rent for condition + mints.
    */
-  async prepareCondition(questionId, oracle, collateralMint, authorizedClob, payer = this.walletPubkey, signers = []) {
+  async prepareCondition(questionId, oracle, collateralMint, authorizedClob, authorizedResolver = oracle, payer = this.walletPubkey, signers = []) {
     const [conditionPda] = PDA.condition(oracle, questionId, this.programIds);
     const [yesMint] = PDA.yesMint(conditionPda, this.programIds);
     const [noMint] = PDA.noMint(conditionPda, this.programIds);
@@ -948,7 +946,8 @@ var CtfClient = class {
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const sig = await this.program.methods.prepareCondition(
       Array.from(questionId),
-      authorizedClob
+      authorizedClob,
+      authorizedResolver
     ).accounts({
       oracle,
       condition: conditionPda,
@@ -1199,8 +1198,8 @@ var CtfClient = class {
         collateralVault: acc.collateralVault,
         yesMint: acc.yesMint,
         noMint: acc.noMint,
-        hookProgram: acc.hookProgram,
         authorizedClob: acc.authorizedClob,
+        authorizedResolver: acc.authorizedResolver,
         isResolved: acc.isResolved,
         resolvedAt: acc.resolvedAt?.toNumber() ?? 0,
         bump: acc.bump
@@ -2271,6 +2270,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 = getAssociatedTokenAddressSync(yesMint, clobConfig, true, TOKEN_PROGRAM_ID);
+    const clobNoAta = getAssociatedTokenAddressSync(noMint, clobConfig, true, 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.
@@ -2299,9 +2346,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)) {
@@ -2402,9 +2468,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,
@@ -3774,7 +3865,7 @@ var DisputeClient = class {
 
 // src/idls/oracle.json
 var oracle_default = {
-  address: "JE3iUvfv2DjhHnEqf2cFtzMtqn1AYQ5s32e1fzkL6KTo",
+  address: "8uNiLDZnarxyFyoCi1bE1qkBMsLs2Tpyohtdzdvjkg8j",
   metadata: {
     name: "oracle_v2",
     version: "0.1.0",
@@ -4499,7 +4590,7 @@ var oracle_default = {
 
 // src/idls/question_market.json
 var question_market_default = {
-  address: "6aYGVgSPNgFxNB9f25UvKrzMs91cGh7urNZKdtnMUm6k",
+  address: "FkpHo3zb5h2nNS5n6tWAvDwXPTXR2qqVLjDmEkMayott",
   metadata: {
     name: "question_market_v2",
     version: "0.1.0",
@@ -4833,19 +4924,19 @@ var question_market_default = {
         },
         {
           name: "fee_management_program",
-          address: "HZ5ec3NbwceUfyzZkwGEzDxQHpr4p4L9JV1gmcPDyXYw"
+          address: "8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm"
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         },
         {
           name: "market_oracle_program",
-          address: "4o7VyLGV79AynuTjTxDvsUfZKS11bX5SkSsk5zHKVovG"
+          address: "Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit"
         },
         {
           name: "admin_program",
-          address: "3E2b2H3ZDMXjqQ1VKDz8zsVXWdRaH5Mjdd7qFB13Uejn"
+          address: "2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i"
         },
         {
           name: "token_program",
@@ -5107,11 +5198,11 @@ var question_market_default = {
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         },
         {
           name: "admin_program",
-          address: "3E2b2H3ZDMXjqQ1VKDz8zsVXWdRaH5Mjdd7qFB13Uejn"
+          address: "2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i"
         },
         {
           name: "token_program",
@@ -5193,7 +5284,7 @@ var question_market_default = {
         },
         {
           name: "market_oracle_program",
-          address: "4o7VyLGV79AynuTjTxDvsUfZKS11bX5SkSsk5zHKVovG"
+          address: "Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit"
         }
       ],
       args: []
@@ -5421,7 +5512,7 @@ var question_market_default = {
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         },
         {
           name: "token_program",
@@ -5557,7 +5648,7 @@ var question_market_default = {
         },
         {
           name: "fee_management_program",
-          address: "HZ5ec3NbwceUfyzZkwGEzDxQHpr4p4L9JV1gmcPDyXYw"
+          address: "8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm"
         },
         {
           name: "token_program",
@@ -5750,7 +5841,7 @@ var question_market_default = {
         },
         {
           name: "presale_program",
-          address: "H9GzTEu5giM1k9HJm126Pp6C6b3iKWahbF7RJj8Jr3zJ"
+          address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"
         }
       ],
       args: []
@@ -5970,7 +6061,8 @@ var question_market_default = {
         {
           name: "condition",
           docs: [
-            "The Condition account in CTF (will be updated via CPI)"
+            "The Condition account in CTF (will be updated via CPI).",
+            "Must match question.condition \u2014 prevents cross-market resolution."
           ],
           writable: true
         },
@@ -7358,7 +7450,7 @@ var question_market_default = {
 
 // src/idls/conditional_tokens.json
 var conditional_tokens_default = {
-  address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB",
+  address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT",
   metadata: {
     name: "conditional_tokens_v2",
     version: "0.1.0",
@@ -7779,6 +7871,10 @@ var conditional_tokens_default = {
         {
           name: "authorized_clob",
           type: "pubkey"
+        },
+        {
+          name: "authorized_resolver",
+          type: "pubkey"
         }
       ]
     },
@@ -7908,9 +8004,6 @@ var conditional_tokens_default = {
         },
         {
           name: "collateral_vault",
-          docs: [
-            "Use canonical bump derivation (no bump = vault.bump) so corrupt bump doesn't block us"
-          ],
           writable: true,
           pda: {
             seeds: [
@@ -7944,9 +8037,6 @@ var conditional_tokens_default = {
         },
         {
           name: "vault_token_account",
-          docs: [
-            "Existing vault token account \u2014 just update the reference"
-          ],
           writable: true,
           pda: {
             seeds: [
@@ -8624,6 +8714,14 @@ var conditional_tokens_default = {
             ],
             type: "u8"
           },
+          {
+            name: "admin",
+            docs: [
+              "Admin pubkey \u2014 only this address can call reinitialize_vault.",
+              "Set at initialize_vault time. If Pubkey::default(), first caller sets it (bootstrap)."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             docs: [
@@ -8632,7 +8730,7 @@ var conditional_tokens_default = {
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -8710,12 +8808,20 @@ var conditional_tokens_default = {
             name: "bump",
             type: "u8"
           },
+          {
+            name: "authorized_resolver",
+            docs: [
+              "QuestionMarket config PDA authorized to call set_payout.",
+              "Uses first 32 bytes of old _reserved \u2014 existing accounts read as Pubkey::default()."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -9061,7 +9167,7 @@ var conditional_tokens_default = {
 
 // src/idls/clob_exchange.json
 var clob_exchange_default = {
-  address: "43ubx86ZnGJ4bzD8uZY91uoUzJdK2jULwSSVk8zHjzEY",
+  address: "AFT8SM1Vv8g8AQTf81LoE5oLteUTyhWzWTLj7SKZjkY1",
   metadata: {
     name: "clob_exchange_v2",
     version: "0.1.0",
@@ -9254,7 +9360,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -9405,7 +9511,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -9552,7 +9658,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -9915,7 +10021,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "token_program",
@@ -10187,7 +10293,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "collateral_token_program",
@@ -10463,7 +10569,7 @@ var clob_exchange_default = {
         },
         {
           name: "conditional_tokens_program",
-          address: "3f4vBEgXo9y4Ndrn8KWnNpLLtt4VAGkmKWqXpGS1BLDB"
+          address: "xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"
         },
         {
           name: "collateral_token_program",
@@ -11203,6 +11309,14 @@ var clob_exchange_default = {
             ],
             type: "u8"
           },
+          {
+            name: "admin",
+            docs: [
+              "Admin pubkey \u2014 only this address can call reinitialize_vault.",
+              "Set at initialize_vault time. If Pubkey::default(), first caller sets it (bootstrap)."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             docs: [
@@ -11211,7 +11325,7 @@ var clob_exchange_default = {
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -11360,12 +11474,20 @@ var clob_exchange_default = {
             name: "bump",
             type: "u8"
           },
+          {
+            name: "authorized_resolver",
+            docs: [
+              "QuestionMarket config PDA authorized to call set_payout.",
+              "Uses first 32 bytes of old _reserved \u2014 existing accounts read as Pubkey::default()."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -11571,7 +11693,7 @@ var clob_exchange_default = {
 
 // src/idls/fee_management.json
 var fee_management_default = {
-  address: "DuYyXguB5PVSKg6E2p4XPrrXZSCJnuBhoGpkGCBN5bBb",
+  address: "8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm",
   metadata: {
     name: "fee_management",
     version: "0.1.0",
@@ -13041,7 +13163,7 @@ var fee_management_default = {
 
 // src/idls/presale.json
 var presale_default = {
-  address: "2Rnw1VoEtsUMQ7wkvYZjDehqSqRob6uNkeymDfvKrquB",
+  address: "CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C",
   metadata: {
     name: "presale",
     version: "0.1.0",
@@ -14708,7 +14830,7 @@ var presale_default = {
 
 // src/idls/market_oracle.json
 var market_oracle_default = {
-  address: "ADWF4J3nCJ2kWnCtycuem2jhu7amUqJWQG3oa5xF67QJ",
+  address: "Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit",
   metadata: {
     name: "market_oracle",
     version: "0.1.0",
@@ -15409,7 +15531,7 @@ var market_oracle_default = {
 
 // src/idls/admin_contract.json
 var admin_contract_default = {
-  address: "4NdD5962SfGqofmeyjfifJpdGnwTAiKaUKB5Z42UDc9T",
+  address: "2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i",
   metadata: {
     name: "admin_contract",
     version: "0.1.0",
@@ -16260,11 +16382,29 @@ var admin_contract_default = {
   accounts: [
     {
       name: "AdminConfig",
-      discriminator: [156, 10, 79, 161, 71, 9, 62, 77]
+      discriminator: [
+        156,
+        10,
+        79,
+        161,
+        71,
+        9,
+        62,
+        77
+      ]
     },
     {
       name: "ClaimRecord",
-      discriminator: [57, 229, 0, 9, 65, 62, 96, 7]
+      discriminator: [
+        57,
+        229,
+        0,
+        9,
+        65,
+        62,
+        96,
+        7
+      ]
     }
   ],
   types: [
@@ -16355,9 +16495,9 @@ var admin_contract_default = {
 
 // src/idls/referral.json
 var referral_default = {
-  address: "7b5ohWDqrQ2KRcDJMWwj1dwgRkt5ZJdMavSmrXn9oBgL",
+  address: "9kyNMtUEFR6hDeZHUTbRKH3t1EJisfSvWQKKUev7ujoC",
   metadata: {
-    name: "referral",
+    name: "referral_v2",
     version: "0.1.0",
     spec: "0.1.0",
     description: "Referral program for XMarket \u2014 whitelist-gated batch USDS distribution"
@@ -16846,9 +16986,9 @@ var referral_default = {
 
 // src/idls/dispute.json
 var dispute_default = {
-  address: "4toSDWDCcx37R6HZ78P71nDp3NNoJvcmQpzP4sfivVvL",
+  address: "8gqHPY1WtGFGmYNbrGrPVoct1kqPL6cCaUtJ17EHSsFp",
   metadata: {
-    name: "dispute",
+    name: "dispute_v2",
     version: "0.1.0",
     spec: "0.1.0",
     description: "Dispute program for XMarket \u2014 raise/resolve/claim disputes on prediction markets"