@x402/extensions 2.3.0 → 2.4.0

package/dist/cjs/index.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   BAZAAR: () => BAZAAR,
+  EIP2612_GAS_SPONSORING: () => EIP2612_GAS_SPONSORING,
   InMemorySIWxStorage: () => InMemorySIWxStorage,
   PAYMENT_IDENTIFIER: () => PAYMENT_IDENTIFIER,
   PAYMENT_ID_MAX_LENGTH: () => PAYMENT_ID_MAX_LENGTH,
@@ -50,6 +51,7 @@ __export(src_exports, {
   createSIWxRequestHook: () => createSIWxRequestHook,
   createSIWxSettleHook: () => createSIWxSettleHook,
   declareDiscoveryExtension: () => declareDiscoveryExtension,
+  declareEip2612GasSponsoringExtension: () => declareEip2612GasSponsoringExtension,
   declarePaymentIdentifierExtension: () => declarePaymentIdentifierExtension,
   declareSIWxExtension: () => declareSIWxExtension,
   decodeBase58: () => decodeBase58,
@@ -60,6 +62,7 @@ __export(src_exports, {
   extractDiscoveryInfoFromExtension: () => extractDiscoveryInfoFromExtension,
   extractDiscoveryInfoV1: () => extractDiscoveryInfoV1,
   extractEVMChainId: () => extractEVMChainId,
+  extractEip2612GasSponsoringInfo: () => extractEip2612GasSponsoringInfo,
   extractPaymentIdentifier: () => extractPaymentIdentifier,
   extractResourceMetadataV1: () => extractResourceMetadataV1,
   extractSolanaChainReference: () => extractSolanaChainReference,
@@ -69,9 +72,14 @@ __export(src_exports, {
   getEVMAddress: () => getEVMAddress,
   getSolanaAddress: () => getSolanaAddress,
   hasPaymentIdentifier: () => hasPaymentIdentifier,
+  isBodyExtensionConfig: () => isBodyExtensionConfig,
   isDiscoverableV1: () => isDiscoverableV1,
+  isEVMSigner: () => isEVMSigner,
+  isMcpExtensionConfig: () => isMcpExtensionConfig,
   isPaymentIdentifierExtension: () => isPaymentIdentifierExtension,
   isPaymentIdentifierRequired: () => isPaymentIdentifierRequired,
+  isQueryExtensionConfig: () => isQueryExtensionConfig,
+  isSolanaSigner: () => isSolanaSigner,
   isValidPaymentId: () => isValidPaymentId,
   parseSIWxHeader: () => parseSIWxHeader,
   paymentIdentifierResourceServerExtension: () => paymentIdentifierResourceServerExtension,
@@ -81,6 +89,7 @@ __export(src_exports, {
   siwxResourceServerExtension: () => siwxResourceServerExtension,
   validateAndExtract: () => validateAndExtract,
   validateDiscoveryExtension: () => validateDiscoveryExtension,
+  validateEip2612GasSponsoringInfo: () => validateEip2612GasSponsoringInfo,
   validatePaymentIdentifier: () => validatePaymentIdentifier,
   validatePaymentIdentifierRequirement: () => validatePaymentIdentifierRequirement,
   validateSIWxMessage: () => validateSIWxMessage,
@@ -92,10 +101,23 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/bazaar/http/types.ts
+var isQueryExtensionConfig = (config) => {
+  return !("bodyType" in config) && !("toolName" in config);
+};
+var isBodyExtensionConfig = (config) => {
+  return "bodyType" in config;
+};
+
+// src/bazaar/mcp/types.ts
+var isMcpExtensionConfig = (config) => {
+  return "toolName" in config;
+};
+
 // src/bazaar/types.ts
-var BAZAAR = "bazaar";
+var BAZAAR = { key: "bazaar" };
 
-// src/bazaar/resourceService.ts
+// src/bazaar/http/resourceService.ts
 function createQueryDiscoveryExtension({
   method,
   input = {},
@@ -227,7 +249,97 @@ function createBodyDiscoveryExtension({
     }
   };
 }
+
+// src/bazaar/mcp/resourceService.ts
+function createMcpDiscoveryExtension({
+  toolName,
+  description,
+  transport,
+  inputSchema,
+  example,
+  output
+}) {
+  return {
+    info: {
+      input: {
+        type: "mcp",
+        toolName,
+        ...description !== void 0 ? { description } : {},
+        ...transport !== void 0 ? { transport } : {},
+        inputSchema,
+        ...example !== void 0 ? { example } : {}
+      },
+      ...output?.example ? {
+        output: {
+          type: "json",
+          example: output.example
+        }
+      } : {}
+    },
+    schema: {
+      $schema: "https://json-schema.org/draft/2020-12/schema",
+      type: "object",
+      properties: {
+        input: {
+          type: "object",
+          properties: {
+            type: {
+              type: "string",
+              const: "mcp"
+            },
+            toolName: {
+              type: "string"
+            },
+            ...description !== void 0 ? {
+              description: {
+                type: "string"
+              }
+            } : {},
+            ...transport !== void 0 ? {
+              transport: {
+                type: "string",
+                enum: ["streamable-http", "sse"]
+              }
+            } : {},
+            inputSchema: {
+              type: "object"
+            },
+            ...example !== void 0 ? {
+              example: {
+                type: "object"
+              }
+            } : {}
+          },
+          required: ["type", "toolName", "inputSchema"],
+          additionalProperties: false
+        },
+        ...output?.example ? {
+          output: {
+            type: "object",
+            properties: {
+              type: {
+                type: "string"
+              },
+              example: {
+                type: "object",
+                ...output.schema && typeof output.schema === "object" ? output.schema : {}
+              }
+            },
+            required: ["type"]
+          }
+        } : {}
+      },
+      required: ["input"]
+    }
+  };
+}
+
+// src/bazaar/resourceService.ts
 function declareDiscoveryExtension(config) {
+  if ("toolName" in config) {
+    const extension2 = createMcpDiscoveryExtension(config);
+    return { bazaar: extension2 };
+  }
   const bodyType = config.bodyType;
   const isBodyMethod2 = bodyType !== void 0;
   const extension = isBodyMethod2 ? createBodyDiscoveryExtension(config) : createQueryDiscoveryExtension(config);
@@ -239,12 +351,15 @@ function isHTTPRequestContext(ctx) {
   return ctx !== null && typeof ctx === "object" && "method" in ctx && "adapter" in ctx;
 }
 var bazaarResourceServerExtension = {
-  key: BAZAAR,
+  key: BAZAAR.key,
   enrichDeclaration: (declaration, transportContext) => {
     if (!isHTTPRequestContext(transportContext)) {
       return declaration;
     }
     const extension = declaration;
+    if (extension.info?.input?.type === "mcp") {
+      return declaration;
+    }
     const method = transportContext.method;
     const existingInputProps = extension.schema?.properties?.input?.properties || {};
     const updatedInputProps = {
@@ -427,7 +542,7 @@ function extractDiscoveryInfo(paymentPayload, paymentRequirements, validate = tr
   if (paymentPayload.x402Version === 2) {
     resourceUrl = paymentPayload.resource?.url ?? "";
     if (paymentPayload.extensions) {
-      const bazaarExtension = paymentPayload.extensions[BAZAAR];
+      const bazaarExtension = paymentPayload.extensions[BAZAAR.key];
       if (bazaarExtension && typeof bazaarExtension === "object") {
         try {
           const extension = bazaarExtension;
@@ -470,14 +585,17 @@ function extractDiscoveryInfo(paymentPayload, paymentRequirements, validate = tr
     description = requirementsV1.description;
     mimeType = requirementsV1.mimeType;
   }
-  return {
+  const base = {
     resourceUrl: normalizedResourceUrl,
     description,
     mimeType,
-    method: discoveryInfo.input.method,
     x402Version: paymentPayload.x402Version,
     discoveryInfo
   };
+  if (discoveryInfo.input.type === "mcp") {
+    return { ...base, toolName: discoveryInfo.input.toolName };
+  }
+  return { ...base, method: discoveryInfo.input.method };
 }
 function extractDiscoveryInfoFromExtension(extension, validate = true) {
   if (validate) {
@@ -620,6 +738,21 @@ function decodeBase58(encoded) {
 function encodeBase58(bytes) {
   return import_base.base58.encode(bytes);
 }
+function isSolanaSigner(signer) {
+  if ("signMessages" in signer && typeof signer.signMessages === "function") {
+    return true;
+  }
+  if ("publicKey" in signer && signer.publicKey) {
+    const pk = signer.publicKey;
+    if (typeof pk === "object" && pk !== null && "toBase58" in pk) {
+      return true;
+    }
+    if (typeof pk === "string" && !pk.startsWith("0x")) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // src/sign-in-with-x/schema.ts
 function buildSIWxSchema() {
@@ -884,6 +1017,30 @@ async function verifyEVMSignature(message, address, signature, verifier) {
   }
   return (0, import_viem.verifyMessage)(args);
 }
+function isEVMSigner(signer) {
+  if ("signMessages" in signer && typeof signer.signMessages === "function") {
+    return false;
+  }
+  if ("publicKey" in signer && signer.publicKey) {
+    const pk = signer.publicKey;
+    if (typeof pk === "object" && pk !== null && "toBase58" in pk) {
+      return false;
+    }
+    if (typeof pk === "string" && !pk.startsWith("0x")) {
+      return false;
+    }
+  }
+  if ("account" in signer && signer.account && typeof signer.account === "object") {
+    const account = signer.account;
+    if (account.address && account.address.startsWith("0x")) {
+      return true;
+    }
+  }
+  if ("address" in signer && typeof signer.address === "string" && signer.address.startsWith("0x")) {
+    return true;
+  }
+  return false;
+}
 
 // src/sign-in-with-x/verify.ts
 async function verifySIWxSignature(payload, options) {
@@ -1020,8 +1177,14 @@ function getEVMAddress(signer) {
   throw new Error("EVM signer missing address");
 }
 function getSolanaAddress(signer) {
-  const pk = signer.publicKey;
-  return typeof pk === "string" ? pk : pk.toBase58();
+  if ("address" in signer && signer.address) {
+    return signer.address;
+  }
+  if ("publicKey" in signer) {
+    const pk = signer.publicKey;
+    return typeof pk === "string" ? pk : pk.toBase58();
+  }
+  throw new Error("Solana signer missing address or publicKey");
 }
 async function signEVMMessage(message, signer) {
   if (signer.account) {
@@ -1031,8 +1194,17 @@ async function signEVMMessage(message, signer) {
 }
 async function signSolanaMessage(message, signer) {
   const messageBytes = new TextEncoder().encode(message);
-  const signatureBytes = await signer.signMessage(messageBytes);
-  return encodeBase58(signatureBytes);
+  if ("signMessages" in signer) {
+    const results = await signer.signMessages([{ content: messageBytes, signatures: {} }]);
+    const sigDict = results[0];
+    const signatureBytes = Object.values(sigDict)[0];
+    return encodeBase58(signatureBytes);
+  }
+  if ("signMessage" in signer) {
+    const signatureBytes = await signer.signMessage(messageBytes);
+    return encodeBase58(signatureBytes);
+  }
+  throw new Error("Solana signer missing signMessage or signMessages method");
 }
 
 // src/sign-in-with-x/client.ts
@@ -1205,15 +1377,15 @@ function createSIWxRequestHook(options) {
   };
 }
 function createSIWxClientHook(signer) {
+  const signerIsSolana = isSolanaSigner(signer);
+  const expectedSignatureType = signerIsSolana ? "ed25519" : "eip191";
   return async (context) => {
     const extensions = context.paymentRequired.extensions ?? {};
     const siwxExtension = extensions[SIGN_IN_WITH_X];
     if (!siwxExtension?.supportedChains) return;
     try {
-      const paymentNetwork = context.paymentRequired.accepts?.[0]?.network;
-      if (!paymentNetwork) return;
       const matchingChain = siwxExtension.supportedChains.find(
-        (chain) => chain.chainId === paymentNetwork
+        (chain) => chain.type === expectedSignatureType
       );
       if (!matchingChain) {
         return;
@@ -1443,9 +1615,97 @@ var paymentIdentifierResourceServerExtension = {
   // No enrichment needed - the declaration is static
   // Future hooks for idempotency could be added here if needed
 };
+
+// src/eip2612-gas-sponsoring/types.ts
+var EIP2612_GAS_SPONSORING = { key: "eip2612GasSponsoring" };
+
+// src/eip2612-gas-sponsoring/resourceService.ts
+var eip2612GasSponsoringSchema = {
+  $schema: "https://json-schema.org/draft/2020-12/schema",
+  type: "object",
+  properties: {
+    from: {
+      type: "string",
+      pattern: "^0x[a-fA-F0-9]{40}$",
+      description: "The address of the sender."
+    },
+    asset: {
+      type: "string",
+      pattern: "^0x[a-fA-F0-9]{40}$",
+      description: "The address of the ERC-20 token contract."
+    },
+    spender: {
+      type: "string",
+      pattern: "^0x[a-fA-F0-9]{40}$",
+      description: "The address of the spender (Canonical Permit2)."
+    },
+    amount: {
+      type: "string",
+      pattern: "^[0-9]+$",
+      description: "The amount to approve (uint256). Typically MaxUint."
+    },
+    nonce: {
+      type: "string",
+      pattern: "^[0-9]+$",
+      description: "The current nonce of the sender."
+    },
+    deadline: {
+      type: "string",
+      pattern: "^[0-9]+$",
+      description: "The timestamp at which the signature expires."
+    },
+    signature: {
+      type: "string",
+      pattern: "^0x[a-fA-F0-9]+$",
+      description: "The 65-byte concatenated signature (r, s, v) as a hex string."
+    },
+    version: {
+      type: "string",
+      pattern: "^[0-9]+(\\.[0-9]+)*$",
+      description: "Schema version identifier."
+    }
+  },
+  required: ["from", "asset", "spender", "amount", "nonce", "deadline", "signature", "version"]
+};
+function declareEip2612GasSponsoringExtension() {
+  const key = EIP2612_GAS_SPONSORING.key;
+  return {
+    [key]: {
+      info: {
+        description: "The facilitator accepts EIP-2612 gasless Permit to `Permit2` canonical contract.",
+        version: "1"
+      },
+      schema: eip2612GasSponsoringSchema
+    }
+  };
+}
+
+// src/eip2612-gas-sponsoring/facilitator.ts
+function extractEip2612GasSponsoringInfo(paymentPayload) {
+  if (!paymentPayload.extensions) {
+    return null;
+  }
+  const extension = paymentPayload.extensions[EIP2612_GAS_SPONSORING.key];
+  if (!extension?.info) {
+    return null;
+  }
+  const info = extension.info;
+  if (!info.from || !info.asset || !info.spender || !info.amount || !info.nonce || !info.deadline || !info.signature || !info.version) {
+    return null;
+  }
+  return info;
+}
+function validateEip2612GasSponsoringInfo(info) {
+  const addressPattern = /^0x[a-fA-F0-9]{40}$/;
+  const numericPattern = /^[0-9]+$/;
+  const hexPattern = /^0x[a-fA-F0-9]+$/;
+  const versionPattern = /^[0-9]+(\.[0-9]+)*$/;
+  return addressPattern.test(info.from) && addressPattern.test(info.asset) && addressPattern.test(info.spender) && numericPattern.test(info.amount) && numericPattern.test(info.nonce) && numericPattern.test(info.deadline) && hexPattern.test(info.signature) && versionPattern.test(info.version);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BAZAAR,
+  EIP2612_GAS_SPONSORING,
   InMemorySIWxStorage,
   PAYMENT_IDENTIFIER,
   PAYMENT_ID_MAX_LENGTH,
@@ -1465,6 +1725,7 @@ var paymentIdentifierResourceServerExtension = {
   createSIWxRequestHook,
   createSIWxSettleHook,
   declareDiscoveryExtension,
+  declareEip2612GasSponsoringExtension,
   declarePaymentIdentifierExtension,
   declareSIWxExtension,
   decodeBase58,
@@ -1475,6 +1736,7 @@ var paymentIdentifierResourceServerExtension = {
   extractDiscoveryInfoFromExtension,
   extractDiscoveryInfoV1,
   extractEVMChainId,
+  extractEip2612GasSponsoringInfo,
   extractPaymentIdentifier,
   extractResourceMetadataV1,
   extractSolanaChainReference,
@@ -1484,9 +1746,14 @@ var paymentIdentifierResourceServerExtension = {
   getEVMAddress,
   getSolanaAddress,
   hasPaymentIdentifier,
+  isBodyExtensionConfig,
   isDiscoverableV1,
+  isEVMSigner,
+  isMcpExtensionConfig,
   isPaymentIdentifierExtension,
   isPaymentIdentifierRequired,
+  isQueryExtensionConfig,
+  isSolanaSigner,
   isValidPaymentId,
   parseSIWxHeader,
   paymentIdentifierResourceServerExtension,
@@ -1496,6 +1763,7 @@ var paymentIdentifierResourceServerExtension = {
   siwxResourceServerExtension,
   validateAndExtract,
   validateDiscoveryExtension,
+  validateEip2612GasSponsoringInfo,
   validatePaymentIdentifier,
   validatePaymentIdentifierRequirement,
   validateSIWxMessage,