@theliem/xmarket-sdk 3.1.0 → 3.1.2

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, Keypair, Transaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import BN from 'bn.js';
 
 interface ProgramIds {
@@ -241,9 +241,9 @@ declare class OracleClient {
     configPda(owner?: PublicKey): PublicKey;
     /** One-time setup. Caller becomes owner. */
     initialize(admin: PublicKey): Promise<TxResult>;
-    /** Admin or owner adds an address to the oracle whitelist. */
+    /** Admin or owner adds an address to the oracle resolver whitelist. */
     addToWhitelist(address: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
-    /** Admin or owner removes an address from the oracle whitelist. */
+    /** Admin or owner removes an address from the oracle resolver whitelist. */
     removeFromWhitelist(address: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
     /**
      * Whitelisted reporter resolves a question.
@@ -342,17 +342,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.
@@ -415,17 +415,6 @@ declare class MarketClient {
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, ownerPubkey: PublicKey);
     get walletPubkey(): PublicKey;
     initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
-    /**
-     * Build createQuestion transaction.
-     * @param payer   - Pays rent for all new accounts (can differ from creator)
-     * @param creator - Identity of the question creator (signs but does not pay)
-     */
-    createQuestion(params: CreateQuestionParams, oracle: PublicKey, creator?: PublicKey, payer?: PublicKey): Promise<{
-        tx: Transaction;
-        questionPda: PublicKey;
-        conditionPda: PublicKey;
-        questionId: Uint8Array;
-    }>;
     /**
      * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
      * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
@@ -736,6 +725,11 @@ declare class PresaleClient {
      * Creator claims their share of presale revenue after distribute_presale_revenue.
      */
     claimRevenue(presalePda: PublicKey, creator?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    /**
+     * Transfer creator_claimable_revenue (80%) to BOTMM wallet.
+     * Call after collectPresaleRevenue (distribute_presale_revenue).
+     */
+    distributeBotmmRevenue(presalePda: PublicKey, botmmAddress: PublicKey, currencyMint?: PublicKey): Promise<Transaction>;
     fetchPresale(presalePda: PublicKey): Promise<PresaleInfo | null>;
     fetchUserBuyRecord(presalePda: PublicKey, user: PublicKey): Promise<UserBuyRecord | 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, Keypair, Transaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import BN from 'bn.js';
 
 interface ProgramIds {
@@ -241,9 +241,9 @@ declare class OracleClient {
     configPda(owner?: PublicKey): PublicKey;
     /** One-time setup. Caller becomes owner. */
     initialize(admin: PublicKey): Promise<TxResult>;
-    /** Admin or owner adds an address to the oracle whitelist. */
+    /** Admin or owner adds an address to the oracle resolver whitelist. */
     addToWhitelist(address: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
-    /** Admin or owner removes an address from the oracle whitelist. */
+    /** Admin or owner removes an address from the oracle resolver whitelist. */
     removeFromWhitelist(address: PublicKey, ownerPubkey?: PublicKey): Promise<TxResult>;
     /**
      * Whitelisted reporter resolves a question.
@@ -342,17 +342,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.
@@ -415,17 +415,6 @@ declare class MarketClient {
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, ownerPubkey: PublicKey);
     get walletPubkey(): PublicKey;
     initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
-    /**
-     * Build createQuestion transaction.
-     * @param payer   - Pays rent for all new accounts (can differ from creator)
-     * @param creator - Identity of the question creator (signs but does not pay)
-     */
-    createQuestion(params: CreateQuestionParams, oracle: PublicKey, creator?: PublicKey, payer?: PublicKey): Promise<{
-        tx: Transaction;
-        questionPda: PublicKey;
-        conditionPda: PublicKey;
-        questionId: Uint8Array;
-    }>;
     /**
      * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
      * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
@@ -736,6 +725,11 @@ declare class PresaleClient {
      * Creator claims their share of presale revenue after distribute_presale_revenue.
      */
     claimRevenue(presalePda: PublicKey, creator?: PublicKey, signers?: Keypair[]): Promise<TxResult>;
+    /**
+     * Transfer creator_claimable_revenue (80%) to BOTMM wallet.
+     * Call after collectPresaleRevenue (distribute_presale_revenue).
+     */
+    distributeBotmmRevenue(presalePda: PublicKey, botmmAddress: PublicKey, currencyMint?: PublicKey): Promise<Transaction>;
     fetchPresale(presalePda: PublicKey): Promise<PresaleInfo | null>;
     fetchUserBuyRecord(presalePda: PublicKey, user: PublicKey): Promise<UserBuyRecord | null>;
 }

package/dist/index.js

@@ -4,13 +4,13 @@ var anchor4 = require('@coral-xyz/anchor');
 var web3_js = require('@solana/web3.js');
 var crypto = require('crypto');
 var splToken = require('@solana/spl-token');
-var oracleIdl = require('./oracle-A5VOIMGM.json');
+var oracleIdl = require('./oracle-O53KMXDK.json');
 var hookIdl = require('./hook-THBRGUM6.json');
-var questionMarketIdl = require('./question_market-77YI4LRP.json');
+var questionMarketIdl = require('./question_market-RP3J3N2M.json');
 var conditionalTokensIdl = require('./conditional_tokens-3O5V46N5.json');
 var clobExchangeIdl = require('./clob_exchange-MQF4NI27.json');
 var feeManagementIdl = require('./fee_management-VGF77YXG.json');
-var presaleIdl = require('./presale-ZZJXXQS3.json');
+var presaleIdl = require('./presale-Q4NDVQFN.json');
 var marketOracleIdl = require('./market_oracle-E6UUARGR.json');
 var BN4 = require('bn.js');
 var nacl = require('tweetnacl');
@@ -287,7 +287,7 @@ var OracleClient = class {
     }).rpc();
     return { signature: sig };
   }
-  /** Admin or owner adds an address to the oracle whitelist. */
+  /** Admin or owner adds an address to the oracle resolver whitelist. */
   async addToWhitelist(address, ownerPubkey) {
     const sig = await this.program.methods.addToWhitelist(address).accounts({
       authority: this.walletPubkey,
@@ -296,7 +296,7 @@ var OracleClient = class {
     }).rpc();
     return { signature: sig };
   }
-  /** Admin or owner removes an address from the oracle whitelist. */
+  /** Admin or owner removes an address from the oracle resolver whitelist. */
   async removeFromWhitelist(address, ownerPubkey) {
     const sig = await this.program.methods.removeFromWhitelist(address).accounts({
       authority: this.walletPubkey,
@@ -544,6 +544,7 @@ var InvalidParamError = class extends XMarketError {
 };
 
 // src/programs/market.ts
+var TOKEN_METADATA_PROGRAM_ID = new web3_js.PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
 var MarketClient = class {
   constructor(program, provider, programIds, ownerPubkey) {
     this.program = program;
@@ -566,45 +567,6 @@ var MarketClient = class {
       systemProgram: web3_js.SystemProgram.programId
     }).transaction();
   }
-  /**
-   * Build createQuestion transaction.
-   * @param payer   - Pays rent for all new accounts (can differ from creator)
-   * @param creator - Identity of the question creator (signs but does not pay)
-   */
-  async createQuestion(params, oracle, creator = this.walletPubkey, payer = this.walletPubkey) {
-    const questionId = params.questionId ?? generateQuestionId(params.content);
-    const contentHash = params.contentHash ?? generateContentHash(params.content);
-    const [questionPda] = PDA.question(this.configPda, questionId, this.programIds);
-    const [conditionPda] = PDA.condition(oracle, questionId, this.programIds);
-    const [yesMint] = PDA.yesMint(conditionPda, this.programIds);
-    const [noMint] = PDA.noMint(conditionPda, this.programIds);
-    const [mintAuthority] = PDA.mintAuthority(conditionPda, this.programIds);
-    const [collateralVault] = PDA.collateralVault(params.collateralMint, this.programIds);
-    const tx = await this.program.methods.createQuestionWithCondition({
-      questionId: Array.from(questionId),
-      contentHash: Array.from(contentHash),
-      hookProgram: params.hookProgram,
-      authorizedClob: params.authorizedClob,
-      expirationTime: new anchor4__namespace.BN(params.expirationTime)
-    }).accounts({
-      payer,
-      creator,
-      config: this.configPda,
-      question: questionPda,
-      currencyMint: params.collateralMint,
-      oracle,
-      condition: conditionPda,
-      yesMint,
-      noMint,
-      mintAuthority,
-      collateralVault,
-      conditionalTokensProgram: this.programIds.conditionalTokens,
-      tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
-      systemProgram: web3_js.SystemProgram.programId,
-      rent: web3_js.SYSVAR_RENT_PUBKEY
-    }).transaction();
-    return { tx, questionPda, conditionPda, questionId };
-  }
   /**
    * Build createQuestionAdmin transaction (whitelist/admin path — status = Approved immediately).
    * @param creator - Whitelisted creator (must be in whitelist or be admin/owner)
@@ -774,6 +736,10 @@ var MarketClient = class {
     const presaleVault = splToken.getAssociatedTokenAddressSync(currencyMint, presalePda, true);
     const creatorQtAta = splToken.getAssociatedTokenAddressSync(qtMint, creator);
     const creatorCurrencyAta = splToken.getAssociatedTokenAddressSync(currencyMint, creator);
+    const [qtMetadata] = web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("metadata"), TOKEN_METADATA_PROGRAM_ID.toBuffer(), qtMint.toBuffer()],
+      TOKEN_METADATA_PROGRAM_ID
+    );
     const tx = await this.program.methods.createPresale({
       price: params.price,
       startTime: params.startTime,
@@ -792,6 +758,8 @@ var MarketClient = class {
       creatorCurrencyAta,
       creatorQtAta,
       userBuyRecord,
+      qtMetadata,
+      tokenMetadataProgram: TOKEN_METADATA_PROGRAM_ID,
       presaleProgram: this.programIds.presale,
       tokenProgram: splToken.TOKEN_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -1002,7 +970,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);
@@ -1013,7 +981,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,
@@ -1031,14 +999,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);
@@ -1048,7 +1015,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,
@@ -1064,14 +1031,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);
@@ -1081,7 +1047,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,
@@ -1097,8 +1063,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.
@@ -1439,8 +1404,8 @@ var ClobClient = class {
   async _sendLegacyTx(instructions) {
     const { connection } = this.provider;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    const { Transaction: Transaction3 } = await import('@solana/web3.js');
-    const tx = new Transaction3();
+    const { Transaction: Transaction5 } = await import('@solana/web3.js');
+    const tx = new Transaction5();
     tx.recentBlockhash = blockhash;
     tx.feePayer = this.walletPubkey;
     tx.add(...instructions);
@@ -2199,6 +2164,26 @@ var PresaleClient = class {
     }).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 = splToken.getAssociatedTokenAddressSync(currencyMint, presalePda, true);
+    const botmmTokenAccount = splToken.getAssociatedTokenAddressSync(currencyMint, botmmAddress);
+    return this.program.methods.distributeBotmmRevenue().accounts({
+      presale: presalePda,
+      presaleVault,
+      currencyMint,
+      botmmTokenAccount,
+      tokenProgram: splToken.TOKEN_PROGRAM_ID
+    }).transaction();
+  }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchPresale(presalePda) {
     try {