@theliem/xmarket-sdk 4.1.2 → 4.2.0

package/dist/index.js

@@ -2134,7 +2134,7 @@ ${logs.join("\n")}`);
    * remaining_accounts per NO maker (6):
    *   [maker, order_record, buyer_no_token, buyer_no_collateral, buyer_no_position, no_order_status]
    */
-  async _buildMintIx(yesSigned, noMakers, collateralMint, operator, payer) {
+  async _buildMintIx(yesSigned, noMakers, collateralMint, operator, payer, feeRecipient, opts) {
     const condition = yesSigned.order.condition;
     const taker = yesSigned.order.maker;
     const takerNonce = yesSigned.order.nonce;
@@ -2172,6 +2172,26 @@ ${logs.join("\n")}`);
         { pubkey: noStatus, isSigner: false, isWritable: true }
       );
     }
+    if (yesSigned.order.fee.gtn(0) && this.programIds.feeManagement && this.feeConfigOwner) {
+      const companyAddr = await this.companyAddress();
+      const refVault = await this.referralVault();
+      if (companyAddr && refVault) {
+        const feeOverridePda = PDA.marketFeeOverride(condition, this.programIds)[0];
+        const feeOverrideExists = await this.provider.connection.getAccountInfo(feeOverridePda);
+        if (feeOverrideExists) {
+          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 }
+          );
+        }
+      }
+    }
+    const resolvedFeeRecipient = feeRecipient ?? clobUsdcAta;
     return this.program.methods.matchMintOrders(takerNonce, fillAmount, true).accounts({
       operator,
       payer,
@@ -2183,6 +2203,7 @@ ${logs.join("\n")}`);
       takerYesToken,
       takerYesPosition,
       takerOrderStatus,
+      feeRecipient: resolvedFeeRecipient,
       clobUsdcAta,
       clobYesAta,
       clobNoAta,
@@ -2212,7 +2233,7 @@ ${logs.join("\n")}`);
     const [noMint] = PDA.noMint(condition, this.programIds);
     const clobYesAta = splToken.getAssociatedTokenAddressSync(yesMint, clobConfig, true, splToken.TOKEN_PROGRAM_ID);
     const clobNoAta = splToken.getAssociatedTokenAddressSync(noMint, clobConfig, true, splToken.TOKEN_PROGRAM_ID);
-    const matchIx = await this._buildMintIx(yesSigned, noMakers, collateralMint, operatorWallet.publicKey, this.walletPubkey);
+    const matchIx = await this._buildMintIx(yesSigned, noMakers, collateralMint, operatorWallet.publicKey, this.walletPubkey, _feeRecipient);
     await this._ensureClobOutcomeAtas(yesMint, noMint, clobConfig, clobYesAta, clobNoAta);
     const sig = await this.sendMatchTx([matchIx], lookupTable, operatorWallet);
     return { signature: sig };