@theliem/xmarket-sdk 4.1.1 → 4.2.0

package/dist/index.mjs

@@ -185,6 +185,7 @@ var PDA = class {
     );
   }
   // ─── Presale ─────────────────────────────────────────────────────────────────
+  /** seeds: ["presale", questionMarketConfig, presale_index u64 LE] under presale program */
   static presale(questionMarketConfig, presaleIndex, programIds) {
     if (!programIds.presale) throw new Error("presale program ID not configured");
     const idxBuf = Buffer.alloc(8);
@@ -607,28 +608,52 @@ var MarketClient = class {
     return this.program.methods.bumpPresaleCount(new anchor6.BN(count)).accounts({ authority, config: this.configPda }).transaction();
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
+  configNotFoundMessage() {
+    return `Question market config not found at ${this.configPda.toBase58()}. Check NetworkConfig.programIds.questionMarket (v2 FkpHo3...) and marketOwner (config owner pubkey \u2014 not the user wallet). Devnet: use DEVNET_CONFIG or marketOwner DEVNET_MARKET_OWNER.`;
+  }
   async fetchConfig() {
+    const info = await this.provider.connection.getAccountInfo(this.configPda);
+    if (!info) return null;
     try {
       const acc = await this.program.account.questionMarketConfig.fetch(this.configPda);
-      return {
-        owner: acc.owner,
-        admin: acc.admin,
-        oracle: acc.oracle,
-        oracleProgram: acc.oracleProgram,
-        conditionalTokensProgram: acc.conditionalTokensProgram,
-        questionCount: acc.questionCount.toNumber(),
-        approvedCount: acc.approvedCount.toNumber(),
-        rejectedCount: acc.rejectedCount.toNumber(),
-        presaleCount: acc.presaleCount.toNumber(),
-        whitelist: acc.whitelist.slice(0, acc.whitelistLen),
-        whitelistLen: acc.whitelistLen,
-        isPaused: acc.isPaused,
-        bump: acc.bump
-      };
+      return this.mapQuestionMarketConfig(acc);
     } catch {
       return null;
     }
   }
+  /** Like fetchConfig but throws with a hint when the config account is missing or invalid. */
+  async fetchConfigOrThrow() {
+    const info = await this.provider.connection.getAccountInfo(this.configPda);
+    if (!info) {
+      throw new Error(this.configNotFoundMessage());
+    }
+    try {
+      const acc = await this.program.account.questionMarketConfig.fetch(this.configPda);
+      return this.mapQuestionMarketConfig(acc);
+    } catch (e) {
+      throw new Error(
+        `${this.configNotFoundMessage()} Deserialize failed: ${e instanceof Error ? e.message : e}`
+      );
+    }
+  }
+  mapQuestionMarketConfig(acc) {
+    const accAny = acc;
+    return {
+      owner: accAny.owner,
+      admin: accAny.admin,
+      oracle: accAny.oracle,
+      oracleProgram: accAny.oracleProgram,
+      conditionalTokensProgram: accAny.conditionalTokensProgram,
+      questionCount: Number(accAny.questionCount.toString()),
+      approvedCount: Number(accAny.approvedCount.toString()),
+      rejectedCount: Number(accAny.rejectedCount.toString()),
+      presaleCount: Number(accAny.presaleCount.toString()),
+      whitelist: accAny.whitelist.slice(0, accAny.whitelistLen),
+      whitelistLen: accAny.whitelistLen,
+      isPaused: accAny.isPaused,
+      bump: accAny.bump
+    };
+  }
   /** Check if address is in question_market whitelist (can call createQuestion) */
   async isWhitelisted(address) {
     const cfg = await this.fetchConfig();
@@ -681,9 +706,10 @@ var MarketClient = class {
    * Any user creates a presale + initial buy (question-market::create_presale).
    * Reads agents_rev / company_rev from fee_config.
    *
-   * @param feeConfig   fee_management fee_config PDA (owner = feeConfigOwner)
-   * @param currencyMint collateral token (e.g. USDC)
-   * @param presaleIndex config.presale_count — fetch config first or pass 0 for first presale
+   * Presale PDA seeds (presale program): ["presale", config, presale_index]
+   * where presale_index must equal config.presale_count at execution time.
+   *
+   * @param presaleIndex config.presale_count — fetch config first via fetchConfig()
    */
   async createPresale(params, feeConfig, currencyMint, presaleIndex, creator = this.walletPubkey, payer = creator) {
     if (!this.programIds.presale) throw new Error("presale program ID not configured");
@@ -2082,7 +2108,7 @@ ${logs.join("\n")}`);
    * remaining_accounts per NO maker (6):
    *   [maker, order_record, buyer_no_token, buyer_no_collateral, buyer_no_position, no_order_status]
    */
-  async _buildMintIx(yesSigned, noMakers, collateralMint, operator, payer) {
+  async _buildMintIx(yesSigned, noMakers, collateralMint, operator, payer, feeRecipient, opts) {
     const condition = yesSigned.order.condition;
     const taker = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
@@ -2120,6 +2146,26 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    if (yesSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
+      const companyAddr = await this.companyAddress();
+      const refVault = await this.referralVault();
+      if (companyAddr && refVault) {
+        const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
+        const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
+        if (feeOverrideExists) {
+          const oracleVault = opts?.marketOracleVault ?? await this.getMarketOracleVault(condition, collateralMint) ?? payer;
+          remainingAccounts.push(
+            { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
+            { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
+            { pubkey: feeOverridePda, isSigner: false, isWritable: false },
+            { pubkey: getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
+            { pubkey: oracleVault, isSigner: false, isWritable: true },
+            { pubkey: refVault, isSigner: false, isWritable: true }
+          );
+        }
+      }
+    }
+    const resolvedFeeRecipient = feeRecipient ?? clobUsdcAta;
     return this.program.methods.matchMintOrders(takerNonce, fillAmount, true).accounts({
       operator,
       payer,
@@ -2131,6 +2177,7 @@ ${logs.join("\n")}`);
       takerYesToken,
       takerYesPosition,
       takerOrderStatus,
+      feeRecipient: resolvedFeeRecipient,
       clobUsdcAta,
       clobYesAta,
       clobNoAta,
@@ -2160,7 +2207,7 @@ ${logs.join("\n")}`);
     const [noMint] = PDA.noMint(condition, this.programIds);
     const clobYesAta = getAssociatedTokenAddressSync(yesMint, clobConfig, true, TOKEN_PROGRAM_ID);
     const clobNoAta = getAssociatedTokenAddressSync(noMint, clobConfig, true, TOKEN_PROGRAM_ID);
-    const matchIx = await this._buildMintIx(yesSigned, noMakers, collateralMint, operatorWallet.publicKey, this.walletPubkey);
+    const matchIx = await this._buildMintIx(yesSigned, noMakers, collateralMint, operatorWallet.publicKey, this.walletPubkey, _feeRecipient);
     await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
@@ -7184,13 +7231,6 @@ var question_market_default = {
             ],
             type: "pubkey"
           },
-          {
-            name: "oracle_program",
-            docs: [
-              "Oracle program ID \u2014 pinned for CPI validation in resolve_question"
-            ],
-            type: "pubkey"
-          },
           {
             name: "question_count",
             docs: [
@@ -7252,6 +7292,14 @@ var question_market_default = {
             ],
             type: "u64"
           },
+          {
+            name: "oracle_program",
+            docs: [
+              "Oracle program ID \u2014 pinned for CPI validation in resolve_question",
+              "Placed at end of meaningful fields to avoid layout shift on old accounts."
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             docs: [
@@ -18042,7 +18090,11 @@ var XMarketSDK = class {
     );
     anchor6.setProvider(this.provider);
     this._programIds = config.programIds;
-    this._marketOwner = marketOwner ?? wallet.publicKey;
+    this._marketOwner = marketOwner ?? config.marketOwner ?? wallet.publicKey;
+  }
+  /** Question market config PDA derived from marketOwner + questionMarket program. */
+  get questionMarketConfigPda() {
+    return this.market.configPda;
   }
   _withAddress(idl, address) {
     return { ...idl, address: address.toBase58() };
@@ -18132,6 +18184,44 @@ var XMarketSDK = class {
     return this._dispute;
   }
 };
+var V2_PROGRAM_IDS = {
+  oracle: new PublicKey("8uNiLDZnarxyFyoCi1bE1qkBMsLs2Tpyohtdzdvjkg8j"),
+  conditionalTokens: new PublicKey("xpn3htSptTZECudoRA8WJmAEtiijxDseTqtawYysVNT"),
+  questionMarket: new PublicKey("FkpHo3zb5h2nNS5n6tWAvDwXPTXR2qqVLjDmEkMayott"),
+  clobExchange: new PublicKey("AFT8SM1Vv8g8AQTf81LoE5oLteUTyhWzWTLj7SKZjkY1"),
+  feeManagement: new PublicKey("8S6hxqbDc8kgHf4uUzq2t15PeY36QSCYEpBVvM4Fhrkm"),
+  presale: new PublicKey("CKd94vPibAMAr8R5eLv21r8PYXkgLRithipBe8GV7J6C"),
+  marketOracle: new PublicKey("Agt6beCbghi4jV9A8v9geRP5dnt2wDkJBVgy9oM33zit"),
+  adminContract: new PublicKey("2HsyCdr59W5ndeboaE9JAmhEQ46m5Gm2ZWBfYEs1tC1i"),
+  referral: new PublicKey("9kyNMtUEFR6hDeZHUTbRKH3t1EJisfSvWQKKUev7ujoC"),
+  dispute: new PublicKey("8gqHPY1WtGFGmYNbrGrPVoct1kqPL6cCaUtJ17EHSsFp")
+};
+var DEVNET_MARKET_OWNER = new PublicKey(
+  "7eGpbyRpcM7WpNKQtd6XkteNQWHbWXP7icZjKzNK2aTk"
+);
+var DEVNET_QUESTION_MARKET_CONFIG = new PublicKey(
+  "7n8y2oQYmxTp9fn2Wf2dFE1pC7ZESXYJ4yXSbYSEuRn5"
+);
+var DEVNET_USDC_MINT = new PublicKey(
+  "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
+);
+var MAINNET_USDC_MINT = new PublicKey(
+  "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+);
+var DEVNET_CONFIG = {
+  name: "devnet",
+  rpcUrl: "https://api.devnet.solana.com",
+  programIds: V2_PROGRAM_IDS,
+  defaultCollateral: { mint: DEVNET_USDC_MINT, decimals: 6 },
+  marketOwner: DEVNET_MARKET_OWNER,
+  feeConfigOwner: DEVNET_MARKET_OWNER
+};
+var MAINNET_CONFIG = {
+  name: "mainnet",
+  rpcUrl: "https://api.mainnet-beta.solana.com",
+  programIds: V2_PROGRAM_IDS,
+  defaultCollateral: { mint: MAINNET_USDC_MINT, decimals: 6 }
+};
 var MAX_APPROVE_AMOUNT = new BN4("18446744073709551615");
 function buildCreateUserAtasTx(condition, user, payer, programIds) {
   const [yesMint] = PDA.yesMint(condition, programIds);
@@ -18201,6 +18291,6 @@ function buildApproveAllOutcomeTokensTx(condition, signer, payer, delegate, prog
   return tx;
 }
 
-export { AccountNotFoundError, AdminClient, ClobClient, CtfClient, DisputeClient, FEE_DENOMINATOR, FeeManagementClient, IX_SYSVAR, InvalidParamError, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, OracleClient, PDA, PresaleClient, QuestionStatus, ReferralClient, SEEDS, UnauthorizedError, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedCollectFeeEd25519Instruction, buildBatchedEd25519Instruction, buildBatchedRedeemFeeEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeCollectFeeOrderToBytes, serializeOrderToBytes, serializeRedeemFeeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
+export { AccountNotFoundError, AdminClient, ClobClient, CtfClient, DEVNET_CONFIG, DEVNET_MARKET_OWNER, DEVNET_QUESTION_MARKET_CONFIG, DEVNET_USDC_MINT, DisputeClient, FEE_DENOMINATOR, FeeManagementClient, IX_SYSVAR, InvalidParamError, MAINNET_CONFIG, MAINNET_USDC_MINT, MAX_APPROVE_AMOUNT, MarketClient, MarketOracleClient, OracleClient, PDA, PresaleClient, QuestionStatus, ReferralClient, SEEDS, UnauthorizedError, V2_PROGRAM_IDS, XMarketError, XMarketSDK, buildApproveAllOutcomeTokensTx, buildApproveCollateralTx, buildBatchedCollectFeeEd25519Instruction, buildBatchedEd25519Instruction, buildBatchedRedeemFeeEd25519Instruction, buildCreateUserAtasTx, buildOrder, buildOrderFromPrice, deserializeSignedOrder, detectMatchType, generateContentHash, generateQuestionId, getOrderSignBytes, orderAmountsFromPrice, serializeCollectFeeOrderToBytes, serializeOrderToBytes, serializeRedeemFeeOrderToBytes, serializeSignedOrder, signOrder, signOrderWithKeypair, verifySignedOrder };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map