@theliem/xmarket-sdk 3.6.1 → 3.8.0

package/dist/index.mjs

@@ -1750,7 +1750,7 @@ ${logs.join("\n")}`);
    *   [extraAccountMetaList, hookConfig, hookProgram]
    *   [feeManagement, fee_config, mkt_override, company_ata, oracle_vault]  (when fee > 0)
    */
-  async buildMatchComplementaryIxs(takerSigned, makersSigned, collateralMint, feeRecipient, operator, opts, useTakerPrice = false) {
+  async buildMatchComplementaryIxs(takerSigned, makersSigned, collateralMint, feeRecipient, operator, opts, useTakerPrice = false, skipCrossingCheck = true) {
     const condition = takerSigned.order.condition;
     const tokenId = takerSigned.order.tokenId;
     const taker = takerSigned.order.maker;
@@ -1790,17 +1790,21 @@ ${logs.join("\n")}`);
     if (takerSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
       const companyAddr = await this.companyAddress();
       if (companyAddr) {
-        const oracleVault = opts?.marketOracleVault ?? this.walletPubkey;
-        feeAccounts = [
-          { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
-          { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
-          { pubkey: PDA.marketFeeOverride(condition, this.programIds)[0], isSigner: false, isWritable: false },
-          { pubkey: getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
-          { pubkey: oracleVault, isSigner: false, isWritable: true }
-        ];
+        const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
+        const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
+        if (feeOverrideExists) {
+          const oracleVault = opts?.marketOracleVault ?? this.walletPubkey;
+          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: getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
+            { pubkey: oracleVault, isSigner: false, isWritable: true }
+          ];
+        }
       }
     }
-    const matchIx = await this.program.methods.matchComplementary(takerNonce, fillAmount, useTakerPrice).accounts({
+    const matchIx = await this.program.methods.matchComplementary(takerNonce, fillAmount, useTakerPrice, skipCrossingCheck).accounts({
       operator,
       payer: this.walletPubkey,
       clobConfig: this.configPda(),
@@ -1843,19 +1847,14 @@ ${logs.join("\n")}`);
   }
   /**
    * 1 SELL taker vs N BUY makers.
-   * Rust program only supports BUY-as-taker, so we decompose into N instructions
-   * (BUY_i as taker, SELL as single maker) combined into one atomic transaction.
-   * Engine must use limitPrice for BUY.makerAmount to pass per-pair crossing check.
+   * Program now supports SELL-as-taker natively → 1 instruction with all BUY makers
+   * in remaining_accounts (same structure as BUY taker case).
    */
   async matchComplementarySellVsMultiBuy(sellTaker, buyMakers, collateralMint, feeRecipient, operatorWallet, lookupTable, opts) {
-    await Promise.all([
-      this.registerOrderIfNeeded(sellTaker),
-      ...buyMakers.map((m) => this.registerOrderIfNeeded(m))
-    ]);
-    const sell = sellTaker.order;
     if (buyMakers.length === 0) {
       throw new InvalidParamError("COMPLEMENTARY: no BUY maker orders provided");
     }
+    const sell = sellTaker.order;
     const totalBuyPayment = buyMakers.reduce(
       (acc, b) => acc + BigInt(b.order.makerAmount.toString()),
       BigInt(0)
@@ -1866,24 +1865,20 @@ ${logs.join("\n")}`);
         `COMPLEMENTARY: total buyer payments ${totalBuyPayment} < seller expected ${sellExpected}`
       );
     }
-    const crossingBuys = buyMakers;
-    const allIxs = [];
-    for (const buyMaker of crossingBuys) {
-      const ixs = await this.buildMatchComplementaryIxs(
-        buyMaker,
-        // BUY as taker
-        [sellTaker],
-        // SELL as maker
-        collateralMint,
-        feeRecipient,
-        operatorWallet.publicKey,
-        opts,
-        true
-        // useTakerPrice: SELL gets filled at BUY's price (maker's price per doc)
-      );
-      allIxs.push(...ixs);
-    }
-    const sig = await this.sendMatchTx(allIxs, lookupTable, operatorWallet);
+    await Promise.all([
+      this.registerOrderIfNeeded(sellTaker),
+      ...buyMakers.map((m) => this.registerOrderIfNeeded(m))
+    ]);
+    const ixs = await this.buildMatchComplementaryIxs(
+      sellTaker,
+      buyMakers,
+      collateralMint,
+      feeRecipient,
+      operatorWallet.publicKey,
+      opts,
+      false
+    );
+    const sig = await this.sendMatchTx(ixs, lookupTable, operatorWallet);
     return { signature: sig };
   }
   /**
@@ -2125,19 +2120,7 @@ ${logs.join("\n")}`);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
-      const buy = buySignedOrder.order;
-      const finalSells = sellCandidates.filter((s) => {
-        const sell = s.order;
-        const lhs = BigInt(buy.makerAmount.toString()) * BigInt(sell.makerAmount.toString());
-        const rhs = BigInt(buy.takerAmount.toString()) * BigInt(sell.takerAmount.toString());
-        return lhs >= rhs;
-      });
-      if (finalSells.length === 0) {
-        throw new InvalidParamError("COMPLEMENTARY: no maker orders cross with the buy order");
-      }
-      if (finalSells.length < sellCandidates.length) {
-        console.warn(`[matchOrders] filtered ${sellCandidates.length - finalSells.length} non-crossing maker(s)`);
-      }
+      const finalSells = sellCandidates;
       return this.matchComplementary(buySignedOrder, finalSells, collateralMint, feeRecipient, operatorWallet, alt, opts);
     }
     const allBuy = t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_BUY);
@@ -8838,6 +8821,10 @@ var clob_exchange_default = {
         {
           name: "use_taker_price",
           type: "bool"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },