@theliem/xmarket-sdk 3.19.0 → 3.21.0

package/dist/index.mjs

@@ -354,7 +354,7 @@ var OracleClient = class {
         owner: acc.owner,
         admin: acc.admin,
         questionCount: acc.questionCount.toNumber(),
-        whitelist: acc.whitelist,
+        whitelist: acc.whitelist.slice(0, acc.whitelistLen),
         whitelistLen: acc.whitelistLen,
         isPaused: acc.isPaused,
         bump: acc.bump
@@ -407,6 +407,23 @@ var HookClient = class {
     }).rpc();
     return { signature: sig };
   }
+  /**
+   * Returns initializeExtraAccountMetaList instruction if the account doesn't exist yet, else null.
+   * Used by ClobClient to auto-prepend when extraAccountMetaList is missing.
+   */
+  async buildInitHookIxIfNeeded(mint, payer) {
+    const [extraAccountMetaList] = PDA.extraAccountMetaList(mint, this.programIds);
+    const existing = await this.provider.connection.getAccountInfo(extraAccountMetaList);
+    if (existing) return null;
+    return this.program.methods.initializeExtraAccountMetaList().accounts({
+      payer,
+      extraAccountMetaList,
+      mint,
+      hookConfig: this.configPda(),
+      tokenProgram: TOKEN_2022_PROGRAM_ID,
+      systemProgram: SystemProgram.programId
+    }).instruction();
+  }
   /**
    * Register extra account metas for a Token-2022 YES/NO mint.
    * Must be called once per mint after CTF creates it.
@@ -481,7 +498,7 @@ var HookClient = class {
       const acc = await this.program.account.hookConfig.fetch(this.configPda());
       return {
         owner: acc.owner,
-        whitelist: acc.whitelist,
+        whitelist: acc.whitelist.slice(0, acc.whitelistLen),
         whitelistLen: acc.whitelistLen,
         isFrozen: acc.isFrozen,
         bump: acc.bump
@@ -571,7 +588,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),
@@ -592,6 +612,8 @@ var MarketClient = class {
       collateralVault,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       questionFee: questionFeePda,
+      feeConfig: feeConfigPda,
+      marketFeeOverride,
       feeManagementProgram: this.programIds.feeManagement,
       tokenProgram: TOKEN_2022_PROGRAM_ID,
       systemProgram: SystemProgram.programId,
@@ -663,6 +685,9 @@ var MarketClient = class {
       systemProgram: SystemProgram.programId
     }).transaction();
   }
+  async bumpPresaleCount(count, authority) {
+    return this.program.methods.bumpPresaleCount(new anchor5.BN(count)).accounts({ authority, config: this.configPda }).transaction();
+  }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
     try {
@@ -676,7 +701,7 @@ var MarketClient = class {
         approvedCount: acc.approvedCount.toNumber(),
         rejectedCount: acc.rejectedCount.toNumber(),
         presaleCount: acc.presaleCount.toNumber(),
-        whitelist: acc.whitelist,
+        whitelist: acc.whitelist.slice(0, acc.whitelistLen),
         whitelistLen: acc.whitelistLen,
         isPaused: acc.isPaused,
         bump: acc.bump
@@ -829,6 +854,9 @@ var MarketClient = class {
     const [adminConfig] = PDA.adminConfig(adminOwner, this.programIds);
     const adminVault = 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,
@@ -857,6 +885,8 @@ var MarketClient = class {
       adminConfig,
       claimRecord,
       questionFee: questionFeePda,
+      feeConfig: feeConfigPda,
+      marketFeeOverride,
       feeManagementProgram: this.programIds.feeManagement,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       presaleProgram: this.programIds.presale,
@@ -1520,6 +1550,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;
@@ -1542,6 +1574,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 = getAssociatedTokenAddressSync(collateralMint, marketOraclePda, true);
+    this._marketOracleVaultCache.set(key, vault);
+    return vault;
+  }
   get walletPubkey() {
     return this.provider.wallet.publicKey;
   }
@@ -1641,11 +1691,11 @@ var ClobClient = class {
       if (companyAddr) {
         addresses.push(getAssociatedTokenAddressSync(collateralMint, companyAddr));
       }
-      addresses.push(payer);
+      const oracleVaultForAlt = await this.getMarketOracleVault(condition, collateralMint) ?? payer;
+      addresses.push(oracleVaultForAlt);
       if (refVault) {
         addresses.push(refVault);
       }
-      addresses.push(TOKEN_PROGRAM_ID);
     }
     const slot = await connection.getSlot("finalized");
     const [createIx, altAddress] = AddressLookupTableProgram.createLookupTable({
@@ -1908,7 +1958,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 },
@@ -2164,15 +2214,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: getAssociatedTokenAddressSync(collateralMint, companyAddr), isSigner: false, isWritable: true },
             { pubkey: oracleVault, isSigner: false, isWritable: true },
-            { pubkey: refVault, isSigner: false, isWritable: true },
-            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }
+            { pubkey: refVault, isSigner: false, isWritable: true }
           );
         }
       }
@@ -2373,6 +2422,18 @@ ${logs.join("\n")}`);
     const m0 = makers[0].order;
     const SIDE_BUY = 0;
     const SIDE_SELL = 1;
+    const hookInitIxs = [];
+    if (this.hookClient) {
+      const condition0 = t.condition;
+      const [ym] = PDA.yesMint(condition0, this.programIds);
+      const [nm] = PDA.noMint(condition0, this.programIds);
+      const [yIx, nIx] = await Promise.all([
+        this.hookClient.buildInitHookIxIfNeeded(ym, payer),
+        this.hookClient.buildInitHookIxIfNeeded(nm, payer)
+      ]);
+      if (yIx) hookInitIxs.push(yIx);
+      if (nIx) hookInitIxs.push(nIx);
+    }
     if (t.tokenId === m0.tokenId) {
       let buySignedOrder, sellCandidates;
       if (t.side === SIDE_BUY && makers.every((m) => m.order.side === SIDE_SELL)) {
@@ -2392,7 +2453,7 @@ ${logs.join("\n")}`);
           opts,
           false
         );
-        return this._buildUnsignedVtx(ixs3, alt, payer);
+        return this._buildUnsignedVtx([...hookInitIxs, ...ixs3], alt, payer);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
@@ -2408,7 +2469,7 @@ ${logs.join("\n")}`);
         operator,
         opts
       );
-      return this._buildUnsignedVtx(ixs2, alt, payer);
+      return this._buildUnsignedVtx([...hookInitIxs, ...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);
@@ -2429,7 +2490,7 @@ ${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 this._buildUnsignedVtx([ix], alt, payer);
+      return this._buildUnsignedVtx([...hookInitIxs, ix], alt, payer);
     }
     await Promise.all([
       this.registerOrderIfNeeded(taker),
@@ -2441,7 +2502,7 @@ ${logs.join("\n")}`);
       const ix = allBuy ? await this._buildMintIx(yesMaker, [taker], collateralMint, operator, payer) : await this._buildMergeIx(yesMaker, [taker], collateralMint, operator, payer, opts);
       ixs.push(ix);
     }
-    return this._buildUnsignedVtx(ixs, alt, payer);
+    return this._buildUnsignedVtx([...hookInitIxs, ...ixs], alt, payer);
   }
   // ─── batchCollectRedeemEarly ─────────────────────────────────────────────────
   /**
@@ -2498,7 +2559,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 },
@@ -2511,10 +2572,16 @@ ${logs.join("\n")}`);
       }
     }
     await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
+    const hookInitIxs = [];
+    if (this.hookClient) {
+      const ix = await this.hookClient.buildInitHookIxIfNeeded(outcomeMint, payer);
+      if (ix) hookInitIxs.push(ix);
+    }
     const ed25519Ix = buildBatchedCollectFeeEd25519Instruction(signedOrders);
+    const ed25519IxIndex = 2 + hookInitIxs.length;
     const collectIx = await this.program.methods.batchCollectRedeemEarly(
-      2,
-      // ix_index: Ed25519 ix is ix[2] (cuLimit=0, heapFrame=1, ed25519=2)
+      ed25519IxIndex,
+      // ix_index: adjusted for any prepended hook init ixs
       signedOrders.length,
       outcomeIndex
     ).accounts({
@@ -2538,7 +2605,7 @@ ${logs.join("\n")}`);
       systemProgram: SystemProgram.programId
     }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
     const cachedAlt = this._altCache.get(condition.toBase58());
-    return this._buildUnsignedVtx([ed25519Ix, collectIx], cachedAlt, payer);
+    return this._buildUnsignedVtx([...hookInitIxs, ed25519Ix, collectIx], cachedAlt, payer);
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
@@ -4636,6 +4703,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"
@@ -4741,6 +4822,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: [
@@ -5297,39 +5427,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",
@@ -6895,7 +7009,7 @@ var question_market_default = {
             type: {
               array: [
                 "pubkey",
-                30
+                20
               ]
             }
           },
@@ -6935,7 +7049,7 @@ var question_market_default = {
             type: {
               array: [
                 "u8",
-                120
+                440
               ]
             }
           }
@@ -16286,6 +16400,7 @@ var XMarketSDK = class {
       const program = new anchor5.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;
   }
@@ -16304,6 +16419,9 @@ 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;
+      this._clob.hookClient = this.hook;
     }
     return this._clob;
   }