@agentcash/router 1.1.0 → 1.1.2

package/dist/index.cjs

@@ -366,6 +366,11 @@ var RouteRegistry = class {
 // src/orchestrate.ts
 var import_server2 = require("next/server");
 
+// src/auth/normalize-wallet.ts
+function normalizeWalletAddress(address) {
+  return address.startsWith("0x") ? address.toLowerCase() : address;
+}
+
 // src/plugin.ts
 function createDefaultContext(meta) {
   const ctx = {
@@ -877,6 +882,23 @@ function getRequirementNetwork(requirements, fallback) {
   const network = requirements?.network;
   return typeof network === "string" ? network : fallback;
 }
+function siwxSignatureType(network) {
+  return network.startsWith("solana:") ? "ed25519" : "eip191";
+}
+function getSupportedChains(x402Accepts, fallbackNetwork) {
+  const seen = /* @__PURE__ */ new Set();
+  const chains = [];
+  for (const accept of x402Accepts) {
+    if (accept.network && !seen.has(accept.network)) {
+      seen.add(accept.network);
+      chains.push({ chainId: accept.network, type: siwxSignatureType(accept.network) });
+    }
+  }
+  if (chains.length === 0) {
+    chains.push({ chainId: fallbackNetwork, type: siwxSignatureType(fallbackNetwork) });
+  }
+  return chains;
+}
 function createRequestHandler(routeEntry, handler, deps) {
   async function invoke(request, meta, pluginCtx, wallet, account, parsedBody) {
     const ctx = {
@@ -1004,12 +1026,14 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!siwxHeader && routeEntry.authMode === "siwx") {
         const url = new URL(request.url);
         const nonce = crypto.randomUUID().replace(/-/g, "");
+        const supportedChains = getSupportedChains(deps.x402Accepts, deps.network);
+        const primaryChain = supportedChains[0];
         const siwxInfo = {
           domain: url.hostname,
           uri: request.url,
           version: "1",
-          chainId: deps.network,
-          type: "eip191",
+          chainId: primaryChain.chainId,
+          type: primaryChain.type,
           nonce,
           issuedAt: (/* @__PURE__ */ new Date()).toISOString(),
           expirationTime: new Date(Date.now() + SIWX_CHALLENGE_EXPIRY_MS).toISOString(),
@@ -1033,7 +1057,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             "sign-in-with-x": {
               info: siwxInfo,
               // supportedChains at top level required by MCP tools for chain detection
-              supportedChains: [{ chainId: deps.network, type: "eip191" }],
+              supportedChains,
               ...siwxSchema ? { schema: siwxSchema } : {}
             }
           }
@@ -1069,7 +1093,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             return response;
           }
         } else {
-          const wallet = siwx.wallet.toLowerCase();
+          const wallet = normalizeWalletAddress(siwx.wallet);
           pluginCtx.setVerifiedWallet(wallet);
           if (routeEntry.authMode === "siwx") {
             firePluginHook(deps.plugin, "onAuthVerified", pluginCtx, {
@@ -1171,7 +1195,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!verify?.valid) return await build402(request, routeEntry, deps, meta, pluginCtx);
       const { payload: verifyPayload, requirements: verifyRequirements } = verify;
       const matchedNetwork = getRequirementNetwork(verifyRequirements, deps.network);
-      const wallet = verify.payer.toLowerCase();
+      const wallet = normalizeWalletAddress(verify.payer);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "x402",
@@ -1194,6 +1218,12 @@ function createRequestHandler(routeEntry, handler, deps) {
             verifyPayload,
             verifyRequirements
           );
+          if (!settle.result?.success) {
+            const reason = settle.result?.errorReason || "x402 settlement returned success=false";
+            const error = new Error(reason);
+            error.errorReason = reason;
+            throw error;
+          }
           if (routeEntry.siwxEnabled) {
             try {
               await deps.entitlementStore.grant(routeEntry.key, wallet);
@@ -1218,6 +1248,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             message: err instanceof Error ? err.message : String(err),
             route: routeEntry.key,
             network: matchedNetwork,
+            errorReason: errObj.errorReason,
             facilitatorStatus: errObj.response?.status,
             facilitatorBody: errObj.response?.data ?? errObj.response?.body
           });
@@ -1266,7 +1297,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       const rawSource = credential?.source ?? "";
       const didParts = rawSource.split(":");
       const lastPart = didParts[didParts.length - 1];
-      const wallet = ((0, import_viem.isAddress)(lastPart) ? (0, import_viem.getAddress)(lastPart) : rawSource).toLowerCase();
+      const wallet = normalizeWalletAddress((0, import_viem.isAddress)(lastPart) ? (0, import_viem.getAddress)(lastPart) : rawSource);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "mpp",
@@ -1762,16 +1793,16 @@ var MemoryEntitlementStore = class {
   async has(route, wallet) {
     const wallets = this.routeToWallets.get(route);
     if (!wallets) return false;
-    return wallets.has(wallet.toLowerCase());
+    return wallets.has(normalizeWalletAddress(wallet));
   }
   async grant(route, wallet) {
-    const normalizedWallet = wallet.toLowerCase();
+    const normalized = normalizeWalletAddress(wallet);
     let wallets = this.routeToWallets.get(route);
     if (!wallets) {
       wallets = /* @__PURE__ */ new Set();
       this.routeToWallets.set(route, wallets);
     }
-    wallets.add(normalizedWallet);
+    wallets.add(normalized);
   }
 };
 function detectRedisClientType2(client) {
@@ -1794,26 +1825,26 @@ function createRedisEntitlementStore(client, options) {
   return {
     async has(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        const result2 = await redis2.sismember(key, normalizedWallet);
+        const result2 = await redis2.sismember(key, normalized);
         return result2 === 1 || result2 === true;
       }
       const redis = client;
-      const result = await redis.sismember(key, normalizedWallet);
+      const result = await redis.sismember(key, normalized);
       return result === 1;
     },
     async grant(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        await redis2.sadd(key, normalizedWallet);
+        await redis2.sadd(key, normalized);
         return;
       }
       const redis = client;
-      await redis.sadd(key, normalizedWallet);
+      await redis.sadd(key, normalized);
     }
   };
 }

package/dist/index.js

@@ -327,6 +327,11 @@ var RouteRegistry = class {
 // src/orchestrate.ts
 import { NextResponse as NextResponse2 } from "next/server";
 
+// src/auth/normalize-wallet.ts
+function normalizeWalletAddress(address) {
+  return address.startsWith("0x") ? address.toLowerCase() : address;
+}
+
 // src/plugin.ts
 function createDefaultContext(meta) {
   const ctx = {
@@ -838,6 +843,23 @@ function getRequirementNetwork(requirements, fallback) {
   const network = requirements?.network;
   return typeof network === "string" ? network : fallback;
 }
+function siwxSignatureType(network) {
+  return network.startsWith("solana:") ? "ed25519" : "eip191";
+}
+function getSupportedChains(x402Accepts, fallbackNetwork) {
+  const seen = /* @__PURE__ */ new Set();
+  const chains = [];
+  for (const accept of x402Accepts) {
+    if (accept.network && !seen.has(accept.network)) {
+      seen.add(accept.network);
+      chains.push({ chainId: accept.network, type: siwxSignatureType(accept.network) });
+    }
+  }
+  if (chains.length === 0) {
+    chains.push({ chainId: fallbackNetwork, type: siwxSignatureType(fallbackNetwork) });
+  }
+  return chains;
+}
 function createRequestHandler(routeEntry, handler, deps) {
   async function invoke(request, meta, pluginCtx, wallet, account, parsedBody) {
     const ctx = {
@@ -965,12 +987,14 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!siwxHeader && routeEntry.authMode === "siwx") {
         const url = new URL(request.url);
         const nonce = crypto.randomUUID().replace(/-/g, "");
+        const supportedChains = getSupportedChains(deps.x402Accepts, deps.network);
+        const primaryChain = supportedChains[0];
         const siwxInfo = {
           domain: url.hostname,
           uri: request.url,
           version: "1",
-          chainId: deps.network,
-          type: "eip191",
+          chainId: primaryChain.chainId,
+          type: primaryChain.type,
           nonce,
           issuedAt: (/* @__PURE__ */ new Date()).toISOString(),
           expirationTime: new Date(Date.now() + SIWX_CHALLENGE_EXPIRY_MS).toISOString(),
@@ -994,7 +1018,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             "sign-in-with-x": {
               info: siwxInfo,
               // supportedChains at top level required by MCP tools for chain detection
-              supportedChains: [{ chainId: deps.network, type: "eip191" }],
+              supportedChains,
               ...siwxSchema ? { schema: siwxSchema } : {}
             }
           }
@@ -1030,7 +1054,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             return response;
           }
         } else {
-          const wallet = siwx.wallet.toLowerCase();
+          const wallet = normalizeWalletAddress(siwx.wallet);
           pluginCtx.setVerifiedWallet(wallet);
           if (routeEntry.authMode === "siwx") {
             firePluginHook(deps.plugin, "onAuthVerified", pluginCtx, {
@@ -1132,7 +1156,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!verify?.valid) return await build402(request, routeEntry, deps, meta, pluginCtx);
       const { payload: verifyPayload, requirements: verifyRequirements } = verify;
       const matchedNetwork = getRequirementNetwork(verifyRequirements, deps.network);
-      const wallet = verify.payer.toLowerCase();
+      const wallet = normalizeWalletAddress(verify.payer);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "x402",
@@ -1155,6 +1179,12 @@ function createRequestHandler(routeEntry, handler, deps) {
             verifyPayload,
             verifyRequirements
           );
+          if (!settle.result?.success) {
+            const reason = settle.result?.errorReason || "x402 settlement returned success=false";
+            const error = new Error(reason);
+            error.errorReason = reason;
+            throw error;
+          }
           if (routeEntry.siwxEnabled) {
             try {
               await deps.entitlementStore.grant(routeEntry.key, wallet);
@@ -1179,6 +1209,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             message: err instanceof Error ? err.message : String(err),
             route: routeEntry.key,
             network: matchedNetwork,
+            errorReason: errObj.errorReason,
             facilitatorStatus: errObj.response?.status,
             facilitatorBody: errObj.response?.data ?? errObj.response?.body
           });
@@ -1227,7 +1258,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       const rawSource = credential?.source ?? "";
       const didParts = rawSource.split(":");
       const lastPart = didParts[didParts.length - 1];
-      const wallet = (isAddress(lastPart) ? getAddress(lastPart) : rawSource).toLowerCase();
+      const wallet = normalizeWalletAddress(isAddress(lastPart) ? getAddress(lastPart) : rawSource);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "mpp",
@@ -1723,16 +1754,16 @@ var MemoryEntitlementStore = class {
   async has(route, wallet) {
     const wallets = this.routeToWallets.get(route);
     if (!wallets) return false;
-    return wallets.has(wallet.toLowerCase());
+    return wallets.has(normalizeWalletAddress(wallet));
   }
   async grant(route, wallet) {
-    const normalizedWallet = wallet.toLowerCase();
+    const normalized = normalizeWalletAddress(wallet);
     let wallets = this.routeToWallets.get(route);
     if (!wallets) {
       wallets = /* @__PURE__ */ new Set();
       this.routeToWallets.set(route, wallets);
     }
-    wallets.add(normalizedWallet);
+    wallets.add(normalized);
   }
 };
 function detectRedisClientType2(client) {
@@ -1755,26 +1786,26 @@ function createRedisEntitlementStore(client, options) {
   return {
     async has(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        const result2 = await redis2.sismember(key, normalizedWallet);
+        const result2 = await redis2.sismember(key, normalized);
         return result2 === 1 || result2 === true;
       }
       const redis = client;
-      const result = await redis.sismember(key, normalizedWallet);
+      const result = await redis.sismember(key, normalized);
       return result === 1;
     },
     async grant(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        await redis2.sadd(key, normalizedWallet);
+        await redis2.sadd(key, normalized);
         return;
       }
       const redis = client;
-      await redis.sadd(key, normalizedWallet);
+      await redis.sadd(key, normalized);
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcash/router",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Unified route builder for Next.js App Router APIs with x402, MPP, SIWX, and API key auth",
   "type": "module",
   "exports": {