@optimex-xyz/market-maker-sdk 0.4.8 → 0.4.10

package/README.md

@@ -127,13 +127,12 @@ Provides an indicative quote for the given token pair and trade amount. The quot
 - **Query Parameters**:
   - `from_token_id` (string): The ID of the source token.
   - `to_token_id` (string): The ID of the destination token.
-  - `amount` (string): The amount of the source token to be traded, represented as a string in base 10 to accommodate large numbers.
-  - `session_id` (string, optional): A unique identifier for the session.
+  - `amount` (string): The amount of the source token to be traded, represented as a string in base 10 to accommodate large numbers. This should be treated as a BigInt in your implementation.
 
 #### Example Request
 
 ```
-GET /indicative-quote?from_token_id=ETH&to_token_id=BTC&amount=1000000000000000000&session_id=12345
+GET /indicative-quote?from_token_id=ETH&to_token_id=BTC&amount=1000000000000000000
 ```
 
 #### Expected Response
@@ -152,7 +151,7 @@ GET /indicative-quote?from_token_id=ETH&to_token_id=BTC&amount=10000000000000000
 
 - `session_id` (string): The session ID associated with the request.
 - `pmm_receiving_address` (string): The receiving address where the user will send the `from_token`.
-- `indicative_quote` (string): The indicative quote value, represented as a string.
+- `indicative_quote` (string): The indicative quote value, represented as a string. Should be treated as a BigInt in your implementation.
 - `error` (string): Error message, if any (empty if no error).
 
 #### Example Implementation
@@ -183,7 +182,9 @@ async function getIndicativeQuote(req, res) {
     }
 
     // Calculate the quote (implementation specific to your PMM)
-    const quote = calculateQuote(fromToken, toToken, amount);
+    // Note: Treat amount as BigInt
+    const amountBigInt = BigInt(amount);
+    const quote = calculateQuote(fromToken, toToken, amountBigInt);
 
     // Get the receiving address for this token pair
     const pmmReceivingAddress = getPMMReceivingAddress(fromToken.network_id);
@@ -191,7 +192,7 @@ async function getIndicativeQuote(req, res) {
     return res.status(200).json({
       session_id: sessionId,
       pmm_receiving_address: pmmReceivingAddress,
-      indicative_quote: quote,
+      indicative_quote: quote.toString(),
       error: ''
     });
   } catch (error) {
@@ -216,21 +217,21 @@ Provides a commitment quote for a specific trade, representing a firm commitment
 - **HTTP Method**: `GET`
 - **Query Parameters**:
   - `session_id` (string): A unique identifier for the session.
-  - `trade_id` (string): The unique identifier for the trade.
+  - `trade_id` (string): The unique identifier for the trade. Example format: `0x3bfe2fc4889a98a39b31b348e7b212ea3f2bea63fd1ea2e0c8ba326433677328`.
   - `from_token_id` (string): The ID of the source token.
   - `to_token_id` (string): The ID of the destination token.
-  - `amount` (string): The amount of the source token to be traded, in base 10.
+  - `amount` (string): The amount of the source token to be traded, in base 10. This should be treated as a BigInt in your implementation.
   - `from_user_address` (string): The address of the user initiating the trade.
   - `to_user_address` (string): The address where the user will receive the `to_token`.
   - `user_deposit_tx` (string): The transaction hash where the user deposited their funds.
   - `user_deposit_vault` (string): The vault where the user's deposit is kept.
-  - `trade_deadline` (string): The UNIX timestamp (in seconds) by which the user expects to receive payment.
-  - `script_deadline` (string): The UNIX timestamp (in seconds) after which the user can withdraw their deposit if not paid.
+  - `trade_deadline` (string): The UNIX timestamp (in seconds) by which the user expects to receive payment. Should be treated as a BigInt in your implementation.
+  - `script_deadline` (string): The UNIX timestamp (in seconds) after which the user can withdraw their deposit if not paid. Should be treated as a BigInt in your implementation.
 
 #### Example Request
 
 ```
-GET /commitment-quote?session_id=12345&trade_id=abcd1234&from_token_id=ETH&to_token_id=BTC&amount=1000000000000000000&from_user_address=0xUserAddress&to_user_address=0xReceivingAddress&user_deposit_tx=0xDepositTxHash&user_deposit_vault=VaultData&trade_deadline=1696012800&script_deadline=1696016400
+GET /commitment-quote?session_id=12345&trade_id=0x3bfe2fc4889a98a39b31b348e7b212ea3f2bea63fd1ea2e0c8ba326433677328&from_token_id=ETH&to_token_id=BTC&amount=1000000000000000000&from_user_address=0xUserAddress&to_user_address=0xReceivingAddress&user_deposit_tx=0xDepositTxHash&user_deposit_vault=VaultData&trade_deadline=1696012800&script_deadline=1696016400
 ```
 
 #### Expected Response
@@ -240,14 +241,14 @@ GET /commitment-quote?session_id=12345&trade_id=abcd1234&from_token_id=ETH&to_to
 
 ```json
 {
-  "trade_id": "abcd1234",
+  "trade_id": "0x3bfe2fc4889a98a39b31b348e7b212ea3f2bea63fd1ea2e0c8ba326433677328",
   "commitment_quote": "987654321000000000",
   "error": "" // Empty if no error
 }
 ```
 
 - `trade_id` (string): The trade ID associated with the request.
-- `commitment_quote` (string): The committed quote value, represented as a string.
+- `commitment_quote` (string): The committed quote value, represented as a string. Should be treated as a BigInt in your implementation.
 - `error` (string): Error message, if any (empty if no error).
 
 #### Example Implementation
@@ -296,7 +297,9 @@ async function getCommitmentQuote(req, res) {
     }
 
     // Calculate the final quote (implementation specific to your PMM)
-    const quote = calculateFinalQuote(fromToken, toToken, amount, trade_deadline);
+    // Note: Treat numeric values as BigInt
+    const amountBigInt = BigInt(amount);
+    const quote = calculateFinalQuote(fromToken, toToken, amountBigInt, trade_deadline);
 
     // Store the trade in the database
     await tradeRepository.create({
@@ -304,19 +307,19 @@ async function getCommitmentQuote(req, res) {
       sessionId: session_id,
       fromTokenId: from_token_id,
       toTokenId: to_token_id,
-      amount,
+      amount: amountBigInt.toString(),
       fromUserAddress: from_user_address,
       toUserAddress: to_user_address,
       userDepositTx: user_deposit_tx,
       userDepositVault: user_deposit_vault,
       tradeDeadline: trade_deadline,
       scriptDeadline: script_deadline,
-      commitmentQuote: quote
+      commitmentQuote: quote.toString()
     });
 
     return res.status(200).json({
       trade_id,
-      commitment_quote: quote,
+      commitment_quote: quote.toString(),
       error: ''
     });
   } catch (error) {
@@ -339,15 +342,16 @@ Returns a signature from the PMM to confirm the settlement quote, required to fi
 
 - **HTTP Method**: `GET`
 - **Query Parameters**:
-  - `trade_id` (string): The unique identifier for the trade.
-  - `committed_quote` (string): The committed quote value in base 10.
+  - `trade_id` (string): The unique identifier for the trade. Example format: `0x3d09b8eb94466bffa126aeda68c8c0f330633a7d0058f57269d795530415498a`.
+  - `committed_quote` (string): The committed quote value in base 10. This should be treated as a BigInt in your implementation.
   - `trade_deadline` (string): The UNIX timestamp (in seconds) by which the user expects to receive payment.
   - `script_deadline` (string): The UNIX timestamp (in seconds) after which the user can withdraw their deposit if not paid.
 
+
 #### Example Request
 
 ```
-GET /settlement-signature?trade_id=abcd1234&committed_quote=987654321000000000&trade_deadline=1696012800&script_deadline=1696016400
+GET /settlement-signature?trade_id=0x3d09b8eb94466bffa126aeda68c8c0f330633a7d0058f57269d795530415498a&committed_quote=987654321000000000&trade_deadline=1696012800&script_deadline=1696016400
 ```
 
 #### Expected Response
@@ -357,7 +361,7 @@ GET /settlement-signature?trade_id=abcd1234&committed_quote=987654321000000000&t
 
 ```json
 {
-  "trade_id": "abcd1234",
+  "trade_id": "0x3d09b8eb94466bffa126aeda68c8c0f330633a7d0058f57269d795530415498a",
   "signature": "0xSignatureData",
   "deadline": 1696012800,
   "error": "" // Empty if no error
@@ -401,12 +405,14 @@ async function getSettlementSignature(req, res) {
     const { from_token, to_token } = tradeDetails.data;
 
     // Create a commitment info hash
+    // Note: Treat numeric values as BigInt
+    const committedQuoteBigInt = BigInt(committed_quote);
     const commitInfoHash = createCommitInfoHash(
       pmmId,
       trade.pmmReceivingAddress,
       to_token.chain,
       to_token.address,
-      committed_quote,
+      committedQuoteBigInt,
       deadline
     );
 
@@ -441,7 +447,7 @@ Used by the solver to acknowledge to the PMM about a successful settlement, indi
 
 - **HTTP Method**: `POST`
 - **Form Parameters**:
-  - `trade_id` (string): The unique identifier for the trade.
+  - `trade_id` (string): The unique identifier for the trade. Example format: `0x024be4dae899989e0c3d9b4459e5811613bcd04016dc56529f16a19d2a7724c0`.
   - `trade_deadline` (string): The UNIX timestamp (in seconds) by which the user expects to receive payment.
   - `script_deadline` (string): The UNIX timestamp (in seconds) after which the user can withdraw their deposit if not paid.
   - `chosen` (string): `"true"` if the PMM is selected, `"false"` otherwise.
@@ -452,7 +458,7 @@ Used by the solver to acknowledge to the PMM about a successful settlement, indi
 POST /ack-settlement
 Content-Type: application/x-www-form-urlencoded
 
-trade_id=abcd1234&trade_deadline=1696012800&script_deadline=1696016400&chosen=true
+trade_id=0x024be4dae899989e0c3d9b4459e5811613bcd04016dc56529f16a19d2a7724c0&trade_deadline=1696012800&script_deadline=1696016400&chosen=true
 ```
 
 #### Expected Response
@@ -462,7 +468,7 @@ trade_id=abcd1234&trade_deadline=1696012800&script_deadline=1696016400&chosen=tr
 
 ```json
 {
-  "trade_id": "abcd1234",
+  "trade_id": "0x024be4dae899989e0c3d9b4459e5811613bcd04016dc56529f16a19d2a7724c0",
   "status": "acknowledged",
   "error": "" // Empty if no error
 }
@@ -521,10 +527,10 @@ Used by the solver to signal the chosen PMM to start submitting their payment.
 
 - **HTTP Method**: `POST`
 - **Form Parameters**:
-  - `trade_id` (string): The unique identifier for the trade.
-  - `total_fee_amount` (string): The amount of total fee the PMM has to submit, in base 10.
+  - `trade_id` (string): The unique identifier for the trade. Example format: `0x3bfe2fc4889a98a39b31b348e7b212ea3f2bea63fd1ea2e0c8ba326433677328`.
   - `trade_deadline` (string): The UNIX timestamp (in seconds) by which the user expects to receive payment.
   - `script_deadline` (string): The UNIX timestamp (in seconds) after which the user can withdraw their deposit if not paid.
+  - `total_fee_amount` (string): The amount of total fee the PMM has to submit, in base 10. This should be treated as a BigInt in your implementation.
 
 #### Example Request
 
@@ -532,7 +538,7 @@ Used by the solver to signal the chosen PMM to start submitting their payment.
 POST /signal-payment
 Content-Type: application/x-www-form-urlencoded
 
-trade_id=abcd1234&total_fee_amount=1000000000000000&trade_deadline=1696012800&script_deadline=1696016400
+trade_id=0x3bfe2fc4889a98a39b31b348e7b212ea3f2bea63fd1ea2e0c8ba326433677328&total_fee_amount=1000000000000000&trade_deadline=1696012800&script_deadline=1696016400
 ```
 
 #### Expected Response
@@ -542,7 +548,7 @@ trade_id=abcd1234&total_fee_amount=1000000000000000&trade_deadline=1696012800&sc
 
 ```json
 {
-  "trade_id": "abcd1234",
+  "trade_id": "0x3bfe2fc4889a98a39b31b348e7b212ea3f2bea63fd1ea2e0c8ba326433677328",
   "status": "acknowledged",
   "error": "" // Empty if no error
 }
@@ -721,7 +727,7 @@ Allows the PMM to submit the settlement transaction hash for one or more trades.
 
 - `trade_ids` (array of strings): An array of trade IDs associated with the settlement transaction.
 - `pmm_id` (string): The PMM's ID, which must match the one committed for the trade(s).
-- `settlement_tx` (string): The raw transaction data representing the settlement.
+- `settlement_tx` (string): The txHash of the settlement.
 - `signature` (string): The PMM's signature on the settlement transaction.
 - `start_index` (integer): The index indicating the starting point for settlement processing (used for batch settlements).
 - `signed_at` (integer): The UNIX timestamp (in seconds) when the PMM signed the settlement transaction.
@@ -849,3 +855,123 @@ In case the target chain is Bitcoin, the transaction should have at least N + 1
 Example implementation:
 
 ```js
+import * as bitcoin from 'bitcoinjs-lib'
+import { ECPairFactory } from 'ecpair'
+import * as ecc from 'tiny-secp256k1'
+import axios from 'axios'
+import { getTradeIdsHash } from '@optimex-xyz/market-maker-sdk'
+
+async function makeBitcoinPayment(params) {
+  const { toAddress, amount, token, tradeId } = params
+  const ECPair = ECPairFactory(ecc)
+
+  // Set up Bitcoin library
+  bitcoin.initEccLib(ecc)
+
+  // Get network configuration
+  const network = getNetwork(token.networkId)
+  const rpcUrl = getRpcUrl(token.networkId)
+
+  // Create keypair from private key
+  const keyPair = ECPair.fromWIF(process.env.PMM_BTC_PRIVATE_KEY, network)
+  const payment = bitcoin.payments.p2tr({
+    internalPubkey: Buffer.from(keyPair.publicKey.slice(1, 33)),
+    network,
+  })
+
+  if (!payment.address) {
+    throw new Error('Could not generate address')
+  }
+
+  // Get UTXOs for the address
+  const utxos = await getUTXOs(payment.address, rpcUrl)
+  if (utxos.length === 0) {
+    throw new Error(`No UTXOs found in ${token.networkSymbol} wallet`)
+  }
+
+  // Create and sign transaction
+  const psbt = new bitcoin.Psbt({ network })
+  let totalInput = 0n
+
+  // Add inputs
+  for (const utxo of utxos) {
+    if (!payment.output) {
+      throw new Error('Could not generate output script')
+    }
+
+    const internalKey = Buffer.from(keyPair.publicKey.slice(1, 33))
+
+    psbt.addInput({
+      hash: utxo.txid,
+      index: utxo.vout,
+      witnessUtxo: {
+        script: payment.output,
+        value: BigInt(utxo.value),
+      },
+      tapInternalKey: internalKey,
+    })
+
+    totalInput += BigInt(utxo.value)
+  }
+
+  // Check if we have enough balance
+  if (totalInput < amount) {
+    throw new Error(
+      `Insufficient balance. Need ${amount} satoshis, but only have ${totalInput} satoshis`
+    )
+  }
+
+  // Get fee rate
+  const feeRate = await getFeeRate(rpcUrl)
+  const fee = BigInt(Math.ceil(200 * feeRate))
+  const changeAmount = totalInput - amount - fee
+
+  // Add recipient output
+  psbt.addOutput({
+    address: toAddress,
+    value: amount,
+  })
+
+  // Add change output if needed
+  if (changeAmount > 546n) {
+    psbt.addOutput({
+      address: payment.address,
+      value: changeAmount,
+    })
+  }
+
+  // Add OP_RETURN output with trade ID hash
+  const tradeIdsHash = getTradeIdsHash([tradeId])
+  psbt.addOutput({
+    script: bitcoin.script.compile([
+      bitcoin.opcodes.OP_RETURN,
+      Buffer.from(tradeIdsHash.slice(2), 'hex')
+    ]),
+    value: 0n,
+  })
+
+  // Sign inputs
+  const toXOnly = (pubKey) => (pubKey.length === 32 ? pubKey : pubKey.slice(1, 33))
+  const tweakedSigner = keyPair.tweak(bitcoin.crypto.taggedHash('TapTweak', toXOnly(keyPair.publicKey)))
+
+  for (let i = 0; i < psbt.data.inputs.length; i++) {
+    psbt.signInput(i, tweakedSigner, [bitcoin.Transaction.SIGHASH_DEFAULT])
+  }
+
+  psbt.finalizeAllInputs()
+
+  // Extract transaction
+  const tx = psbt.extractTransaction()
+  const rawTx = tx.toHex()
+
+  // Broadcast transaction
+  const response = await axios.post(`${rpcUrl}/api/tx`, rawTx, {
+    headers: {
+      'Content-Type': 'text/plain',
+    },
+  })
+
+  return response.data // Transaction ID
+}
+
+```

package/dist/index.d.mts

@@ -4666,11 +4666,24 @@ declare const SubmitSettlementRequestSchema: z.ZodObject<{
     startIndex: number;
 }>;
 declare const SubmitSettlementResponseSchema: z.ZodObject<{
-    message: z.ZodString;
+    data: z.ZodObject<{
+        message: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        message: string;
+    }, {
+        message: string;
+    }>;
+    traceId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    message: string;
+    data: {
+        message: string;
+    };
+    traceId: string;
 }, {
-    message: string;
+    data: {
+        message: string;
+    };
+    traceId: string;
 }>;
 declare const TradeDetailResponseSchema: z.ZodObject<{
     data: z.ZodObject<{
@@ -4719,7 +4732,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         amountAfterFees: z.ZodString;
         fromUserAddress: z.ZodString;
         userReceivingAddress: z.ZodString;
-        deadline: z.ZodNumber;
         protocolFeeInBps: z.ZodString;
         protocolMpcPubkey: z.ZodString;
         protocolMpcAddress: z.ZodString;
@@ -4745,7 +4757,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         pmmFailureStats: z.ZodRecord<z.ZodString, z.ZodNumber>;
         commitedSignature: z.ZodString;
         minAmountOut: z.ZodNull;
-        sessionDeadline: z.ZodNumber;
         userDepositTx: z.ZodString;
         depositVault: z.ZodString;
         paymentBundle: z.ZodObject<{
@@ -4777,12 +4788,20 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         state: z.ZodString;
         lastUpdateMsg: z.ZodString;
         version: z.ZodNumber;
+        scriptTimeout: z.ZodNumber;
+        affiliateFeeInBps: z.ZodString;
+        totalFee: z.ZodString;
+        protocolFee: z.ZodString;
+        affiliateFee: z.ZodString;
+        tradeTimeout: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -4820,7 +4839,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -4837,12 +4855,17 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     }, {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -4880,7 +4903,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -4897,15 +4919,20 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     }>;
     traceId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     data: {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -4943,7 +4970,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -4960,15 +4986,20 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     };
     traceId: string;
 }, {
     data: {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -5006,7 +5037,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -5023,6 +5053,9 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     };
     traceId: string;
 }>;

package/dist/index.d.ts

@@ -4666,11 +4666,24 @@ declare const SubmitSettlementRequestSchema: z.ZodObject<{
     startIndex: number;
 }>;
 declare const SubmitSettlementResponseSchema: z.ZodObject<{
-    message: z.ZodString;
+    data: z.ZodObject<{
+        message: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        message: string;
+    }, {
+        message: string;
+    }>;
+    traceId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    message: string;
+    data: {
+        message: string;
+    };
+    traceId: string;
 }, {
-    message: string;
+    data: {
+        message: string;
+    };
+    traceId: string;
 }>;
 declare const TradeDetailResponseSchema: z.ZodObject<{
     data: z.ZodObject<{
@@ -4719,7 +4732,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         amountAfterFees: z.ZodString;
         fromUserAddress: z.ZodString;
         userReceivingAddress: z.ZodString;
-        deadline: z.ZodNumber;
         protocolFeeInBps: z.ZodString;
         protocolMpcPubkey: z.ZodString;
         protocolMpcAddress: z.ZodString;
@@ -4745,7 +4757,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         pmmFailureStats: z.ZodRecord<z.ZodString, z.ZodNumber>;
         commitedSignature: z.ZodString;
         minAmountOut: z.ZodNull;
-        sessionDeadline: z.ZodNumber;
         userDepositTx: z.ZodString;
         depositVault: z.ZodString;
         paymentBundle: z.ZodObject<{
@@ -4777,12 +4788,20 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         state: z.ZodString;
         lastUpdateMsg: z.ZodString;
         version: z.ZodNumber;
+        scriptTimeout: z.ZodNumber;
+        affiliateFeeInBps: z.ZodString;
+        totalFee: z.ZodString;
+        protocolFee: z.ZodString;
+        affiliateFee: z.ZodString;
+        tradeTimeout: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -4820,7 +4839,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -4837,12 +4855,17 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     }, {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -4880,7 +4903,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -4897,15 +4919,20 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     }>;
     traceId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     data: {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -4943,7 +4970,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -4960,15 +4986,20 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     };
     traceId: string;
 }, {
     data: {
         version: number;
-        deadline: number;
         tradeId: string;
+        totalFee: string;
         minAmountOut: null;
+        tradeTimeout: number;
         sessionId: string;
+        scriptTimeout: number;
         solverAddress: string;
         fromToken: {
             address: string;
@@ -5006,7 +5037,6 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         commitmentRetries: number;
         pmmFailureStats: Record<string, number>;
         commitedSignature: string;
-        sessionDeadline: number;
         userDepositTx: string;
         depositVault: string;
         paymentBundle: {
@@ -5023,6 +5053,9 @@ declare const TradeDetailResponseSchema: z.ZodObject<{
         tradeMakePaymentTx: string;
         state: string;
         lastUpdateMsg: string;
+        affiliateFeeInBps: string;
+        protocolFee: string;
+        affiliateFee: string;
     };
     traceId: string;
 }>;

package/dist/index.js

@@ -3671,7 +3671,10 @@ var SubmitSettlementRequestSchema = import_zod.z.object({
   signedAt: import_zod.z.number()
 });
 var SubmitSettlementResponseSchema = import_zod.z.object({
-  message: import_zod.z.string()
+  data: import_zod.z.object({
+    message: import_zod.z.string()
+  }),
+  traceId: import_zod.z.string()
 });
 var TokenInfoSchema = import_zod.z.object({
   tokenId: import_zod.z.string(),
@@ -3703,7 +3706,6 @@ var TradeDetailResponseSchema = import_zod.z.object({
     amountAfterFees: import_zod.z.string(),
     fromUserAddress: import_zod.z.string(),
     userReceivingAddress: import_zod.z.string(),
-    deadline: import_zod.z.number(),
     protocolFeeInBps: import_zod.z.string(),
     protocolMpcPubkey: import_zod.z.string(),
     protocolMpcAddress: import_zod.z.string(),
@@ -3720,7 +3722,6 @@ var TradeDetailResponseSchema = import_zod.z.object({
     pmmFailureStats: import_zod.z.record(import_zod.z.number()),
     commitedSignature: import_zod.z.string(),
     minAmountOut: import_zod.z.null(),
-    sessionDeadline: import_zod.z.number(),
     userDepositTx: import_zod.z.string(),
     depositVault: import_zod.z.string(),
     paymentBundle: PaymentBundleSchema,
@@ -3730,7 +3731,13 @@ var TradeDetailResponseSchema = import_zod.z.object({
     tradeMakePaymentTx: import_zod.z.string(),
     state: import_zod.z.string(),
     lastUpdateMsg: import_zod.z.string(),
-    version: import_zod.z.number()
+    version: import_zod.z.number(),
+    scriptTimeout: import_zod.z.number(),
+    affiliateFeeInBps: import_zod.z.string(),
+    totalFee: import_zod.z.string(),
+    protocolFee: import_zod.z.string(),
+    affiliateFee: import_zod.z.string(),
+    tradeTimeout: import_zod.z.number()
   }),
   traceId: import_zod.z.string()
 });
@@ -3769,7 +3776,8 @@ var SolverService = class {
       return SubmitSettlementResponseSchema.parse(response.data);
     } catch (error) {
       if (import_axios.default.isAxiosError(error)) {
-        throw new Error(`Failed to submit settlement transaction: ${error.message}`);
+        const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message;
+        throw new Error(errorMessage);
       }
       if (error instanceof import_zod.z.ZodError) {
         throw new Error(`Invalid data: ${error.message}`);
@@ -3795,7 +3803,8 @@ var SolverService = class {
       return TradeDetailResponseSchema.parse(camelCaseData);
     } catch (error) {
       if (import_axios.default.isAxiosError(error)) {
-        throw new Error(`Failed to fetch trade details: ${error.message}`);
+        const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message;
+        throw new Error(errorMessage);
       }
       if (error instanceof import_zod.z.ZodError) {
         throw new Error(`Invalid data: ${error.message}`);
@@ -3862,7 +3871,8 @@ var TokenService = class {
       return validatedResponse.data.tokens;
     } catch (error) {
       if (import_axios2.default.isAxiosError(error)) {
-        throw new Error(`Failed to fetch tokens: ${error.message}`);
+        const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message;
+        throw new Error(errorMessage);
       }
       if (error instanceof import_zod3.z.ZodError) {
         throw new Error(`Invalid token data received: ${error.message}`);

package/dist/index.mjs

@@ -3606,7 +3606,10 @@ var SubmitSettlementRequestSchema = z.object({
   signedAt: z.number()
 });
 var SubmitSettlementResponseSchema = z.object({
-  message: z.string()
+  data: z.object({
+    message: z.string()
+  }),
+  traceId: z.string()
 });
 var TokenInfoSchema = z.object({
   tokenId: z.string(),
@@ -3638,7 +3641,6 @@ var TradeDetailResponseSchema = z.object({
     amountAfterFees: z.string(),
     fromUserAddress: z.string(),
     userReceivingAddress: z.string(),
-    deadline: z.number(),
     protocolFeeInBps: z.string(),
     protocolMpcPubkey: z.string(),
     protocolMpcAddress: z.string(),
@@ -3655,7 +3657,6 @@ var TradeDetailResponseSchema = z.object({
     pmmFailureStats: z.record(z.number()),
     commitedSignature: z.string(),
     minAmountOut: z.null(),
-    sessionDeadline: z.number(),
     userDepositTx: z.string(),
     depositVault: z.string(),
     paymentBundle: PaymentBundleSchema,
@@ -3665,7 +3666,13 @@ var TradeDetailResponseSchema = z.object({
     tradeMakePaymentTx: z.string(),
     state: z.string(),
     lastUpdateMsg: z.string(),
-    version: z.number()
+    version: z.number(),
+    scriptTimeout: z.number(),
+    affiliateFeeInBps: z.string(),
+    totalFee: z.string(),
+    protocolFee: z.string(),
+    affiliateFee: z.string(),
+    tradeTimeout: z.number()
   }),
   traceId: z.string()
 });
@@ -3704,7 +3711,8 @@ var SolverService = class {
       return SubmitSettlementResponseSchema.parse(response.data);
     } catch (error) {
       if (axios.isAxiosError(error)) {
-        throw new Error(`Failed to submit settlement transaction: ${error.message}`);
+        const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message;
+        throw new Error(errorMessage);
       }
       if (error instanceof z.ZodError) {
         throw new Error(`Invalid data: ${error.message}`);
@@ -3730,7 +3738,8 @@ var SolverService = class {
       return TradeDetailResponseSchema.parse(camelCaseData);
     } catch (error) {
       if (axios.isAxiosError(error)) {
-        throw new Error(`Failed to fetch trade details: ${error.message}`);
+        const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message;
+        throw new Error(errorMessage);
       }
       if (error instanceof z.ZodError) {
         throw new Error(`Invalid data: ${error.message}`);
@@ -3797,7 +3806,8 @@ var TokenService = class {
       return validatedResponse.data.tokens;
     } catch (error) {
       if (axios2.isAxiosError(error)) {
-        throw new Error(`Failed to fetch tokens: ${error.message}`);
+        const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message;
+        throw new Error(errorMessage);
       }
       if (error instanceof z3.ZodError) {
         throw new Error(`Invalid token data received: ${error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimex-xyz/market-maker-sdk",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "private": false,
   "publishConfig": {
     "access": "public"