@theliem/xmarket-sdk 3.8.0 → 3.10.0

package/dist/index.d.mts

@@ -1078,6 +1078,18 @@ declare function detectMatchType(a: Order | SignedOrder, b: Order | SignedOrder)
 
 /** Maximum u64 — approve "unlimited" amount. */
 declare const MAX_APPROVE_AMOUNT: BN;
+/**
+ * Build a Transaction that creates YES and NO Token-2022 ATAs for a user
+ * (idempotent — safe to call even if they already exist).
+ *
+ * Required signer: payer (fee payer). No user signature needed.
+ *
+ * @param condition  - condition PDA
+ * @param user       - wallet that will own the ATAs
+ * @param payer      - fee payer wallet pubkey
+ * @param programIds - network program IDs
+ */
+declare function buildCreateUserAtasTx(condition: PublicKey, user: PublicKey, payer: PublicKey, programIds: ProgramIds): Transaction;
 /**
  * Build a Transaction that approves the CLOB config PDA to transfer collateral
  * (USDC) from the signer's ATA.
@@ -1099,4 +1111,4 @@ declare function buildApproveCollateralTx(collateralMint: PublicKey, signer: Pub
  */
 declare function buildApproveAllOutcomeTokensTx(condition: PublicKey, signer: PublicKey, payer: PublicKey, delegate: PublicKey, programIds: ProgramIds, amount?: BN): Transaction;
 
-export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, FEE_DENOMINATOR, FeeManagementClient, HookClient, type HookConfig, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, SEEDS, type SignedOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, FEE_DENOMINATOR, FeeManagementClient, HookClient, type HookConfig, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, SEEDS, type SignedOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };

package/dist/index.d.ts

@@ -1078,6 +1078,18 @@ declare function detectMatchType(a: Order | SignedOrder, b: Order | SignedOrder)
 
 /** Maximum u64 — approve "unlimited" amount. */
 declare const MAX_APPROVE_AMOUNT: BN;
+/**
+ * Build a Transaction that creates YES and NO Token-2022 ATAs for a user
+ * (idempotent — safe to call even if they already exist).
+ *
+ * Required signer: payer (fee payer). No user signature needed.
+ *
+ * @param condition  - condition PDA
+ * @param user       - wallet that will own the ATAs
+ * @param payer      - fee payer wallet pubkey
+ * @param programIds - network program IDs
+ */
+declare function buildCreateUserAtasTx(condition: PublicKey, user: PublicKey, payer: PublicKey, programIds: ProgramIds): Transaction;
 /**
  * Build a Transaction that approves the CLOB config PDA to transfer collateral
  * (USDC) from the signer's ATA.
@@ -1099,4 +1111,4 @@ declare function buildApproveCollateralTx(collateralMint: PublicKey, signer: Pub
  */
 declare function buildApproveAllOutcomeTokensTx(condition: PublicKey, signer: PublicKey, payer: PublicKey, delegate: PublicKey, programIds: ProgramIds, amount?: BN): Transaction;
 
-export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, FEE_DENOMINATOR, FeeManagementClient, HookClient, type HookConfig, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, SEEDS, type SignedOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, AdminClient, type AdminConfigInfo, type ClaimRecordInfo, ClobClient, type ClobConfig, type CollateralConfig, type CollateralVault, type Condition, type CreateQuestionParams, CtfClient, type CtfConfig, FEE_DENOMINATOR, FeeManagementClient, HookClient, type HookConfig, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, type MarketOracleInfo, type MatchType, type NetworkConfig, type NetworkName, OracleClient, type OracleConfig, type Order, type OrderStatus, PDA, type Position, PresaleClient, type PresaleInfo, type ProgramIds, type Question, type QuestionFee, type QuestionMarketConfig, type QuestionResult, QuestionStatus, SEEDS, type SignedOrder, type TxResult, UnauthorizedError, type UserBuyRecord, type UserClaimRecord, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };

package/dist/index.js

@@ -1619,10 +1619,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,
@@ -1631,7 +1631,7 @@ ${logs.join("\n")}`);
       ));
     }
     if (!noInfo) {
-      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction3(
         this.walletPubkey,
         clobNoAta,
         clobConfig,
@@ -1967,7 +1967,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,
@@ -2063,17 +2063,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: splToken.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: splToken.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,
@@ -2152,10 +2156,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,
@@ -9126,6 +9139,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },
@@ -9417,6 +9434,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "skip_crossing_check",
+          type: "bool"
         }
       ]
     },
@@ -14995,6 +15016,33 @@ var XMarketSDK = class {
   }
 };
 var MAX_APPROVE_AMOUNT = new BN4__default.default("18446744073709551615");
+function buildCreateUserAtasTx(condition, user, payer, programIds) {
+  const [yesMint] = PDA.yesMint(condition, programIds);
+  const [noMint] = PDA.noMint(condition, programIds);
+  const yesAta = splToken.getAssociatedTokenAddressSync(yesMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
+  const noAta = splToken.getAssociatedTokenAddressSync(noMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
+  const tx = new web3_js.Transaction();
+  tx.feePayer = payer;
+  tx.add(
+    splToken.createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      yesAta,
+      user,
+      yesMint,
+      splToken.TOKEN_2022_PROGRAM_ID,
+      splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+    ),
+    splToken.createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      noAta,
+      user,
+      noMint,
+      splToken.TOKEN_2022_PROGRAM_ID,
+      splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+    )
+  );
+  return tx;
+}
 function buildApproveCollateralTx(collateralMint, signer, payer, delegate, amount = MAX_APPROVE_AMOUNT) {
   const ownerAta = splToken.getAssociatedTokenAddressSync(collateralMint, signer, false, splToken.TOKEN_PROGRAM_ID);
   const approveIx = splToken.createApproveInstruction(
@@ -15061,6 +15109,7 @@ exports.XMarketSDK = XMarketSDK;
 exports.buildApproveAllOutcomeTokensTx = buildApproveAllOutcomeTokensTx;
 exports.buildApproveCollateralTx = buildApproveCollateralTx;
 exports.buildBatchedEd25519Instruction = buildBatchedEd25519Instruction;
+exports.buildCreateUserAtasTx = buildCreateUserAtasTx;
 exports.buildOrder = buildOrder;
 exports.buildOrderFromPrice = buildOrderFromPrice;
 exports.deserializeSignedOrder = deserializeSignedOrder;