@theliem/xmarket-sdk 3.4.2 → 3.6.0

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 {
@@ -1407,15 +1509,39 @@ var ClobClient = class {
       takerOrderRecord
     ];
     if (feeRecipientAddr) addresses.push(feeRecipientAddr);
+    const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
+    const [vaultToken] = PDA.vaultToken(collateralMint, this.programIds);
+    const [mintAuth] = PDA.mintAuthority(condition, this.programIds);
+    const [extraMetaNo] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const clobUsdcAta = splToken.getAssociatedTokenAddressSync(collateralMint, clobConfigPda, true);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfigPda, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfigPda, this.programIds);
+    addresses.push(
+      collateralVault,
+      vaultToken,
+      mintAuth,
+      extraMetaNo,
+      clobUsdcAta,
+      clobYesAta,
+      clobNoAta,
+      clobYesPos,
+      clobNoPos,
+      collateralMint,
+      splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+    );
     for (const m of makers) {
       const seller = m.order.maker;
-      const [sellerPos] = PDA.position(condition, tokenId, seller, this.programIds);
+      const makerTokenId = m.order.tokenId;
+      const makerMint = makerTokenId === 1 ? yesMint : noMint;
+      const [sellerPos] = PDA.position(condition, makerTokenId, seller, this.programIds);
       const [sellerStatus] = PDA.orderStatus(seller, m.order.nonce, this.programIds);
       const [sellerRecord] = PDA.orderRecord(seller, m.order.nonce, this.programIds);
       addresses.push(
         seller,
         sellerRecord,
-        splToken.getAssociatedTokenAddressSync(outcomeMint, seller, false, splToken.TOKEN_2022_PROGRAM_ID),
+        splToken.getAssociatedTokenAddressSync(makerMint, seller, false, splToken.TOKEN_2022_PROGRAM_ID),
         splToken.getAssociatedTokenAddressSync(collateralMint, seller),
         sellerPos,
         sellerStatus
@@ -1487,6 +1613,36 @@ ${logs.join("\n")}`);
   async _sendLegacyTx(instructions) {
     await this._sendLegacyTxSig(instructions);
   }
+  async _ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta) {
+    const { connection } = this.provider;
+    const [yesInfo, noInfo] = await Promise.all([
+      connection.getAccountInfo(clobYesAta),
+      connection.getAccountInfo(clobNoAta)
+    ]);
+    const { createAssociatedTokenAccountIdempotentInstruction: createAssociatedTokenAccountIdempotentInstruction2 } = await import('@solana/spl-token');
+    const ixs = [];
+    if (!yesInfo) {
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+        this.walletPubkey,
+        clobYesAta,
+        clobConfig,
+        yesMint,
+        splToken.TOKEN_2022_PROGRAM_ID
+      ));
+    }
+    if (!noInfo) {
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+        this.walletPubkey,
+        clobNoAta,
+        clobConfig,
+        noMint,
+        splToken.TOKEN_2022_PROGRAM_ID
+      ));
+    }
+    if (ixs.length > 0) {
+      await this._sendLegacyTx(ixs);
+    }
+  }
   /**
    * Send a match transaction as versioned (v0) with optional ALT.
    * Both operator wallet and payer (this.provider.wallet) sign.
@@ -1494,11 +1650,12 @@ ${logs.join("\n")}`);
   async sendMatchTx(instructions, lookupTable, whitelistedWallet) {
     const { connection } = this.provider;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    const cuLimit = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 8e5 });
+    const cuLimit = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 });
+    const heapFrame = web3_js.ComputeBudgetProgram.requestHeapFrame({ bytes: 262144 });
     const message = new web3_js.TransactionMessage({
       payerKey: this.walletPubkey,
       recentBlockhash: blockhash,
-      instructions: [cuLimit, ...instructions]
+      instructions: [cuLimit, heapFrame, ...instructions]
     }).compileToV0Message(lookupTable ? [lookupTable] : []);
     const vtx = new web3_js.VersionedTransaction(message);
     const signers = [this.provider.wallet.payer];
@@ -1507,7 +1664,7 @@ ${logs.join("\n")}`);
     }
     vtx.sign(signers);
     const sig = await connection.sendRawTransaction(vtx.serialize(), {
-      skipPreflight: true
+      skipPreflight: false
     });
     const result = await connection.confirmTransaction(
       { signature: sig, blockhash, lastValidBlockHeight },
@@ -1619,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;
@@ -1669,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(),
@@ -1710,6 +1867,49 @@ ${logs.join("\n")}`);
     const sig = await this.sendMatchTx(ixs, lookupTable, operatorWallet);
     return { signature: sig };
   }
+  /**
+   * 1 SELL taker vs N BUY makers.
+   * Rust program only supports BUY-as-taker, so we decompose into N instructions
+   * (BUY_i as taker, SELL as single maker) combined into one atomic transaction.
+   * Engine must use limitPrice for BUY.makerAmount to pass per-pair crossing check.
+   */
+  async matchComplementarySellVsMultiBuy(sellTaker, buyMakers, collateralMint, feeRecipient, operatorWallet, lookupTable, opts) {
+    await Promise.all([
+      this.registerOrderIfNeeded(sellTaker),
+      ...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 (crossingBuys.length < buyMakers.length) {
+      console.warn(`[matchOrders] SELL+BUY: filtered ${buyMakers.length - crossingBuys.length} non-crossing BUY(s)`);
+    }
+    const allIxs = [];
+    for (const buyMaker of crossingBuys) {
+      const ixs = await this.buildMatchComplementaryIxs(
+        buyMaker,
+        // BUY as taker
+        [sellTaker],
+        // SELL as maker
+        collateralMint,
+        feeRecipient,
+        operatorWallet.publicKey,
+        opts,
+        true
+        // useTakerPrice: SELL gets filled at BUY's price (maker's price per doc)
+      );
+      allIxs.push(...ixs);
+    }
+    const sig = await this.sendMatchTx(allIxs, lookupTable, operatorWallet);
+    return { signature: sig };
+  }
   /**
    * MINT: 1 YES buyer (taker) + N NO buyers (makers).
    * Phase 1: register taker + all NO makers in parallel.
@@ -1727,6 +1927,7 @@ ${logs.join("\n")}`);
     const taker = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
     const fillAmount = new anchor5__namespace.BN("18446744073709551615");
+    const clobConfig = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
     const [mintAuthority] = PDA.mintAuthority(condition, this.programIds);
@@ -1737,6 +1938,15 @@ ${logs.join("\n")}`);
     const takerYesToken = splToken.getAssociatedTokenAddressSync(yesMint, taker, false, splToken.TOKEN_2022_PROGRAM_ID);
     const [takerYesPosition] = PDA.position(condition, 1, taker, this.programIds);
     const [takerOrderStatus] = PDA.orderStatus(taker, takerNonce, this.programIds);
+    const clobUsdcAta = splToken.getAssociatedTokenAddressSync(collateralMint, clobConfig, true);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfig, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfig, this.programIds);
+    const [extraMetaYes] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [extraMetaNo] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const hookProgram = this.programIds.hook;
     const remainingAccounts = [];
     for (const nm of noMakers) {
       const noMaker = nm.order.maker;
@@ -1746,6 +1956,7 @@ ${logs.join("\n")}`);
       const [noPosition] = PDA.position(condition, 0, noMaker, this.programIds);
       const [noStatus] = PDA.orderStatus(noMaker, nm.order.nonce, this.programIds);
       remainingAccounts.push(
+        { pubkey: noMaker, isSigner: false, isWritable: false },
         { pubkey: noRecord, isSigner: false, isWritable: false },
         { pubkey: noToken, isSigner: false, isWritable: true },
         { pubkey: noCollateral, isSigner: false, isWritable: true },
@@ -1753,10 +1964,16 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    remainingAccounts.push(
+      { pubkey: extraMetaYes, isSigner: false, isWritable: false },
+      { pubkey: extraMetaNo, isSigner: false, isWritable: false },
+      { pubkey: hookConfig, isSigner: false, isWritable: false },
+      { pubkey: hookProgram, isSigner: false, isWritable: false }
+    );
     const matchIx = await this.program.methods.matchMintOrders(takerNonce, fillAmount).accounts({
       operator: operatorWallet.publicKey,
       payer: this.walletPubkey,
-      clobConfig: this.configPda(),
+      clobConfig,
       condition,
       taker,
       takerOrderRecord,
@@ -1764,16 +1981,25 @@ ${logs.join("\n")}`);
       takerYesToken,
       takerYesPosition,
       takerOrderStatus,
+      clobUsdcAta,
+      clobYesAta,
+      clobNoAta,
+      clobYesPosition: clobYesPos,
+      clobNoPosition: clobNoPos,
       collateralVault,
       vaultTokenAccount,
+      collateralMint,
       yesMint,
       noMint,
       mintAuthority,
-      clobAuthority: this.configPda(),
+      clobAuthority: clobConfig,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: splToken.TOKEN_PROGRAM_ID,
+      token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
     }).remainingAccounts(remainingAccounts).instruction();
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
   }
@@ -1795,9 +2021,9 @@ ${logs.join("\n")}`);
     const sellerYes = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
     const fillAmount = new anchor5__namespace.BN("18446744073709551615");
+    const clobConfig = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
-    const [mintAuthority] = PDA.mintAuthority(condition, this.programIds);
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
     const [takerOrderRecord] = PDA.orderRecord(sellerYes, takerNonce, this.programIds);
@@ -1805,6 +2031,15 @@ ${logs.join("\n")}`);
     const [takerYesPosition] = PDA.position(condition, 1, sellerYes, this.programIds);
     const takerCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, sellerYes);
     const [takerOrderStatus] = PDA.orderStatus(sellerYes, takerNonce, this.programIds);
+    const clobUsdcAta = splToken.getAssociatedTokenAddressSync(collateralMint, clobConfig, true);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfig, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfig, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfig, this.programIds);
+    const [extraMetaYes] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [extraMetaNo] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const hookProgram = this.programIds.hook;
     const remainingAccounts = [];
     for (const nm of noMakers) {
       const noMaker = nm.order.maker;
@@ -1814,6 +2049,7 @@ ${logs.join("\n")}`);
       const [noPosition] = PDA.position(condition, 0, noMaker, this.programIds);
       const [noStatus] = PDA.orderStatus(noMaker, nm.order.nonce, this.programIds);
       remainingAccounts.push(
+        { pubkey: noMaker, isSigner: false, isWritable: false },
         { pubkey: noRecord, isSigner: false, isWritable: false },
         { pubkey: noToken, isSigner: false, isWritable: true },
         { pubkey: noCollateral, isSigner: false, isWritable: true },
@@ -1821,6 +2057,12 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    remainingAccounts.push(
+      { pubkey: extraMetaYes, isSigner: false, isWritable: false },
+      { pubkey: extraMetaNo, isSigner: false, isWritable: false },
+      { pubkey: hookConfig, isSigner: false, isWritable: false },
+      { pubkey: hookProgram, isSigner: false, isWritable: false }
+    );
     if (yesSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
       const companyAddr = await this.companyAddress();
       if (companyAddr) {
@@ -1837,7 +2079,7 @@ ${logs.join("\n")}`);
     const matchIx = await this.program.methods.matchMergeOrders(takerNonce, fillAmount).accounts({
       operator: operatorWallet.publicKey,
       payer: this.walletPubkey,
-      clobConfig: this.configPda(),
+      clobConfig,
       condition,
       taker: sellerYes,
       takerOrderRecord,
@@ -1845,17 +2087,24 @@ ${logs.join("\n")}`);
       takerYesPosition,
       takerCollateral,
       takerOrderStatus,
+      clobUsdcAta,
+      clobYesAta,
+      clobNoAta,
+      clobYesPosition: clobYesPos,
+      clobNoPosition: clobNoPos,
       collateralVault,
       vaultTokenAccount,
+      collateralMint,
       yesMint,
       noMint,
-      mintAuthority,
-      feeRecipient,
-      clobAuthority: this.configPda(),
+      clobAuthority: clobConfig,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: splToken.TOKEN_PROGRAM_ID,
+      token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
     }).remainingAccounts(remainingAccounts).instruction();
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
   }
@@ -1896,38 +2145,22 @@ ${logs.join("\n")}`);
         buySignedOrder = taker;
         sellCandidates = makers;
       } else if (t.side === SIDE_SELL && makers.every((m) => m.order.side === SIDE_BUY)) {
-        buySignedOrder = makers[0];
-        sellCandidates = [taker, ...makers.slice(1)];
+        return this.matchComplementarySellVsMultiBuy(taker, makers, collateralMint, feeRecipient, operatorWallet, alt, opts);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
-      const budget = BigInt(buySignedOrder.order.makerAmount.toString());
-      const totalAsk = sellCandidates.reduce(
-        (s, m) => s + BigInt(m.order.takerAmount.toString()),
-        BigInt(0)
-      );
-      let finalSells;
-      if (budget >= totalAsk) {
-        finalSells = sellCandidates;
-      } else {
-        const sorted = [...sellCandidates].sort((a, b) => {
-          const pa = BigInt(a.order.takerAmount.toString()) * BigInt(b.order.makerAmount.toString());
-          const pb = BigInt(b.order.takerAmount.toString()) * BigInt(a.order.makerAmount.toString());
-          return pa < pb ? -1 : pa > pb ? 1 : 0;
-        });
-        finalSells = [];
-        let remaining = budget;
-        for (const s of sorted) {
-          const cost = BigInt(s.order.takerAmount.toString());
-          if (remaining >= cost) {
-            finalSells.push(s);
-            remaining -= cost;
-          }
-        }
-        if (finalSells.length === 0) {
-          throw new InvalidParamError("COMPLEMENTARY: taker budget insufficient for any maker");
-        }
-        console.warn(`[matchOrders] budget ${budget} < totalAsk ${totalAsk}: matched ${finalSells.length}/${sellCandidates.length} makers`);
+      const buy = buySignedOrder.order;
+      const finalSells = sellCandidates.filter((s) => {
+        const sell = s.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 (finalSells.length === 0) {
+        throw new InvalidParamError("COMPLEMENTARY: no maker orders cross with the buy order");
+      }
+      if (finalSells.length < sellCandidates.length) {
+        console.warn(`[matchOrders] filtered ${sellCandidates.length - finalSells.length} non-crossing maker(s)`);
       }
       return this.matchComplementary(buySignedOrder, finalSells, collateralMint, feeRecipient, operatorWallet, alt, opts);
     }
@@ -1939,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 {
@@ -8578,6 +8858,10 @@ var clob_exchange_default = {
         {
           name: "fill_amount",
           type: "u64"
+        },
+        {
+          name: "use_taker_price",
+          type: "bool"
         }
       ]
     },
@@ -8630,7 +8914,8 @@ var clob_exchange_default = {
           }
         },
         {
-          name: "condition"
+          name: "condition",
+          writable: true
         },
         {
           name: "taker"
@@ -8706,27 +8991,98 @@ var clob_exchange_default = {
           }
         },
         {
-          name: "collateral_vault",
+          name: "clob_usdc_ata",
+          docs: [
+            "USDC ATA owned by clob_config \u2014 receives USDC from vault after merge"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "account",
+                path: "clob_config"
+              },
+              {
+                kind: "account",
+                path: "collateral_token_program"
+              },
+              {
+                kind: "account",
+                path: "collateral_mint"
+              }
+            ],
+            program: {
+              kind: "const",
+              value: [
+                140,
+                151,
+                37,
+                143,
+                78,
+                36,
+                137,
+                241,
+                187,
+                61,
+                16,
+                41,
+                20,
+                142,
+                13,
+                131,
+                11,
+                90,
+                19,
+                153,
+                218,
+                255,
+                16,
+                132,
+                4,
+                142,
+                123,
+                216,
+                219,
+                233,
+                248,
+                89
+              ]
+            }
+          }
+        },
+        {
+          name: "clob_yes_ata",
           writable: true
         },
         {
-          name: "vault_token_account",
+          name: "clob_no_ata",
           writable: true
         },
         {
-          name: "yes_mint",
+          name: "clob_yes_position",
           writable: true
         },
         {
-          name: "no_mint",
+          name: "clob_no_position",
           writable: true
         },
         {
-          name: "mint_authority",
+          name: "collateral_vault",
           writable: true
         },
         {
-          name: "fee_recipient",
+          name: "vault_token_account",
+          writable: true
+        },
+        {
+          name: "collateral_mint"
+        },
+        {
+          name: "yes_mint",
+          writable: true
+        },
+        {
+          name: "no_mint",
           writable: true
         },
         {
@@ -8760,6 +9116,14 @@ var clob_exchange_default = {
           name: "collateral_token_program",
           address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
         },
+        {
+          name: "token_2022_program",
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
+        {
+          name: "associated_token_program",
+          address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -8825,7 +9189,8 @@ var clob_exchange_default = {
           }
         },
         {
-          name: "condition"
+          name: "condition",
+          writable: true
         },
         {
           name: "taker"
@@ -8900,6 +9265,94 @@ var clob_exchange_default = {
             ]
           }
         },
+        {
+          name: "clob_usdc_ata",
+          docs: [
+            "USDC ATA owned by clob_config \u2014 receives combined USDC, then split_position pulls from here"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "account",
+                path: "clob_config"
+              },
+              {
+                kind: "account",
+                path: "collateral_token_program"
+              },
+              {
+                kind: "account",
+                path: "collateral_mint"
+              }
+            ],
+            program: {
+              kind: "const",
+              value: [
+                140,
+                151,
+                37,
+                143,
+                78,
+                36,
+                137,
+                241,
+                187,
+                61,
+                16,
+                41,
+                20,
+                142,
+                13,
+                131,
+                11,
+                90,
+                19,
+                153,
+                218,
+                255,
+                16,
+                132,
+                4,
+                142,
+                123,
+                216,
+                219,
+                233,
+                248,
+                89
+              ]
+            }
+          }
+        },
+        {
+          name: "clob_yes_ata",
+          docs: [
+            "YES Token-2022 ATA owned by clob_config \u2014 receives YES from split, then transferred to taker"
+          ],
+          writable: true
+        },
+        {
+          name: "clob_no_ata",
+          docs: [
+            "NO Token-2022 ATA owned by clob_config \u2014 receives NO from split, then transferred to makers"
+          ],
+          writable: true
+        },
+        {
+          name: "clob_yes_position",
+          docs: [
+            "YES Position PDA for clob_config (set by CTF split_position init_if_needed)"
+          ],
+          writable: true
+        },
+        {
+          name: "clob_no_position",
+          docs: [
+            "NO Position PDA for clob_config (set by CTF split_position init_if_needed)"
+          ],
+          writable: true
+        },
         {
           name: "collateral_vault",
           writable: true
@@ -8908,6 +9361,9 @@ var clob_exchange_default = {
           name: "vault_token_account",
           writable: true
         },
+        {
+          name: "collateral_mint"
+        },
         {
           name: "yes_mint",
           writable: true
@@ -8951,6 +9407,14 @@ var clob_exchange_default = {
           name: "collateral_token_program",
           address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
         },
+        {
+          name: "token_2022_program",
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
+        {
+          name: "associated_token_program",
+          address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -14541,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(
@@ -14693,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;