@theliem/xmarket-sdk 3.12.0 → 3.13.0

package/dist/index.d.mts

@@ -162,7 +162,7 @@ interface OrderStatus {
     filledAmount: BN;
     bump: number;
 }
-/** Per-question fee rates, all out of FEE_DENOMINATOR (1_000_000). E.g. 2_000 = 0.2% */
+/** Per-question fee rates, all out of FEE_DENOMINATOR (10_000). E.g. 200 = 2%, 2_000 = 20% */
 interface QuestionFee {
     conditionId: Uint8Array;
     mergeFee: BN;
@@ -170,7 +170,7 @@ interface QuestionFee {
     swapFee: BN;
     bump: number;
 }
-declare const FEE_DENOMINATOR = 1000000;
+declare const FEE_DENOMINATOR = 10000;
 /**
  * Off-chain order struct passed as instruction data.
  * Operator validates + submits matched order pairs on-chain.
@@ -476,8 +476,24 @@ declare class MarketClient {
      * @param creator         presale creator pubkey (stored in question)
      * @param currencyMint    collateral mint
      */
-    approvePresale(presalePda: PublicKey, contentHash: Uint8Array, hookProgram: PublicKey, authorizedClob: PublicKey, expirationTime: anchor.BN, creator: PublicKey, currencyMint: PublicKey, caller?: PublicKey, payer?: PublicKey): Promise<{
-        tx: Transaction;
+    approvePresale(params: {
+        presalePda: PublicKey;
+        contentHash: Uint8Array;
+        hookProgram: PublicKey;
+        authorizedClob: PublicKey;
+        expirationTime: anchor.BN;
+        creator: PublicKey;
+        currencyMint: PublicKey;
+        /** Revenue distribution — required: approvePresale now distributes 80/10/10 automatically */
+        referralAddress: PublicKey;
+        companyAddress: PublicKey;
+        adminOwner: PublicKey;
+        caller?: PublicKey;
+        payer?: PublicKey;
+        /** Provide an ALT to use VersionedTransaction (required: 31 accounts exceeds legacy tx limit) */
+        lookupTable?: AddressLookupTableAccount;
+    }): Promise<{
+        tx: Transaction | VersionedTransaction;
         questionPda: PublicKey;
         conditionPda: PublicKey;
         marketOraclePda: PublicKey;
@@ -516,16 +532,19 @@ declare class FeeManagementClient {
     initFeeConfig(admin: PublicKey, companyAddress: PublicKey, referralAddress: PublicKey, presaleRevenueAddress: PublicKey, investorsMarketRev: number, companyMarketRev: number, agentsPresaleRev: number, companyPresaleRev: number, authority: PublicKey, payer: PublicKey): Promise<TxResult>;
     fetchFeeConfig(owner: PublicKey): Promise<any | null>;
     /**
-     * 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.
      */
+    getMarketFee(conditionPda: PublicKey): Promise<QuestionFee | null>;
     fetchQuestionFee(conditionPda: PublicKey): Promise<QuestionFee | null>;
     /**
-     * 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

package/dist/index.d.ts

@@ -162,7 +162,7 @@ interface OrderStatus {
     filledAmount: BN;
     bump: number;
 }
-/** Per-question fee rates, all out of FEE_DENOMINATOR (1_000_000). E.g. 2_000 = 0.2% */
+/** Per-question fee rates, all out of FEE_DENOMINATOR (10_000). E.g. 200 = 2%, 2_000 = 20% */
 interface QuestionFee {
     conditionId: Uint8Array;
     mergeFee: BN;
@@ -170,7 +170,7 @@ interface QuestionFee {
     swapFee: BN;
     bump: number;
 }
-declare const FEE_DENOMINATOR = 1000000;
+declare const FEE_DENOMINATOR = 10000;
 /**
  * Off-chain order struct passed as instruction data.
  * Operator validates + submits matched order pairs on-chain.
@@ -476,8 +476,24 @@ declare class MarketClient {
      * @param creator         presale creator pubkey (stored in question)
      * @param currencyMint    collateral mint
      */
-    approvePresale(presalePda: PublicKey, contentHash: Uint8Array, hookProgram: PublicKey, authorizedClob: PublicKey, expirationTime: anchor.BN, creator: PublicKey, currencyMint: PublicKey, caller?: PublicKey, payer?: PublicKey): Promise<{
-        tx: Transaction;
+    approvePresale(params: {
+        presalePda: PublicKey;
+        contentHash: Uint8Array;
+        hookProgram: PublicKey;
+        authorizedClob: PublicKey;
+        expirationTime: anchor.BN;
+        creator: PublicKey;
+        currencyMint: PublicKey;
+        /** Revenue distribution — required: approvePresale now distributes 80/10/10 automatically */
+        referralAddress: PublicKey;
+        companyAddress: PublicKey;
+        adminOwner: PublicKey;
+        caller?: PublicKey;
+        payer?: PublicKey;
+        /** Provide an ALT to use VersionedTransaction (required: 31 accounts exceeds legacy tx limit) */
+        lookupTable?: AddressLookupTableAccount;
+    }): Promise<{
+        tx: Transaction | VersionedTransaction;
         questionPda: PublicKey;
         conditionPda: PublicKey;
         marketOraclePda: PublicKey;
@@ -516,16 +532,19 @@ declare class FeeManagementClient {
     initFeeConfig(admin: PublicKey, companyAddress: PublicKey, referralAddress: PublicKey, presaleRevenueAddress: PublicKey, investorsMarketRev: number, companyMarketRev: number, agentsPresaleRev: number, companyPresaleRev: number, authority: PublicKey, payer: PublicKey): Promise<TxResult>;
     fetchFeeConfig(owner: PublicKey): Promise<any | null>;
     /**
-     * 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.
      */
+    getMarketFee(conditionPda: PublicKey): Promise<QuestionFee | null>;
     fetchQuestionFee(conditionPda: PublicKey): Promise<QuestionFee | null>;
     /**
-     * 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

package/dist/index.js

@@ -522,7 +522,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);
@@ -587,6 +587,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),
@@ -606,6 +608,8 @@ var MarketClient = class {
       mintAuthority,
       collateralVault,
       conditionalTokensProgram: this.programIds.conditionalTokens,
+      questionFee: questionFeePda,
+      feeManagementProgram: this.programIds.feeManagement,
       tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId,
       rent: web3_js.SYSVAR_RENT_PUBKEY
@@ -804,9 +808,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();
@@ -819,7 +839,14 @@ var MarketClient = class {
     const [collateralVault] = PDA.collateralVault(currencyMint, this.programIds);
     const [marketOraclePda] = PDA.marketOraclePda(questionPda, this.programIds);
     const marketOracleVault = splToken.getAssociatedTokenAddressSync(currencyMint, marketOraclePda, true);
-    const tx = await this.program.methods.approvePresale({
+    const [questionFeePda] = PDA.questionFee(conditionPda, this.programIds);
+    const presaleVault = splToken.getAssociatedTokenAddressSync(currencyMint, presalePda, true);
+    const referralTokenAccount = splToken.getAssociatedTokenAddressSync(currencyMint, referralAddress);
+    const companyTokenAccount = splToken.getAssociatedTokenAddressSync(currencyMint, companyAddress);
+    const [adminConfig] = PDA.adminConfig(adminOwner, this.programIds);
+    const adminVault = splToken.getAssociatedTokenAddressSync(currencyMint, adminConfig, true);
+    const [claimRecord] = PDA.claimRecord(conditionPda.toBytes(), this.programIds);
+    const builder = this.program.methods.approvePresale({
       contentHash: Array.from(contentHash),
       hookProgram,
       authorizedClob,
@@ -840,15 +867,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: splToken.TOKEN_PROGRAM_ID,
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId,
       rent: web3_js.SYSVAR_RENT_PUBKEY
-    }).transaction();
+    });
+    let tx;
+    if (params.lookupTable) {
+      const ix = await builder.instruction();
+      const cu = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 });
+      const { blockhash } = await this.provider.connection.getLatestBlockhash();
+      const msg = new web3_js.TransactionMessage({
+        payerKey: payer,
+        recentBlockhash: blockhash,
+        instructions: [cu, ix]
+      }).compileToV0Message([params.lookupTable]);
+      tx = new web3_js.VersionedTransaction(msg);
+    } else {
+      tx = await builder.transaction();
+    }
     return { tx, questionPda, conditionPda, marketOraclePda, marketOracleVault };
   }
   /**
@@ -2426,9 +2476,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);
@@ -2445,11 +2500,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
@@ -4286,9 +4341,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"
@@ -4297,6 +4402,10 @@ var question_market_default = {
           name: "market_oracle_program",
           address: "ADWF4J3nCJ2kWnCtycuem2jhu7amUqJWQG3oa5xF67QJ"
         },
+        {
+          name: "admin_program",
+          address: "4NdD5962SfGqofmeyjfifJpdGnwTAiKaUKB5Z42UDc9T"
+        },
         {
           name: "token_program",
           address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -4939,6 +5048,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"
@@ -6055,6 +6205,18 @@ var question_market_default = {
           {
             name: "creator",
             type: "pubkey"
+          },
+          {
+            name: "agents_fee",
+            type: "u64"
+          },
+          {
+            name: "company_fee",
+            type: "u64"
+          },
+          {
+            name: "botmm_revenue",
+            type: "u64"
           }
         ]
       }
@@ -10546,6 +10708,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: [
@@ -11240,6 +11466,19 @@ var fee_management_default = {
         235
       ]
     },
+    {
+      name: "QuestionFeeInitialized",
+      discriminator: [
+        147,
+        167,
+        20,
+        219,
+        32,
+        142,
+        227,
+        171
+      ]
+    },
     {
       name: "QuestionFeeUpdated",
       discriminator: [
@@ -11622,7 +11861,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"
           },
@@ -11641,6 +11880,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: {