@theliem/xmarket-sdk 1.0.12 → 3.0.1

package/dist/index.mjs

@@ -1,63 +1,16 @@
 import * as anchor4 from '@coral-xyz/anchor';
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, SYSVAR_RENT_PUBKEY, TransactionInstruction, Ed25519Program, TransactionMessage, VersionedTransaction, Connection, Transaction } from '@solana/web3.js';
+import { SYSVAR_INSTRUCTIONS_PUBKEY, PublicKey, SystemProgram, SYSVAR_RENT_PUBKEY, TransactionInstruction, Ed25519Program, TransactionMessage, VersionedTransaction, Connection, Transaction } from '@solana/web3.js';
 import { createHash } from 'crypto';
 import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, createApproveInstruction } from '@solana/spl-token';
 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';
 
 // src/sdk.ts
-var DEVNET_CONFIG = {
-  name: "devnet",
-  rpcUrl: "https://api.devnet.solana.com",
-  programIds: {
-    oracle: new PublicKey("FzLnnbKtQCTKviEbrDYMLZYXNDHQdjSSa4Ybj4jAbrUL"),
-    conditionalTokens: new PublicKey("A6N1F8MRsdgcojAx8p6FaECvw8mo8w6qJcWsbKQBANK4"),
-    questionMarket: new PublicKey("FCvCbWoLpzNYKzQnXYXCo1yz9DTpgUs11QqHVqnqtWhA"),
-    hook: new PublicKey("F7y5MfW8d5kqR25QHDhUQ9LrKCiZUZVF6Pdnw15q5zZW"),
-    clobExchange: new PublicKey("Cs4GY1yZVxjxhhyUum3AupMuS3bo4yKRXifgLTTAh1sf")
-  },
-  defaultCollateral: {
-    mint: new PublicKey("53osACZSom79AHf6nK4eq8DL6viMZmyVERYPDB6S6Eck"),
-    decimals: 9
-  }
-};
-var LOCALNET_CONFIG = {
-  name: "localnet",
-  rpcUrl: "http://localhost:8899",
-  programIds: { ...DEVNET_CONFIG.programIds },
-  defaultCollateral: {
-    mint: new PublicKey("6Gk4qsruSjunenwzP4L5DQukawfVNvdr9rPX2qG77jmH"),
-    decimals: 6
-  }
-};
-var MAINNET_CONFIG = {
-  name: "mainnet",
-  rpcUrl: "https://api.mainnet-beta.solana.com",
-  programIds: {
-    oracle: new PublicKey("E667trvbHmZEnptjnjXp9x8e1Fpji3viHo1J1DGPKijh"),
-    conditionalTokens: new PublicKey("3WFSX7zPLrJSU811h7awgqXTZuKhUR1Fi1VBDayHhk4s"),
-    questionMarket: new PublicKey("GiQh2xBmEiM4gYq4U9PMSaUJNq1T9TfEJL5cXvNYhtGm"),
-    hook: new PublicKey("11111111111111111111111111111111"),
-    // not yet deployed
-    clobExchange: new PublicKey("11111111111111111111111111111111")
-    // not yet deployed
-  },
-  defaultCollateral: {
-    mint: new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"),
-    // USDC mainnet
-    decimals: 6
-  }
-};
-var NETWORK_CONFIGS = {
-  devnet: DEVNET_CONFIG,
-  localnet: LOCALNET_CONFIG,
-  mainnet: MAINNET_CONFIG
-};
 var SEEDS = {
   config: Buffer.from("config"),
   question: Buffer.from("question"),
@@ -1291,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);
@@ -1341,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,
@@ -1364,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);
@@ -1412,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,
@@ -1440,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);
@@ -1463,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). */
@@ -1564,23 +1529,21 @@ var ClobClient = class {
     return status?.isCancelled === true;
   }
 };
-var XMarketSDK = class _XMarketSDK {
-  constructor(config) {
-    this.networkConfig = typeof config.network === "string" ? NETWORK_CONFIGS[config.network] : config.network;
+var XMarketSDK = class {
+  constructor(config, wallet, marketOwner) {
+    this.networkConfig = config;
     this.provider = new anchor4.AnchorProvider(
-      new Connection(this.networkConfig.rpcUrl, "confirmed"),
-      config.wallet,
+      new Connection(config.rpcUrl, "confirmed"),
+      wallet,
       { commitment: "confirmed", preflightCommitment: "confirmed" }
     );
     anchor4.setProvider(this.provider);
-    this._programIds = this.networkConfig.programIds;
-    this._marketOwner = config.marketOwner ?? config.wallet.publicKey;
+    this._programIds = config.programIds;
+    this._marketOwner = marketOwner ?? wallet.publicKey;
   }
-  // ─── Lazy-initialised clients ─────────────────────────────────────────────
   _withAddress(idl, address) {
     return { ...idl, address: address.toBase58() };
   }
-  /** Oracle program client */
   get oracle() {
     if (!this._oracle) {
       const program = new anchor4.Program(this._withAddress(oracleIdl, this._programIds.oracle), this.provider);
@@ -1588,7 +1551,6 @@ var XMarketSDK = class _XMarketSDK {
     }
     return this._oracle;
   }
-  /** Transfer-hook program client */
   get hook() {
     if (!this._hook) {
       const program = new anchor4.Program(this._withAddress(hookIdl, this._programIds.hook), this.provider);
@@ -1596,7 +1558,6 @@ var XMarketSDK = class _XMarketSDK {
     }
     return this._hook;
   }
-  /** QuestionMarket program client */
   get market() {
     if (!this._market) {
       const program = new anchor4.Program(this._withAddress(questionMarketIdl, this._programIds.questionMarket), this.provider);
@@ -1605,7 +1566,6 @@ var XMarketSDK = class _XMarketSDK {
     }
     return this._market;
   }
-  /** Conditional tokens (CTF) program client */
   get ctf() {
     if (!this._ctf) {
       const program = new anchor4.Program(this._withAddress(conditionalTokensIdl, this._programIds.conditionalTokens), this.provider);
@@ -1613,7 +1573,6 @@ var XMarketSDK = class _XMarketSDK {
     }
     return this._ctf;
   }
-  /** CLOB exchange program client */
   get clob() {
     if (!this._clob) {
       const program = new anchor4.Program(this._withAddress(clobExchangeIdl, this._programIds.clobExchange), this.provider);
@@ -1621,48 +1580,6 @@ var XMarketSDK = class _XMarketSDK {
     }
     return this._clob;
   }
-  // ─── Factory helpers ──────────────────────────────────────────────────────
-  /**
-   * Connect to devnet.
-   * ```ts
-   * const sdk = XMarketSDK.devnet(wallet);
-   * ```
-   */
-  static devnet(wallet, marketOwner) {
-    return new _XMarketSDK({ network: "devnet", wallet, marketOwner });
-  }
-  /**
-   * Connect to localhost test validator.
-   * ```ts
-   * const sdk = XMarketSDK.localnet(wallet);
-   * ```
-   */
-  static localnet(wallet, marketOwner) {
-    return new _XMarketSDK({ network: "localnet", wallet, marketOwner });
-  }
-  /**
-   * Connect to mainnet-beta.
-   * ```ts
-   * const sdk = XMarketSDK.mainnet(wallet);
-   * ```
-   */
-  static mainnet(wallet, marketOwner) {
-    return new _XMarketSDK({ network: "mainnet", wallet, marketOwner });
-  }
-  /**
-   * Custom network (e.g. custom RPC, custom program IDs for a fork).
-   * ```ts
-   * const sdk = XMarketSDK.custom({
-   *   name: "staging",
-   *   rpcUrl: "https://my-rpc.com",
-   *   programIds: { ... },
-   *   defaultCollateral: { mint: ..., decimals: 6 },
-   * }, wallet);
-   * ```
-   */
-  static custom(config, wallet, marketOwner) {
-    return new _XMarketSDK({ network: config, wallet, marketOwner });
-  }
 };
 function buildOrder(params) {
   return {
@@ -1731,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;
@@ -1792,6 +1709,6 @@ function buildApproveAllOutcomeTokensTx(condition, signer, payer, delegate, prog
   return tx;
 }
 
-export { AccountNotFoundError, ClobClient, CtfClient, DEVNET_CONFIG, HookClient, IX_SYSVAR, InvalidParamError, LOCALNET_CONFIG, MAINNET_CONFIG, MAX_APPROVE_AMOUNT, MarketClient, NETWORK_CONFIGS, OracleClient, PDA, QuestionStatus, SEEDS, UnauthorizedError, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildOrder, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, ClobClient, CtfClient, HookClient, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, OracleClient, PDA, QuestionStatus, SEEDS, UnauthorizedError, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedEd25519Instruction, buildOrder, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, serializeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map