@zeroxyz/sdk 0.12.0 → 0.14.0

package/dist/{chunk-KDWESC42.js → chunk-FWHVWIO2.js}

@@ -6,43 +6,46 @@ import { x402Client } from '@x402/core/client';
 import { x402HTTPClient, decodePaymentResponseHeader, encodePaymentRequiredHeader } from '@x402/core/http';
 import { registerExactEvmScheme } from '@x402/evm/exact/client';
 import { createSIWxClientHook } from '@x402/extensions/sign-in-with-x';
-import { wrapFetchWithPayment } from '@x402/fetch';
 import { Receipt, Challenge } from 'mppx';
 import { Mppx, tempo } from 'mppx/client';
 import { createHash } from 'crypto';
 import { z } from 'zod';
 
 // src/auth/managed-account.ts
-var createManagedAccount = (client, address) => toAccount({
-  address,
-  async signMessage({ message }) {
-    return await client.auth.signMessage(
-      { message },
-      { expectedAddress: address }
-    );
-  },
-  async signTypedData(typedData) {
-    const td = typedData;
-    return await client.auth.signTypedData(
-      {
-        domain: td.domain,
-        types: td.types,
-        primaryType: td.primaryType,
-        message: td.message
-      },
-      { expectedAddress: address }
-    );
-  },
-  async signTransaction(transaction, options) {
-    const serialize = options?.serializer ?? serializeTransaction;
-    const unsigned = await serialize(transaction);
-    const signature = await client.auth.signTransaction(
-      { unsignedTransaction: unsigned },
-      { expectedAddress: address }
-    );
-    return await serialize(transaction, parseSignature(signature));
-  }
-});
+var createManagedAccount = (client, address, opts = {}) => {
+  const signOptions = {
+    // expectedAddress pins verification to this adapter's frozen address.
+    expectedAddress: address,
+    ...opts.explicitWallet ? { walletAddress: address } : {}
+  };
+  return toAccount({
+    address,
+    async signMessage({ message }) {
+      return await client.auth.signMessage({ message }, signOptions);
+    },
+    async signTypedData(typedData) {
+      const td = typedData;
+      return await client.auth.signTypedData(
+        {
+          domain: td.domain,
+          types: td.types,
+          primaryType: td.primaryType,
+          message: td.message
+        },
+        signOptions
+      );
+    },
+    async signTransaction(transaction, options) {
+      const serialize = options?.serializer ?? serializeTransaction;
+      const unsigned = await serialize(transaction);
+      const signature = await client.auth.signTransaction(
+        { unsignedTransaction: unsigned },
+        signOptions
+      );
+      return await serialize(transaction, parseSignature(signature));
+    }
+  });
+};
 var USDC_BASE = "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913";
 var USDC_TEMPO = "0x20c000000000000000000000b9537d11c60e8b50";
 var TEMPO_CHAIN_ID = 4217;
@@ -639,12 +642,12 @@ var cancelBody = (response) => {
   } catch {
   }
 };
-var resolveAccount = async (client, overrideAccount, signal) => {
+var resolveAccount = async (client, overrideAccount, signal, walletAddress) => {
   if (overrideAccount) return overrideAccount;
   const credentials = client.getCredentials();
   if (credentials.kind === "account") return credentials.account;
   if (credentials.kind === "session") {
-    return await client.resolveManagedAccount(signal);
+    return await client.resolveManagedAccount(signal, walletAddress);
   }
   throw new ZeroAuthError(
     "auth_no_credentials",
@@ -690,9 +693,13 @@ var Payments = class {
     const account = await resolveAccount(
       this.client,
       input.account,
-      input.signal
+      input.signal,
+      input.walletAddress
     );
     let capturedAmount = null;
+    let pendingAmountUnits = 0n;
+    let identityChallengeHandled = false;
+    let paidChallengeHandled = false;
     let capturedNetwork;
     let preflightError = null;
     const x402 = registerExactEvmScheme(new x402Client(), { signer: account });
@@ -721,11 +728,25 @@ var Payments = class {
         };
       }
       const rawAmountUnits = BigInt(rawAmount);
-      capturedAmount = formatUnits(rawAmountUnits, 6);
+      pendingAmountUnits = rawAmountUnits;
+      const challengeAmount = formatUnits(rawAmountUnits, 6);
+      if (rawAmountUnits === 0n) {
+        if (identityChallengeHandled || paidChallengeHandled) {
+          return {
+            abort: true,
+            reason: "Only one zero-value identity challenge is allowed, and it must precede payment."
+          };
+        }
+      } else if (paidChallengeHandled) {
+        return {
+          abort: true,
+          reason: "A positive-value x402 payment was already attempted for this fetch; refusing a second charge."
+        };
+      }
       if (maxPayUnits !== null && rawAmountUnits > maxPayUnits) {
         return {
           abort: true,
-          reason: `Payment of ${capturedAmount} USDC exceeds maxPay ${input.maxPay}`
+          reason: `Payment of ${challengeAmount} USDC exceeds maxPay ${input.maxPay}`
         };
       }
       const detected = networkToChain(capturedNetwork);
@@ -745,9 +766,10 @@ var Payments = class {
       }
       if (balance !== null && balance < rawAmountUnits) {
         const have = formatUnits(balance, 6);
+        const requiredAmount = formatUnits(rawAmountUnits, 6);
         preflightError = new ZeroInsufficientFundsError(
-          `wallet has ${have} USDC on Base, needs ${capturedAmount}.`,
-          { have, need: capturedAmount }
+          `wallet has ${have} USDC on Base, needs ${requiredAmount}.`,
+          { have, need: requiredAmount }
         );
         return { abort: true, reason: preflightError.message };
       }
@@ -758,18 +780,64 @@ var Payments = class {
     const httpClient = new x402HTTPClient(x402).onPaymentRequired(
       createSIWxClientHook(account)
     );
-    const wrappedFetch = wrapFetchWithPayment(
-      withSynthesizedX402Header(configuredFetch),
-      httpClient
-    );
+    const paymentFetch = withSynthesizedX402Header(configuredFetch);
     let response;
     try {
-      response = await wrappedFetch(input.url, {
+      const request2 = new Request(input.url, {
         method: input.method ?? "GET",
         headers: input.headers,
         body: input.body,
         signal: input.signal
       });
+      response = await paymentFetch(request2.clone());
+      for (let paymentStage = 0; paymentStage < 2; paymentStage++) {
+        if (response.status !== 402) break;
+        const parseChallenge = async (challengeResponse) => {
+          let body;
+          try {
+            const text = await challengeResponse.clone().text();
+            if (text) body = JSON.parse(text);
+          } catch {
+          }
+          return httpClient.getPaymentRequiredResponse(
+            (name) => challengeResponse.headers.get(name),
+            body
+          );
+        };
+        let paymentRequired = await parseChallenge(response);
+        const hookHeaders = await httpClient.handlePaymentRequired(paymentRequired);
+        if (hookHeaders) {
+          const hookRequest = request2.clone();
+          for (const [key, value] of Object.entries(hookHeaders)) {
+            hookRequest.headers.set(key, value);
+          }
+          response = await paymentFetch(hookRequest);
+          if (response.status === 402) {
+            paymentRequired = await parseChallenge(response);
+          } else {
+            break;
+          }
+        }
+        pendingAmountUnits = 0n;
+        const paymentPayload = await x402.createPaymentPayload(paymentRequired);
+        if (pendingAmountUnits === 0n) {
+          identityChallengeHandled = true;
+          capturedAmount = "0";
+        } else {
+          paidChallengeHandled = true;
+          capturedAmount = formatUnits(pendingAmountUnits, 6);
+        }
+        const paymentHeaders = httpClient.encodePaymentSignatureHeader(paymentPayload);
+        const paidRequest = request2.clone();
+        for (const [key, value] of Object.entries(paymentHeaders)) {
+          paidRequest.headers.set(key, value);
+        }
+        paidRequest.headers.set(
+          "Access-Control-Expose-Headers",
+          "PAYMENT-RESPONSE,X-PAYMENT-RESPONSE"
+        );
+        response = await paymentFetch(paidRequest);
+      }
     } catch (err) {
       if (preflightError) throw preflightError;
       if (err instanceof ZeroError) throw err;
@@ -825,7 +893,8 @@ var Payments = class {
     const account = await resolveAccount(
       this.client,
       input.account,
-      input.signal
+      input.signal,
+      input.walletAddress
     );
     const configuredFetch = buildConfiguredFetch(this.client, {
       timeoutMs: input.timeoutMs
@@ -1336,8 +1405,17 @@ var cancelBody2 = (response) => {
   } catch {
   }
 };
-var detectPaymentRequirement = async (response) => {
+var detectPaymentRequirement = async (response, preferredProtocol) => {
   if (response.status !== 402) return null;
+  const wwwAuth = response.headers.get("www-authenticate");
+  const advertisesMpp = wwwAuth ? splitWwwAuthenticateChallenges(wwwAuth).some((challenge) => {
+    const scheme = challenge.trim().split(/\s+/)[0]?.toLowerCase() ?? "";
+    return MPP_SCHEME_TOKENS.has(scheme);
+  }) : false;
+  if (preferredProtocol === "mpp") {
+    cancelBody2(response);
+    return advertisesMpp ? { protocol: "mpp", raw: { "www-authenticate": wwwAuth } } : { protocol: "unknown", raw: { requestedProtocol: "mpp" } };
+  }
   const x402Header = response.headers.get("payment-required") ?? response.headers.get("x-payment-required");
   if (x402Header) {
     cancelBody2(response);
@@ -1367,15 +1445,13 @@ var detectPaymentRequirement = async (response) => {
     } catch {
     }
   }
-  const wwwAuth = response.headers.get("www-authenticate");
-  if (wwwAuth) {
-    const schemes = splitWwwAuthenticateChallenges(wwwAuth).map(
-      (challenge) => challenge.trim().split(/\s+/)[0]?.toLowerCase() ?? ""
-    );
-    if (schemes.some((scheme) => MPP_SCHEME_TOKENS.has(scheme))) {
-      cancelBody2(response);
-      return { protocol: "mpp", raw: { "www-authenticate": wwwAuth } };
-    }
+  if (preferredProtocol === "x402") {
+    cancelBody2(response);
+    return { protocol: "unknown", raw: { requestedProtocol: "x402" } };
+  }
+  if (advertisesMpp) {
+    cancelBody2(response);
+    return { protocol: "mpp", raw: { "www-authenticate": wwwAuth } };
   }
   cancelBody2(response);
   return { protocol: "unknown", raw: {} };
@@ -1605,7 +1681,8 @@ var recordErrorFetchRun = async (client, opts, result, capabilityIdOverride) =>
       ...fetchOriginForRecord && { fetchOrigin: fetchOriginForRecord },
       ...result.status !== null && { status: result.status },
       latencyMs: result.latencyMs,
-      ...opts.requestSchema && { requestSchema: opts.requestSchema }
+      ...opts.requestSchema && { requestSchema: opts.requestSchema },
+      ...opts.walletAddress && !opts.account && { walletAddress: opts.walletAddress }
     });
     result.runId = created.runId;
     delete result.runTrackingSkipped;
@@ -1700,7 +1777,10 @@ var clientFetch = async (client, url, opts = {}) => {
     return result2;
   }
   if (response.status === 402) {
-    const requirement = await detectPaymentRequirement(response);
+    const requirement = await detectPaymentRequirement(
+      response,
+      opts.paymentProtocol
+    );
     if (requirement?.protocol === "x402" || requirement?.protocol === "mpp") {
       const payCall = requirement.protocol === "x402" ? client.payments.pay : client.payments.payMpp;
       try {
@@ -1714,6 +1794,7 @@ var clientFetch = async (client, url, opts = {}) => {
           body: requestBody,
           maxPay: opts.maxPay,
           account: opts.account,
+          ...opts.walletAddress && { walletAddress: opts.walletAddress },
           signal: opts.signal,
           timeoutMs: opts.timeoutMs,
           ...opts.displayCostAmount && {
@@ -1771,7 +1852,7 @@ var clientFetch = async (client, url, opts = {}) => {
     } else if (requirement?.protocol === "unknown") {
       const result2 = errorFetchResult(
         startedAt,
-        "Capability returned 402 with an unrecognized payment protocol. Neither x402 nor MPP markers were detected in the response headers or body.",
+        opts.paymentProtocol ? `Capability did not advertise the requested ${opts.paymentProtocol} payment protocol.` : "Capability returned 402 with an unrecognized payment protocol. Neither x402 nor MPP markers were detected in the response headers or body.",
         "unrecognized_402_protocol",
         capabilityIdRequested,
         "payment_failed",
@@ -1886,6 +1967,10 @@ var clientFetch = async (client, url, opts = {}) => {
           ...opts.capabilityId === void 0 ? { fetchOrigin: "direct_url" } : opts.fetchOrigin && { fetchOrigin: opts.fetchOrigin },
           status: response.status,
           latencyMs,
+          // Attribute to the selected wallet in session mode. Skipped when a
+          // per-call `account` override records the run — that account's own
+          // EIP-191 identity is the attribution.
+          ...opts.walletAddress && !opts.account && { walletAddress: opts.walletAddress },
           ...opts.requestSchema && { requestSchema: opts.requestSchema },
           ...derived?.responseSchema && {
             responseSchema: derived.responseSchema
@@ -1951,7 +2036,7 @@ var clientFetch = async (client, url, opts = {}) => {
 
 // package.json
 var package_default = {
-  version: "0.12.0"};
+  version: "0.14.0"};
 
 // src/version.ts
 var SDK_VERSION = package_default.version;
@@ -2441,6 +2526,9 @@ var userWalletDtoSchema = z.object({
   walletAddress: z.string(),
   source: z.enum(["self_custody", "privy_embedded"]),
   isPrimary: z.boolean(),
+  // Owner-chosen display name; null/absent = unnamed (show the address).
+  // Optional so the SDK tolerates servers that predate nicknames.
+  nickname: z.string().nullable().optional(),
   linkedAt: z.union([z.string(), z.date()]).nullable().optional(),
   importedAt: z.union([z.string(), z.date()]).nullable().optional(),
   delegationGranted: z.boolean(),
@@ -2658,7 +2746,10 @@ var Auth = class {
           {
             method: "POST",
             path: "/v1/users/me/sign-message",
-            body: { message: normalizeMessage(input.message) }
+            body: {
+              message: normalizeMessage(input.message),
+              ...opts.walletAddress ? { walletAddress: opts.walletAddress } : {}
+            }
           },
           signResponseSchema
         );
@@ -2683,7 +2774,10 @@ var Auth = class {
           {
             method: "POST",
             path: "/v1/users/me/sign-transaction",
-            body: { unsignedTransaction: input.unsignedTransaction }
+            body: {
+              unsignedTransaction: input.unsignedTransaction,
+              ...opts.walletAddress ? { walletAddress: opts.walletAddress } : {}
+            }
           },
           signResponseSchema
         );
@@ -2722,7 +2816,10 @@ var Auth = class {
           {
             method: "POST",
             path: "/v1/users/me/sign-typed-data",
-            body: { typedData: input }
+            body: {
+              typedData: input,
+              ...opts.walletAddress ? { walletAddress: opts.walletAddress } : {}
+            }
           },
           signResponseSchema
         );
@@ -3099,6 +3196,9 @@ var Runs = class {
     if (params.unreviewed !== void 0) query.unreviewed = params.unreviewed;
     if (params.limit !== void 0) query.limit = params.limit;
     if (params.cursor !== void 0) query.cursor = params.cursor;
+    if (params.walletAddress !== void 0) {
+      query.walletAddress = Array.isArray(params.walletAddress) ? params.walletAddress.join(",") : params.walletAddress;
+    }
     return request(
       this.client,
       {
@@ -3234,6 +3334,50 @@ var Wallet = class {
     },
     userWalletDtoSchema
   );
+  // Re-stamp Zero's signing delegation on a profile wallet (default: the
+  // primary). Session-only. Naming a wallet re-authorizes THAT wallet and
+  // never provisions; the server 404s an address not on the profile.
+  reauthorizeDelegation = (opts = {}) => request(
+    this.client,
+    {
+      method: "POST",
+      path: "/v1/users/me/wallets/provision",
+      ...opts.walletAddress ? { body: { walletAddress: opts.walletAddress } } : {},
+      signal: opts.signal
+    },
+    userWalletDtoSchema
+  );
+  // Revoke Zero's signing delegation on a profile wallet (default: the
+  // primary). Session-only. Managed signing on that wallet 403s until it is
+  // re-authorized. Note: this stamps the server-side gate — removing Zero's
+  // signer cryptographically is owner-authorized and happens in the user's
+  // Privy session (the web profile page does both).
+  revokeDelegation = (opts = {}) => request(
+    this.client,
+    {
+      method: "DELETE",
+      path: "/v1/users/me/wallets/delegation",
+      ...opts.walletAddress ? { query: { walletAddress: opts.walletAddress } } : {},
+      signal: opts.signal
+    },
+    userWalletDtoSchema
+  );
+  // Set, change, or clear (null / empty string) the owner-chosen nickname on
+  // a profile wallet. Session-only. Nicknames are private to the
+  // authenticated user — they never appear on reviews or public surfaces.
+  setNickname = (opts) => request(
+    this.client,
+    {
+      method: "PATCH",
+      path: "/v1/users/me/wallets/nickname",
+      body: {
+        walletAddress: opts.walletAddress,
+        nickname: opts.nickname
+      },
+      signal: opts.signal
+    },
+    userWalletDtoSchema
+  );
   // Link an existing self-custody wallet to the session user by private key.
   // Session-only. 409s when the wallet is already linked (to this or another
   // profile — the error message says which).
@@ -3244,7 +3388,8 @@ var Wallet = class {
       path: "/v1/users/me/wallets/import",
       body: {
         privateKey: opts.privateKey,
-        ...opts.makePrimary !== void 0 ? { makePrimary: opts.makePrimary } : {}
+        ...opts.makePrimary !== void 0 ? { makePrimary: opts.makePrimary } : {},
+        ...opts.nickname !== void 0 ? { nickname: opts.nickname } : {}
       },
       signal: opts.signal
     },
@@ -3447,6 +3592,9 @@ var ZeroClient = class _ZeroClient {
   managedAccountInFlight = null;
   managedAccountAC = null;
   managedAccountGen = 0;
+  // Explicitly-selected (non-default) managed wallets, keyed by lowercased
+  // address. Same lifecycle as managedAccount: cleared on clearManagedAccount.
+  managedAccountByAddress = /* @__PURE__ */ new Map();
   // Multi-tenant servers calling `client.fetch(url, { account: tenantAccount })`
   // on every request would otherwise construct a new ZeroClient (with
   // five namespace instances) per call. Keyed by lowercased account
@@ -3668,8 +3816,16 @@ var ZeroClient = class _ZeroClient {
     }
     this.withAccountCache.clear();
   };
-  /** @internal — used by payments.pay() in session mode. Cached, dedupes concurrent lookups. */
-  resolveManagedAccount = (signal) => {
+  /**
+   * @internal — used by payments.pay() in session mode. Cached, dedupes
+   * concurrent lookups. Pass `walletAddress` to sign as a specific profile
+   * wallet instead of the primary; explicit wallets are cached per address
+   * and their sign requests carry the address so intent and signer agree.
+   */
+  resolveManagedAccount = (signal, walletAddress) => {
+    if (walletAddress) {
+      return this.resolveManagedAccountByAddress(walletAddress, signal);
+    }
     if (this.managedAccount) return Promise.resolve(this.managedAccount);
     if (this.managedAccountInFlight) {
       return this.raceWithSignal(this.managedAccountInFlight, signal);
@@ -3711,6 +3867,42 @@ var ZeroClient = class _ZeroClient {
     });
     return this.raceWithSignal(this.managedAccountInFlight, signal);
   };
+  // Explicit-wallet variant of resolveManagedAccount. No in-flight dedupe:
+  // this is the rare path (per-wallet pay), the resolution is idempotent, and
+  // the per-address cache absorbs repeat calls.
+  resolveManagedAccountByAddress = async (walletAddress, signal) => {
+    if (this.credentials.kind !== "session") {
+      throw new ZeroAuthError(
+        "auth_no_credentials",
+        "resolveManagedAccount() requires session credentials."
+      );
+    }
+    const canonical = getAddress(walletAddress);
+    const cached = this.managedAccountByAddress.get(canonical.toLowerCase());
+    if (cached) return cached;
+    const startedAtGen = this.managedAccountGen;
+    const wallets = await this.auth.wallets({ signal });
+    const match = wallets.find(
+      (w) => w.walletAddress.toLowerCase() === canonical.toLowerCase()
+    );
+    if (!match || match.source !== "privy_embedded") {
+      throw new ZeroAuthError(
+        "auth_error",
+        `Wallet ${canonical} is not a Privy-embedded wallet on this profile. Managed signing can only use profile wallets (see client.wallet.list()).`
+      );
+    }
+    if (this.managedAccountGen !== startedAtGen) {
+      throw new ZeroAuthError(
+        "auth_session_expired",
+        "Session cleared during managed-account resolution. Retry to rebuild against the current session."
+      );
+    }
+    const acc = createManagedAccount(this, canonical, {
+      explicitWallet: true
+    });
+    this.managedAccountByAddress.set(canonical.toLowerCase(), acc);
+    return acc;
+  };
   // Per-caller signal gate: each caller can reject on their own abort
   // without cancelling the shared underlying promise.
   raceWithSignal = (p, signal) => {
@@ -3741,6 +3933,7 @@ var ZeroClient = class _ZeroClient {
     this.managedAccountAC?.abort();
     this.managedAccountInFlight = null;
     this.managedAccountAC = null;
+    this.managedAccountByAddress.clear();
     this.managedAccountGen++;
   };
   /** @internal — Read cached managed account without triggering resolution. */
@@ -3794,5 +3987,5 @@ var ZeroClient = class _ZeroClient {
 };
 
 export { Auth, AuthAgent, AuthDevice, BUG_REPORT_CATEGORIES, BugReports, Capabilities, DEFAULT_BASE_URL, DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT_MS, FETCH_SKIP_REASONS, FETCH_WARNINGS, Payments, Runs, SDK_VERSION, TEMPO_CHAIN_ID2 as TEMPO_CHAIN_ID, TEMPO_TESTNET_CHAIN_ID, USDC_BASE, USDC_DECIMALS, USDC_TEMPO, Wallet, ZeroAgentAuthError, ZeroApiError, ZeroAuthError, ZeroClient, ZeroConfigurationError, ZeroError, ZeroPaymentError, ZeroSessionCloseFailedError, ZeroTimeoutError, ZeroValidationError, ZeroWalletError, asSchemaNode, coerceTempoChainId, createManagedAccount, extractInputEnvelope, isShortToken, normalizeTransportEnvelopeRequest, paymentHasAnchor, tempoChainLabelFromId, unwrapTransportEnvelope };
-//# sourceMappingURL=chunk-KDWESC42.js.map
-//# sourceMappingURL=chunk-KDWESC42.js.map
+//# sourceMappingURL=chunk-FWHVWIO2.js.map
+//# sourceMappingURL=chunk-FWHVWIO2.js.map