@theliem/xmarket-sdk 3.5.0 → 3.6.1

package/dist/index.mjs

@@ -2,7 +2,7 @@ import * as anchor5 from '@coral-xyz/anchor';
 import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, SYSVAR_RENT_PUBKEY, ComputeBudgetProgram, Transaction, TransactionInstruction, Ed25519Program, AddressLookupTableProgram, TransactionMessage, VersionedTransaction, Connection } from '@solana/web3.js';
 import { createHash } from 'crypto';
 import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, createAssociatedTokenAccountIdempotentInstruction, createApproveInstruction } from '@solana/spl-token';
-import BN5 from 'bn.js';
+import BN4 from 'bn.js';
 import * as nacl from 'tweetnacl';
 
 // src/sdk.ts
@@ -1312,6 +1312,108 @@ function buildBatchedEd25519Instruction(orders) {
   });
 }
 var IX_SYSVAR = 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(Date.now()),
+    expiry: params.expiry ?? new BN4(0),
+    createdAt: params.createdAt ?? new BN4(Math.floor(Date.now() / 1e3)),
+    fee: params.fee ?? new BN4(0),
+    taker: params.taker ?? new PublicKey(new Uint8Array(32)),
+    signer: params.maker
+  };
+}
+function orderAmountsFromPrice(side, price, quantity, decimals = 9) {
+  const PRICE_PRECISION = new BN4(1e6);
+  const DENOM = new BN4(100).mul(PRICE_PRECISION);
+  const base = new BN4(10).pow(new BN4(decimals));
+  const priceScaled = new BN4(Math.round(price * 1e6));
+  const quantityBase = new BN4(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.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 PublicKey(bytes.slice(offset, offset + 32));
+  const readU64 = (offset) => new BN4(bytes.slice(offset, offset + 8), "le");
+  const readI64 = (offset) => new BN4(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.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 {
@@ -1648,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) {
+  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;
@@ -1698,7 +1800,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(),
@@ -1751,18 +1853,20 @@ ${logs.join("\n")}`);
       ...buyMakers.map((m) => this.registerOrderIfNeeded(m))
     ]);
     const sell = sellTaker.order;
-    const crossingBuys = buyMakers.filter((b) => {
-      const buy = b.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 (crossingBuys.length === 0) {
-      throw new InvalidParamError("COMPLEMENTARY: no BUY maker orders cross with the SELL taker");
+    if (buyMakers.length === 0) {
+      throw new InvalidParamError("COMPLEMENTARY: no BUY maker orders provided");
     }
-    if (crossingBuys.length < buyMakers.length) {
-      console.warn(`[matchOrders] SELL+BUY: filtered ${buyMakers.length - crossingBuys.length} non-crossing BUY(s)`);
+    const totalBuyPayment = buyMakers.reduce(
+      (acc, b) => acc + BigInt(b.order.makerAmount.toString()),
+      BigInt(0)
+    );
+    const sellExpected = BigInt(sell.takerAmount.toString());
+    if (totalBuyPayment < sellExpected) {
+      throw new InvalidParamError(
+        `COMPLEMENTARY: total buyer payments ${totalBuyPayment} < seller expected ${sellExpected}`
+      );
     }
+    const crossingBuys = buyMakers;
     const allIxs = [];
     for (const buyMaker of crossingBuys) {
       const ixs = await this.buildMatchComplementaryIxs(
@@ -1773,7 +1877,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);
     }
@@ -2042,6 +2148,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 {
@@ -8681,6 +8834,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "use_taker_price",
+          type: "bool"
         }
       ]
     },
@@ -14824,91 +14981,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(Date.now()),
-    expiry: params.expiry ?? new BN5(0),
-    createdAt: params.createdAt ?? new BN5(Math.floor(Date.now() / 1e3)),
-    fee: params.fee ?? new BN5(0),
-    taker: params.taker ?? new PublicKey(new Uint8Array(32)),
-    signer: params.maker
-  };
-}
-function signOrderWithKeypair(order, keypair) {
-  const message = serializeOrderToBytes(order);
-  const signature = nacl.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 PublicKey(bytes.slice(offset, offset + 32));
-  const readU64 = (offset) => new BN5(bytes.slice(offset, offset + 8), "le");
-  const readI64 = (offset) => new BN5(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.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("18446744073709551615");
+var MAX_APPROVE_AMOUNT = new BN4("18446744073709551615");
 function buildApproveCollateralTx(collateralMint, signer, payer, delegate, amount = MAX_APPROVE_AMOUNT) {
   const ownerAta = getAssociatedTokenAddressSync(collateralMint, signer, false, TOKEN_PROGRAM_ID);
   const approveIx = createApproveInstruction(
@@ -14952,6 +15025,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, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, 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, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map