@theliem/xmarket-sdk 3.20.0 → 3.22.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as anchor from '@coral-xyz/anchor';
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, Transaction, Keypair, TransactionInstruction, AddressLookupTableAccount, VersionedTransaction } from '@solana/web3.js';
+import { PublicKey, Transaction, TransactionInstruction, Keypair, AddressLookupTableAccount, VersionedTransaction } from '@solana/web3.js';
 import BN from 'bn.js';
 
 interface ProgramIds {
@@ -281,6 +281,11 @@ declare class HookClient {
     configPda(): PublicKey;
     /** One-time setup. Caller becomes owner. */
     initialize(initialWhitelist: PublicKey[]): Promise<TxResult>;
+    /**
+     * Returns initializeExtraAccountMetaList instruction if the account doesn't exist yet, else null.
+     * Used by ClobClient to auto-prepend when extraAccountMetaList is missing.
+     */
+    buildInitHookIxIfNeeded(mint: PublicKey, payer: PublicKey): Promise<TransactionInstruction | null>;
     /**
      * Register extra account metas for a Token-2022 YES/NO mint.
      * Must be called once per mint after CTF creates it.
@@ -632,6 +637,8 @@ declare class ClobClient {
     /** Injected by XMarketSDK — enables auto-derive of marketOracleVault for presale markets */
     ctfClient?: CtfClient;
     qmConfigPda?: PublicKey;
+    /** Injected by XMarketSDK — enables auto-init extraAccountMetaList if missing */
+    hookClient?: HookClient;
     /** Cached company_address from fee_config to avoid repeated RPC calls */
     private _companyAddress?;
     /** Cached referral_vault from fee_config */
@@ -831,7 +838,13 @@ declare class ClobClient {
      */
     buildBatchCollectRedeemEarlyTx(signedOrders: SignedCollectFeeOrder[], condition: PublicKey, outcomeIndex: 0 | 1, operator: PublicKey, payer: PublicKey, opts?: {
         marketOracleVault?: PublicKey;
+        lookupTable?: AddressLookupTableAccount;
     }): Promise<VersionedTransaction>;
+    /**
+     * Build ALT with static accounts for a condition — no order-specific PDAs needed.
+     * Use before buildBatchCollectRedeemEarlyTx when no prior buildMatchOrdersTx ran in this session.
+     */
+    buildAltForCondition(condition: PublicKey, _payer: PublicKey, collateralMint?: PublicKey): Promise<AddressLookupTableAccount>;
     fetchConfig(): Promise<ClobConfig | null>;
     fetchOrderStatus(maker: PublicKey, nonce: anchor.BN): Promise<OrderStatus | null>;
     fetchOrderRecord(maker: PublicKey, nonce: anchor.BN): Promise<{

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as anchor from '@coral-xyz/anchor';
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, Transaction, Keypair, TransactionInstruction, AddressLookupTableAccount, VersionedTransaction } from '@solana/web3.js';
+import { PublicKey, Transaction, TransactionInstruction, Keypair, AddressLookupTableAccount, VersionedTransaction } from '@solana/web3.js';
 import BN from 'bn.js';
 
 interface ProgramIds {
@@ -281,6 +281,11 @@ declare class HookClient {
     configPda(): PublicKey;
     /** One-time setup. Caller becomes owner. */
     initialize(initialWhitelist: PublicKey[]): Promise<TxResult>;
+    /**
+     * Returns initializeExtraAccountMetaList instruction if the account doesn't exist yet, else null.
+     * Used by ClobClient to auto-prepend when extraAccountMetaList is missing.
+     */
+    buildInitHookIxIfNeeded(mint: PublicKey, payer: PublicKey): Promise<TransactionInstruction | null>;
     /**
      * Register extra account metas for a Token-2022 YES/NO mint.
      * Must be called once per mint after CTF creates it.
@@ -632,6 +637,8 @@ declare class ClobClient {
     /** Injected by XMarketSDK — enables auto-derive of marketOracleVault for presale markets */
     ctfClient?: CtfClient;
     qmConfigPda?: PublicKey;
+    /** Injected by XMarketSDK — enables auto-init extraAccountMetaList if missing */
+    hookClient?: HookClient;
     /** Cached company_address from fee_config to avoid repeated RPC calls */
     private _companyAddress?;
     /** Cached referral_vault from fee_config */
@@ -831,7 +838,13 @@ declare class ClobClient {
      */
     buildBatchCollectRedeemEarlyTx(signedOrders: SignedCollectFeeOrder[], condition: PublicKey, outcomeIndex: 0 | 1, operator: PublicKey, payer: PublicKey, opts?: {
         marketOracleVault?: PublicKey;
+        lookupTable?: AddressLookupTableAccount;
     }): Promise<VersionedTransaction>;
+    /**
+     * Build ALT with static accounts for a condition — no order-specific PDAs needed.
+     * Use before buildBatchCollectRedeemEarlyTx when no prior buildMatchOrdersTx ran in this session.
+     */
+    buildAltForCondition(condition: PublicKey, _payer: PublicKey, collateralMint?: PublicKey): Promise<AddressLookupTableAccount>;
     fetchConfig(): Promise<ClobConfig | null>;
     fetchOrderStatus(maker: PublicKey, nonce: anchor.BN): Promise<OrderStatus | null>;
     fetchOrderRecord(maker: PublicKey, nonce: anchor.BN): Promise<{

package/dist/index.js

@@ -380,7 +380,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
@@ -433,6 +433,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: splToken.TOKEN_2022_PROGRAM_ID,
+      systemProgram: web3_js.SystemProgram.programId
+    }).instruction();
+  }
   /**
    * Register extra account metas for a Token-2022 YES/NO mint.
    * Must be called once per mint after CTF creates it.
@@ -507,7 +524,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
@@ -710,7 +727,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
@@ -2431,6 +2448,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)) {
@@ -2450,7 +2479,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");
       }
@@ -2466,7 +2495,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);
@@ -2487,7 +2516,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),
@@ -2499,7 +2528,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 ─────────────────────────────────────────────────
   /**
@@ -2569,10 +2598,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({
@@ -2595,8 +2630,83 @@ ${logs.join("\n")}`);
       token2022Program: splToken.TOKEN_2022_PROGRAM_ID,
       systemProgram: web3_js.SystemProgram.programId
     }).remainingAccounts([...userAccounts, ...hookAccounts, ...feeAccounts]).instruction();
-    const cachedAlt = this._altCache.get(condition.toBase58());
-    return this._buildUnsignedVtx([ed25519Ix, collectIx], cachedAlt, payer);
+    const alt = opts?.lookupTable ?? this._altCache.get(condition.toBase58()) ?? await this.buildAltForCondition(condition, payer, collateralMint);
+    return this._buildUnsignedVtx([...hookInitIxs, ed25519Ix, collectIx], alt, payer);
+  }
+  /**
+   * Build ALT with static accounts for a condition — no order-specific PDAs needed.
+   * Use before buildBatchCollectRedeemEarlyTx when no prior buildMatchOrdersTx ran in this session.
+   */
+  async buildAltForCondition(condition, _payer, collateralMint) {
+    const cacheKey = condition.toBase58();
+    if (this._altCache.has(cacheKey)) return this._altCache.get(cacheKey);
+    const mint = collateralMint ?? this.networkConfig.defaultCollateral.mint;
+    const payer = this.walletPubkey;
+    const { connection } = this.provider;
+    const clobConfigPda = this.configPda();
+    const [yesMint] = PDA.yesMint(condition, this.programIds);
+    const [noMint] = PDA.noMint(condition, this.programIds);
+    const [extraAccountMeta] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const [collateralVault] = PDA.collateralVault(mint, this.programIds);
+    const [vaultTokenAccount] = PDA.vaultToken(mint, this.programIds);
+    const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfigPda, true, splToken.TOKEN_2022_PROGRAM_ID);
+    const feeRecipientAddr = (await this.fetchConfig())?.feeRecipient;
+    const addresses = [
+      web3_js.Ed25519Program.programId,
+      this.programIds.clobExchange,
+      this.programIds.conditionalTokens,
+      this.programIds.hook,
+      splToken.TOKEN_PROGRAM_ID,
+      splToken.TOKEN_2022_PROGRAM_ID,
+      web3_js.SystemProgram.programId,
+      web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
+      clobConfigPda,
+      hookConfig,
+      condition,
+      yesMint,
+      noMint,
+      extraAccountMeta,
+      collateralVault,
+      vaultTokenAccount,
+      clobYesAta,
+      clobNoAta
+    ];
+    if (feeRecipientAddr) addresses.push(feeRecipientAddr);
+    if (this.feeConfigOwner && this.programIds.feeManagement) {
+      const companyAddr = await this.companyAddress();
+      const refVault = await this.referralVault();
+      addresses.push(this.programIds.feeManagement);
+      addresses.push(PDA.feeConfig(this.feeConfigOwner, this.programIds)[0]);
+      addresses.push(PDA.marketFeeOverride(condition, this.programIds)[0]);
+      if (companyAddr) addresses.push(splToken.getAssociatedTokenAddressSync(mint, companyAddr));
+      if (refVault) addresses.push(refVault);
+      const oracleVault = await this.getMarketOracleVault(condition, mint) ?? payer;
+      addresses.push(oracleVault);
+    }
+    const slot = await connection.getSlot("finalized");
+    const [createIx, altAddress] = web3_js.AddressLookupTableProgram.createLookupTable(
+      { authority: payer, payer, recentSlot: slot }
+    );
+    const BATCH = 30;
+    const extendIxs = [];
+    for (let i = 0; i < addresses.length; i += BATCH) {
+      extendIxs.push(web3_js.AddressLookupTableProgram.extendLookupTable(
+        { payer, authority: payer, lookupTable: altAddress, addresses: addresses.slice(i, i + BATCH) }
+      ));
+    }
+    await this._sendLegacyTx([createIx, extendIxs[0]]);
+    for (let i = 1; i < extendIxs.length; i++) await this._sendLegacyTx([extendIxs[i]]);
+    for (let attempt = 0; attempt < 30; attempt++) {
+      await new Promise((r) => setTimeout(r, 1e3));
+      const res = await connection.getAddressLookupTable(altAddress);
+      if (res.value && res.value.state.addresses.length === addresses.length) {
+        this._altCache.set(cacheKey, res.value);
+        return res.value;
+      }
+    }
+    throw new Error(`ALT ${altAddress.toBase58()} not active after 30s`);
   }
   // ─── Queries ─────────────────────────────────────────────────────────────────
   async fetchConfig() {
@@ -16412,6 +16522,7 @@ var XMarketSDK = class {
       }
       this._clob.ctfClient = this.ctf;
       this._clob.qmConfigPda = this.market.configPda;
+      this._clob.hookClient = this.hook;
     }
     return this._clob;
   }