@x402/extensions 2.3.0 → 2.3.1

package/dist/cjs/sign-in-with-x/index.d.ts

@@ -315,10 +315,10 @@ interface EVMSigner {
     address?: string;
 }
 /**
- * Signer interface for Solana SIWX message signing.
- * Compatible with @solana/wallet-adapter and Phantom/Solflare wallet APIs.
+ * Wallet adapter style Solana signer.
+ * Compatible with @solana/wallet-adapter, Phantom/Solflare wallet APIs.
  */
-interface SolanaSigner {
+interface WalletAdapterSigner {
     /** Sign a message and return raw signature bytes */
     signMessage: (message: Uint8Array) => Promise<Uint8Array>;
     /** Solana public key (Base58 encoded string or PublicKey-like object) */
@@ -326,6 +326,23 @@ interface SolanaSigner {
         toBase58: () => string;
     };
 }
+/**
+ * Solana Kit KeyPairSigner style.
+ * Compatible with createKeyPairSignerFromBytes and generateKeyPairSigner from @solana/kit.
+ */
+type SolanaKitSigner = {
+    /** Solana address (Base58 encoded string) */
+    address: string;
+    /** Sign messages - accepts messages with content and signatures */
+    signMessages: (messages: Array<{
+        content: Uint8Array;
+        signatures: Record<string, unknown>;
+    }>) => Promise<Array<Record<string, Uint8Array>>>;
+};
+/**
+ * Union type for Solana signers - supports both wallet adapter and @solana/kit.
+ */
+type SolanaSigner = WalletAdapterSigner | SolanaKitSigner;
 /**
  * Union type for SIWX signers - supports both EVM and Solana wallets.
  */
@@ -339,6 +356,7 @@ type SIWxSigner = EVMSigner | SolanaSigner;
 declare function getEVMAddress(signer: EVMSigner): string;
 /**
  * Get address from a Solana signer.
+ * Supports both wallet adapter (publicKey) and @solana/kit (address) interfaces.
  *
  * @param signer - Solana wallet signer instance
  * @returns The wallet address as a Base58 string
@@ -356,6 +374,7 @@ declare function signEVMMessage(message: string, signer: EVMSigner): Promise<str
 /**
  * Sign a message with a Solana wallet.
  * Returns Base58-encoded signature.
+ * Supports both wallet adapter (signMessage) and @solana/kit (signMessages) interfaces.
  *
  * @param message - The message to sign
  * @param signer - Solana wallet signer instance
@@ -490,6 +509,14 @@ declare function decodeBase58(encoded: string): Uint8Array;
  * @returns Base58 encoded string
  */
 declare function encodeBase58(bytes: Uint8Array): string;
+/**
+ * Detect if a signer is Solana-compatible.
+ * Checks for Solana-specific properties that don't exist on EVM signers.
+ *
+ * @param signer - The signer to check
+ * @returns true if the signer is a Solana signer
+ */
+declare function isSolanaSigner(signer: SIWxSigner): boolean;
 
 /**
  * Server-side declaration helper for SIWX extension
@@ -869,6 +896,14 @@ declare function formatSIWEMessage(info: CompleteSIWxInfo, address: string): str
  * ```
  */
 declare function verifyEVMSignature(message: string, address: string, signature: string, verifier?: EVMMessageVerifier): Promise<boolean>;
+/**
+ * Detect if a signer is EVM-compatible.
+ * Checks for EVM-specific properties.
+ *
+ * @param signer - The signer to check
+ * @returns true if the signer is an EVM signer
+ */
+declare function isEVMSigner(signer: SIWxSigner): boolean;
 
 /**
  * Storage interface for SIWX payment tracking.
@@ -1029,8 +1064,9 @@ declare function createSIWxRequestHook(options: CreateSIWxHookOptions): (context
 /**
  * Creates an onPaymentRequired hook for client-side SIWX authentication.
  *
- * Uses the network from payment requirements to select the appropriate chain
- * from the server's supportedChains.
+ * Matches the signer type to a compatible chain in supportedChains.
+ * For EVM signers: matches any eip191 chain
+ * For Solana signers: matches any ed25519 chain
  *
  * @param signer - Wallet signer for creating SIWX proofs
  * @returns Hook function for x402HTTPClient.onPaymentRequired()
@@ -1052,4 +1088,4 @@ declare function createSIWxClientHook(signer: SIWxSigner): (context: {
     headers: Record<string, string>;
 } | void>;
 
-export { type CompleteSIWxInfo, type CreateSIWxHookOptions, type DeclareSIWxOptions, type EVMMessageVerifier, type EVMSigner, InMemorySIWxStorage, SIGN_IN_WITH_X, type SIWxExtension, type SIWxExtensionInfo, type SIWxExtensionSchema, type SIWxHookEvent, type SIWxPayload, SIWxPayloadSchema, type SIWxSigner, type SIWxStorage, type SIWxValidationOptions, type SIWxValidationResult, type SIWxVerifyOptions, type SIWxVerifyResult, SOLANA_DEVNET, SOLANA_MAINNET, SOLANA_TESTNET, type SignatureScheme, type SignatureType, type SolanaSigner, type 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 };
+export { type CompleteSIWxInfo, type CreateSIWxHookOptions, type DeclareSIWxOptions, type EVMMessageVerifier, type EVMSigner, InMemorySIWxStorage, SIGN_IN_WITH_X, type SIWxExtension, type SIWxExtensionInfo, type SIWxExtensionSchema, type SIWxHookEvent, type SIWxPayload, SIWxPayloadSchema, type SIWxSigner, type SIWxStorage, type SIWxValidationOptions, type SIWxValidationResult, type SIWxVerifyOptions, type SIWxVerifyResult, SOLANA_DEVNET, SOLANA_MAINNET, SOLANA_TESTNET, type SignatureScheme, type SignatureType, type SolanaSigner, type 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 };

package/dist/cjs/sign-in-with-x/index.js

@@ -52,6 +52,8 @@ __export(sign_in_with_x_exports, {
   formatSIWSMessage: () => formatSIWSMessage,
   getEVMAddress: () => getEVMAddress,
   getSolanaAddress: () => getSolanaAddress,
+  isEVMSigner: () => isEVMSigner,
+  isSolanaSigner: () => isSolanaSigner,
   parseSIWxHeader: () => parseSIWxHeader,
   signEVMMessage: () => signEVMMessage,
   signSolanaMessage: () => signSolanaMessage,
@@ -138,6 +140,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() {
@@ -402,6 +419,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) {
@@ -538,8 +579,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) {
@@ -549,8 +596,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
@@ -723,15 +779,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;
@@ -772,6 +828,8 @@ function createSIWxClientHook(signer) {
   formatSIWSMessage,
   getEVMAddress,
   getSolanaAddress,
+  isEVMSigner,
+  isSolanaSigner,
   parseSIWxHeader,
   signEVMMessage,
   signSolanaMessage,