@theliem/xmarket-sdk 3.26.0 → 3.28.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import * as anchor5 from '@coral-xyz/anchor';
+import * as anchor6 from '@coral-xyz/anchor';
 import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, SYSVAR_RENT_PUBKEY, ComputeBudgetProgram, TransactionMessage, VersionedTransaction, Transaction, TransactionInstruction, Ed25519Program, AddressLookupTableProgram, Connection } from '@solana/web3.js';
 import { createHash } from 'crypto';
 import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, createAssociatedTokenAccountIdempotentInstruction, createApproveInstruction } from '@solana/spl-token';
@@ -350,7 +350,7 @@ var OracleClient = class {
     return this.program.methods.resolveQuestion(
       Array.from(questionId),
       outcomeCount,
-      payoutNumerators.map((n) => new anchor5.BN(n))
+      payoutNumerators.map((n) => new anchor6.BN(n))
     ).accounts({
       reporter,
       oracleConfig,
@@ -639,7 +639,7 @@ var MarketClient = class {
       contentHash: Array.from(contentHash),
       hookProgram: params.hookProgram,
       authorizedClob: params.authorizedClob,
-      expirationTime: new anchor5.BN(params.expirationTime)
+      expirationTime: new anchor6.BN(params.expirationTime)
     }).accounts({
       creator,
       payer,
@@ -728,7 +728,7 @@ var MarketClient = class {
     }).transaction();
   }
   async bumpPresaleCount(count, authority) {
-    return this.program.methods.bumpPresaleCount(new anchor5.BN(count)).accounts({ authority, config: this.configPda }).transaction();
+    return this.program.methods.bumpPresaleCount(new anchor6.BN(count)).accounts({ authority, config: this.configPda }).transaction();
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
@@ -1236,7 +1236,7 @@ var CtfClient = class {
    * Bypasses QuestionMarket — only for oracle-owned conditions.
    */
   async reportPayouts(condition, payoutNumerators) {
-    const sig = await this.program.methods.reportPayouts(payoutNumerators.map((n) => new anchor5.BN(n))).accounts({
+    const sig = await this.program.methods.reportPayouts(payoutNumerators.map((n) => new anchor6.BN(n))).accounts({
       oracle: this.walletPubkey,
       condition
     }).rpc();
@@ -2081,7 +2081,7 @@ ${logs.join("\n")}`);
     const tokenId = takerSigned.order.tokenId;
     const taker = takerSigned.order.maker;
     const takerNonce = takerSigned.order.nonce;
-    const fillAmount = opts?.fillAmount ?? new anchor5.BN("18446744073709551615");
+    const fillAmount = opts?.fillAmount ?? new anchor6.BN("18446744073709551615");
     const [outcomeMint] = tokenId === 1 ? PDA.yesMint(condition, this.programIds) : PDA.noMint(condition, this.programIds);
     const [takerOrderRecord] = PDA.orderRecord(taker, takerNonce, this.programIds);
     const takerCollateral = getAssociatedTokenAddressSync(collateralMint, taker);
@@ -2222,7 +2222,7 @@ ${logs.join("\n")}`);
     const condition = yesSigned.order.condition;
     const taker = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
-    const fillAmount = new anchor5.BN("18446744073709551615");
+    const fillAmount = new anchor6.BN("18446744073709551615");
     const clobConfig = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
@@ -2326,7 +2326,7 @@ ${logs.join("\n")}`);
     const condition = yesSigned.order.condition;
     const sellerYes = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
-    const fillAmount = new anchor5.BN("18446744073709551615");
+    const fillAmount = new anchor6.BN("18446744073709551615");
     const clobConfig = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
@@ -2793,9 +2793,9 @@ ${logs.join("\n")}`);
       ixSysvar: IX_SYSVAR,
       orderSigner: order.user,
       redeemFeeOrderRecord,
-      systemProgram: anchor5.web3.SystemProgram.programId
+      systemProgram: anchor6.web3.SystemProgram.programId
     }).instruction();
-    const tx = new anchor5.web3.Transaction();
+    const tx = new anchor6.web3.Transaction();
     tx.add(ed25519Ix, registerIx);
     return tx;
   }
@@ -2898,7 +2898,7 @@ ${logs.join("\n")}`);
       conditionalTokensProgram: this.programIds.conditionalTokens,
       tokenProgram: TOKEN_PROGRAM_ID,
       token2022Program: TOKEN_2022_PROGRAM_ID,
-      systemProgram: anchor5.web3.SystemProgram.programId
+      systemProgram: anchor6.web3.SystemProgram.programId
     }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
     const alt = opts?.lookupTable ?? await this.buildAltForCondition(condition, payer, collateralMint);
     return this._buildUnsignedVtx([...hookInitIxs, redeemIx], alt, payer);
@@ -3000,7 +3000,7 @@ ${logs.join("\n")}`);
       conditionalTokensProgram: this.programIds.conditionalTokens,
       tokenProgram: TOKEN_PROGRAM_ID,
       token2022Program: TOKEN_2022_PROGRAM_ID,
-      systemProgram: anchor5.web3.SystemProgram.programId
+      systemProgram: anchor6.web3.SystemProgram.programId
     }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
     const alt = opts?.lookupTable ?? await this.buildAltForCondition(condition, payer, collateralMint);
     return this._buildUnsignedVtx([...hookInitIxs, mergeIx], alt, payer);
@@ -3560,6 +3560,84 @@ var MarketOracleClient = class {
       return null;
     }
   }
+  /**
+   * Derive marketOracleVault from presaleAddress and return its USDS balance.
+   * presaleAddress is used as the questionId seed in the question PDA.
+   */
+  async getOracleVaultBalance(presaleAddress, qmConfigPda, collateralMint) {
+    const [questionPda] = PDA.question(qmConfigPda, presaleAddress.toBytes(), this.programIds);
+    const [marketOraclePda] = PDA.marketOraclePda(questionPda, this.programIds);
+    const vault = getAssociatedTokenAddressSync(collateralMint, marketOraclePda, true);
+    const bal = await this.program.provider.connection.getTokenAccountBalance(vault);
+    return bal.value.uiAmount ?? 0;
+  }
+  /**
+   * Estimate the USDS share a user would receive if they called claimFeesShare now.
+   * Works both before and after fees_distributed — no extra params needed.
+   *
+   * When fees not yet distributed, auto-resolves qtMint via:
+   *   oracle.question (questionPda) → raw account bytes[8..40] = presalePda
+   *   → PDA.qtMint(presalePda) → qtMint
+   *
+   * Formula mirrors on-chain claim_fees_share_handler:
+   *   effective_total = vault_balance + oracle.total_claimed
+   *   share = user_qt_balance * effective_total / oracle.qt_total_supply
+   */
+  async estimateFeesShare(marketOraclePda, user) {
+    const { connection } = this.provider;
+    const [oracle, claimRecord] = await Promise.all([
+      this.fetchMarketOracle(marketOraclePda),
+      this.fetchUserClaimRecord(marketOraclePda, user)
+    ]);
+    if (!oracle) return null;
+    const hasClaimed = claimRecord?.hasClaimed ?? false;
+    const vaultAta = getAssociatedTokenAddressSync(oracle.currencyMint, marketOraclePda, true);
+    const needsQtMintResolve = !oracle.feesDistributed || oracle.qtMint.equals(PublicKey.default);
+    const [vaultResult, questionAccount] = await Promise.all([
+      connection.getTokenAccountBalance(vaultAta).catch(() => null),
+      needsQtMintResolve ? connection.getAccountInfo(oracle.question).catch(() => null) : Promise.resolve(null)
+    ]);
+    const vaultBalance = vaultResult ? new anchor6.BN(vaultResult.value.amount) : new anchor6.BN(0);
+    let qtMint = oracle.qtMint;
+    if (needsQtMintResolve && questionAccount) {
+      try {
+        const presalePda = new PublicKey(questionAccount.data.slice(41, 73));
+        qtMint = PDA.qtMint(presalePda, this.programIds)[0];
+      } catch {
+      }
+    }
+    const isDefaultMint = qtMint.equals(PublicKey.default);
+    const needsSupply = (!oracle.feesDistributed || oracle.qtTotalSupply.isZero()) && !isDefaultMint;
+    const userQtAta = isDefaultMint ? null : getAssociatedTokenAddressSync(qtMint, user);
+    const [qtBalResult, supplyResult] = await Promise.all([
+      userQtAta ? connection.getTokenAccountBalance(userQtAta).catch(() => null) : Promise.resolve(null),
+      needsSupply ? connection.getTokenSupply(qtMint).catch(() => null) : Promise.resolve(null)
+    ]);
+    const userQtBalance = qtBalResult ? new anchor6.BN(qtBalResult.value.amount) : new anchor6.BN(0);
+    const qtTotalSupply = needsSupply && supplyResult ? new anchor6.BN(supplyResult.value.amount) : oracle.qtTotalSupply;
+    const effectiveTotal = vaultBalance.add(oracle.totalClaimed);
+    if (qtTotalSupply.isZero() || userQtBalance.isZero()) {
+      return {
+        share: new anchor6.BN(0),
+        effectiveTotal,
+        vaultBalance,
+        userQtBalance,
+        qtTotalSupply,
+        feesDistributed: oracle.feesDistributed,
+        hasClaimed
+      };
+    }
+    const share = userQtBalance.mul(effectiveTotal).div(qtTotalSupply);
+    return {
+      share,
+      effectiveTotal,
+      vaultBalance,
+      userQtBalance,
+      qtTotalSupply,
+      feesDistributed: oracle.feesDistributed,
+      hasClaimed
+    };
+  }
   async fetchUserClaimRecord(marketOraclePda, user) {
     try {
       const pda = this.userClaimRecordPda(marketOraclePda, user);
@@ -18697,12 +18775,12 @@ var dispute_default = {
 var XMarketSDK = class {
   constructor(config, wallet, marketOwner) {
     this.networkConfig = config;
-    this.provider = new anchor5.AnchorProvider(
+    this.provider = new anchor6.AnchorProvider(
       new Connection(config.rpcUrl, "confirmed"),
       wallet,
       { commitment: "confirmed", preflightCommitment: "confirmed" }
     );
-    anchor5.setProvider(this.provider);
+    anchor6.setProvider(this.provider);
     this._programIds = config.programIds;
     this._marketOwner = marketOwner ?? wallet.publicKey;
   }
@@ -18711,21 +18789,21 @@ var XMarketSDK = class {
   }
   get oracle() {
     if (!this._oracle) {
-      const program = new anchor5.Program(this._withAddress(oracle_default, this._programIds.oracle), this.provider);
+      const program = new anchor6.Program(this._withAddress(oracle_default, this._programIds.oracle), this.provider);
       this._oracle = new OracleClient(program, this.provider, this._programIds);
     }
     return this._oracle;
   }
   get hook() {
     if (!this._hook) {
-      const program = new anchor5.Program(this._withAddress(hook_default, this._programIds.hook), this.provider);
+      const program = new anchor6.Program(this._withAddress(hook_default, this._programIds.hook), this.provider);
       this._hook = new HookClient(program, this.provider, this._programIds);
     }
     return this._hook;
   }
   get market() {
     if (!this._market) {
-      const program = new anchor5.Program(this._withAddress(question_market_default, this._programIds.questionMarket), this.provider);
+      const program = new anchor6.Program(this._withAddress(question_market_default, this._programIds.questionMarket), this.provider);
       this._market = new MarketClient(program, this.provider, this._programIds, this._marketOwner);
       this._market.ctfClient = this.ctf;
       this._market.feeConfigOwner = this.networkConfig.feeConfigOwner ?? this._marketOwner;
@@ -18734,14 +18812,14 @@ var XMarketSDK = class {
   }
   get ctf() {
     if (!this._ctf) {
-      const program = new anchor5.Program(this._withAddress(conditional_tokens_default, this._programIds.conditionalTokens), this.provider);
+      const program = new anchor6.Program(this._withAddress(conditional_tokens_default, this._programIds.conditionalTokens), this.provider);
       this._ctf = new CtfClient(program, this.provider, this._programIds);
     }
     return this._ctf;
   }
   get clob() {
     if (!this._clob) {
-      const program = new anchor5.Program(this._withAddress(clob_exchange_default, this._programIds.clobExchange), this.provider);
+      const program = new anchor6.Program(this._withAddress(clob_exchange_default, this._programIds.clobExchange), this.provider);
       this._clob = new ClobClient(program, this.provider, this._programIds, this.networkConfig);
       if (this.networkConfig.feeConfigOwner && this._programIds.feeManagement) {
         this._clob.feeConfigOwner = this.networkConfig.feeConfigOwner;
@@ -18756,7 +18834,7 @@ var XMarketSDK = class {
   get fee() {
     if (!this._fee) {
       if (!this._programIds.feeManagement) throw new Error("feeManagement program ID not configured in NetworkConfig");
-      const program = new anchor5.Program(this._withAddress(fee_management_default, this._programIds.feeManagement), this.provider);
+      const program = new anchor6.Program(this._withAddress(fee_management_default, this._programIds.feeManagement), this.provider);
       this._fee = new FeeManagementClient(program, this.provider, this._programIds);
     }
     return this._fee;
@@ -18764,7 +18842,7 @@ var XMarketSDK = class {
   get presale() {
     if (!this._presale) {
       if (!this._programIds.presale) throw new Error("presale program ID not configured in NetworkConfig");
-      const program = new anchor5.Program(this._withAddress(presale_default, this._programIds.presale), this.provider);
+      const program = new anchor6.Program(this._withAddress(presale_default, this._programIds.presale), this.provider);
       this._presale = new PresaleClient(program, this.provider, this._programIds);
     }
     return this._presale;
@@ -18772,7 +18850,7 @@ var XMarketSDK = class {
   get marketOracle() {
     if (!this._marketOracle) {
       if (!this._programIds.marketOracle) throw new Error("marketOracle program ID not configured in NetworkConfig");
-      const program = new anchor5.Program(this._withAddress(market_oracle_default, this._programIds.marketOracle), this.provider);
+      const program = new anchor6.Program(this._withAddress(market_oracle_default, this._programIds.marketOracle), this.provider);
       this._marketOracle = new MarketOracleClient(program, this.provider, this._programIds);
     }
     return this._marketOracle;
@@ -18780,7 +18858,7 @@ var XMarketSDK = class {
   get admin() {
     if (!this._admin) {
       if (!this._programIds.adminContract) throw new Error("adminContract program ID not configured in NetworkConfig");
-      const program = new anchor5.Program(this._withAddress(admin_contract_default, this._programIds.adminContract), this.provider);
+      const program = new anchor6.Program(this._withAddress(admin_contract_default, this._programIds.adminContract), this.provider);
       this._admin = new AdminClient(program, this.provider, this._programIds);
     }
     return this._admin;
@@ -18788,7 +18866,7 @@ var XMarketSDK = class {
   get referral() {
     if (!this._referral) {
       if (!this._programIds.referral) throw new Error("referral program ID not configured in NetworkConfig");
-      const program = new anchor5.Program(this._withAddress(referral_default, this._programIds.referral), this.provider);
+      const program = new anchor6.Program(this._withAddress(referral_default, this._programIds.referral), this.provider);
       this._referral = new ReferralClient(program, this.provider, this._programIds);
     }
     return this._referral;
@@ -18796,7 +18874,7 @@ var XMarketSDK = class {
   get dispute() {
     if (!this._dispute) {
       if (!this._programIds.dispute) throw new Error("dispute program ID not configured in NetworkConfig");
-      const program = new anchor5.Program(this._withAddress(dispute_default, this._programIds.dispute), this.provider);
+      const program = new anchor6.Program(this._withAddress(dispute_default, this._programIds.dispute), this.provider);
       this._dispute = new DisputeClient(program, this.provider, this._programIds);
     }
     return this._dispute;