@orangecheck/sdk 1.15.0 → 1.16.0

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { bech32 } from '@scure/base';
-import { Buffer } from 'buffer';
 import { verifySignature as verifySignature$1, decodeAddress } from '@orangecheck/bip322';
+import { Buffer } from 'buffer';
 import { hmac } from '@noble/hashes/hmac.js';
 import { sha256 } from '@noble/hashes/sha2.js';
 import { bytesToHex, utf8ToBytes } from '@noble/hashes/utils.js';
@@ -245,109 +245,28 @@ function computeScore(sats, days, config) {
 function computeAllScores(sats, days) {
   return { v0: scoreV0(sats, days), tier: scoreTier(sats, days) };
 }
-
-// src/verify.ts
-var log = createLogger("ocp/verify");
-function looksLikeHex(s) {
-  return /^[0-9a-fA-F]+$/.test(s) && s.length % 2 === 0;
-}
 function toBase64Maybe(sig) {
-  if (looksLikeHex(sig)) {
+  if (/^[0-9a-fA-F]+$/.test(sig) && sig.length % 2 === 0) {
     return Buffer.from(sig, "hex").toString("base64");
   }
   return sig;
 }
-function detectSignatureScheme(addr, sig) {
-  const isSegWit = addr.startsWith("bc1") || addr.startsWith("tb1");
-  if (isSegWit) {
-    return "bip322";
-  }
+function signatureScheme(sigBase64) {
+  if (/^(ful|pof)/.test(sigBase64)) return null;
+  if (sigBase64.startsWith("smp")) return "bip322";
+  return Buffer.from(sigBase64, "base64").length === 65 ? "legacy" : "bip322";
+}
+
+// src/verify.ts
+var log = createLogger("ocp/verify");
+async function verifySignature({ addr, msg, sig }) {
   const sigBase64 = toBase64Maybe(sig);
-  const looksLikeLegacy = sigBase64.length === 88 && /^[IHG]/.test(sigBase64);
-  if (looksLikeLegacy) {
-    return "legacy";
-  }
-  return "bip322";
-}
-async function verifySignature({
-  addr,
-  msg,
-  sig,
-  scheme
-}) {
-  const detectedScheme = scheme || detectSignatureScheme(addr, sig);
-  log.debug(
-    { addr, msgLength: msg.length, sigLength: sig.length, scheme: detectedScheme },
-    "Verifying signature"
-  );
-  if (detectedScheme === "bip322") {
-    const sigBase64 = toBase64Maybe(sig);
-    log.debug(
-      { sigBase64: sigBase64.substring(0, 50) + "..." },
-      "Signature converted to base64"
-    );
-    log.debug(
-      {
-        msgFull: msg,
-        msgLines: msg.split("\n").length,
-        msgFirstLine: msg.split("\n")[0],
-        msgLastLine: msg.split("\n")[msg.split("\n").length - 1]
-      },
-      "Message being verified"
-    );
-    const ok = verifySignature$1(addr, msg, sigBase64);
-    log.info({ addr, ok }, "BIP-322 verification result");
-    if (!ok) {
-      const isSegWit = addr.startsWith("bc1") || addr.startsWith("tb1");
-      if (isSegWit && sigBase64.length === 88) {
-        log.warn(
-          { addr, wallet: "possibly Electrum", sigLength: sigBase64.length },
-          "BIP-322 verification failed - likely Electrum wallet (does not support BIP-322 for SegWit)"
-        );
-      } else {
-        log.error(
-          {
-            addr,
-            sigLength: sigBase64.length,
-            msgLength: msg.length,
-            msgPreview: msg.substring(0, 200)
-          },
-          "BIP-322 verification failed - signature does not match message"
-        );
-      }
-    }
-    return ok ? "sig_ok_bip322" : "sig_invalid";
-  }
-  if (detectedScheme === "legacy") {
-    const sigBase64 = toBase64Maybe(sig);
-    if (!addr.startsWith("1") && !addr.startsWith("m") && !addr.startsWith("n")) {
-      log.warn({ addr }, "Legacy signature attempted on non-P2PKH address");
-      return "sig_unsupported_script";
-    }
-    log.debug(
-      {
-        addr,
-        sigBase64: sigBase64.substring(0, 50) + "...",
-        msgPreview: msg.substring(0, 100) + "...",
-        msgLength: msg.length
-      },
-      "Verifying legacy signature"
-    );
-    const ok = verifySignature$1(addr, msg, sigBase64);
-    log.info({ addr, ok, sigBase64Length: sigBase64.length }, "Legacy verification result");
-    if (!ok) {
-      log.error(
-        {
-          addr,
-          msgFirstLine: msg.split("\n")[0],
-          sigFormat: sigBase64.substring(0, 10)
-        },
-        "Legacy signature verification failed - check message format and signature"
-      );
-    }
-    return ok ? "sig_ok_legacy" : "sig_invalid";
-  }
-  return "invalid_scheme";
+  const scheme = signatureScheme(sigBase64);
+  if (!scheme) return "sig_unsupported_script";
+  const ok = verifySignature$1(addr, msg, sigBase64);
+  log.info({ addr, ok, scheme, msgLength: msg.length }, "Signature verification result");
+  if (!ok) return "sig_invalid";
+  return scheme === "legacy" ? "sig_ok_legacy" : "sig_ok_bip322";
 }
 async function signatureIsValid(input) {
   try {
@@ -1486,24 +1405,17 @@ async function verifyChallenge(opts) {
   if (opts.expectedPurpose && purpose !== opts.expectedPurpose) {
     return { ok: false, reason: "purpose_mismatch" };
   }
-  const scheme = opts.scheme ?? "bip322";
-  let sigValid;
-  if (scheme === "bip322") {
-    const sigBase64 = /^[0-9a-fA-F]+$/.test(opts.signature) && opts.signature.length % 2 === 0 ? Buffer.from(opts.signature, "hex").toString("base64") : opts.signature;
-    sigValid = verifySignature$1(address, opts.message, sigBase64);
-  } else if (scheme === "legacy") {
-    if (!/^[1m][a-km-zA-HJ-NP-Z1-9]{25,34}$/.test(address)) {
-      return { ok: false, reason: "sig_unsupported_scheme" };
-    }
-    sigValid = verifySignature$1(address, opts.message, opts.signature);
-  } else {
-    return { ok: false, reason: "sig_unsupported_scheme" };
+  const sigBase64 = toBase64Maybe(opts.signature);
+  const scheme = signatureScheme(sigBase64);
+  if (!scheme) return { ok: false, reason: "sig_unsupported_scheme" };
+  if (!verifySignature$1(address, opts.message, sigBase64)) {
+    return { ok: false, reason: "sig_invalid" };
   }
-  if (!sigValid) return { ok: false, reason: "sig_invalid" };
   return {
     ok: true,
     reason: "ok",
     address,
+    scheme,
     expiresAt: expiresAt.getTime(),
     nonce,
     ...audience !== void 0 ? { audience } : {},
@@ -2409,12 +2321,12 @@ var STATUS_META = {
   },
   sig_invalid: {
     label: "Signature verification failed",
-    detail: "The signature does not match the message and address. Common issues: (1) Message not copied exactly from Step 2, (2) Wrong wallet/address used, (3) Wallet does not support BIP-322 (Electrum does NOT support BIP-322 for SegWit addresses - use Sparrow Wallet instead). For testnet, ensure your wallet is in testnet mode.",
+    detail: "The signature does not match the message and address. Common issues: (1) the message was not copied exactly, (2) a different address signed it, (3) the wallet signed on another network.",
     severity: "error"
   },
   sig_unsupported_script: {
-    label: "Wallet does not support BIP-322",
-    detail: 'Your wallet generated a legacy signature, but your SegWit address (bc1/tb1) requires BIP-322 message signing. Please use a wallet that supports BIP-322 (like Sparrow Wallet or Bitcoin Core), or switch to a P2PKH address (starting with "1" for mainnet or "m"/"n" for testnet) if your wallet only supports legacy signing.',
+    label: "Signature form not supported",
+    detail: "Your wallet made a BIP-322 full or proof-of-funds signature. Sign with a BIP-322 simple signature, or with legacy message signing, which every address type here accepts.",
     severity: "error"
   },
   bond_confirmed: {