@theliem/xmarket-sdk 3.11.0 → 3.13.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import * as anchor5 from '@coral-xyz/anchor';
-import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, SYSVAR_RENT_PUBKEY, ComputeBudgetProgram, Transaction, TransactionInstruction, Ed25519Program, AddressLookupTableProgram, TransactionMessage, VersionedTransaction, Connection } from '@solana/web3.js';
+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';
 import BN4 from 'bn.js';
@@ -496,7 +496,7 @@ var QuestionStatus = /* @__PURE__ */ ((QuestionStatus2) => {
   QuestionStatus2["Resolved"] = "resolved";
   return QuestionStatus2;
 })(QuestionStatus || {});
-var FEE_DENOMINATOR = 1e6;
+var FEE_DENOMINATOR = 1e4;
 var XMarketError = class extends Error {
   constructor(message, code) {
     super(message);
@@ -561,6 +561,8 @@ var MarketClient = class {
     const [noMint] = PDA.noMint(conditionPda, this.programIds);
     const [mintAuthority] = PDA.mintAuthority(conditionPda, this.programIds);
     const [collateralVault] = PDA.collateralVault(params.collateralMint, this.programIds);
+    if (!this.programIds.feeManagement) throw new Error("feeManagement program ID not configured");
+    const [questionFeePda] = PDA.questionFee(conditionPda, this.programIds);
     const tx = await this.program.methods.createQuestionAdmin({
       questionId: Array.from(questionId),
       contentHash: Array.from(contentHash),
@@ -580,6 +582,8 @@ var MarketClient = class {
       mintAuthority,
       collateralVault,
       conditionalTokensProgram: this.programIds.conditionalTokens,
+      questionFee: questionFeePda,
+      feeManagementProgram: this.programIds.feeManagement,
       tokenProgram: TOKEN_2022_PROGRAM_ID,
       systemProgram: SystemProgram.programId,
       rent: SYSVAR_RENT_PUBKEY
@@ -778,9 +782,25 @@ var MarketClient = class {
    * @param creator         presale creator pubkey (stored in question)
    * @param currencyMint    collateral mint
    */
-  async approvePresale(presalePda, contentHash, hookProgram, authorizedClob, expirationTime, creator, currencyMint, caller = this.walletPubkey, payer = caller) {
+  async approvePresale(params) {
+    const {
+      presalePda,
+      contentHash,
+      hookProgram,
+      authorizedClob,
+      expirationTime,
+      creator,
+      currencyMint,
+      referralAddress,
+      companyAddress,
+      adminOwner
+    } = params;
+    const caller = params.caller ?? this.walletPubkey;
+    const payer = params.payer ?? caller;
     if (!this.programIds.presale) throw new Error("presale program ID not configured");
     if (!this.programIds.marketOracle) throw new Error("marketOracle program ID not configured");
+    if (!this.programIds.feeManagement) throw new Error("feeManagement program ID not configured");
+    if (!this.programIds.adminContract) throw new Error("adminContract program ID not configured");
     const questionId = presalePda.toBytes();
     const [questionPda] = PDA.question(this.configPda, questionId, this.programIds);
     const marketConfig = await this.fetchConfig();
@@ -793,7 +813,14 @@ var MarketClient = class {
     const [collateralVault] = PDA.collateralVault(currencyMint, this.programIds);
     const [marketOraclePda] = PDA.marketOraclePda(questionPda, this.programIds);
     const marketOracleVault = getAssociatedTokenAddressSync(currencyMint, marketOraclePda, true);
-    const tx = await this.program.methods.approvePresale({
+    const [questionFeePda] = PDA.questionFee(conditionPda, this.programIds);
+    const presaleVault = getAssociatedTokenAddressSync(currencyMint, presalePda, true);
+    const referralTokenAccount = getAssociatedTokenAddressSync(currencyMint, referralAddress);
+    const companyTokenAccount = getAssociatedTokenAddressSync(currencyMint, companyAddress);
+    const [adminConfig] = PDA.adminConfig(adminOwner, this.programIds);
+    const adminVault = getAssociatedTokenAddressSync(currencyMint, adminConfig, true);
+    const [claimRecord] = PDA.claimRecord(conditionPda.toBytes(), this.programIds);
+    const builder = this.program.methods.approvePresale({
       contentHash: Array.from(contentHash),
       hookProgram,
       authorizedClob,
@@ -814,15 +841,38 @@ var MarketClient = class {
       collateralVault,
       marketOracle: marketOraclePda,
       marketOracleVault,
+      presaleVault,
+      referralTokenAccount,
+      companyTokenAccount,
+      adminVault,
+      adminConfig,
+      claimRecord,
+      questionFee: questionFeePda,
+      feeManagementProgram: this.programIds.feeManagement,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       presaleProgram: this.programIds.presale,
       marketOracleProgram: this.programIds.marketOracle,
+      adminProgram: this.programIds.adminContract,
       tokenProgram: TOKEN_PROGRAM_ID,
       token2022Program: TOKEN_2022_PROGRAM_ID,
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId,
       rent: SYSVAR_RENT_PUBKEY
-    }).transaction();
+    });
+    let tx;
+    if (params.lookupTable) {
+      const ix = await builder.instruction();
+      const cu = ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 });
+      const { blockhash } = await this.provider.connection.getLatestBlockhash();
+      const msg = new TransactionMessage({
+        payerKey: payer,
+        recentBlockhash: blockhash,
+        instructions: [cu, ix]
+      }).compileToV0Message([params.lookupTable]);
+      tx = new VersionedTransaction(msg);
+    } else {
+      tx = await builder.transaction();
+    }
     return { tx, questionPda, conditionPda, marketOraclePda, marketOracleVault };
   }
   /**
@@ -2237,8 +2287,8 @@ ${logs.join("\n")}`);
    *   vtx.sign([feePayerKeypair, operatorKeypair]);
    *   await connection.sendRawTransaction(vtx.serialize());
    *
-   * Returns an array because NO-taker MINT/MERGE decomposes into N txs (one per YES maker).
-   * Most direct/single-pair cases return a single-element array.
+   * All match types pack into a single VersionedTransaction — same as createQuestionAdmin pattern.
+   * NO-taker MINT/MERGE decomposes into N instructions but all packed in 1 tx.
    *
    * @param operator - Whitelisted CLOB operator pubkey (must sign)
    * @param payer    - Fee payer pubkey (must sign, pays tx fee + rent)
@@ -2264,21 +2314,16 @@ ${logs.join("\n")}`);
           this.registerOrderIfNeeded(taker),
           ...makers.map((m) => this.registerOrderIfNeeded(m))
         ]);
-        const ixs2 = [];
-        for (const buyMaker of makers) {
-          const built = await this.buildMatchComplementaryIxs(
-            buyMaker,
-            [taker],
-            collateralMint,
-            feeRecipient,
-            operator,
-            opts,
-            true,
-            true
-          );
-          ixs2.push(...built);
-        }
-        return [await this._buildUnsignedVtx(ixs2, alt, payer)];
+        const ixs3 = await this.buildMatchComplementaryIxs(
+          taker,
+          makers,
+          collateralMint,
+          feeRecipient,
+          operator,
+          opts,
+          false
+        );
+        return this._buildUnsignedVtx(ixs3, alt, payer);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
@@ -2286,7 +2331,7 @@ ${logs.join("\n")}`);
         this.registerOrderIfNeeded(buySignedOrder),
         ...sellCandidates.map((m) => this.registerOrderIfNeeded(m))
       ]);
-      const ixs = await this.buildMatchComplementaryIxs(
+      const ixs2 = await this.buildMatchComplementaryIxs(
         buySignedOrder,
         sellCandidates,
         collateralMint,
@@ -2294,7 +2339,7 @@ ${logs.join("\n")}`);
         operator,
         opts
       );
-      return [await this._buildUnsignedVtx(ixs, alt, payer)];
+      return this._buildUnsignedVtx(ixs2, alt, payer);
     }
     const allBuy = t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_BUY);
     const allSell = t.side === SIDE_SELL && makers.every((m) => m.order.side === SIDE_SELL);
@@ -2315,19 +2360,19 @@ ${logs.join("\n")}`);
       ]);
       await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
       const ix = allBuy ? await this._buildMintIx(taker, makers, collateralMint, operator, payer) : await this._buildMergeIx(taker, makers, collateralMint, operator, payer, opts);
-      return [await this._buildUnsignedVtx([ix], alt, payer)];
+      return this._buildUnsignedVtx([ix], alt, payer);
     }
-    const vtxs = [];
+    await Promise.all([
+      this.registerOrderIfNeeded(taker),
+      ...makers.map((m) => this.registerOrderIfNeeded(m))
+    ]);
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
+    const ixs = [];
     for (const yesMaker of makers) {
-      await Promise.all([
-        this.registerOrderIfNeeded(yesMaker),
-        this.registerOrderIfNeeded(taker)
-      ]);
-      await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
       const ix = allBuy ? await this._buildMintIx(yesMaker, [taker], collateralMint, operator, payer) : await this._buildMergeIx(yesMaker, [taker], collateralMint, operator, payer, opts);
-      vtxs.push(await this._buildUnsignedVtx([ix], alt, payer));
+      ixs.push(ix);
     }
-    return vtxs;
+    return this._buildUnsignedVtx(ixs, alt, payer);
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
@@ -2405,9 +2450,14 @@ var FeeManagementClient = class {
     }
   }
   /**
-   * Fetch per-question fees for a condition.
-   * Returns null if no fees have been set yet.
+   * Fetch per-market fees for a condition.
+   * Returns null if fees have not been initialized yet.
+   * Fees are set automatically via CPI when create_question_admin / approve_presale runs.
+   * Defaults: swapFee=200 (2%), redeemFee=0, mergeFee=2000 (20%), out of FEE_DENOMINATOR=10_000.
    */
+  async getMarketFee(conditionPda) {
+    return this.fetchQuestionFee(conditionPda);
+  }
   async fetchQuestionFee(conditionPda) {
     try {
       const [pda] = PDA.questionFee(conditionPda, this.programIds);
@@ -2424,11 +2474,11 @@ var FeeManagementClient = class {
     }
   }
   /**
-   * Set per-question fees for a condition.
+   * Set per-question fees for a condition (whitelist-only edit after market creation).
    * @param conditionPda   - condition PDA from the question
-   * @param mergeFee       - fee out of FEE_DENOMINATOR (1_000_000), e.g. 2_000 = 0.2%
+   * @param mergeFee       - fee out of FEE_DENOMINATOR (10_000), e.g. 2_000 = 20%
    * @param redeemFee      - fee out of FEE_DENOMINATOR
-   * @param swapFee        - trading fee out of FEE_DENOMINATOR
+   * @param swapFee        - trading fee out of FEE_DENOMINATOR, e.g. 200 = 2%
    * @param feeConfigOwner - pubkey that owns the fee_config PDA (usually market deployer)
    * @param authority      - signer authorized in fee_config whitelist / admin / owner
    * @param payer          - rent + tx fee payer
@@ -4265,9 +4315,59 @@ var question_market_default = {
           ],
           writable: true
         },
+        {
+          name: "presale_vault",
+          writable: true
+        },
+        {
+          name: "referral_token_account",
+          docs: [
+            "Referral address USDC ATA (receives agents_fee 10%)"
+          ],
+          writable: true
+        },
+        {
+          name: "company_token_account",
+          docs: [
+            "Company address USDC ATA (receives company_fee 10%)"
+          ],
+          writable: true
+        },
+        {
+          name: "admin_vault",
+          docs: [
+            "admin_contract vault ATA (receives botmm_revenue 80%)"
+          ],
+          writable: true
+        },
+        {
+          name: "admin_config",
+          docs: [
+            "admin_contract config PDA (seeds=[ADMIN_CONFIG_SEED, owner] \u2014 validated by admin_contract CPI)"
+          ]
+        },
+        {
+          name: "claim_record",
+          docs: [
+            "ClaimRecord PDA for this presale's conditionId (seeds=[CLAIM_RECORD_SEED, condition_id])",
+            "condition_id computed inside handler \u2014 seeds validated by admin_contract CPI"
+          ],
+          writable: true
+        },
         {
           name: "conditional_tokens_program"
         },
+        {
+          name: "question_fee",
+          docs: [
+            "QuestionFee PDA \u2014 initialized with default fees via CPI to fee-management"
+          ],
+          writable: true
+        },
+        {
+          name: "fee_management_program",
+          address: "DuYyXguB5PVSKg6E2p4XPrrXZSCJnuBhoGpkGCBN5bBb"
+        },
         {
           name: "presale_program",
           address: "2Rnw1VoEtsUMQ7wkvYZjDehqSqRob6uNkeymDfvKrquB"
@@ -4276,6 +4376,10 @@ var question_market_default = {
           name: "market_oracle_program",
           address: "ADWF4J3nCJ2kWnCtycuem2jhu7amUqJWQG3oa5xF67QJ"
         },
+        {
+          name: "admin_program",
+          address: "4NdD5962SfGqofmeyjfifJpdGnwTAiKaUKB5Z42UDc9T"
+        },
         {
           name: "token_program",
           address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -4918,6 +5022,47 @@ var question_market_default = {
         {
           name: "conditional_tokens_program"
         },
+        {
+          name: "question_fee",
+          docs: [
+            "QuestionFee PDA \u2014 initialized with default fees via CPI to fee-management.",
+            "Seed uses condition.key() bytes (consistent with existing set_question_fee SDK convention)."
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  113,
+                  117,
+                  101,
+                  115,
+                  116,
+                  105,
+                  111,
+                  110,
+                  95,
+                  102,
+                  101,
+                  101
+                ]
+              },
+              {
+                kind: "account",
+                path: "condition"
+              }
+            ],
+            program: {
+              kind: "account",
+              path: "fee_management_program"
+            }
+          }
+        },
+        {
+          name: "fee_management_program",
+          address: "DuYyXguB5PVSKg6E2p4XPrrXZSCJnuBhoGpkGCBN5bBb"
+        },
         {
           name: "token_program",
           address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
@@ -6034,6 +6179,18 @@ var question_market_default = {
           {
             name: "creator",
             type: "pubkey"
+          },
+          {
+            name: "agents_fee",
+            type: "u64"
+          },
+          {
+            name: "company_fee",
+            type: "u64"
+          },
+          {
+            name: "botmm_revenue",
+            type: "u64"
           }
         ]
       }
@@ -10525,6 +10682,70 @@ var fee_management_default = {
         }
       ]
     },
+    {
+      name: "init_question_fee",
+      discriminator: [
+        115,
+        49,
+        110,
+        164,
+        33,
+        202,
+        115,
+        79
+      ],
+      accounts: [
+        {
+          name: "payer",
+          writable: true,
+          signer: true
+        },
+        {
+          name: "question_fee",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  113,
+                  117,
+                  101,
+                  115,
+                  116,
+                  105,
+                  111,
+                  110,
+                  95,
+                  102,
+                  101,
+                  101
+                ]
+              },
+              {
+                kind: "arg",
+                path: "condition_id"
+              }
+            ]
+          }
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        }
+      ],
+      args: [
+        {
+          name: "condition_id",
+          type: {
+            array: [
+              "u8",
+              32
+            ]
+          }
+        }
+      ]
+    },
     {
       name: "initialize",
       discriminator: [
@@ -11219,6 +11440,19 @@ var fee_management_default = {
         235
       ]
     },
+    {
+      name: "QuestionFeeInitialized",
+      discriminator: [
+        147,
+        167,
+        20,
+        219,
+        32,
+        142,
+        227,
+        171
+      ]
+    },
     {
       name: "QuestionFeeUpdated",
       discriminator: [
@@ -11601,7 +11835,7 @@ var fee_management_default = {
           {
             name: "merge_fee",
             docs: [
-              "Fees out of FEE_DENOMINATOR (1_000_000). E.g. 2_000 = 0.2%"
+              "Fees out of FEE_DENOMINATOR (10_000). E.g. 200 = 2%, 2_000 = 20%"
             ],
             type: "u64"
           },
@@ -11620,6 +11854,35 @@ var fee_management_default = {
         ]
       }
     },
+    {
+      name: "QuestionFeeInitialized",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "condition_id",
+            type: {
+              array: [
+                "u8",
+                32
+              ]
+            }
+          },
+          {
+            name: "swap_fee",
+            type: "u64"
+          },
+          {
+            name: "redeem_fee",
+            type: "u64"
+          },
+          {
+            name: "merge_fee",
+            type: "u64"
+          }
+        ]
+      }
+    },
     {
       name: "QuestionFeeUpdated",
       type: {