@theliem/xmarket-sdk 3.4.2 → 3.5.0

package/dist/index.mjs

@@ -1381,15 +1381,39 @@ var ClobClient = class {
       takerOrderRecord
     ];
     if (feeRecipientAddr) addresses.push(feeRecipientAddr);
+    const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
+    const [vaultToken] = PDA.vaultToken(collateralMint, this.programIds);
+    const [mintAuth] = PDA.mintAuthority(condition, this.programIds);
+    const [extraMetaNo] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const clobUsdcAta = getAssociatedTokenAddressSync(collateralMint, clobConfigPda, true);
+    const clobYesAta = getAssociatedTokenAddressSync(yesMint, clobConfigPda, true, TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = getAssociatedTokenAddressSync(noMint, clobConfigPda, true, TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfigPda, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfigPda, this.programIds);
+    addresses.push(
+      collateralVault,
+      vaultToken,
+      mintAuth,
+      extraMetaNo,
+      clobUsdcAta,
+      clobYesAta,
+      clobNoAta,
+      clobYesPos,
+      clobNoPos,
+      collateralMint,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    );
     for (const m of makers) {
       const seller = m.order.maker;
-      const [sellerPos] = PDA.position(condition, tokenId, seller, this.programIds);
+      const makerTokenId = m.order.tokenId;
+      const makerMint = makerTokenId === 1 ? yesMint : noMint;
+      const [sellerPos] = PDA.position(condition, makerTokenId, seller, this.programIds);
       const [sellerStatus] = PDA.orderStatus(seller, m.order.nonce, this.programIds);
       const [sellerRecord] = PDA.orderRecord(seller, m.order.nonce, this.programIds);
       addresses.push(
         seller,
         sellerRecord,
-        getAssociatedTokenAddressSync(outcomeMint, seller, false, TOKEN_2022_PROGRAM_ID),
+        getAssociatedTokenAddressSync(makerMint, seller, false, TOKEN_2022_PROGRAM_ID),
         getAssociatedTokenAddressSync(collateralMint, seller),
         sellerPos,
         sellerStatus
@@ -1461,6 +1485,36 @@ ${logs.join("\n")}`);
   async _sendLegacyTx(instructions) {
     await this._sendLegacyTxSig(instructions);
   }
+  async _ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta) {
+    const { connection } = this.provider;
+    const [yesInfo, noInfo] = await Promise.all([
+      connection.getAccountInfo(clobYesAta),
+      connection.getAccountInfo(clobNoAta)
+    ]);
+    const { createAssociatedTokenAccountIdempotentInstruction: createAssociatedTokenAccountIdempotentInstruction2 } = await import('@solana/spl-token');
+    const ixs = [];
+    if (!yesInfo) {
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+        this.walletPubkey,
+        clobYesAta,
+        clobConfig,
+        yesMint,
+        TOKEN_2022_PROGRAM_ID
+      ));
+    }
+    if (!noInfo) {
+      ixs.push(createAssociatedTokenAccountIdempotentInstruction2(
+        this.walletPubkey,
+        clobNoAta,
+        clobConfig,
+        noMint,
+        TOKEN_2022_PROGRAM_ID
+      ));
+    }
+    if (ixs.length > 0) {
+      await this._sendLegacyTx(ixs);
+    }
+  }
   /**
    * Send a match transaction as versioned (v0) with optional ALT.
    * Both operator wallet and payer (this.provider.wallet) sign.
@@ -1468,11 +1522,12 @@ ${logs.join("\n")}`);
   async sendMatchTx(instructions, lookupTable, whitelistedWallet) {
     const { connection } = this.provider;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-    const cuLimit = ComputeBudgetProgram.setComputeUnitLimit({ units: 8e5 });
+    const cuLimit = ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 });
+    const heapFrame = ComputeBudgetProgram.requestHeapFrame({ bytes: 262144 });
     const message = new TransactionMessage({
       payerKey: this.walletPubkey,
       recentBlockhash: blockhash,
-      instructions: [cuLimit, ...instructions]
+      instructions: [cuLimit, heapFrame, ...instructions]
     }).compileToV0Message(lookupTable ? [lookupTable] : []);
     const vtx = new VersionedTransaction(message);
     const signers = [this.provider.wallet.payer];
@@ -1481,7 +1536,7 @@ ${logs.join("\n")}`);
     }
     vtx.sign(signers);
     const sig = await connection.sendRawTransaction(vtx.serialize(), {
-      skipPreflight: true
+      skipPreflight: false
     });
     const result = await connection.confirmTransaction(
       { signature: sig, blockhash, lastValidBlockHeight },
@@ -1684,6 +1739,47 @@ ${logs.join("\n")}`);
     const sig = await this.sendMatchTx(ixs, lookupTable, operatorWallet);
     return { signature: sig };
   }
+  /**
+   * 1 SELL taker vs N BUY makers.
+   * Rust program only supports BUY-as-taker, so we decompose into N instructions
+   * (BUY_i as taker, SELL as single maker) combined into one atomic transaction.
+   * Engine must use limitPrice for BUY.makerAmount to pass per-pair crossing check.
+   */
+  async matchComplementarySellVsMultiBuy(sellTaker, buyMakers, collateralMint, feeRecipient, operatorWallet, lookupTable, opts) {
+    await Promise.all([
+      this.registerOrderIfNeeded(sellTaker),
+      ...buyMakers.map((m) => this.registerOrderIfNeeded(m))
+    ]);
+    const sell = sellTaker.order;
+    const crossingBuys = buyMakers.filter((b) => {
+      const buy = b.order;
+      const lhs = BigInt(buy.makerAmount.toString()) * BigInt(sell.makerAmount.toString());
+      const rhs = BigInt(buy.takerAmount.toString()) * BigInt(sell.takerAmount.toString());
+      return lhs >= rhs;
+    });
+    if (crossingBuys.length === 0) {
+      throw new InvalidParamError("COMPLEMENTARY: no BUY maker orders cross with the SELL taker");
+    }
+    if (crossingBuys.length < buyMakers.length) {
+      console.warn(`[matchOrders] SELL+BUY: filtered ${buyMakers.length - crossingBuys.length} non-crossing BUY(s)`);
+    }
+    const allIxs = [];
+    for (const buyMaker of crossingBuys) {
+      const ixs = await this.buildMatchComplementaryIxs(
+        buyMaker,
+        // BUY as taker
+        [sellTaker],
+        // SELL as maker
+        collateralMint,
+        feeRecipient,
+        operatorWallet.publicKey,
+        opts
+      );
+      allIxs.push(...ixs);
+    }
+    const sig = await this.sendMatchTx(allIxs, lookupTable, operatorWallet);
+    return { signature: sig };
+  }
   /**
    * MINT: 1 YES buyer (taker) + N NO buyers (makers).
    * Phase 1: register taker + all NO makers in parallel.
@@ -1701,6 +1797,7 @@ ${logs.join("\n")}`);
     const taker = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
     const fillAmount = new anchor5.BN("18446744073709551615");
+    const clobConfig = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
     const [mintAuthority] = PDA.mintAuthority(condition, this.programIds);
@@ -1711,6 +1808,15 @@ ${logs.join("\n")}`);
     const takerYesToken = getAssociatedTokenAddressSync(yesMint, taker, false, TOKEN_2022_PROGRAM_ID);
     const [takerYesPosition] = PDA.position(condition, 1, taker, this.programIds);
     const [takerOrderStatus] = PDA.orderStatus(taker, takerNonce, this.programIds);
+    const clobUsdcAta = getAssociatedTokenAddressSync(collateralMint, clobConfig, true);
+    const clobYesAta = getAssociatedTokenAddressSync(yesMint, clobConfig, true, TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = getAssociatedTokenAddressSync(noMint, clobConfig, true, TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfig, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfig, this.programIds);
+    const [extraMetaYes] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [extraMetaNo] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const hookProgram = this.programIds.hook;
     const remainingAccounts = [];
     for (const nm of noMakers) {
       const noMaker = nm.order.maker;
@@ -1720,6 +1826,7 @@ ${logs.join("\n")}`);
       const [noPosition] = PDA.position(condition, 0, noMaker, this.programIds);
       const [noStatus] = PDA.orderStatus(noMaker, nm.order.nonce, this.programIds);
       remainingAccounts.push(
+        { pubkey: noMaker, isSigner: false, isWritable: false },
         { pubkey: noRecord, isSigner: false, isWritable: false },
         { pubkey: noToken, isSigner: false, isWritable: true },
         { pubkey: noCollateral, isSigner: false, isWritable: true },
@@ -1727,10 +1834,16 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    remainingAccounts.push(
+      { pubkey: extraMetaYes, isSigner: false, isWritable: false },
+      { pubkey: extraMetaNo, isSigner: false, isWritable: false },
+      { pubkey: hookConfig, isSigner: false, isWritable: false },
+      { pubkey: hookProgram, isSigner: false, isWritable: false }
+    );
     const matchIx = await this.program.methods.matchMintOrders(takerNonce, fillAmount).accounts({
       operator: operatorWallet.publicKey,
       payer: this.walletPubkey,
-      clobConfig: this.configPda(),
+      clobConfig,
       condition,
       taker,
       takerOrderRecord,
@@ -1738,16 +1851,25 @@ ${logs.join("\n")}`);
       takerYesToken,
       takerYesPosition,
       takerOrderStatus,
+      clobUsdcAta,
+      clobYesAta,
+      clobNoAta,
+      clobYesPosition: clobYesPos,
+      clobNoPosition: clobNoPos,
       collateralVault,
       vaultTokenAccount,
+      collateralMint,
       yesMint,
       noMint,
       mintAuthority,
-      clobAuthority: this.configPda(),
+      clobAuthority: clobConfig,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: TOKEN_PROGRAM_ID,
+      token2022Program: TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId
     }).remainingAccounts(remainingAccounts).instruction();
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
   }
@@ -1769,9 +1891,9 @@ ${logs.join("\n")}`);
     const sellerYes = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
     const fillAmount = new anchor5.BN("18446744073709551615");
+    const clobConfig = this.configPda();
     const [yesMint] = PDA.yesMint(condition, this.programIds);
     const [noMint] = PDA.noMint(condition, this.programIds);
-    const [mintAuthority] = PDA.mintAuthority(condition, this.programIds);
     const [collateralVault] = PDA.collateralVault(collateralMint, this.programIds);
     const [vaultTokenAccount] = PDA.vaultToken(collateralMint, this.programIds);
     const [takerOrderRecord] = PDA.orderRecord(sellerYes, takerNonce, this.programIds);
@@ -1779,6 +1901,15 @@ ${logs.join("\n")}`);
     const [takerYesPosition] = PDA.position(condition, 1, sellerYes, this.programIds);
     const takerCollateral = getAssociatedTokenAddressSync(collateralMint, sellerYes);
     const [takerOrderStatus] = PDA.orderStatus(sellerYes, takerNonce, this.programIds);
+    const clobUsdcAta = getAssociatedTokenAddressSync(collateralMint, clobConfig, true);
+    const clobYesAta = getAssociatedTokenAddressSync(yesMint, clobConfig, true, TOKEN_2022_PROGRAM_ID);
+    const clobNoAta = getAssociatedTokenAddressSync(noMint, clobConfig, true, TOKEN_2022_PROGRAM_ID);
+    const [clobYesPos] = PDA.position(condition, 1, clobConfig, this.programIds);
+    const [clobNoPos] = PDA.position(condition, 0, clobConfig, this.programIds);
+    const [extraMetaYes] = PDA.extraAccountMetaList(yesMint, this.programIds);
+    const [extraMetaNo] = PDA.extraAccountMetaList(noMint, this.programIds);
+    const [hookConfig] = PDA.hookConfig(this.programIds);
+    const hookProgram = this.programIds.hook;
     const remainingAccounts = [];
     for (const nm of noMakers) {
       const noMaker = nm.order.maker;
@@ -1788,6 +1919,7 @@ ${logs.join("\n")}`);
       const [noPosition] = PDA.position(condition, 0, noMaker, this.programIds);
       const [noStatus] = PDA.orderStatus(noMaker, nm.order.nonce, this.programIds);
       remainingAccounts.push(
+        { pubkey: noMaker, isSigner: false, isWritable: false },
         { pubkey: noRecord, isSigner: false, isWritable: false },
         { pubkey: noToken, isSigner: false, isWritable: true },
         { pubkey: noCollateral, isSigner: false, isWritable: true },
@@ -1795,6 +1927,12 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    remainingAccounts.push(
+      { pubkey: extraMetaYes, isSigner: false, isWritable: false },
+      { pubkey: extraMetaNo, isSigner: false, isWritable: false },
+      { pubkey: hookConfig, isSigner: false, isWritable: false },
+      { pubkey: hookProgram, isSigner: false, isWritable: false }
+    );
     if (yesSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
       const companyAddr = await this.companyAddress();
       if (companyAddr) {
@@ -1811,7 +1949,7 @@ ${logs.join("\n")}`);
     const matchIx = await this.program.methods.matchMergeOrders(takerNonce, fillAmount).accounts({
       operator: operatorWallet.publicKey,
       payer: this.walletPubkey,
-      clobConfig: this.configPda(),
+      clobConfig,
       condition,
       taker: sellerYes,
       takerOrderRecord,
@@ -1819,17 +1957,24 @@ ${logs.join("\n")}`);
       takerYesPosition,
       takerCollateral,
       takerOrderStatus,
+      clobUsdcAta,
+      clobYesAta,
+      clobNoAta,
+      clobYesPosition: clobYesPos,
+      clobNoPosition: clobNoPos,
       collateralVault,
       vaultTokenAccount,
+      collateralMint,
       yesMint,
       noMint,
-      mintAuthority,
-      feeRecipient,
-      clobAuthority: this.configPda(),
+      clobAuthority: clobConfig,
       conditionalTokensProgram: this.programIds.conditionalTokens,
       collateralTokenProgram: TOKEN_PROGRAM_ID,
+      token2022Program: TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: SystemProgram.programId
     }).remainingAccounts(remainingAccounts).instruction();
+    await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };
   }
@@ -1870,38 +2015,22 @@ ${logs.join("\n")}`);
         buySignedOrder = taker;
         sellCandidates = makers;
       } else if (t.side === SIDE_SELL && makers.every((m) => m.order.side === SIDE_BUY)) {
-        buySignedOrder = makers[0];
-        sellCandidates = [taker, ...makers.slice(1)];
+        return this.matchComplementarySellVsMultiBuy(taker, makers, collateralMint, feeRecipient, operatorWallet, alt, opts);
       } else {
         throw new InvalidParamError("COMPLEMENTARY requires one BUY and one or more SELLs on same tokenId");
       }
-      const budget = BigInt(buySignedOrder.order.makerAmount.toString());
-      const totalAsk = sellCandidates.reduce(
-        (s, m) => s + BigInt(m.order.takerAmount.toString()),
-        BigInt(0)
-      );
-      let finalSells;
-      if (budget >= totalAsk) {
-        finalSells = sellCandidates;
-      } else {
-        const sorted = [...sellCandidates].sort((a, b) => {
-          const pa = BigInt(a.order.takerAmount.toString()) * BigInt(b.order.makerAmount.toString());
-          const pb = BigInt(b.order.takerAmount.toString()) * BigInt(a.order.makerAmount.toString());
-          return pa < pb ? -1 : pa > pb ? 1 : 0;
-        });
-        finalSells = [];
-        let remaining = budget;
-        for (const s of sorted) {
-          const cost = BigInt(s.order.takerAmount.toString());
-          if (remaining >= cost) {
-            finalSells.push(s);
-            remaining -= cost;
-          }
-        }
-        if (finalSells.length === 0) {
-          throw new InvalidParamError("COMPLEMENTARY: taker budget insufficient for any maker");
-        }
-        console.warn(`[matchOrders] budget ${budget} < totalAsk ${totalAsk}: matched ${finalSells.length}/${sellCandidates.length} makers`);
+      const buy = buySignedOrder.order;
+      const finalSells = sellCandidates.filter((s) => {
+        const sell = s.order;
+        const lhs = BigInt(buy.makerAmount.toString()) * BigInt(sell.makerAmount.toString());
+        const rhs = BigInt(buy.takerAmount.toString()) * BigInt(sell.takerAmount.toString());
+        return lhs >= rhs;
+      });
+      if (finalSells.length === 0) {
+        throw new InvalidParamError("COMPLEMENTARY: no maker orders cross with the buy order");
+      }
+      if (finalSells.length < sellCandidates.length) {
+        console.warn(`[matchOrders] filtered ${sellCandidates.length - finalSells.length} non-crossing maker(s)`);
       }
       return this.matchComplementary(buySignedOrder, finalSells, collateralMint, feeRecipient, operatorWallet, alt, opts);
     }
@@ -8604,7 +8733,8 @@ var clob_exchange_default = {
           }
         },
         {
-          name: "condition"
+          name: "condition",
+          writable: true
         },
         {
           name: "taker"
@@ -8680,27 +8810,98 @@ var clob_exchange_default = {
           }
         },
         {
-          name: "collateral_vault",
+          name: "clob_usdc_ata",
+          docs: [
+            "USDC ATA owned by clob_config \u2014 receives USDC from vault after merge"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "account",
+                path: "clob_config"
+              },
+              {
+                kind: "account",
+                path: "collateral_token_program"
+              },
+              {
+                kind: "account",
+                path: "collateral_mint"
+              }
+            ],
+            program: {
+              kind: "const",
+              value: [
+                140,
+                151,
+                37,
+                143,
+                78,
+                36,
+                137,
+                241,
+                187,
+                61,
+                16,
+                41,
+                20,
+                142,
+                13,
+                131,
+                11,
+                90,
+                19,
+                153,
+                218,
+                255,
+                16,
+                132,
+                4,
+                142,
+                123,
+                216,
+                219,
+                233,
+                248,
+                89
+              ]
+            }
+          }
+        },
+        {
+          name: "clob_yes_ata",
           writable: true
         },
         {
-          name: "vault_token_account",
+          name: "clob_no_ata",
           writable: true
         },
         {
-          name: "yes_mint",
+          name: "clob_yes_position",
           writable: true
         },
         {
-          name: "no_mint",
+          name: "clob_no_position",
           writable: true
         },
         {
-          name: "mint_authority",
+          name: "collateral_vault",
           writable: true
         },
         {
-          name: "fee_recipient",
+          name: "vault_token_account",
+          writable: true
+        },
+        {
+          name: "collateral_mint"
+        },
+        {
+          name: "yes_mint",
+          writable: true
+        },
+        {
+          name: "no_mint",
           writable: true
         },
         {
@@ -8734,6 +8935,14 @@ var clob_exchange_default = {
           name: "collateral_token_program",
           address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
         },
+        {
+          name: "token_2022_program",
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
+        {
+          name: "associated_token_program",
+          address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -8799,7 +9008,8 @@ var clob_exchange_default = {
           }
         },
         {
-          name: "condition"
+          name: "condition",
+          writable: true
         },
         {
           name: "taker"
@@ -8874,6 +9084,94 @@ var clob_exchange_default = {
             ]
           }
         },
+        {
+          name: "clob_usdc_ata",
+          docs: [
+            "USDC ATA owned by clob_config \u2014 receives combined USDC, then split_position pulls from here"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "account",
+                path: "clob_config"
+              },
+              {
+                kind: "account",
+                path: "collateral_token_program"
+              },
+              {
+                kind: "account",
+                path: "collateral_mint"
+              }
+            ],
+            program: {
+              kind: "const",
+              value: [
+                140,
+                151,
+                37,
+                143,
+                78,
+                36,
+                137,
+                241,
+                187,
+                61,
+                16,
+                41,
+                20,
+                142,
+                13,
+                131,
+                11,
+                90,
+                19,
+                153,
+                218,
+                255,
+                16,
+                132,
+                4,
+                142,
+                123,
+                216,
+                219,
+                233,
+                248,
+                89
+              ]
+            }
+          }
+        },
+        {
+          name: "clob_yes_ata",
+          docs: [
+            "YES Token-2022 ATA owned by clob_config \u2014 receives YES from split, then transferred to taker"
+          ],
+          writable: true
+        },
+        {
+          name: "clob_no_ata",
+          docs: [
+            "NO Token-2022 ATA owned by clob_config \u2014 receives NO from split, then transferred to makers"
+          ],
+          writable: true
+        },
+        {
+          name: "clob_yes_position",
+          docs: [
+            "YES Position PDA for clob_config (set by CTF split_position init_if_needed)"
+          ],
+          writable: true
+        },
+        {
+          name: "clob_no_position",
+          docs: [
+            "NO Position PDA for clob_config (set by CTF split_position init_if_needed)"
+          ],
+          writable: true
+        },
         {
           name: "collateral_vault",
           writable: true
@@ -8882,6 +9180,9 @@ var clob_exchange_default = {
           name: "vault_token_account",
           writable: true
         },
+        {
+          name: "collateral_mint"
+        },
         {
           name: "yes_mint",
           writable: true
@@ -8925,6 +9226,14 @@ var clob_exchange_default = {
           name: "collateral_token_program",
           address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
         },
+        {
+          name: "token_2022_program",
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
+        {
+          name: "associated_token_program",
+          address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"