@theliem/xmarket-sdk 3.0.0 → 3.0.1

package/dist/{clob_exchange-ATSH42KC.json → clob_exchange-MQF4NI27.json}

@@ -816,27 +816,7 @@
           "writable": true
         },
         {
-          "name": "clob_authority",
-          "pda": {
-            "seeds": [
-              {
-                "kind": "const",
-                "value": [
-                  99,
-                  108,
-                  111,
-                  98,
-                  95,
-                  99,
-                  111,
-                  110,
-                  102,
-                  105,
-                  103
-                ]
-              }
-            ]
-          }
+          "name": "fee_recipient"
         },
         {
           "name": "conditional_tokens_program",
@@ -1055,27 +1035,7 @@
           "writable": true
         },
         {
-          "name": "clob_authority",
-          "pda": {
-            "seeds": [
-              {
-                "kind": "const",
-                "value": [
-                  99,
-                  108,
-                  111,
-                  98,
-                  95,
-                  99,
-                  111,
-                  110,
-                  102,
-                  105,
-                  103
-                ]
-              }
-            ]
-          }
+          "name": "fee_recipient"
         },
         {
           "name": "conditional_tokens_program",
@@ -1589,10 +1549,6 @@
           {
             "name": "usdc_transferred",
             "type": "u64"
-          },
-          {
-            "name": "fee",
-            "type": "u64"
           }
         ]
       }

package/dist/index.d.mts

@@ -165,8 +165,8 @@ interface OrderStatus {
  * Operator validates + submits matched order pairs on-chain.
  *
  * Semantics (mirrors EVM makerAmount/takerAmount):
- *   BUY  (side=1): makerAmount = USDC paid,      takerAmount = CTF tokens received
- *   SELL (side=0): makerAmount = CTF tokens given, takerAmount = USDC received
+ *   BUY  (side=0): makerAmount = USDC paid,      takerAmount = CTF tokens received
+ *   SELL (side=1): makerAmount = CTF tokens given, takerAmount = USDC received
  */
 interface Order {
     /** Maker's wallet public key */
@@ -175,7 +175,7 @@ interface Order {
     condition: PublicKey;
     /** Outcome token: 0 = NO, 1 = YES */
     tokenId: number;
-    /** Side: 0 = SELL (give tokens, want USDC), 1 = BUY (give USDC, want tokens) */
+    /** Side: 0 = BUY (give USDC, want tokens), 1 = SELL (give tokens, want USDC) — matches EVM convention */
     side: number;
     /** Amount the maker puts in: BUY → USDC, SELL → CTF tokens */
     makerAmount: BN;
@@ -187,7 +187,7 @@ interface Order {
     expiry: BN;
     /** Creation timestamp (Unix seconds) */
     createdAt: BN;
-    /** Fee from taker order transferred to treasury. 0 = use global fee_rate_bps */
+    /** Fixed USDC amount (9 decimals) taker pays to treasury after all fills. 0 = no fee. Set by operator off-chain. */
     fee: BN;
     /** Directed order: only this pubkey can be counterparty. PublicKey.default() = public */
     taker: PublicKey;

package/dist/index.d.ts

@@ -165,8 +165,8 @@ interface OrderStatus {
  * Operator validates + submits matched order pairs on-chain.
  *
  * Semantics (mirrors EVM makerAmount/takerAmount):
- *   BUY  (side=1): makerAmount = USDC paid,      takerAmount = CTF tokens received
- *   SELL (side=0): makerAmount = CTF tokens given, takerAmount = USDC received
+ *   BUY  (side=0): makerAmount = USDC paid,      takerAmount = CTF tokens received
+ *   SELL (side=1): makerAmount = CTF tokens given, takerAmount = USDC received
  */
 interface Order {
     /** Maker's wallet public key */
@@ -175,7 +175,7 @@ interface Order {
     condition: PublicKey;
     /** Outcome token: 0 = NO, 1 = YES */
     tokenId: number;
-    /** Side: 0 = SELL (give tokens, want USDC), 1 = BUY (give USDC, want tokens) */
+    /** Side: 0 = BUY (give USDC, want tokens), 1 = SELL (give tokens, want USDC) — matches EVM convention */
     side: number;
     /** Amount the maker puts in: BUY → USDC, SELL → CTF tokens */
     makerAmount: BN;
@@ -187,7 +187,7 @@ interface Order {
     expiry: BN;
     /** Creation timestamp (Unix seconds) */
     createdAt: BN;
-    /** Fee from taker order transferred to treasury. 0 = use global fee_rate_bps */
+    /** Fixed USDC amount (9 decimals) taker pays to treasury after all fills. 0 = no fee. Set by operator off-chain. */
     fee: BN;
     /** Directed order: only this pubkey can be counterparty. PublicKey.default() = public */
     taker: PublicKey;

package/dist/index.js

@@ -8,7 +8,7 @@ var oracleIdl = require('./oracle-FZJJIJGI.json');
 var hookIdl = require('./hook-THBRGUM6.json');
 var questionMarketIdl = require('./question_market-CB6ZUZ5E.json');
 var conditionalTokensIdl = require('./conditional_tokens-3O5V46N5.json');
-var clobExchangeIdl = require('./clob_exchange-ATSH42KC.json');
+var clobExchangeIdl = require('./clob_exchange-MQF4NI27.json');
 var BN4 = require('bn.js');
 var nacl = require('tweetnacl');
 
@@ -1275,14 +1275,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 = splToken.getAssociatedTokenAddressSync(collateralMint, buyerYes);
     const buyerYesTokenAccount = splToken.getAssociatedTokenAddressSync(yesMint, buyerYes, false, splToken.TOKEN_2022_PROGRAM_ID);
@@ -1325,12 +1324,19 @@ var ClobClient = class {
       yesMint,
       noMint,
       mintAuthority,
-      clobAuthority,
+      feeRecipient,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: splToken.TOKEN_PROGRAM_ID,
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.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,
@@ -1348,13 +1354,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 = splToken.getAssociatedTokenAddressSync(yesMint, sellerYes, false, splToken.TOKEN_2022_PROGRAM_ID);
     const [sellerYesPosition] = PDA.position(condition, 1, sellerYes, this.programIds);
@@ -1396,12 +1401,19 @@ var ClobClient = class {
       vaultTokenAccount,
       yesMint,
       noMint,
-      clobAuthority,
+      feeRecipient,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: splToken.TOKEN_PROGRAM_ID,
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.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,
@@ -1424,8 +1436,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);
@@ -1447,9 +1459,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). */
@@ -1667,7 +1679,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;