@x402/extensions 2.3.0 → 2.3.1

package/dist/cjs/index.d.ts

@@ -1,5 +1,5 @@
 export { B as BAZAAR, a as BazaarClientExtension, b as BodyDiscoveryExtension, c as BodyDiscoveryInfo, D as DiscoveredResource, d as DiscoveryExtension, e as DiscoveryInfo, f as DiscoveryResource, g as DiscoveryResourcesResponse, L as ListDiscoveryResourcesParams, Q as QueryDiscoveryExtension, h as QueryDiscoveryInfo, V as ValidationResult, W as WithExtensions, i as bazaarResourceServerExtension, j as declareDiscoveryExtension, k as extractDiscoveryInfo, l as extractDiscoveryInfoFromExtension, m as extractDiscoveryInfoV1, n as extractResourceMetadataV1, o as isDiscoverableV1, v as validateAndExtract, p as validateDiscoveryExtension, w as withBazaar } from './index-DvDlinmy.js';
-export { CompleteSIWxInfo, CreateSIWxHookOptions, DeclareSIWxOptions, EVMMessageVerifier, EVMSigner, InMemorySIWxStorage, SIGN_IN_WITH_X, SIWxExtension, SIWxExtensionInfo, SIWxExtensionSchema, SIWxHookEvent, SIWxPayload, SIWxPayloadSchema, SIWxSigner, SIWxStorage, SIWxValidationOptions, SIWxValidationResult, SIWxVerifyOptions, SIWxVerifyResult, SOLANA_DEVNET, SOLANA_MAINNET, SOLANA_TESTNET, SignatureScheme, SignatureType, SolanaSigner, SupportedChain, buildSIWxSchema, createSIWxClientHook, createSIWxMessage, createSIWxPayload, createSIWxRequestHook, createSIWxSettleHook, declareSIWxExtension, decodeBase58, encodeBase58, encodeSIWxHeader, extractEVMChainId, extractSolanaChainReference, formatSIWEMessage, formatSIWSMessage, getEVMAddress, getSolanaAddress, parseSIWxHeader, signEVMMessage, signSolanaMessage, siwxResourceServerExtension, validateSIWxMessage, verifyEVMSignature, verifySIWxSignature, verifySolanaSignature, wrapFetchWithSIWx } from './sign-in-with-x/index.js';
+export { CompleteSIWxInfo, CreateSIWxHookOptions, DeclareSIWxOptions, EVMMessageVerifier, EVMSigner, InMemorySIWxStorage, SIGN_IN_WITH_X, SIWxExtension, SIWxExtensionInfo, SIWxExtensionSchema, SIWxHookEvent, SIWxPayload, SIWxPayloadSchema, SIWxSigner, SIWxStorage, SIWxValidationOptions, SIWxValidationResult, SIWxVerifyOptions, SIWxVerifyResult, SOLANA_DEVNET, SOLANA_MAINNET, SOLANA_TESTNET, SignatureScheme, SignatureType, SolanaSigner, SupportedChain, buildSIWxSchema, createSIWxClientHook, createSIWxMessage, createSIWxPayload, createSIWxRequestHook, createSIWxSettleHook, declareSIWxExtension, decodeBase58, encodeBase58, encodeSIWxHeader, extractEVMChainId, extractSolanaChainReference, formatSIWEMessage, formatSIWSMessage, getEVMAddress, getSolanaAddress, isEVMSigner, isSolanaSigner, parseSIWxHeader, signEVMMessage, signSolanaMessage, siwxResourceServerExtension, validateSIWxMessage, verifyEVMSignature, verifySIWxSignature, verifySolanaSignature, wrapFetchWithSIWx } from './sign-in-with-x/index.js';
 export { PAYMENT_IDENTIFIER, PAYMENT_ID_MAX_LENGTH, PAYMENT_ID_MIN_LENGTH, PAYMENT_ID_PATTERN, PaymentIdentifierExtension, PaymentIdentifierInfo, PaymentIdentifierSchema, PaymentIdentifierValidationResult, appendPaymentIdentifierToExtensions, declarePaymentIdentifierExtension, extractAndValidatePaymentIdentifier, extractPaymentIdentifier, generatePaymentId, hasPaymentIdentifier, isPaymentIdentifierExtension, isPaymentIdentifierRequired, isValidPaymentId, paymentIdentifierResourceServerExtension, paymentIdentifierSchema, validatePaymentIdentifier, validatePaymentIdentifierRequirement } from './payment-identifier/index.js';
 import '@x402/core/http';
 import '@x402/core/types';

package/dist/cjs/index.js

@@ -70,8 +70,10 @@ __export(src_exports, {
   getSolanaAddress: () => getSolanaAddress,
   hasPaymentIdentifier: () => hasPaymentIdentifier,
   isDiscoverableV1: () => isDiscoverableV1,
+  isEVMSigner: () => isEVMSigner,
   isPaymentIdentifierExtension: () => isPaymentIdentifierExtension,
   isPaymentIdentifierRequired: () => isPaymentIdentifierRequired,
+  isSolanaSigner: () => isSolanaSigner,
   isValidPaymentId: () => isValidPaymentId,
   parseSIWxHeader: () => parseSIWxHeader,
   paymentIdentifierResourceServerExtension: () => paymentIdentifierResourceServerExtension,
@@ -620,6 +622,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 +901,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 +1061,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 +1078,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 +1261,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;
@@ -1485,8 +1541,10 @@ var paymentIdentifierResourceServerExtension = {
   getSolanaAddress,
   hasPaymentIdentifier,
   isDiscoverableV1,
+  isEVMSigner,
   isPaymentIdentifierExtension,
   isPaymentIdentifierRequired,
+  isSolanaSigner,
   isValidPaymentId,
   parseSIWxHeader,
   paymentIdentifierResourceServerExtension,