@theliem/xmarket-sdk 3.8.0 → 3.10.0

package/dist/index.mjs

@@ -1593,10 +1593,10 @@ ${logs.join("\n")}`);
       connection.getAccountInfo(clobYesAta),
       connection.getAccountInfo(clobNoAta)
     ]);
-    const { createAssociatedTokenAccountIdempotentInstruction: createAssociatedTokenAccountIdempotentInstruction2 } = await import('@solana/spl-token');
+    const { createAssociatedTokenAccountIdempotentInstruction: createAssociatedTokenAccountIdempotentInstruction3 } = await import('@solana/spl-token');
     const ixs = [];
     if (!yesInfo) {
-      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction3(
         this.walletPubkey,
         clobYesAta,
         clobConfig,
@@ -1605,7 +1605,7 @@ ${logs.join("\n")}`);
       ));
     }
     if (!noInfo) {
-      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction3(
         this.walletPubkey,
         clobNoAta,
         clobConfig,
@@ -1941,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,
@@ -2037,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,
@@ -2126,10 +2130,19 @@ ${logs.join("\n")}`);
     const allBuy = t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_BUY);
     const allSell = t.side === SIDE_SELL && makers.every((m) => m.order.side === SIDE_SELL);
     if (!allBuy && !allSell) throw new InvalidParamError("MINT/MERGE: all orders must be same side");
-    if (t.tokenId !== 1) throw new InvalidParamError("MINT/MERGE: taker must be YES (tokenId=1)");
-    if (!makers.every((m) => m.order.tokenId === 0)) throw new InvalidParamError("MINT/MERGE: makers must be NO (tokenId=0)");
-    if (allBuy) return this.matchMintOrders(taker, makers, collateralMint, feeRecipient, operatorWallet, alt);
-    return this.matchMergeOrders(taker, makers, collateralMint, feeRecipient, operatorWallet, alt, opts);
+    const takerIsYes = t.tokenId === 1 && makers.every((m) => m.order.tokenId === 0);
+    const takerIsNo = t.tokenId === 0 && makers.every((m) => m.order.tokenId === 1);
+    if (!takerIsYes && !takerIsNo) throw new InvalidParamError("MINT/MERGE: orders must be complementary YES+NO pair");
+    if (takerIsYes) {
+      if (allBuy) return this.matchMintOrders(taker, makers, collateralMint, feeRecipient, operatorWallet, alt);
+      return this.matchMergeOrders(taker, makers, collateralMint, feeRecipient, operatorWallet, alt, opts);
+    }
+    let lastResult;
+    for (const yesMaker of makers) {
+      if (allBuy) lastResult = await this.matchMintOrders(yesMaker, [taker], collateralMint, feeRecipient, operatorWallet, alt);
+      else lastResult = await this.matchMergeOrders(yesMaker, [taker], collateralMint, feeRecipient, operatorWallet, alt, opts);
+    }
+    return lastResult;
   }
   /**
    * High-level match: caller passes price + quantity + keypair — SDK builds,
@@ -9100,6 +9113,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },
@@ -9391,6 +9408,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },
@@ -14969,6 +14990,33 @@ var XMarketSDK = class {
   }
 };
 var MAX_APPROVE_AMOUNT = new BN4("18446744073709551615");
+function buildCreateUserAtasTx(condition, user, payer, programIds) {
+  const [yesMint] = PDA.yesMint(condition, programIds);
+  const [noMint] = PDA.noMint(condition, programIds);
+  const yesAta = getAssociatedTokenAddressSync(yesMint, user, false, TOKEN_2022_PROGRAM_ID);
+  const noAta = getAssociatedTokenAddressSync(noMint, user, false, TOKEN_2022_PROGRAM_ID);
+  const tx = new Transaction();
+  tx.feePayer = payer;
+  tx.add(
+    createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      yesAta,
+      user,
+      yesMint,
+      TOKEN_2022_PROGRAM_ID,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    ),
+    createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      noAta,
+      user,
+      noMint,
+      TOKEN_2022_PROGRAM_ID,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    )
+  );
+  return tx;
+}
 function buildApproveCollateralTx(collateralMint, signer, payer, delegate, amount = MAX_APPROVE_AMOUNT) {
   const ownerAta = getAssociatedTokenAddressSync(collateralMint, signer, false, TOKEN_PROGRAM_ID);
   const approveIx = createApproveInstruction(
@@ -15012,6 +15060,6 @@ function buildApproveAllOutcomeTokensTx(condition, signer, payer, delegate, prog
   return tx;
 }
 
-export { AccountNotFoundError, AdminClient, ClobClient, CtfClient, FEE_DENOMINATOR, FeeManagementClient, HookClient, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, OracleClient, PDA, PresaleClient, QuestionStatus, SEEDS, UnauthorizedError, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, AdminClient, ClobClient, CtfClient, FEE_DENOMINATOR, FeeManagementClient, HookClient, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, OracleClient, PDA, PresaleClient, QuestionStatus, SEEDS, UnauthorizedError, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map