@theliem/xmarket-sdk 3.7.0 → 3.9.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(),
@@ -1937,7 +1941,7 @@ ${logs.join("\n")}`);
       { pubkey: hookConfig, isSigner: false, isWritable: false },
       { pubkey: hookProgram, isSigner: false, isWritable: false }
     );
-    const matchIx = await this.program.methods.matchMintOrders(takerNonce, fillAmount).accounts({
+    const matchIx = await this.program.methods.matchMintOrders(takerNonce, fillAmount, true).accounts({
       operator: operatorWallet.publicKey,
       payer: this.walletPubkey,
       clobConfig,
@@ -2033,17 +2037,21 @@ ${logs.join("\n")}`);
     if (yesSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
       const companyAddr = await this.companyAddress();
       if (companyAddr) {
-        const oracleVault = opts?.marketOracleVault ?? this.walletPubkey;
-        remainingAccounts.push(
-          { 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;
+          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: getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
+            { pubkey: oracleVault, isSigner: false, isWritable: true }
+          );
+        }
       }
     }
-    const matchIx = await this.program.methods.matchMergeOrders(takerNonce, fillAmount).accounts({
+    const matchIx = await this.program.methods.matchMergeOrders(takerNonce, fillAmount, true).accounts({
       operator: operatorWallet.publicKey,
       payer: this.walletPubkey,
       clobConfig,
@@ -2116,17 +2124,6 @@ ${logs.join("\n")}`);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
-      const buy = buySignedOrder.order;
-      const totalSellDemand = sellCandidates.reduce(
-        (acc, s) => acc + BigInt(s.order.takerAmount.toString()),
-        BigInt(0)
-      );
-      const buyBudget = BigInt(buy.makerAmount.toString());
-      if (buyBudget < totalSellDemand) {
-        throw new InvalidParamError(
-          `COMPLEMENTARY: total sell demand ${totalSellDemand} > buy budget ${buyBudget}. Build taker order with limitPrice, not averageMatchedPrice.`
-        );
-      }
       const finalSells = sellCandidates;
       return this.matchComplementary(buySignedOrder, finalSells, collateralMint, feeRecipient, operatorWallet, alt, opts);
     }
@@ -8828,6 +8825,10 @@ var clob_exchange_default = {
         {
           name: "use_taker_price",
           type: "bool"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },
@@ -9103,6 +9104,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },
@@ -9394,6 +9399,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },