@t2000/sdk 9.2.0 → 9.3.1

package/dist/index.cjs

@@ -1078,7 +1078,11 @@ async function executeTx(client, signer, buildTx, options = {}) {
     include: { effects: true }
   });
   const txn = result.$kind === "Transaction" ? result.Transaction : result.FailedTransaction;
-  await client.core.waitForTransaction({ digest: txn.digest });
+  try {
+    await client.core.waitForTransaction({ digest: txn.digest });
+  } catch (err) {
+    if (!txn.effects) throw err;
+  }
   const effects = txn.effects ?? void 0;
   const gasUsed = effects?.gasUsed;
   let gasCostSui = 0;
@@ -1091,6 +1095,15 @@ async function executeTx(client, signer, buildTx, options = {}) {
 
 // src/wallet/pay.ts
 init_errors();
+
+// src/mpp-cost.ts
+function parseChallengeAmount(challenge) {
+  const raw = challenge?.request?.amount;
+  const n = typeof raw === "string" ? Number(raw) : typeof raw === "number" ? raw : Number.NaN;
+  return Number.isFinite(n) ? n : void 0;
+}
+
+// src/wallet/pay.ts
 init_preflight();
 function preflightPay(input) {
   if (typeof input.url !== "string" || input.url.trim() === "") {
@@ -1115,11 +1128,18 @@ function preflightPay(input) {
   return exports.PREFLIGHT_OK;
 }
 async function payWithMpp(args) {
-  const { signer, client, options } = args;
+  const { signer, client } = args;
+  let options = args.options;
   const pf = preflightPay({ url: options.url, maxPrice: options.maxPrice });
   if (!pf.valid) throw new exports.T2000Error(pf.code, pf.error);
   const method = (options.method ?? "GET").toUpperCase();
   const canHaveBody = method !== "GET" && method !== "HEAD";
+  if (canHaveBody && typeof options.body === "string" && isJsonText(options.body) && !hasContentType(options.headers)) {
+    options = {
+      ...options,
+      headers: { ...options.headers ?? {}, "content-type": "application/json" }
+    };
+  }
   const reqInit = {
     method,
     headers: options.headers,
@@ -1130,13 +1150,35 @@ async function payWithMpp(args) {
     return finalize(probe, { paid: false });
   }
   const requirements = await pickSuiExactRequirements(probe, client.network);
-  if (!requirements) {
-    throw new exports.T2000Error(
-      "FACILITATOR_REJECTION",
-      `Endpoint returned 402 without an x402 'exact' / sui:${client.network} payment requirement. This SDK only speaks the x402 dialect.`
-    );
+  if (requirements) {
+    return payViaX402({ signer, client, options, reqInit, requirements });
+  }
+  const headerChallenge = await parseMppSuiChallenge(probe);
+  if (headerChallenge) {
+    return payViaMppHeader({ signer, client, options });
+  }
+  throw new exports.T2000Error(
+    "FACILITATOR_REJECTION",
+    `Endpoint returned 402 without an x402 'exact' / sui:${client.network} requirement in the body or an MPP 'sui' challenge in WWW-Authenticate. Nothing this SDK can pay.`
+  );
+}
+async function parseMppSuiChallenge(response) {
+  try {
+    const { Challenge } = await import('mppx');
+    const challenges = Challenge.fromResponseList(response);
+    const suiChallenge = challenges.find((c) => c.method === "sui" && c.intent === "charge");
+    if (!suiChallenge) return void 0;
+    const req = suiChallenge.request;
+    if (typeof req?.amount !== "string" || typeof req?.recipient !== "string") return void 0;
+    return {
+      amount: req.amount,
+      currency: typeof req.currency === "string" ? req.currency : "",
+      recipient: req.recipient,
+      description: suiChallenge.description
+    };
+  } catch {
+    return void 0;
   }
-  return payViaX402({ signer, client, options, reqInit, requirements });
 }
 async function pickSuiExactRequirements(response, network) {
   try {
@@ -1151,6 +1193,7 @@ async function payViaX402(args) {
   const { signer, client, options, reqInit, requirements } = args;
   const { buildX402SignedPayment, X402_PAYMENT_HEADER, X402_PAYMENT_RESPONSE_HEADER } = await import('@suimpp/mpp/x402');
   const amountRaw = BigInt(requirements.maxAmountRequired);
+  assertWithinMaxPrice(atomicToHuman(amountRaw, await assetDecimals(requirements.asset)), options.maxPrice);
   const migrationGasSui = await ensureAddressBalanceCovers({
     signer,
     client,
@@ -1186,6 +1229,70 @@ async function payViaX402(args) {
     receipt: digest ? { reference: digest, timestamp: (/* @__PURE__ */ new Date()).toISOString() } : result.receipt
   };
 }
+async function payViaMppHeader(args) {
+  const { signer, client, options } = args;
+  const { Mppx } = await import('mppx/client');
+  const { sui, USDC, USDC_TESTNET } = await import('@suimpp/mpp/client');
+  const signerAddress = signer.getAddress();
+  const network = client.network === "testnet" ? "testnet" : "mainnet";
+  const grpcClient = await makeGrpcBuildClient(client);
+  let paymentDigest;
+  let gasCostSui = 0;
+  let chargedAmount;
+  const mppx = Mppx.create({
+    polyfill: false,
+    onChallenge: async (challenge) => {
+      const parsed = parseChallengeAmount(challenge);
+      if (parsed !== void 0) {
+        chargedAmount = parsed;
+        assertWithinMaxPrice(parsed, options.maxPrice);
+      }
+      return void 0;
+    },
+    methods: [
+      sui({
+        client,
+        currency: network === "testnet" ? USDC_TESTNET : USDC,
+        signer: {
+          toSuiAddress: () => signerAddress,
+          signPersonalMessage: (bytes) => signer.signPersonalMessage(bytes)
+        },
+        execute: async (tx) => {
+          const result2 = await executeTx(client, signer, () => tx, { buildClient: grpcClient });
+          paymentDigest = result2.digest;
+          gasCostSui = result2.gasCostSui;
+          return { digest: result2.digest };
+        }
+      })
+    ]
+  });
+  const method = (options.method ?? "GET").toUpperCase();
+  const canHaveBody = method !== "GET" && method !== "HEAD";
+  const response = await mppx.fetch(options.url, {
+    method,
+    headers: options.headers,
+    body: canHaveBody ? options.body : void 0
+  });
+  const paid = !!paymentDigest;
+  const result = await finalize(response, { paid });
+  if (!paid) return { ...result, dialect: "legacy" };
+  return {
+    ...result,
+    dialect: "legacy",
+    cost: chargedAmount ?? options.maxPrice ?? void 0,
+    gasCostSui,
+    receipt: paymentDigest ? { reference: paymentDigest, timestamp: (/* @__PURE__ */ new Date()).toISOString() } : void 0
+  };
+}
+function assertWithinMaxPrice(price, maxPrice) {
+  if (maxPrice !== void 0 && price > maxPrice) {
+    throw new exports.T2000Error(
+      "PRICE_EXCEEDS_LIMIT",
+      `Service price $${price} exceeds maxPrice ceiling $${maxPrice}`,
+      { price, maxPrice }
+    );
+  }
+}
 async function ensureAddressBalanceCovers(args) {
   const { signer, client, asset, amountRaw } = args;
   const owner = signer.getAddress();
@@ -1219,6 +1326,18 @@ async function ensureAddressBalanceCovers(args) {
   const migration = await executeTx(client, signer, () => tx, { buildClient: grpcClient });
   return migration.gasCostSui;
 }
+function isJsonText(text) {
+  try {
+    JSON.parse(text);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function hasContentType(headers) {
+  if (!headers) return false;
+  return Object.keys(headers).some((k) => k.toLowerCase() === "content-type");
+}
 async function finalize(response, opts) {
   const contentType = response.headers.get("content-type") ?? "";
   let body2;
@@ -3503,6 +3622,7 @@ exports.mistToSui = mistToSui;
 exports.normalizeAddressInput = normalizeAddressInput;
 exports.normalizeAsset = normalizeAsset;
 exports.normalizeCoinType = normalizeCoinType;
+exports.parseMppSuiChallenge = parseMppSuiChallenge;
 exports.parseSuiRpcTx = parseSuiRpcTx;
 exports.payWithMpp = payWithMpp;
 exports.preflightFail = preflightFail;