@theliem/xmarket-sdk 3.1.1 → 3.1.3

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as anchor from '@coral-xyz/anchor';
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, Keypair, TransactionInstruction, Transaction, AddressLookupTableAccount } from '@solana/web3.js';
+import { PublicKey, Transaction, Keypair, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import BN from 'bn.js';
 
 interface ProgramIds {
@@ -247,12 +247,9 @@ declare class OracleClient {
     removeFromWhitelist(address: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
     /**
      * 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).
      */
-    resolveQuestion(questionId: Uint8Array, outcomeCount: number, payoutNumerators: number[], conditionPda: PublicKey, ownerPubkey?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    resolveQuestion(questionId: Uint8Array, outcomeCount: number, payoutNumerators: number[], conditionPda: PublicKey, reporter?: PublicKey, payer?: PublicKey, ownerPubkey?: PublicKey): Promise<Transaction>;
     /** Owner updates the admin. */
     updateAdmin(newAdmin: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
     /** Owner transfers ownership to a new keypair. */
@@ -342,17 +339,17 @@ declare class CtfClient {
      * Split `amount` collateral into equal YES + NO tokens.
      * ATAs created automatically via `init_if_needed`.
      */
-    splitPosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    splitPosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * Merge `amount` YES + NO tokens back into collateral.
      * Both token balances must be ≥ amount.
      */
-    mergePosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    mergePosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * After condition resolves: burn outcome tokens proportional to payout
      * and receive USDC. Works for winning, losing, or both positions.
      */
-    redeemPositions(condition: PublicKey, collateralMint: PublicKey, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    redeemPositions(condition: PublicKey, collateralMint: PublicKey, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * Oracle directly resolves a condition with payout numerators.
      * Bypasses QuestionMarket — only for oracle-owned conditions.
@@ -715,16 +712,16 @@ declare class PresaleClient {
      * qtAmount: amount of MST to receive (9 decimals).
      * USDC cost = qtAmount * price / 1e9.
      */
-    buy(presalePda: PublicKey, qtAmount: anchor.BN, buyer?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    buy(presalePda: PublicKey, qtAmount: anchor.BN, buyer?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * Refund: burn user's MST and return USDC.
      * Only callable when presale status = Rejected.
      */
-    refund(presalePda: PublicKey, user?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    refund(presalePda: PublicKey, user?: PublicKey): Promise<Transaction>;
     /**
      * Creator claims their share of presale revenue after distribute_presale_revenue.
      */
-    claimRevenue(presalePda: PublicKey, creator?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    claimRevenue(presalePda: PublicKey, creator?: PublicKey): Promise<Transaction>;
     /**
      * Transfer creator_claimable_revenue (80%) to BOTMM wallet.
      * Call after collectPresaleRevenue (distribute_presale_revenue).
@@ -764,7 +761,7 @@ declare class MarketOracleClient {
      * User burns their MST and claims proportional share of oracle vault USDC.
      * Call after market.collectTradingFee snapshotted qt supply.
      */
-    claimFeesShare(marketOraclePda: PublicKey, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    claimFeesShare(marketOraclePda: PublicKey, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     fetchMarketOracle(marketOraclePda: PublicKey): Promise<MarketOracleInfo | null>;
     fetchUserClaimRecord(marketOraclePda: PublicKey, user: PublicKey): Promise<UserClaimRecord | null>;
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as anchor from '@coral-xyz/anchor';
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, Keypair, TransactionInstruction, Transaction, AddressLookupTableAccount } from '@solana/web3.js';
+import { PublicKey, Transaction, Keypair, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import BN from 'bn.js';
 
 interface ProgramIds {
@@ -247,12 +247,9 @@ declare class OracleClient {
     removeFromWhitelist(address: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
     /**
      * 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).
      */
-    resolveQuestion(questionId: Uint8Array, outcomeCount: number, payoutNumerators: number[], conditionPda: PublicKey, ownerPubkey?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    resolveQuestion(questionId: Uint8Array, outcomeCount: number, payoutNumerators: number[], conditionPda: PublicKey, reporter?: PublicKey, payer?: PublicKey, ownerPubkey?: PublicKey): Promise<Transaction>;
     /** Owner updates the admin. */
     updateAdmin(newAdmin: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
     /** Owner transfers ownership to a new keypair. */
@@ -342,17 +339,17 @@ declare class CtfClient {
      * Split `amount` collateral into equal YES + NO tokens.
      * ATAs created automatically via `init_if_needed`.
      */
-    splitPosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    splitPosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * Merge `amount` YES + NO tokens back into collateral.
      * Both token balances must be ≥ amount.
      */
-    mergePosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    mergePosition(condition: PublicKey, collateralMint: PublicKey, amount: anchor.BN, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * After condition resolves: burn outcome tokens proportional to payout
      * and receive USDC. Works for winning, losing, or both positions.
      */
-    redeemPositions(condition: PublicKey, collateralMint: PublicKey, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    redeemPositions(condition: PublicKey, collateralMint: PublicKey, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * Oracle directly resolves a condition with payout numerators.
      * Bypasses QuestionMarket — only for oracle-owned conditions.
@@ -715,16 +712,16 @@ declare class PresaleClient {
      * qtAmount: amount of MST to receive (9 decimals).
      * USDC cost = qtAmount * price / 1e9.
      */
-    buy(presalePda: PublicKey, qtAmount: anchor.BN, buyer?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    buy(presalePda: PublicKey, qtAmount: anchor.BN, buyer?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     /**
      * Refund: burn user's MST and return USDC.
      * Only callable when presale status = Rejected.
      */
-    refund(presalePda: PublicKey, user?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    refund(presalePda: PublicKey, user?: PublicKey): Promise<Transaction>;
     /**
      * Creator claims their share of presale revenue after distribute_presale_revenue.
      */
-    claimRevenue(presalePda: PublicKey, creator?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    claimRevenue(presalePda: PublicKey, creator?: PublicKey): Promise<Transaction>;
     /**
      * Transfer creator_claimable_revenue (80%) to BOTMM wallet.
      * Call after collectPresaleRevenue (distribute_presale_revenue).
@@ -764,7 +761,7 @@ declare class MarketOracleClient {
      * User burns their MST and claims proportional share of oracle vault USDC.
      * Call after market.collectTradingFee snapshotted qt supply.
      */
-    claimFeesShare(marketOraclePda: PublicKey, user?: PublicKey, payer?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    claimFeesShare(marketOraclePda: PublicKey, user?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     fetchMarketOracle(marketOraclePda: PublicKey): Promise<MarketOracleInfo | null>;
     fetchUserClaimRecord(marketOraclePda: PublicKey, user: PublicKey): Promise<UserClaimRecord | null>;
 }

package/dist/index.js

@@ -307,28 +307,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__namespace.BN(n))
     ).accounts({
-      reporter: this.walletPubkey,
+      reporter,
       oracleConfig,
       questionResult: questionResultPda,
       condition: conditionPda,
       conditionalTokensProgram: this.programIds.conditionalTokens,
-      payer: payer ?? this.walletPubkey,
+      payer,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   /** Owner updates the admin. */
   async updateAdmin(newAdmin, ownerPubkey) {
@@ -970,7 +966,7 @@ var CtfClient = class {
    * Split `amount` collateral into equal YES + NO tokens.
    * ATAs created automatically via `init_if_needed`.
    */
-  async splitPosition(condition, collateralMint, amount, user = this.walletPubkey, payer = this.walletPubkey, signers = []) {
+  async splitPosition(condition, collateralMint, amount, user = this.walletPubkey, payer = this.walletPubkey) {
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
     const [yesMint] = PDA.yesMint(condition, this.programIds);
@@ -981,7 +977,7 @@ var CtfClient = class {
     const userYesAta = splToken.getAssociatedTokenAddressSync(yesMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
     const userNoAta = splToken.getAssociatedTokenAddressSync(noMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
     const userCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, user);
-    const sig = await this.program.methods.splitPosition(amount).accounts({
+    return this.program.methods.splitPosition(amount).accounts({
       user,
       payer,
       condition,
@@ -999,14 +995,13 @@ var CtfClient = class {
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc({ skipPreflight: true });
-    return { signature: sig };
+    }).transaction();
   }
   /**
    * Merge `amount` YES + NO tokens back into collateral.
    * Both token balances must be ≥ amount.
    */
-  async mergePosition(condition, collateralMint, amount, user = this.walletPubkey, payer = this.walletPubkey, signers = []) {
+  async mergePosition(condition, collateralMint, amount, user = this.walletPubkey, payer = this.walletPubkey) {
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
     const [yesMint] = PDA.yesMint(condition, this.programIds);
@@ -1016,7 +1011,7 @@ var CtfClient = class {
     const userYesAta = splToken.getAssociatedTokenAddressSync(yesMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
     const userNoAta = splToken.getAssociatedTokenAddressSync(noMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
     const userCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, user);
-    const sig = await this.program.methods.mergePosition(amount).accounts({
+    return this.program.methods.mergePosition(amount).accounts({
       user,
       payer,
       condition,
@@ -1032,14 +1027,13 @@ var CtfClient = class {
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc({ skipPreflight: true });
-    return { signature: sig };
+    }).transaction();
   }
   /**
    * After condition resolves: burn outcome tokens proportional to payout
    * and receive USDC. Works for winning, losing, or both positions.
    */
-  async redeemPositions(condition, collateralMint, user = this.walletPubkey, payer = this.walletPubkey, signers = []) {
+  async redeemPositions(condition, collateralMint, user = this.walletPubkey, payer = this.walletPubkey) {
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
     const [yesMint] = PDA.yesMint(condition, this.programIds);
@@ -1049,7 +1043,7 @@ var CtfClient = class {
     const userYesAta = splToken.getAssociatedTokenAddressSync(yesMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
     const userNoAta = splToken.getAssociatedTokenAddressSync(noMint, user, false, splToken.TOKEN_2022_PROGRAM_ID);
     const userCollateral = splToken.getAssociatedTokenAddressSync(collateralMint, user);
-    const sig = await this.program.methods.redeemPositions().accounts({
+    return this.program.methods.redeemPositions().accounts({
       user,
       payer,
       condition,
@@ -1065,8 +1059,7 @@ var CtfClient = class {
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc({ skipPreflight: true });
-    return { signature: sig };
+    }).transaction();
   }
   /**
    * Oracle directly resolves a condition with payout numerators.
@@ -1407,8 +1400,8 @@ var ClobClient = class {
   async _sendLegacyTx(instructions) {
     const { connection } = this.provider;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    const { Transaction: Transaction4 } = await import('@solana/web3.js');
-    const tx = new Transaction4();
+    const { Transaction: Transaction7 } = await import('@solana/web3.js');
+    const tx = new Transaction7();
     tx.recentBlockhash = blockhash;
     tx.feePayer = this.walletPubkey;
     tx.add(...instructions);
@@ -2091,7 +2084,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;
@@ -2101,7 +2094,7 @@ var PresaleClient = class {
     const buyerQtAta = splToken.getAssociatedTokenAddressSync(qtMint, buyer);
     const buyerCurrencyAta = splToken.getAssociatedTokenAddressSync(currencyMint, buyer);
     const presaleVault = splToken.getAssociatedTokenAddressSync(currencyMint, presalePda, true);
-    const sig = await this.program.methods.buy(qtAmount).accounts({
+    return this.program.methods.buy(qtAmount).accounts({
       buyer,
       payer,
       presale: presalePda,
@@ -2115,14 +2108,13 @@ var PresaleClient = class {
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.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;
@@ -2131,7 +2123,7 @@ var PresaleClient = class {
     const userQtAta = splToken.getAssociatedTokenAddressSync(qtMint, user);
     const userCurrencyAta = splToken.getAssociatedTokenAddressSync(currencyMint, user);
     const presaleVault = splToken.getAssociatedTokenAddressSync(currencyMint, presalePda, true);
-    const sig = await this.program.methods.refund().accounts({
+    return this.program.methods.refund().accounts({
       user,
       presale: presalePda,
       qtMint,
@@ -2143,19 +2135,18 @@ var PresaleClient = class {
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   /**
    * Creator claims their share of presale revenue after distribute_presale_revenue.
    */
-  async claimRevenue(presalePda, creator = this.walletPubkey, signers = []) {
+  async claimRevenue(presalePda, creator = this.walletPubkey) {
     const presale = await this.fetchPresale(presalePda);
     if (!presale) throw new Error(`Presale not found: ${presalePda.toBase58()}`);
     const currencyMint = presale.currencyMint;
     const presaleVault = splToken.getAssociatedTokenAddressSync(currencyMint, presalePda, true);
     const creatorCurrencyAta = splToken.getAssociatedTokenAddressSync(currencyMint, creator);
-    const sig = await this.program.methods.claimRevenue().accounts({
+    return this.program.methods.claimRevenue().accounts({
       creator,
       presale: presalePda,
       presaleVault,
@@ -2164,8 +2155,7 @@ var PresaleClient = class {
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   /**
    * Transfer creator_claimable_revenue (80%) to BOTMM wallet.
@@ -2252,7 +2242,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;
@@ -2261,7 +2251,7 @@ var MarketOracleClient = class {
     const userQtAta = splToken.getAssociatedTokenAddressSync(qtMint, user);
     const userCurrencyAta = splToken.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,
@@ -2274,8 +2264,7 @@ var MarketOracleClient = class {
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
-    }).signers(signers).rpc();
-    return { signature: sig };
+    }).transaction();
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchMarketOracle(marketOraclePda) {