@theliem/xmarket-sdk 3.3.0 → 3.3.1

package/dist/index.d.mts

@@ -431,6 +431,8 @@ declare class MarketClient {
     removeAdmin(owner?: PublicKey): Promise<Transaction>;
     addToWhitelist(address: PublicKey, authority?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     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>;
     fetchConfig(): Promise<QuestionMarketConfig | null>;
     fetchQuestion(questionPda: PublicKey): Promise<Question | null>;
     questionPda(questionId: Uint8Array): PublicKey;
@@ -546,103 +548,101 @@ declare class ClobClient {
     get walletPubkey(): PublicKey;
     /**
      * Get or create an ALT for a condition.
-     * First call: creates + extends ALT on-chain, waits for activation (~2s).
-     * Subsequent calls for same condition: returns cached ALT instantly.
-     * BE devs never interact with this — called automatically by matchOrders.
+     * Includes order_record PDAs for taker + all makers so match tx stays under 1232 bytes.
      */
-    ensureAlt(condition: PublicKey, collateralMint: PublicKey, buyerPubkey: PublicKey, buyerNonce: anchor.BN, makers: SignedOrder[]): Promise<AddressLookupTableAccount>;
+    ensureAlt(condition: PublicKey, collateralMint: PublicKey, takerSigned: SignedOrder, makers: SignedOrder[]): Promise<AddressLookupTableAccount>;
+    private _sendLegacyTxSig;
     private _sendLegacyTx;
     /**
-     * Send a match transaction as versioned (v0).
-     * Pass a pre-built AddressLookupTableAccount to compress account keys and
-     * stay under the 1232-byte limit — required for match_complementary which
-     * has ~25 accounts + 2 Ed25519 precompile instructions (~1697 bytes raw).
-     *
-     * If `whitelistedWallet` is provided and differs from `this.provider.wallet`,
-     * both wallets sign the transaction (whitelisted operator + payer).
+     * Send a match transaction as versioned (v0) with optional ALT.
+     * Both operator wallet and payer (this.provider.wallet) sign.
      */
     sendMatchTx(instructions: TransactionInstruction[], lookupTable?: AddressLookupTableAccount, whitelistedWallet?: anchor.Wallet): Promise<string>;
     configPda(): PublicKey;
-    /** One-time setup. Caller becomes admin. */
+    /**
+     * Register a signed order on-chain.
+     * Sends Ed25519 precompile ix + register_order ix in one legacy tx.
+     * Called at match time (engine-triggered), not at order placement.
+     */
+    registerOrder(signed: SignedOrder): Promise<string>;
+    /** Register only if the PDA doesn't exist yet (idempotent). */
+    private registerOrderIfNeeded;
+    /** Cancel an order — closes its OrderRecord PDA and returns rent to maker. */
+    cancelOrder(nonce: anchor.BN): Promise<TxResult>;
     initialize(operators: PublicKey[], feeRecipient: PublicKey, feeRateBps: number): Promise<TxResult>;
-    /** Admin adds an operator to the whitelist. */
     addOperator(operator: PublicKey): Promise<TxResult>;
-    /** Admin removes an operator from the whitelist. */
     removeOperator(operator: PublicKey): Promise<TxResult>;
-    /** Admin pause/unpause the CLOB. */
     setPaused(paused: boolean): Promise<TxResult>;
-    /**
-     * Emergency reset of CLOB config (upgrade authority only).
-     */
     forceResetClob(programData: PublicKey, newAdmin: PublicKey, newOperators: PublicKey[], newFeeRecipient: PublicKey, newFeeRateBps: number): Promise<TxResult>;
     /**
-     * COMPLEMENTARY match: 1 buyer (taker) + N sellers (makers), same tokenId.
-     *
-     * Transaction structure:
-     *   ix[0]   Ed25519(taker/buyer)
-     *   ix[1+i] Ed25519(maker_i/seller_i)
-     *   ix[N+1] match_complementary(buyNonce, makerNonces[])
-     *
-     * remaining_accounts: [hook×3] [seller×5 × N]
-     */
-    /** Build Ed25519 + matchComplementary instructions without sending.
+     * Build match_complementary instruction (no Ed25519 — OrderRecord PDAs used).
      *
-     * If `buySigned.order.fee > 0` and `feeClient` + `feeConfigOwner` are wired in,
-     * automatically appends 5 fee_management remaining_accounts so the program CPIs
-     * to distribute_fee internally. No manual `feeDistribute` param needed.
+     * remaining_accounts layout:
+     *   [seller, order_record, seller_token, seller_collateral, seller_position, sell_status] × N
+     *   [extraAccountMetaList, hookConfig, hookProgram]
+     *   [feeManagement, fee_config, mkt_override, company_ata, oracle_vault]  (when fee > 0)
      */
-    buildMatchComplementaryIxs(buySigned: SignedOrder, makersSigned: SignedOrder[], collateralMint: PublicKey, feeRecipient: PublicKey, operator: PublicKey, opts?: {
+    buildMatchComplementaryIxs(takerSigned: SignedOrder, makersSigned: SignedOrder[], collateralMint: PublicKey, feeRecipient: PublicKey, operator: PublicKey, opts?: {
         marketOracleVault?: PublicKey;
+        fillAmount?: anchor.BN;
     }): Promise<TransactionInstruction[]>;
+    /**
+     * COMPLEMENTARY: 1 taker (BUY) + N makers (SELL), same tokenId.
+     * Phase 1: register taker + all makers in parallel.
+     * Phase 2: 1 atomic match tx.
+     */
     private matchComplementary;
     /**
-     * MINT match: 1 YES buyer (taker) + N NO buyers (makers).
+     * MINT: 1 YES buyer (taker) + N NO buyers (makers).
+     * Phase 1: register taker + all NO makers in parallel.
+     * Phase 2: 1 atomic match tx.
      *
-     * Transaction structure:
-     *   ix[0]   Ed25519(taker/YES buyer)
-     *   ix[1+i] Ed25519(maker_i/NO buyer)
-     *   ix[N+1] match_mint_orders(yesNonce, makerNonces[])
-     *
-     * remaining_accounts: [maker×5 × N]  (no hook accounts — mint_to doesn't fire hook)
+     * remaining_accounts per NO maker (5):
+     *   [order_record, buyer_no_token, buyer_no_collateral, buyer_no_position, no_order_status]
      */
     private matchMintOrders;
     /**
-     * MERGE match: 1 YES seller (taker) + N NO sellers (makers).
-     *
-     * Transaction structure:
-     *   ix[0]   Ed25519(taker/YES seller)
-     *   ix[1+i] Ed25519(maker_i/NO seller)
-     *   ix[N+1] match_merge_orders(yesNonce, makerNonces[])
+     * MERGE: 1 YES seller (taker) + N NO sellers (makers).
+     * Phase 1: register taker + all NO makers in parallel.
+     * Phase 2: 1 atomic match tx.
      *
-     * remaining_accounts: [maker×5 × N]  (no hook accounts — burn doesn't fire hook)
+     * remaining_accounts per NO maker (5):
+     *   [order_record, seller_no_token, seller_no_collateral, seller_no_position, no_order_status]
+     * After all makers, optional 5 fee accounts.
      */
     private matchMergeOrders;
     /**
-     * Auto-detect match type and execute 1-taker + N-makers in a single transaction.
+     * Auto-detect match type and execute 2-phase:
+     *   Phase 1 — register all orders (taker + makers) on-chain in parallel.
+     *   Phase 2 — 1 atomic match transaction.
      *
-     * Detection (pure, no RPC) based on taker.order vs makers[0].order:
-     *   taker.tokenId === makers[0].tokenId: taker BUY + all makers SELL → COMPLEMENTARY
-     *   taker.tokenId !== makers[0].tokenId + taker BUY + all makers BUY → MINT
-     *   taker.tokenId !== makers[0].tokenId + taker SELL + all makers SELL → MERGE
-     *   Otherwise → throws InvalidParamError
-     *
-     * All makers must have the same tokenId and side as makers[0].
-     */
-    /**
-     * Auto-detect match type and execute in a single transaction.
-     * ALT is managed automatically (created on first call per condition, cached thereafter).
-     * feeRecipient and collateralMint are derived from on-chain config.
-     * Fee distribution (distribute_fee CPI) fires automatically when order.fee > 0.
+     * Detection (pure, no RPC):
+     *   taker.tokenId === makers[0].tokenId:
+     *     taker BUY + all makers SELL → COMPLEMENTARY
+     *   taker.tokenId !== makers[0].tokenId + all BUY  → MINT
+     *   taker.tokenId !== makers[0].tokenId + all SELL → MERGE
      *
-     * @param opts.marketOracleVault  Required for presale markets (is_admin=false).
-     *   Pass the ATA of the market_oracle PDA so 50% of fee goes there.
-     *   For admin markets (is_admin=true) omit — payer is used as placeholder (no transfer).
+     * @param opts.marketOracleVault  Oracle vault ATA for presale markets.
+     *   Omit for admin markets (payer used as placeholder).
      */
     matchOrders(taker: SignedOrder, makers: SignedOrder[], opts?: {
         marketOracleVault?: PublicKey;
     }): Promise<TxResult>;
     fetchConfig(): Promise<ClobConfig | null>;
     fetchOrderStatus(maker: PublicKey, nonce: anchor.BN): Promise<OrderStatus | null>;
+    fetchOrderRecord(maker: PublicKey, nonce: anchor.BN): Promise<{
+        maker: PublicKey;
+        condition: PublicKey;
+        tokenId: number;
+        side: number;
+        makerAmount: anchor.BN;
+        takerAmount: anchor.BN;
+        nonce: anchor.BN;
+        expiry: anchor.BN;
+        fee: anchor.BN;
+        taker: PublicKey;
+        signer: PublicKey;
+    } | null>;
 }
 
 interface PresaleInfo {
@@ -802,6 +802,7 @@ declare class PDA {
     static extraAccountMetaList(mint: PublicKey, programIds: Pick<ProgramIds, "hook">): [PublicKey, number];
     static clobConfig(programIds: Pick<ProgramIds, "clobExchange">): [PublicKey, number];
     static orderStatus(maker: PublicKey, nonce: BN, programIds: Pick<ProgramIds, "clobExchange">): [PublicKey, number];
+    static orderRecord(maker: PublicKey, nonce: BN, programIds: Pick<ProgramIds, "clobExchange">): [PublicKey, number];
     static feeConfig(owner: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static questionFee(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static marketFeeOverride(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];

package/dist/index.d.ts

@@ -431,6 +431,8 @@ declare class MarketClient {
     removeAdmin(owner?: PublicKey): Promise<Transaction>;
     addToWhitelist(address: PublicKey, authority?: PublicKey, payer?: PublicKey): Promise<Transaction>;
     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>;
     fetchConfig(): Promise<QuestionMarketConfig | null>;
     fetchQuestion(questionPda: PublicKey): Promise<Question | null>;
     questionPda(questionId: Uint8Array): PublicKey;
@@ -546,103 +548,101 @@ declare class ClobClient {
     get walletPubkey(): PublicKey;
     /**
      * Get or create an ALT for a condition.
-     * First call: creates + extends ALT on-chain, waits for activation (~2s).
-     * Subsequent calls for same condition: returns cached ALT instantly.
-     * BE devs never interact with this — called automatically by matchOrders.
+     * Includes order_record PDAs for taker + all makers so match tx stays under 1232 bytes.
      */
-    ensureAlt(condition: PublicKey, collateralMint: PublicKey, buyerPubkey: PublicKey, buyerNonce: anchor.BN, makers: SignedOrder[]): Promise<AddressLookupTableAccount>;
+    ensureAlt(condition: PublicKey, collateralMint: PublicKey, takerSigned: SignedOrder, makers: SignedOrder[]): Promise<AddressLookupTableAccount>;
+    private _sendLegacyTxSig;
     private _sendLegacyTx;
     /**
-     * Send a match transaction as versioned (v0).
-     * Pass a pre-built AddressLookupTableAccount to compress account keys and
-     * stay under the 1232-byte limit — required for match_complementary which
-     * has ~25 accounts + 2 Ed25519 precompile instructions (~1697 bytes raw).
-     *
-     * If `whitelistedWallet` is provided and differs from `this.provider.wallet`,
-     * both wallets sign the transaction (whitelisted operator + payer).
+     * Send a match transaction as versioned (v0) with optional ALT.
+     * Both operator wallet and payer (this.provider.wallet) sign.
      */
     sendMatchTx(instructions: TransactionInstruction[], lookupTable?: AddressLookupTableAccount, whitelistedWallet?: anchor.Wallet): Promise<string>;
     configPda(): PublicKey;
-    /** One-time setup. Caller becomes admin. */
+    /**
+     * Register a signed order on-chain.
+     * Sends Ed25519 precompile ix + register_order ix in one legacy tx.
+     * Called at match time (engine-triggered), not at order placement.
+     */
+    registerOrder(signed: SignedOrder): Promise<string>;
+    /** Register only if the PDA doesn't exist yet (idempotent). */
+    private registerOrderIfNeeded;
+    /** Cancel an order — closes its OrderRecord PDA and returns rent to maker. */
+    cancelOrder(nonce: anchor.BN): Promise<TxResult>;
     initialize(operators: PublicKey[], feeRecipient: PublicKey, feeRateBps: number): Promise<TxResult>;
-    /** Admin adds an operator to the whitelist. */
     addOperator(operator: PublicKey): Promise<TxResult>;
-    /** Admin removes an operator from the whitelist. */
     removeOperator(operator: PublicKey): Promise<TxResult>;
-    /** Admin pause/unpause the CLOB. */
     setPaused(paused: boolean): Promise<TxResult>;
-    /**
-     * Emergency reset of CLOB config (upgrade authority only).
-     */
     forceResetClob(programData: PublicKey, newAdmin: PublicKey, newOperators: PublicKey[], newFeeRecipient: PublicKey, newFeeRateBps: number): Promise<TxResult>;
     /**
-     * COMPLEMENTARY match: 1 buyer (taker) + N sellers (makers), same tokenId.
-     *
-     * Transaction structure:
-     *   ix[0]   Ed25519(taker/buyer)
-     *   ix[1+i] Ed25519(maker_i/seller_i)
-     *   ix[N+1] match_complementary(buyNonce, makerNonces[])
-     *
-     * remaining_accounts: [hook×3] [seller×5 × N]
-     */
-    /** Build Ed25519 + matchComplementary instructions without sending.
+     * Build match_complementary instruction (no Ed25519 — OrderRecord PDAs used).
      *
-     * If `buySigned.order.fee > 0` and `feeClient` + `feeConfigOwner` are wired in,
-     * automatically appends 5 fee_management remaining_accounts so the program CPIs
-     * to distribute_fee internally. No manual `feeDistribute` param needed.
+     * remaining_accounts layout:
+     *   [seller, order_record, seller_token, seller_collateral, seller_position, sell_status] × N
+     *   [extraAccountMetaList, hookConfig, hookProgram]
+     *   [feeManagement, fee_config, mkt_override, company_ata, oracle_vault]  (when fee > 0)
      */
-    buildMatchComplementaryIxs(buySigned: SignedOrder, makersSigned: SignedOrder[], collateralMint: PublicKey, feeRecipient: PublicKey, operator: PublicKey, opts?: {
+    buildMatchComplementaryIxs(takerSigned: SignedOrder, makersSigned: SignedOrder[], collateralMint: PublicKey, feeRecipient: PublicKey, operator: PublicKey, opts?: {
         marketOracleVault?: PublicKey;
+        fillAmount?: anchor.BN;
     }): Promise<TransactionInstruction[]>;
+    /**
+     * COMPLEMENTARY: 1 taker (BUY) + N makers (SELL), same tokenId.
+     * Phase 1: register taker + all makers in parallel.
+     * Phase 2: 1 atomic match tx.
+     */
     private matchComplementary;
     /**
-     * MINT match: 1 YES buyer (taker) + N NO buyers (makers).
+     * MINT: 1 YES buyer (taker) + N NO buyers (makers).
+     * Phase 1: register taker + all NO makers in parallel.
+     * Phase 2: 1 atomic match tx.
      *
-     * Transaction structure:
-     *   ix[0]   Ed25519(taker/YES buyer)
-     *   ix[1+i] Ed25519(maker_i/NO buyer)
-     *   ix[N+1] match_mint_orders(yesNonce, makerNonces[])
-     *
-     * remaining_accounts: [maker×5 × N]  (no hook accounts — mint_to doesn't fire hook)
+     * remaining_accounts per NO maker (5):
+     *   [order_record, buyer_no_token, buyer_no_collateral, buyer_no_position, no_order_status]
      */
     private matchMintOrders;
     /**
-     * MERGE match: 1 YES seller (taker) + N NO sellers (makers).
-     *
-     * Transaction structure:
-     *   ix[0]   Ed25519(taker/YES seller)
-     *   ix[1+i] Ed25519(maker_i/NO seller)
-     *   ix[N+1] match_merge_orders(yesNonce, makerNonces[])
+     * MERGE: 1 YES seller (taker) + N NO sellers (makers).
+     * Phase 1: register taker + all NO makers in parallel.
+     * Phase 2: 1 atomic match tx.
      *
-     * remaining_accounts: [maker×5 × N]  (no hook accounts — burn doesn't fire hook)
+     * remaining_accounts per NO maker (5):
+     *   [order_record, seller_no_token, seller_no_collateral, seller_no_position, no_order_status]
+     * After all makers, optional 5 fee accounts.
      */
     private matchMergeOrders;
     /**
-     * Auto-detect match type and execute 1-taker + N-makers in a single transaction.
+     * Auto-detect match type and execute 2-phase:
+     *   Phase 1 — register all orders (taker + makers) on-chain in parallel.
+     *   Phase 2 — 1 atomic match transaction.
      *
-     * Detection (pure, no RPC) based on taker.order vs makers[0].order:
-     *   taker.tokenId === makers[0].tokenId: taker BUY + all makers SELL → COMPLEMENTARY
-     *   taker.tokenId !== makers[0].tokenId + taker BUY + all makers BUY → MINT
-     *   taker.tokenId !== makers[0].tokenId + taker SELL + all makers SELL → MERGE
-     *   Otherwise → throws InvalidParamError
-     *
-     * All makers must have the same tokenId and side as makers[0].
-     */
-    /**
-     * Auto-detect match type and execute in a single transaction.
-     * ALT is managed automatically (created on first call per condition, cached thereafter).
-     * feeRecipient and collateralMint are derived from on-chain config.
-     * Fee distribution (distribute_fee CPI) fires automatically when order.fee > 0.
+     * Detection (pure, no RPC):
+     *   taker.tokenId === makers[0].tokenId:
+     *     taker BUY + all makers SELL → COMPLEMENTARY
+     *   taker.tokenId !== makers[0].tokenId + all BUY  → MINT
+     *   taker.tokenId !== makers[0].tokenId + all SELL → MERGE
      *
-     * @param opts.marketOracleVault  Required for presale markets (is_admin=false).
-     *   Pass the ATA of the market_oracle PDA so 50% of fee goes there.
-     *   For admin markets (is_admin=true) omit — payer is used as placeholder (no transfer).
+     * @param opts.marketOracleVault  Oracle vault ATA for presale markets.
+     *   Omit for admin markets (payer used as placeholder).
      */
     matchOrders(taker: SignedOrder, makers: SignedOrder[], opts?: {
         marketOracleVault?: PublicKey;
     }): Promise<TxResult>;
     fetchConfig(): Promise<ClobConfig | null>;
     fetchOrderStatus(maker: PublicKey, nonce: anchor.BN): Promise<OrderStatus | null>;
+    fetchOrderRecord(maker: PublicKey, nonce: anchor.BN): Promise<{
+        maker: PublicKey;
+        condition: PublicKey;
+        tokenId: number;
+        side: number;
+        makerAmount: anchor.BN;
+        takerAmount: anchor.BN;
+        nonce: anchor.BN;
+        expiry: anchor.BN;
+        fee: anchor.BN;
+        taker: PublicKey;
+        signer: PublicKey;
+    } | null>;
 }
 
 interface PresaleInfo {
@@ -802,6 +802,7 @@ declare class PDA {
     static extraAccountMetaList(mint: PublicKey, programIds: Pick<ProgramIds, "hook">): [PublicKey, number];
     static clobConfig(programIds: Pick<ProgramIds, "clobExchange">): [PublicKey, number];
     static orderStatus(maker: PublicKey, nonce: BN, programIds: Pick<ProgramIds, "clobExchange">): [PublicKey, number];
+    static orderRecord(maker: PublicKey, nonce: BN, programIds: Pick<ProgramIds, "clobExchange">): [PublicKey, number];
     static feeConfig(owner: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static questionFee(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];
     static marketFeeOverride(conditionPda: PublicKey, programIds: Pick<ProgramIds, "feeManagement">): [PublicKey, number];