@theliem/xmarket-sdk 3.18.0 → 3.20.0

package/dist/index.d.mts

@@ -421,6 +421,8 @@ declare class MarketClient {
     readonly configPda: PublicKey;
     /** Injected by XMarketSDK after construction — enables fetchQuestionBalances. */
     ctfClient?: CtfClient;
+    /** Injected by XMarketSDK — fee config owner (= market owner) for MarketFeeOverride PDA derivation */
+    feeConfigOwner?: PublicKey;
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, ownerPubkey: PublicKey);
     get walletPubkey(): PublicKey;
     initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
@@ -450,6 +452,7 @@ declare class MarketClient {
     removeFromWhitelist(address: PublicKey, authority?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     growConfig(owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     restoreConfig(snapshot: Buffer, owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
+    bumpPresaleCount(count: number, authority: PublicKey): Promise<Transaction>;
     fetchConfig(): Promise<QuestionMarketConfig | null>;
     fetchQuestion(questionPda: PublicKey): Promise<Question | null>;
     questionPda(questionId: Uint8Array): PublicKey;
@@ -626,10 +629,15 @@ declare class ClobClient {
     /** Injected by XMarketSDK after construction — enables auto fee distribution */
     feeClient?: FeeManagementClient;
     feeConfigOwner?: PublicKey;
+    /** Injected by XMarketSDK — enables auto-derive of marketOracleVault for presale markets */
+    ctfClient?: CtfClient;
+    qmConfigPda?: PublicKey;
     /** Cached company_address from fee_config to avoid repeated RPC calls */
     private _companyAddress?;
     /** Cached referral_vault from fee_config */
     private _referralVault?;
+    /** Cache: conditionPda.toBase58() → marketOracleVault ATA */
+    private _marketOracleVaultCache;
     /** ALT cache: condition.toBase58() → loaded ALT account */
     private _altCache;
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, networkConfig: {
@@ -639,6 +647,12 @@ declare class ClobClient {
     });
     private companyAddress;
     private referralVault;
+    /**
+     * Derive marketOracleVault ATA for a condition, cached per condition.
+     * Works for presale markets (market_oracle initialized by approvePresale).
+     * Returns undefined if ctfClient/qmConfigPda not injected or marketOracle not configured.
+     */
+    private getMarketOracleVault;
     get walletPubkey(): PublicKey;
     /**
      * Get or create an ALT for a condition.

package/dist/index.d.ts

@@ -421,6 +421,8 @@ declare class MarketClient {
     readonly configPda: PublicKey;
     /** Injected by XMarketSDK after construction — enables fetchQuestionBalances. */
     ctfClient?: CtfClient;
+    /** Injected by XMarketSDK — fee config owner (= market owner) for MarketFeeOverride PDA derivation */
+    feeConfigOwner?: PublicKey;
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, ownerPubkey: PublicKey);
     get walletPubkey(): PublicKey;
     initialize(admin: PublicKey, oracle: PublicKey, owner?: PublicKey): Promise<Transaction>;
@@ -450,6 +452,7 @@ declare class MarketClient {
     removeFromWhitelist(address: PublicKey, authority?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     growConfig(owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     restoreConfig(snapshot: Buffer, owner?: PublicKey, payer?: PublicKey): Promise<Transaction>;
+    bumpPresaleCount(count: number, authority: PublicKey): Promise<Transaction>;
     fetchConfig(): Promise<QuestionMarketConfig | null>;
     fetchQuestion(questionPda: PublicKey): Promise<Question | null>;
     questionPda(questionId: Uint8Array): PublicKey;
@@ -626,10 +629,15 @@ declare class ClobClient {
     /** Injected by XMarketSDK after construction — enables auto fee distribution */
     feeClient?: FeeManagementClient;
     feeConfigOwner?: PublicKey;
+    /** Injected by XMarketSDK — enables auto-derive of marketOracleVault for presale markets */
+    ctfClient?: CtfClient;
+    qmConfigPda?: PublicKey;
     /** Cached company_address from fee_config to avoid repeated RPC calls */
     private _companyAddress?;
     /** Cached referral_vault from fee_config */
     private _referralVault?;
+    /** Cache: conditionPda.toBase58() → marketOracleVault ATA */
+    private _marketOracleVaultCache;
     /** ALT cache: condition.toBase58() → loaded ALT account */
     private _altCache;
     constructor(program: anchor.Program, provider: anchor.AnchorProvider, programIds: ProgramIds, networkConfig: {
@@ -639,6 +647,12 @@ declare class ClobClient {
     });
     private companyAddress;
     private referralVault;
+    /**
+     * Derive marketOracleVault ATA for a condition, cached per condition.
+     * Works for presale markets (market_oracle initialized by approvePresale).
+     * Returns undefined if ctfClient/qmConfigPda not injected or marketOracle not configured.
+     */
+    private getMarketOracleVault;
     get walletPubkey(): PublicKey;
     /**
      * Get or create an ALT for a condition.

package/dist/index.js

@@ -597,7 +597,10 @@ var MarketClient = class {
     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");
+    if (!this.feeConfigOwner) throw new Error("feeConfigOwner not configured");
     const [questionFeePda] = PDA.questionFee(conditionPda, this.programIds);
+    const [feeConfigPda] = PDA.feeConfig(this.feeConfigOwner, this.programIds);
+    const [marketFeeOverride] = PDA.marketFeeOverride(conditionPda, this.programIds);
     const tx = await this.program.methods.createQuestionAdmin({
       questionId: Array.from(questionId),
       contentHash: Array.from(contentHash),
@@ -618,6 +621,8 @@ var MarketClient = class {
       collateralVault,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       questionFee: questionFeePda,
+      feeConfig: feeConfigPda,
+      marketFeeOverride,
       feeManagementProgram: this.programIds.feeManagement,
       tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId,
@@ -689,6 +694,9 @@ var MarketClient = class {
       systemProgram: web3_js.SystemProgram.programId
     }).transaction();
   }
+  async bumpPresaleCount(count, authority) {
+    return this.program.methods.bumpPresaleCount(new anchor5__namespace.BN(count)).accounts({ authority, config: this.configPda }).transaction();
+  }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
     try {
@@ -855,6 +863,9 @@ var MarketClient = class {
     const [adminConfig] = PDA.adminConfig(adminOwner, this.programIds);
     const adminVault = splToken.getAssociatedTokenAddressSync(currencyMint, adminConfig, true);
     const [claimRecord] = PDA.claimRecord(conditionPda.toBytes(), this.programIds);
+    const feeConfigOwner = this.feeConfigOwner ?? adminOwner;
+    const [feeConfigPda] = PDA.feeConfig(feeConfigOwner, this.programIds);
+    const [marketFeeOverride] = PDA.marketFeeOverride(conditionPda, this.programIds);
     const builder = this.program.methods.approvePresale({
       contentHash: Array.from(contentHash),
       hookProgram,
@@ -883,6 +894,8 @@ var MarketClient = class {
       adminConfig,
       claimRecord,
       questionFee: questionFeePda,
+      feeConfig: feeConfigPda,
+      marketFeeOverride,
       feeManagementProgram: this.programIds.feeManagement,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       presaleProgram: this.programIds.presale,
@@ -1546,6 +1559,8 @@ function _detectMatchType(a, b) {
 // src/programs/clob.ts
 var ClobClient = class {
   constructor(program, provider, programIds, networkConfig) {
+    /** Cache: conditionPda.toBase58() → marketOracleVault ATA */
+    this._marketOracleVaultCache = /* @__PURE__ */ new Map();
     /** ALT cache: condition.toBase58() → loaded ALT account */
     this._altCache = /* @__PURE__ */ new Map();
     this.program = program;
@@ -1568,6 +1583,24 @@ var ClobClient = class {
     await this.companyAddress();
     return this._referralVault;
   }
+  /**
+   * Derive marketOracleVault ATA for a condition, cached per condition.
+   * Works for presale markets (market_oracle initialized by approvePresale).
+   * Returns undefined if ctfClient/qmConfigPda not injected or marketOracle not configured.
+   */
+  async getMarketOracleVault(condition, collateralMint) {
+    if (!this.ctfClient || !this.qmConfigPda || !this.programIds.marketOracle) return void 0;
+    const key = condition.toBase58();
+    const cached = this._marketOracleVaultCache.get(key);
+    if (cached) return cached;
+    const cond = await this.ctfClient.fetchCondition(condition);
+    if (!cond) return void 0;
+    const [questionPda] = PDA.question(this.qmConfigPda, cond.questionId, this.programIds);
+    const [marketOraclePda] = PDA.marketOraclePda(questionPda, this.programIds);
+    const vault = splToken.getAssociatedTokenAddressSync(collateralMint, marketOraclePda, true);
+    this._marketOracleVaultCache.set(key, vault);
+    return vault;
+  }
   get walletPubkey() {
     return this.provider.wallet.publicKey;
   }
@@ -1667,11 +1700,11 @@ var ClobClient = class {
       if (companyAddr) {
         addresses.push(splToken.getAssociatedTokenAddressSync(collateralMint, companyAddr));
       }
-      addresses.push(payer);
+      const oracleVaultForAlt = await this.getMarketOracleVault(condition, collateralMint) ?? payer;
+      addresses.push(oracleVaultForAlt);
       if (refVault) {
         addresses.push(refVault);
       }
-      addresses.push(splToken.TOKEN_PROGRAM_ID);
     }
     const slot = await connection.getSlot("finalized");
     const [createIx, altAddress] = web3_js.AddressLookupTableProgram.createLookupTable({
@@ -1934,7 +1967,7 @@ ${logs.join("\n")}`);
         const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
         const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
         if (feeOverrideExists) {
-          const oracleVault = opts?.marketOracleVault ?? this.walletPubkey;
+          const oracleVault = opts?.marketOracleVault ?? await this.getMarketOracleVault(condition, collateralMint) ?? this.walletPubkey;
           feeAccounts = [
             { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
             { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
@@ -2190,15 +2223,14 @@ ${logs.join("\n")}`);
         const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
         const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
         if (feeOverrideExists) {
-          const oracleVault = opts?.marketOracleVault ?? payer;
+          const oracleVault = opts?.marketOracleVault ?? await this.getMarketOracleVault(condition, collateralMint) ?? payer;
           remainingAccounts.push(
             { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
             { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
             { pubkey: feeOverridePda, isSigner: false, isWritable: false },
             { pubkey: splToken.getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
             { pubkey: oracleVault, isSigner: false, isWritable: true },
-            { pubkey: refVault, isSigner: false, isWritable: true },
-            { pubkey: splToken.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }
+            { pubkey: refVault, isSigner: false, isWritable: true }
           );
         }
       }
@@ -2524,7 +2556,7 @@ ${logs.join("\n")}`);
         const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
         const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
         if (feeOverrideExists) {
-          const oracleVault = opts?.marketOracleVault ?? payer;
+          const oracleVault = opts?.marketOracleVault ?? await this.getMarketOracleVault(condition, collateralMint) ?? payer;
           feeAccounts = [
             { pubkey: this.programIds.feeManagement, isSigner: false, isWritable: false },
             { pubkey: PDA.feeConfig(this.feeConfigOwner, this.programIds)[0], isSigner: false, isWritable: false },
@@ -3871,7 +3903,7 @@ var oracle_default = {
 
 // src/idls/hook.json
 var hook_default = {
-  address: "F7y5MfW8d5kqR25QHDhUQ9LrKCiZUZVF6Pdnw15q5zZW",
+  address: "5DnFGrt8BGjybNA3EMFKwV1Yvw9iVzJXC7zqP94R7iEV",
   metadata: {
     name: "hook",
     version: "0.1.0",
@@ -3896,12 +3928,7 @@ var hook_default = {
       ],
       accounts: [
         {
-          name: "owner",
-          signer: true
-        },
-        {
-          name: "payer",
-          writable: true,
+          name: "admin",
           signer: true
         },
         {
@@ -4032,12 +4059,7 @@ var hook_default = {
       ],
       accounts: [
         {
-          name: "owner",
-          signer: true
-        },
-        {
-          name: "payer",
-          writable: true,
+          name: "admin",
           signer: true
         },
         {
@@ -4186,7 +4208,7 @@ var hook_default = {
       ],
       accounts: [
         {
-          name: "owner",
+          name: "admin",
           writable: true,
           signer: true
         },
@@ -4245,12 +4267,7 @@ var hook_default = {
       ],
       accounts: [
         {
-          name: "owner",
-          signer: true
-        },
-        {
-          name: "payer",
-          writable: true,
+          name: "admin",
           signer: true
         },
         {
@@ -4304,36 +4321,42 @@ var hook_default = {
   types: [
     {
       name: "HookConfig",
+      docs: [
+        "Global config for the Hook program.",
+        "Stores the whitelist of programs allowed to transfer YES/NO Token-2022 tokens."
+      ],
       type: {
         kind: "struct",
         fields: [
           {
-            name: "version",
-            type: "u8"
-          },
-          {
-            name: "owner",
+            name: "admin",
+            docs: [
+              "Admin who can update the whitelist (should be a multisig)"
+            ],
             type: "pubkey"
           },
           {
             name: "whitelist",
+            docs: [
+              "Programs allowed to initiate or receive YES/NO token transfers.",
+              "Typically: CTF program PDA, CLOB program PDA."
+            ],
             type: {
-              array: [
-                "pubkey",
-                10
-              ]
+              vec: "pubkey"
             }
           },
-          {
-            name: "whitelist_len",
-            type: "u8"
-          },
           {
             name: "is_frozen",
+            docs: [
+              "If true, whitelist can no longer be modified (locked forever)"
+            ],
             type: "bool"
           },
           {
             name: "bump",
+            docs: [
+              "Bump for this PDA"
+            ],
             type: "u8"
           },
           {
@@ -4341,7 +4364,7 @@ var hook_default = {
             type: {
               array: [
                 "u8",
-                64
+                32
               ]
             }
           }
@@ -4671,6 +4694,20 @@ var question_market_default = {
           ],
           writable: true
         },
+        {
+          name: "fee_config",
+          docs: [
+            "FeeConfig PDA \u2014 passed to set_market_fee_override CPI."
+          ],
+          writable: true
+        },
+        {
+          name: "market_fee_override",
+          docs: [
+            "MarketFeeOverride PDA \u2014 auto-init with is_admin=false and fee_config defaults."
+          ],
+          writable: true
+        },
         {
           name: "fee_management_program",
           address: "DuYyXguB5PVSKg6E2p4XPrrXZSCJnuBhoGpkGCBN5bBb"
@@ -4776,6 +4813,55 @@ var question_market_default = {
       ],
       args: []
     },
+    {
+      name: "bump_presale_count",
+      discriminator: [
+        42,
+        84,
+        98,
+        9,
+        208,
+        168,
+        38,
+        55
+      ],
+      accounts: [
+        {
+          name: "authority",
+          signer: true
+        },
+        {
+          name: "config",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              },
+              {
+                kind: "account",
+                path: "config.owner",
+                account: "QuestionMarketConfig"
+              }
+            ]
+          }
+        }
+      ],
+      args: [
+        {
+          name: "count",
+          type: "u64"
+        }
+      ]
+    },
     {
       name: "collect_presale_revenue",
       discriminator: [
@@ -5332,39 +5418,23 @@ var question_market_default = {
         {
           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)."
+            "QuestionFee PDA \u2014 initialized with default fees via CPI to fee-management."
           ],
-          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"
-            }
-          }
+          writable: true
+        },
+        {
+          name: "fee_config",
+          docs: [
+            "FeeConfig PDA \u2014 passed to set_market_fee_override CPI as authority validator."
+          ],
+          writable: true
+        },
+        {
+          name: "market_fee_override",
+          docs: [
+            "MarketFeeOverride PDA \u2014 init'd by set_market_fee_override CPI (is_admin=true)."
+          ],
+          writable: true
         },
         {
           name: "fee_management_program",
@@ -6337,7 +6407,8 @@ var question_market_default = {
           {
             name: "investors_market_rev",
             docs: [
-              "Market revenue split: investors + company (out of FEE_DENOMINATOR = 1_000_000)"
+              "Market revenue split \u2014 three parts must sum to FEE_DENOMINATOR (10_000).",
+              "investors_market_rev + company_market_rev + referral_market_rev == 10_000"
             ],
             type: "u32"
           },
@@ -6348,7 +6419,7 @@ var question_market_default = {
           {
             name: "agents_presale_rev",
             docs: [
-              "Presale revenue split: agents + company (out of FEE_DENOMINATOR = 1_000_000)"
+              "Presale revenue split: agents + company (out of FEE_DENOMINATOR = 10_000)"
             ],
             type: "u32"
           },
@@ -6373,12 +6444,26 @@ var question_market_default = {
             name: "bump",
             type: "u8"
           },
+          {
+            name: "referral_market_rev",
+            docs: [
+              "Share of market trading fees routed to referral_vault (e.g. 2_000 = 20%)"
+            ],
+            type: "u32"
+          },
+          {
+            name: "referral_vault",
+            docs: [
+              "ATA of referral program config PDA \u2014 receives referral_market_rev% of trading fees"
+            ],
+            type: "pubkey"
+          },
           {
             name: "_reserved",
             type: {
               array: [
                 "u8",
-                64
+                28
               ]
             }
           }
@@ -6915,7 +7000,7 @@ var question_market_default = {
             type: {
               array: [
                 "pubkey",
-                30
+                20
               ]
             }
           },
@@ -6955,7 +7040,7 @@ var question_market_default = {
             type: {
               array: [
                 "u8",
-                120
+                440
               ]
             }
           }
@@ -16306,6 +16391,7 @@ var XMarketSDK = class {
       const program = new anchor5__namespace.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;
     }
     return this._market;
   }
@@ -16324,6 +16410,8 @@ var XMarketSDK = class {
         this._clob.feeConfigOwner = this.networkConfig.feeConfigOwner;
         this._clob.feeClient = this.fee;
       }
+      this._clob.ctfClient = this.ctf;
+      this._clob.qmConfigPda = this.market.configPda;
     }
     return this._clob;
   }