@theliem/xmarket-sdk 3.1.2 → 3.2.0

package/dist/index.mjs

@@ -1,14 +1,14 @@
 import * as anchor4 from '@coral-xyz/anchor';
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, SYSVAR_RENT_PUBKEY, TransactionInstruction, Ed25519Program, AddressLookupTableProgram, TransactionMessage, VersionedTransaction, Connection, Transaction } from '@solana/web3.js';
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, SYSVAR_RENT_PUBKEY, ComputeBudgetProgram, TransactionInstruction, Ed25519Program, AddressLookupTableProgram, TransactionMessage, VersionedTransaction, Connection, Transaction } from '@solana/web3.js';
 import { createHash } from 'crypto';
 import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, createApproveInstruction } from '@solana/spl-token';
 import oracleIdl from './oracle-O53KMXDK.json';
 import hookIdl from './hook-THBRGUM6.json';
-import questionMarketIdl from './question_market-RP3J3N2M.json';
-import conditionalTokensIdl from './conditional_tokens-3O5V46N5.json';
+import questionMarketIdl from './question_market-CD4WRZLT.json';
+import conditionalTokensIdl from './conditional_tokens-X53GZYAY.json';
 import clobExchangeIdl from './clob_exchange-MQF4NI27.json';
 import feeManagementIdl from './fee_management-VGF77YXG.json';
-import presaleIdl from './presale-Q4NDVQFN.json';
+import presaleIdl from './presale-D7EQAQDZ.json';
 import marketOracleIdl from './market_oracle-E6UUARGR.json';
 import BN4 from 'bn.js';
 import * as nacl from 'tweetnacl';
@@ -273,28 +273,24 @@ var OracleClient = class {
   }
   /**
    * Whitelisted reporter resolves a question.
-   * CPIs directly into CTF.set_payout — condition is resolved in one tx.
-   * @param conditionPda  - CTF condition account (oracle_config = oraclePda, question_id must match)
-   * @param ownerPubkey   - oracle config owner (defaults to wallet)
-   * @param payer         - fee payer (defaults to wallet)
+   * reporter signs the instruction; payer covers the tx fee (Kora pattern).
    */
-  async resolveQuestion(questionId, outcomeCount, payoutNumerators, conditionPda, ownerPubkey, payer, signers = []) {
+  async resolveQuestion(questionId, outcomeCount, payoutNumerators, conditionPda, reporter = this.walletPubkey, payer = this.walletPubkey, ownerPubkey) {
     const oracleConfig = this.configPda(ownerPubkey);
     const [questionResultPda] = PDA.questionResult(oracleConfig, questionId, this.programIds);
-    const sig = await this.program.methods.resolveQuestion(
+    return this.program.methods.resolveQuestion(
       Array.from(questionId),
       outcomeCount,
       payoutNumerators.map((n) => new anchor4.BN(n))
     ).accounts({
-      reporter: this.walletPubkey,
+      reporter,
       oracleConfig,
       questionResult: questionResultPda,
       condition: conditionPda,
       conditionalTokensProgram: this.programIds.conditionalTokens,
-      payer: payer ?? this.walletPubkey,
+      payer,
       systemProgram: SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   /** Owner updates the admin. */
   async updateAdmin(newAdmin, ownerPubkey) {
@@ -732,6 +728,9 @@ var MarketClient = class {
       systemProgram: SystemProgram.programId,
       rent: SYSVAR_RENT_PUBKEY
     }).transaction();
+    tx.instructions.unshift(
+      ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 })
+    );
     return { tx, presalePda, qtMint };
   }
   /**
@@ -805,14 +804,15 @@ var MarketClient = class {
     }).transaction();
   }
   /**
-   * Whitelist-only: distribute presale vault funds → agents_rev% + company_rev% + rest to creator.
-   * Must be called after approvePresale.
+   * Whitelist-only: distribute presale vault → 10% agents + 10% company + 80% botmm.
+   * Closes presale_vault ATA and presale PDA after distribution; lamports returned to payer.
    */
-  async collectPresaleRevenue(presalePda, currencyMint, referralAddress, companyAddress, caller = this.walletPubkey) {
+  async collectPresaleRevenue(presalePda, currencyMint, referralAddress, companyAddress, botmmAddress, caller = this.walletPubkey, payer = this.walletPubkey) {
     if (!this.programIds.presale) throw new Error("presale program ID not configured");
     const presaleVault = getAssociatedTokenAddressSync(currencyMint, presalePda, true);
     const referralTokenAccount = getAssociatedTokenAddressSync(currencyMint, referralAddress);
     const companyTokenAccount = getAssociatedTokenAddressSync(currencyMint, companyAddress);
+    const botmmTokenAccount = getAssociatedTokenAddressSync(currencyMint, botmmAddress);
     return this.program.methods.collectPresaleRevenue().accounts({
       caller,
       config: this.configPda,
@@ -821,6 +821,8 @@ var MarketClient = class {
       currencyMint,
       referralTokenAccount,
       companyTokenAccount,
+      botmmTokenAccount,
+      payer,
       presaleProgram: this.programIds.presale,
       tokenProgram: TOKEN_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -1370,8 +1372,8 @@ var ClobClient = class {
   async _sendLegacyTx(instructions) {
     const { connection } = this.provider;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    const { Transaction: Transaction5 } = await import('@solana/web3.js');
-    const tx = new Transaction5();
+    const { Transaction: Transaction7 } = await import('@solana/web3.js');
+    const tx = new Transaction7();
     tx.recentBlockhash = blockhash;
     tx.feePayer = this.walletPubkey;
     tx.add(...instructions);
@@ -2054,7 +2056,7 @@ var PresaleClient = class {
    * qtAmount: amount of MST to receive (9 decimals).
    * USDC cost = qtAmount * price / 1e9.
    */
-  async buy(presalePda, qtAmount, buyer = this.walletPubkey, payer = this.walletPubkey, signers = []) {
+  async buy(presalePda, qtAmount, buyer = this.walletPubkey, payer = this.walletPubkey) {
     const presale = await this.fetchPresale(presalePda);
     if (!presale) throw new Error(`Presale not found: ${presalePda.toBase58()}`);
     const qtMint = presale.qtMint;
@@ -2064,7 +2066,7 @@ var PresaleClient = class {
     const buyerQtAta = getAssociatedTokenAddressSync(qtMint, buyer);
     const buyerCurrencyAta = getAssociatedTokenAddressSync(currencyMint, buyer);
     const presaleVault = getAssociatedTokenAddressSync(currencyMint, presalePda, true);
-    const sig = await this.program.methods.buy(qtAmount).accounts({
+    return this.program.methods.buy(qtAmount).accounts({
       buyer,
       payer,
       presale: presalePda,
@@ -2078,14 +2080,13 @@ var PresaleClient = class {
       tokenProgram: TOKEN_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   /**
    * Refund: burn user's MST and return USDC.
    * Only callable when presale status = Rejected.
    */
-  async refund(presalePda, user = this.walletPubkey, signers = []) {
+  async refund(presalePda, user = this.walletPubkey) {
     const presale = await this.fetchPresale(presalePda);
     if (!presale) throw new Error(`Presale not found: ${presalePda.toBase58()}`);
     const qtMint = presale.qtMint;
@@ -2094,7 +2095,7 @@ var PresaleClient = class {
     const userQtAta = getAssociatedTokenAddressSync(qtMint, user);
     const userCurrencyAta = getAssociatedTokenAddressSync(currencyMint, user);
     const presaleVault = getAssociatedTokenAddressSync(currencyMint, presalePda, true);
-    const sig = await this.program.methods.refund().accounts({
+    return this.program.methods.refund().accounts({
       user,
       presale: presalePda,
       qtMint,
@@ -2106,48 +2107,6 @@ var PresaleClient = class {
       tokenProgram: TOKEN_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
-  }
-  /**
-   * Creator claims their share of presale revenue after distribute_presale_revenue.
-   */
-  async claimRevenue(presalePda, creator = this.walletPubkey, signers = []) {
-    const presale = await this.fetchPresale(presalePda);
-    if (!presale) throw new Error(`Presale not found: ${presalePda.toBase58()}`);
-    const currencyMint = presale.currencyMint;
-    const presaleVault = getAssociatedTokenAddressSync(currencyMint, presalePda, true);
-    const creatorCurrencyAta = getAssociatedTokenAddressSync(currencyMint, creator);
-    const sig = await this.program.methods.claimRevenue().accounts({
-      creator,
-      presale: presalePda,
-      presaleVault,
-      creatorCurrencyAta,
-      currencyMint,
-      tokenProgram: TOKEN_PROGRAM_ID,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      systemProgram: SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
-  }
-  /**
-   * Transfer creator_claimable_revenue (80%) to BOTMM wallet.
-   * Call after collectPresaleRevenue (distribute_presale_revenue).
-   */
-  async distributeBotmmRevenue(presalePda, botmmAddress, currencyMint) {
-    if (!currencyMint) {
-      const presale = await this.fetchPresale(presalePda);
-      if (!presale) throw new Error(`Presale not found: ${presalePda.toBase58()}`);
-      currencyMint = presale.currencyMint;
-    }
-    const presaleVault = getAssociatedTokenAddressSync(currencyMint, presalePda, true);
-    const botmmTokenAccount = getAssociatedTokenAddressSync(currencyMint, botmmAddress);
-    return this.program.methods.distributeBotmmRevenue().accounts({
-      presale: presalePda,
-      presaleVault,
-      currencyMint,
-      botmmTokenAccount,
-      tokenProgram: TOKEN_PROGRAM_ID
     }).transaction();
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
@@ -2215,7 +2174,7 @@ var MarketOracleClient = class {
    * User burns their MST and claims proportional share of oracle vault USDC.
    * Call after market.collectTradingFee snapshotted qt supply.
    */
-  async claimFeesShare(marketOraclePda, user = this.walletPubkey, payer = this.walletPubkey, signers = []) {
+  async claimFeesShare(marketOraclePda, user = this.walletPubkey, payer = this.walletPubkey) {
     const oracle = await this.fetchMarketOracle(marketOraclePda);
     if (!oracle) throw new Error(`MarketOracle not found: ${marketOraclePda.toBase58()}`);
     const currencyMint = oracle.currencyMint;
@@ -2224,7 +2183,7 @@ var MarketOracleClient = class {
     const userQtAta = getAssociatedTokenAddressSync(qtMint, user);
     const userCurrencyAta = getAssociatedTokenAddressSync(currencyMint, user);
     const userClaimRecord = this.userClaimRecordPda(marketOraclePda, user);
-    const sig = await this.program.methods.claimFeesShare().accounts({
+    return this.program.methods.claimFeesShare().accounts({
       user,
       payer,
       marketOracle: marketOraclePda,
@@ -2237,8 +2196,7 @@ var MarketOracleClient = class {
       tokenProgram: TOKEN_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchMarketOracle(marketOraclePda) {