@theliem/xmarket-sdk 3.0.0 → 3.0.1

package/dist/index.mjs

@@ -6,7 +6,7 @@ import oracleIdl from './oracle-FZJJIJGI.json';
 import hookIdl from './hook-THBRGUM6.json';
 import questionMarketIdl from './question_market-CB6ZUZ5E.json';
 import conditionalTokensIdl from './conditional_tokens-3O5V46N5.json';
-import clobExchangeIdl from './clob_exchange-ATSH42KC.json';
+import clobExchangeIdl from './clob_exchange-MQF4NI27.json';
 import BN4 from 'bn.js';
 import * as nacl from 'tweetnacl';
 
@@ -1244,14 +1244,13 @@ var ClobClient = class {
    *
    * remaining_accounts: [maker×5 × N]  (no hook accounts — mint_to doesn't fire hook)
    */
-  async matchMintOrders(yesSigned, makersSigned, collateralMint, whitelistedWallet, lookupTable) {
+  async matchMintOrders(yesSigned, makersSigned, collateralMint, feeRecipient, whitelistedWallet, lookupTable) {
     const condition = yesSigned.order.condition;
     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 [clobAuthority] = PDA.clobConfig(this.programIds);
     const buyerYes = yesSigned.order.maker;
     const buyerYesCollateral = getAssociatedTokenAddressSync(collateralMint, buyerYes);
     const buyerYesTokenAccount = getAssociatedTokenAddressSync(yesMint, buyerYes, false, TOKEN_2022_PROGRAM_ID);
@@ -1294,12 +1293,19 @@ var ClobClient = class {
       yesMint,
       noMint,
       mintAuthority,
-      clobAuthority,
+      feeRecipient,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: TOKEN_PROGRAM_ID,
       token2022Program: TOKEN_2022_PROGRAM_ID,
       systemProgram: SystemProgram.programId
     }).remainingAccounts(makerAccounts).instruction();
+    const frKey = feeRecipient.toBase58();
+    for (const k of matchIx.keys) {
+      if (k.pubkey.toBase58() === frKey) {
+        k.isWritable = true;
+        break;
+      }
+    }
     const sig = await this._sendMatchTx(
       [...ed25519Ixs, matchIx],
       lookupTable,
@@ -1317,13 +1323,12 @@ var ClobClient = class {
    *
    * remaining_accounts: [maker×5 × N]  (no hook accounts — burn doesn't fire hook)
    */
-  async matchMergeOrders(yesSigned, makersSigned, collateralMint, whitelistedWallet, lookupTable) {
+  async matchMergeOrders(yesSigned, makersSigned, collateralMint, feeRecipient, whitelistedWallet, lookupTable) {
     const condition = yesSigned.order.condition;
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
-    const [clobAuthority] = PDA.clobConfig(this.programIds);
     const sellerYes = yesSigned.order.maker;
     const sellerYesTokenAccount = getAssociatedTokenAddressSync(yesMint, sellerYes, false, TOKEN_2022_PROGRAM_ID);
     const [sellerYesPosition] = PDA.position(condition, 1, sellerYes, this.programIds);
@@ -1365,12 +1370,19 @@ var ClobClient = class {
       vaultTokenAccount,
       yesMint,
       noMint,
-      clobAuthority,
+      feeRecipient,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: TOKEN_PROGRAM_ID,
       token2022Program: TOKEN_2022_PROGRAM_ID,
       systemProgram: SystemProgram.programId
     }).remainingAccounts(makerAccounts).instruction();
+    const frKeyM = feeRecipient.toBase58();
+    for (const k of matchIx.keys) {
+      if (k.pubkey.toBase58() === frKeyM) {
+        k.isWritable = true;
+        break;
+      }
+    }
     const sig = await this._sendMatchTx(
       [...ed25519Ixs, matchIx],
       lookupTable,
@@ -1393,8 +1405,8 @@ var ClobClient = class {
     if (makers.length === 0) throw new InvalidParamError("At least 1 maker required");
     const t = taker.order;
     const m0 = makers[0].order;
-    const SIDE_BUY = 1;
-    const SIDE_SELL = 0;
+    const SIDE_BUY = 0;
+    const SIDE_SELL = 1;
     if (t.tokenId === m0.tokenId) {
       if (t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_SELL)) {
         return this.matchComplementary(taker, makers, collateralMint, feeRecipient, whitelistedWallet, lookupTable);
@@ -1416,9 +1428,9 @@ var ClobClient = class {
       throw new InvalidParamError("MINT/MERGE: all makers must be the NO side (tokenId=0)");
     }
     if (allBuy) {
-      return this.matchMintOrders(taker, makers, collateralMint, whitelistedWallet, lookupTable);
+      return this.matchMintOrders(taker, makers, collateralMint, feeRecipient, whitelistedWallet, lookupTable);
     }
-    return this.matchMergeOrders(taker, makers, collateralMint, whitelistedWallet, lookupTable);
+    return this.matchMergeOrders(taker, makers, collateralMint, feeRecipient, whitelistedWallet, lookupTable);
   }
   // ─── Whitelist admin ─────────────────────────────────────────────────────────
   /** Add an address to the CLOB whitelist (owner only). */
@@ -1636,7 +1648,7 @@ function detectMatchType(a, b) {
   return _detectMatchType(_a, _b);
 }
 function _detectMatchType(a, b) {
-  const SIDE_BUY = 1;
+  const SIDE_BUY = 0;
   if (a.tokenId === b.tokenId) {
     const aBuy2 = a.side === SIDE_BUY;
     const bBuy2 = b.side === SIDE_BUY;