@chipi-stack/core 0.6.0 → 0.6.2

package/dist/index.cjs

@@ -553,13 +553,17 @@ var DEFAULT_PAYMENT_HEADER = "X-PAYMENT";
 var X402_DOMAIN = {
   name: "x402-starknet",
   version: "1",
-  chainId: "SN_MAIN"
+  chainId: "SN_MAIN",
+  // SNIP-12 revision 1 (StarknetDomain). Without it starknet.js refuses to
+  // hash the typed data, so no account could sign a payment.
+  revision: "1"
 };
 var X402_TYPES = {
   StarknetDomain: [
     { name: "name", type: "shortstring" },
     { name: "version", type: "shortstring" },
-    { name: "chainId", type: "shortstring" }
+    { name: "chainId", type: "shortstring" },
+    { name: "revision", type: "shortstring" }
   ],
   Payment: [
     { name: "from_address", type: "ContractAddress" },
@@ -591,7 +595,7 @@ function buildX402TypedData(message) {
   return {
     types: X402_TYPES,
     primaryType: "Payment",
-    domain: X402_DOMAIN,
+    domain: { ...X402_DOMAIN },
     message: {
       ...resolved,
       amount: { low: resolved.amount, high: "0" }
@@ -765,12 +769,24 @@ function generateNonce() {
   }
   return `${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
 }
+function feltEquals(value, expected) {
+  try {
+    return BigInt(value) === expected;
+  } catch {
+    return false;
+  }
+}
 function normalizeX402Signature(signature) {
   if (Array.isArray(signature)) {
-    if (signature.length < 2) {
-      throw new Error(`Array signature must have at least 2 elements, got ${signature.length}`);
+    if (signature.length === 2) {
+      return { r: String(signature[0]), s: String(signature[1]) };
+    }
+    if (signature.length === 5 && feltEquals(signature[0], 1n) && feltEquals(signature[1], 0n)) {
+      return { r: String(signature[3]), s: String(signature[4]) };
     }
-    return { r: String(signature[0]), s: String(signature[1]) };
+    throw new Error(
+      `Unsupported ${signature.length}-felt signature: x402 needs one Starknet key, signed as [r, s] (OpenZeppelin, Braavos) or [1, 0, pubkey, r, s] (Argent / Ready).`
+    );
   }
   if (signature && typeof signature === "object" && "r" in signature && "s" in signature) {
     const sig = signature;