@theliem/xmarket-sdk 3.5.0 → 3.6.0

package/dist/index.d.mts

@@ -596,7 +596,7 @@ declare class ClobClient {
     buildMatchComplementaryIxs(takerSigned: SignedOrder, makersSigned: SignedOrder[], collateralMint: PublicKey, feeRecipient: PublicKey, operator: PublicKey, opts?: {
         marketOracleVault?: PublicKey;
         fillAmount?: anchor.BN;
-    }): Promise<TransactionInstruction[]>;
+    }, useTakerPrice?: boolean): Promise<TransactionInstruction[]>;
     /**
      * COMPLEMENTARY: 1 taker (BUY) + N makers (SELL), same tokenId.
      * Phase 1: register taker + all makers in parallel.
@@ -646,6 +646,48 @@ declare class ClobClient {
     matchOrders(taker: SignedOrder, makers: SignedOrder[], opts?: {
         marketOracleVault?: PublicKey;
     }): Promise<TxResult>;
+    /**
+     * High-level match: caller passes price + quantity + keypair — SDK builds,
+     * signs, and submits in one call. No manual amount calculation needed.
+     *
+     * Amounts are computed from each order's own limit `price` (percentage, e.g. 51 for 51%).
+     * NEVER pass averageMatchedPrice — that is an engine output, not an order input.
+     *
+     * @param taker   { keypair, condition, tokenId, side, price, quantity, nonce?, expiry? }
+     * @param makers  Array of same shape
+     * @param decimals Collateral decimals (default 9 for USDS)
+     */
+    matchOrdersFromPrice(taker: {
+        keypair: {
+            publicKey: PublicKey;
+            secretKey: Uint8Array;
+        };
+        condition: PublicKey;
+        tokenId: number;
+        side: 0 | 1;
+        price: number;
+        quantity: number;
+        nonce?: BN;
+        expiry?: BN;
+        fee?: BN;
+        taker?: PublicKey;
+    }, makers: Array<{
+        keypair: {
+            publicKey: PublicKey;
+            secretKey: Uint8Array;
+        };
+        condition: PublicKey;
+        tokenId: number;
+        side: 0 | 1;
+        price: number;
+        quantity: number;
+        nonce?: BN;
+        expiry?: BN;
+        fee?: BN;
+        taker?: PublicKey;
+    }>, decimals?: number, opts?: {
+        marketOracleVault?: PublicKey;
+    }): Promise<TxResult>;
     fetchConfig(): Promise<ClobConfig | null>;
     fetchOrderStatus(maker: PublicKey, nonce: anchor.BN): Promise<OrderStatus | null>;
     fetchOrderRecord(maker: PublicKey, nonce: anchor.BN): Promise<{
@@ -947,6 +989,51 @@ declare function buildOrder(params: {
     fee?: BN;
     taker?: PublicKey;
 }): Order;
+/**
+ * Compute makerAmount / takerAmount from a limit price and quantity.
+ *
+ * ALWAYS use the order's own limit price (e.g., 51 for a 51% limit order).
+ * NEVER pass `averageMatchedPrice` — that is an output of the matching engine,
+ * not an order input. Using avgPrice here causes crossing checks to fail
+ * for any maker whose price equals the limit price exactly.
+ *
+ * BUY  YES (side=0): makerAmount = USDS spent = qty × price/100
+ *                    takerAmount = YES received = qty
+ * SELL YES (side=1): makerAmount = YES given   = qty
+ *                    takerAmount = USDS received = qty × price/100
+ *
+ * @param side      0 = BUY, 1 = SELL
+ * @param price     Limit price in percentage cents (e.g., 51 for 51% = $0.51/token)
+ * @param quantity  Whole token count (e.g., 11 for 11 YES tokens)
+ * @param decimals  Collateral token decimals (default 9 for USDS)
+ */
+declare function orderAmountsFromPrice(side: 0 | 1, price: number, quantity: number, decimals?: number): {
+    makerAmount: BN;
+    takerAmount: BN;
+};
+/**
+ * Build a fully-populated Order from human-readable price + quantity.
+ * Amounts are computed using the limit price — never use averageMatchedPrice.
+ *
+ * @param params.side      0 = BUY, 1 = SELL
+ * @param params.price     Limit price in percentage (e.g., 51 for 51%)
+ * @param params.quantity  Whole token count (e.g., 11 for 11 YES tokens)
+ * @param params.decimals  Collateral decimals (default 9 for USDS)
+ */
+declare function buildOrderFromPrice(params: {
+    maker: PublicKey;
+    condition: PublicKey;
+    tokenId: number;
+    side: 0 | 1;
+    price: number;
+    quantity: number;
+    decimals?: number;
+    nonce?: BN;
+    expiry?: BN;
+    createdAt?: BN;
+    fee?: BN;
+    taker?: PublicKey;
+}): Order;
 /**
  * Sign an order with a Keypair.
  * Uses Ed25519 (nacl.sign.detached) over the 178-byte canonical message.
@@ -1013,4 +1100,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, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, 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, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };

package/dist/index.d.ts

@@ -596,7 +596,7 @@ declare class ClobClient {
     buildMatchComplementaryIxs(takerSigned: SignedOrder, makersSigned: SignedOrder[], collateralMint: PublicKey, feeRecipient: PublicKey, operator: PublicKey, opts?: {
         marketOracleVault?: PublicKey;
         fillAmount?: anchor.BN;
-    }): Promise<TransactionInstruction[]>;
+    }, useTakerPrice?: boolean): Promise<TransactionInstruction[]>;
     /**
      * COMPLEMENTARY: 1 taker (BUY) + N makers (SELL), same tokenId.
      * Phase 1: register taker + all makers in parallel.
@@ -646,6 +646,48 @@ declare class ClobClient {
     matchOrders(taker: SignedOrder, makers: SignedOrder[], opts?: {
         marketOracleVault?: PublicKey;
     }): Promise<TxResult>;
+    /**
+     * High-level match: caller passes price + quantity + keypair — SDK builds,
+     * signs, and submits in one call. No manual amount calculation needed.
+     *
+     * Amounts are computed from each order's own limit `price` (percentage, e.g. 51 for 51%).
+     * NEVER pass averageMatchedPrice — that is an engine output, not an order input.
+     *
+     * @param taker   { keypair, condition, tokenId, side, price, quantity, nonce?, expiry? }
+     * @param makers  Array of same shape
+     * @param decimals Collateral decimals (default 9 for USDS)
+     */
+    matchOrdersFromPrice(taker: {
+        keypair: {
+            publicKey: PublicKey;
+            secretKey: Uint8Array;
+        };
+        condition: PublicKey;
+        tokenId: number;
+        side: 0 | 1;
+        price: number;
+        quantity: number;
+        nonce?: BN;
+        expiry?: BN;
+        fee?: BN;
+        taker?: PublicKey;
+    }, makers: Array<{
+        keypair: {
+            publicKey: PublicKey;
+            secretKey: Uint8Array;
+        };
+        condition: PublicKey;
+        tokenId: number;
+        side: 0 | 1;
+        price: number;
+        quantity: number;
+        nonce?: BN;
+        expiry?: BN;
+        fee?: BN;
+        taker?: PublicKey;
+    }>, decimals?: number, opts?: {
+        marketOracleVault?: PublicKey;
+    }): Promise<TxResult>;
     fetchConfig(): Promise<ClobConfig | null>;
     fetchOrderStatus(maker: PublicKey, nonce: anchor.BN): Promise<OrderStatus | null>;
     fetchOrderRecord(maker: PublicKey, nonce: anchor.BN): Promise<{
@@ -947,6 +989,51 @@ declare function buildOrder(params: {
     fee?: BN;
     taker?: PublicKey;
 }): Order;
+/**
+ * Compute makerAmount / takerAmount from a limit price and quantity.
+ *
+ * ALWAYS use the order's own limit price (e.g., 51 for a 51% limit order).
+ * NEVER pass `averageMatchedPrice` — that is an output of the matching engine,
+ * not an order input. Using avgPrice here causes crossing checks to fail
+ * for any maker whose price equals the limit price exactly.
+ *
+ * BUY  YES (side=0): makerAmount = USDS spent = qty × price/100
+ *                    takerAmount = YES received = qty
+ * SELL YES (side=1): makerAmount = YES given   = qty
+ *                    takerAmount = USDS received = qty × price/100
+ *
+ * @param side      0 = BUY, 1 = SELL
+ * @param price     Limit price in percentage cents (e.g., 51 for 51% = $0.51/token)
+ * @param quantity  Whole token count (e.g., 11 for 11 YES tokens)
+ * @param decimals  Collateral token decimals (default 9 for USDS)
+ */
+declare function orderAmountsFromPrice(side: 0 | 1, price: number, quantity: number, decimals?: number): {
+    makerAmount: BN;
+    takerAmount: BN;
+};
+/**
+ * Build a fully-populated Order from human-readable price + quantity.
+ * Amounts are computed using the limit price — never use averageMatchedPrice.
+ *
+ * @param params.side      0 = BUY, 1 = SELL
+ * @param params.price     Limit price in percentage (e.g., 51 for 51%)
+ * @param params.quantity  Whole token count (e.g., 11 for 11 YES tokens)
+ * @param params.decimals  Collateral decimals (default 9 for USDS)
+ */
+declare function buildOrderFromPrice(params: {
+    maker: PublicKey;
+    condition: PublicKey;
+    tokenId: number;
+    side: 0 | 1;
+    price: number;
+    quantity: number;
+    decimals?: number;
+    nonce?: BN;
+    expiry?: BN;
+    createdAt?: BN;
+    fee?: BN;
+    taker?: PublicKey;
+}): Order;
 /**
  * Sign an order with a Keypair.
  * Uses Ed25519 (nacl.sign.detached) over the 178-byte canonical message.
@@ -1013,4 +1100,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, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, 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, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };

package/dist/index.js

@@ -4,7 +4,7 @@ var anchor5 = require('@coral-xyz/anchor');
 var web3_js = require('@solana/web3.js');
 var crypto = require('crypto');
 var splToken = require('@solana/spl-token');
-var BN5 = require('bn.js');
+var BN4 = require('bn.js');
 var nacl = require('tweetnacl');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -28,7 +28,7 @@ function _interopNamespace(e) {
 }
 
 var anchor5__namespace = /*#__PURE__*/_interopNamespace(anchor5);
-var BN5__default = /*#__PURE__*/_interopDefault(BN5);
+var BN4__default = /*#__PURE__*/_interopDefault(BN4);
 var nacl__namespace = /*#__PURE__*/_interopNamespace(nacl);
 
 // src/sdk.ts
@@ -1338,6 +1338,108 @@ function buildBatchedEd25519Instruction(orders) {
   });
 }
 var IX_SYSVAR = web3_js.SYSVAR_INSTRUCTIONS_PUBKEY;
+function buildOrder(params) {
+  return {
+    maker: params.maker,
+    condition: params.condition,
+    tokenId: params.tokenId,
+    side: params.side,
+    makerAmount: params.makerAmount,
+    takerAmount: params.takerAmount,
+    nonce: params.nonce ?? new BN4__default.default(Date.now()),
+    expiry: params.expiry ?? new BN4__default.default(0),
+    createdAt: params.createdAt ?? new BN4__default.default(Math.floor(Date.now() / 1e3)),
+    fee: params.fee ?? new BN4__default.default(0),
+    taker: params.taker ?? new web3_js.PublicKey(new Uint8Array(32)),
+    signer: params.maker
+  };
+}
+function orderAmountsFromPrice(side, price, quantity, decimals = 9) {
+  const PRICE_PRECISION = new BN4__default.default(1e6);
+  const DENOM = new BN4__default.default(100).mul(PRICE_PRECISION);
+  const base = new BN4__default.default(10).pow(new BN4__default.default(decimals));
+  const priceScaled = new BN4__default.default(Math.round(price * 1e6));
+  const quantityBase = new BN4__default.default(quantity).mul(base);
+  const collateral = quantityBase.mul(priceScaled).div(DENOM);
+  return side === 0 ? { makerAmount: collateral, takerAmount: quantityBase } : { makerAmount: quantityBase, takerAmount: collateral };
+}
+function buildOrderFromPrice(params) {
+  const { makerAmount, takerAmount } = orderAmountsFromPrice(
+    params.side,
+    params.price,
+    params.quantity,
+    params.decimals ?? 9
+  );
+  return buildOrder({ ...params, makerAmount, takerAmount });
+}
+function signOrderWithKeypair(order, keypair) {
+  const message = serializeOrderToBytes(order);
+  const signature = nacl__namespace.sign.detached(message, keypair.secretKey);
+  return { order, signature };
+}
+function getOrderSignBytes(order) {
+  return serializeOrderToBytes(order);
+}
+function serializeSignedOrder(signed) {
+  const orderBytes = serializeOrderToBytes(signed.order);
+  const buf = new Uint8Array(242);
+  buf.set(orderBytes, 0);
+  buf.set(signed.signature, 178);
+  return buf;
+}
+function deserializeSignedOrder(bytes) {
+  if (bytes.length !== 242) throw new InvalidParamError("SignedOrder must be 242 bytes");
+  const readPubkey = (offset) => new web3_js.PublicKey(bytes.slice(offset, offset + 32));
+  const readU64 = (offset) => new BN4__default.default(bytes.slice(offset, offset + 8), "le");
+  const readI64 = (offset) => new BN4__default.default(bytes.slice(offset, offset + 8), "le");
+  const order = {
+    maker: readPubkey(0),
+    condition: readPubkey(32),
+    tokenId: bytes[64],
+    side: bytes[65],
+    makerAmount: readU64(66),
+    takerAmount: readU64(74),
+    nonce: readU64(82),
+    expiry: readI64(90),
+    createdAt: readI64(98),
+    fee: readU64(106),
+    taker: readPubkey(114),
+    signer: readPubkey(146)
+  };
+  const signature = bytes.slice(178, 242);
+  return { order, signature };
+}
+function verifySignedOrder(signed) {
+  const message = serializeOrderToBytes(signed.order);
+  return nacl__namespace.sign.detached.verify(
+    message,
+    signed.signature,
+    signed.order.signer.toBytes()
+  );
+}
+function detectMatchType(a, b) {
+  const _a = "order" in a ? a.order : a;
+  const _b = "order" in b ? b.order : b;
+  return _detectMatchType(_a, _b);
+}
+function _detectMatchType(a, b) {
+  const SIDE_BUY = 0;
+  if (a.tokenId === b.tokenId) {
+    const aBuy2 = a.side === SIDE_BUY;
+    const bBuy2 = b.side === SIDE_BUY;
+    if (aBuy2 !== bBuy2) return "COMPLEMENTARY";
+    throw new InvalidParamError(
+      "Orders with same tokenId must be one BUY and one SELL (COMPLEMENTARY)"
+    );
+  }
+  const aBuy = a.side === SIDE_BUY;
+  const bBuy = b.side === SIDE_BUY;
+  if (aBuy && bBuy) return "MINT";
+  if (!aBuy && !bBuy) return "MERGE";
+  throw new InvalidParamError(
+    "Orders with different tokenIds must both be BUY (MINT) or both SELL (MERGE)"
+  );
+}
 
 // src/programs/clob.ts
 var ClobClient = class {
@@ -1674,7 +1776,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) {
+  async buildMatchComplementaryIxs(takerSigned, makersSigned, collateralMint, feeRecipient, operator, opts, useTakerPrice = false) {
     const condition = takerSigned.order.condition;
     const tokenId = takerSigned.order.tokenId;
     const taker = takerSigned.order.maker;
@@ -1724,7 +1826,7 @@ ${logs.join("\n")}`);
         ];
       }
     }
-    const matchIx = await this.program.methods.matchComplementary(takerNonce, fillAmount).accounts({
+    const matchIx = await this.program.methods.matchComplementary(takerNonce, fillAmount, useTakerPrice).accounts({
       operator,
       payer: this.walletPubkey,
       clobConfig: this.configPda(),
@@ -1799,7 +1901,9 @@ ${logs.join("\n")}`);
         collateralMint,
         feeRecipient,
         operatorWallet.publicKey,
-        opts
+        opts,
+        true
+        // useTakerPrice: SELL gets filled at BUY's price (maker's price per doc)
       );
       allIxs.push(...ixs);
     }
@@ -2068,6 +2172,53 @@ ${logs.join("\n")}`);
     if (allBuy) return this.matchMintOrders(taker, makers, collateralMint, feeRecipient, operatorWallet, alt);
     return this.matchMergeOrders(taker, makers, collateralMint, feeRecipient, operatorWallet, alt, opts);
   }
+  /**
+   * High-level match: caller passes price + quantity + keypair — SDK builds,
+   * signs, and submits in one call. No manual amount calculation needed.
+   *
+   * Amounts are computed from each order's own limit `price` (percentage, e.g. 51 for 51%).
+   * NEVER pass averageMatchedPrice — that is an engine output, not an order input.
+   *
+   * @param taker   { keypair, condition, tokenId, side, price, quantity, nonce?, expiry? }
+   * @param makers  Array of same shape
+   * @param decimals Collateral decimals (default 9 for USDS)
+   */
+  async matchOrdersFromPrice(taker, makers, decimals = 9, opts) {
+    const nacl2 = await import('tweetnacl');
+    const buildSigned = (p) => {
+      const order = buildOrderFromPrice({
+        maker: p.keypair.publicKey,
+        condition: p.condition,
+        tokenId: p.tokenId,
+        side: p.side,
+        price: p.price,
+        quantity: p.quantity,
+        decimals,
+        nonce: p.nonce,
+        expiry: p.expiry,
+        fee: p.fee,
+        taker: p.taker
+      });
+      const msg = serializeOrderToBytes(order);
+      const sig = nacl2.default.sign.detached(msg, p.keypair.secretKey);
+      return { order, signature: sig };
+    };
+    const takerSigned = buildSigned(taker);
+    const sortedMakers = [...makers].sort((a, b) => {
+      const sameToken = a.tokenId === taker.tokenId && b.tokenId === taker.tokenId;
+      const isDirectBuy = taker.side === 0 && sameToken;
+      const isDirectSell = taker.side === 1 && sameToken;
+      const isMint = taker.side === 0 && taker.tokenId === 1;
+      const isMerge = taker.side === 1 && taker.tokenId === 1;
+      if (isDirectBuy) return a.price - b.price;
+      if (isDirectSell) return b.price - a.price;
+      if (isMint) return b.price - a.price;
+      if (isMerge) return a.price - b.price;
+      return 0;
+    });
+    const makersSigned = sortedMakers.map(buildSigned);
+    return this.matchOrders(takerSigned, makersSigned, opts);
+  }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
     try {
@@ -8707,6 +8858,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "use_taker_price",
+          type: "bool"
         }
       ]
     },
@@ -14850,91 +15005,7 @@ var XMarketSDK = class {
     return this._admin;
   }
 };
-function buildOrder(params) {
-  return {
-    maker: params.maker,
-    condition: params.condition,
-    tokenId: params.tokenId,
-    side: params.side,
-    makerAmount: params.makerAmount,
-    takerAmount: params.takerAmount,
-    nonce: params.nonce ?? new BN5__default.default(Date.now()),
-    expiry: params.expiry ?? new BN5__default.default(0),
-    createdAt: params.createdAt ?? new BN5__default.default(Math.floor(Date.now() / 1e3)),
-    fee: params.fee ?? new BN5__default.default(0),
-    taker: params.taker ?? new web3_js.PublicKey(new Uint8Array(32)),
-    signer: params.maker
-  };
-}
-function signOrderWithKeypair(order, keypair) {
-  const message = serializeOrderToBytes(order);
-  const signature = nacl__namespace.sign.detached(message, keypair.secretKey);
-  return { order, signature };
-}
-function getOrderSignBytes(order) {
-  return serializeOrderToBytes(order);
-}
-function serializeSignedOrder(signed) {
-  const orderBytes = serializeOrderToBytes(signed.order);
-  const buf = new Uint8Array(242);
-  buf.set(orderBytes, 0);
-  buf.set(signed.signature, 178);
-  return buf;
-}
-function deserializeSignedOrder(bytes) {
-  if (bytes.length !== 242) throw new InvalidParamError("SignedOrder must be 242 bytes");
-  const readPubkey = (offset) => new web3_js.PublicKey(bytes.slice(offset, offset + 32));
-  const readU64 = (offset) => new BN5__default.default(bytes.slice(offset, offset + 8), "le");
-  const readI64 = (offset) => new BN5__default.default(bytes.slice(offset, offset + 8), "le");
-  const order = {
-    maker: readPubkey(0),
-    condition: readPubkey(32),
-    tokenId: bytes[64],
-    side: bytes[65],
-    makerAmount: readU64(66),
-    takerAmount: readU64(74),
-    nonce: readU64(82),
-    expiry: readI64(90),
-    createdAt: readI64(98),
-    fee: readU64(106),
-    taker: readPubkey(114),
-    signer: readPubkey(146)
-  };
-  const signature = bytes.slice(178, 242);
-  return { order, signature };
-}
-function verifySignedOrder(signed) {
-  const message = serializeOrderToBytes(signed.order);
-  return nacl__namespace.sign.detached.verify(
-    message,
-    signed.signature,
-    signed.order.signer.toBytes()
-  );
-}
-function detectMatchType(a, b) {
-  const _a = "order" in a ? a.order : a;
-  const _b = "order" in b ? b.order : b;
-  return _detectMatchType(_a, _b);
-}
-function _detectMatchType(a, b) {
-  const SIDE_BUY = 0;
-  if (a.tokenId === b.tokenId) {
-    const aBuy2 = a.side === SIDE_BUY;
-    const bBuy2 = b.side === SIDE_BUY;
-    if (aBuy2 !== bBuy2) return "COMPLEMENTARY";
-    throw new InvalidParamError(
-      "Orders with same tokenId must be one BUY and one SELL (COMPLEMENTARY)"
-    );
-  }
-  const aBuy = a.side === SIDE_BUY;
-  const bBuy = b.side === SIDE_BUY;
-  if (aBuy && bBuy) return "MINT";
-  if (!aBuy && !bBuy) return "MERGE";
-  throw new InvalidParamError(
-    "Orders with different tokenIds must both be BUY (MINT) or both SELL (MERGE)"
-  );
-}
-var MAX_APPROVE_AMOUNT = new BN5__default.default("18446744073709551615");
+var MAX_APPROVE_AMOUNT = new BN4__default.default("18446744073709551615");
 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(
@@ -15002,11 +15073,13 @@ exports.buildApproveAllOutcomeTokensTx = buildApproveAllOutcomeTokensTx;
 exports.buildApproveCollateralTx = buildApproveCollateralTx;
 exports.buildBatchedEd25519Instruction = buildBatchedEd25519Instruction;
 exports.buildOrder = buildOrder;
+exports.buildOrderFromPrice = buildOrderFromPrice;
 exports.deserializeSignedOrder = deserializeSignedOrder;
 exports.detectMatchType = detectMatchType;
 exports.generateContentHash = generateContentHash;
 exports.generateQuestionId = generateQuestionId;
 exports.getOrderSignBytes = getOrderSignBytes;
+exports.orderAmountsFromPrice = orderAmountsFromPrice;
 exports.serializeOrderToBytes = serializeOrderToBytes;
 exports.serializeSignedOrder = serializeSignedOrder;
 exports.signOrder = signOrder;