Update server.mjs

Author: GsCommand

server.mjs

@@ -1396,12 +1396,9 @@ return res.json(receipt);
       }
 
       return res.status(500).json(receipt);
-<<<<<<< HEAD
  eed1802 (Runtime: signer env standardization + ENS verify smoke)
 
   }
-=======
->>>>>>> 37238de (Fix verify route structure and restore compile integrity)
 }
 
 // -----------------------
@@ -1583,30 +1580,25 @@ app.post("/debug/prewarm", requireDebug, (req, res) => {
 // verify endpoint (signature/hash + optional schema + optional ENS binding)
 // -----------------------
 app.post("/verify", async (req, res) => {
-<<<<<<< HEAD
   const receipt = req.body;
-=======
+
   const work = async () => {
     const receipt = req.body;
->>>>>>> 37238de (Fix verify route structure and restore compile integrity)
 
   const wantEns = String(req.query.ens || "0") === "1";
   const strictKid = String(req.query.strict_kid || "0") === "1";
   const refresh = String(req.query.refresh || "0") === "1";
   const wantSchema = String(req.query.schema || "0") === "1";
 
-<<<<<<< HEAD
   const proof = receipt?.metadata?.proof;
   const proofCanonical = String(proof?.canonical_id || proof?.canonical || "");
   const runtimeCoreReceipt = normalizeReceiptForRuntimeCoreVerify(receipt);
 
   const verifyLogic = async () => {
-=======
     const proof = receipt?.metadata?.proof;
     const proofCanonical = String(proof?.canonical_id || proof?.canonical || "");
     const runtimeCoreReceipt = normalizeReceiptForRuntimeCoreVerify(receipt);
 
->>>>>>> 37238de (Fix verify route structure and restore compile integrity)
     if (!proof?.signature_b64 || !proof?.hash_sha256) {
       return res.status(400).json({
         ok: false,
@@ -1655,18 +1647,16 @@ app.post("/verify", async (req, res) => {
         canonical: ensOut.canonical || null,
       };
 
-<<<<<<< HEAD
       const kidOk = strictKid && ensExpect.kid ? String(proof.kid || "") === ensExpect.kid : true;
       const canonicalOk = proofCanonical === String(ensExpect.canonical || "");
       const signerOk = String(proof.signer_id || "") === String(ensExpect.signer_ens || "");
-=======
+
       // Enforce kid/canonical/signer binding from ENS BEFORE cryptographic verify
       const kidOk =
         strictKid && ensExpect.kid ? String(proof.kid || "") === ensExpect.kid : true;
 
       const canonicalOk = proofCanonical === (ensExpect.canonical || "");
       const signerOk = String(proof.signer_id || "") === (ensExpect.signer_ens || "");
->>>>>>> 37238de (Fix verify route structure and restore compile integrity)
 
       if (!kidOk || !canonicalOk || !signerOk) {
         return res.status(400).json({
@@ -1795,15 +1785,13 @@ app.post("/verify", async (req, res) => {
       }
     }
 
-<<<<<<< HEAD
     const okFinal = hashMatches === true && signatureValid === true && (wantSchema ? schemaOk === true : true);
-=======
+
     // ok requires proven hash+sig; schema only required if requested
     const okFinal =
       hashMatches === true &&
       signatureValid === true &&
       (wantSchema ? schemaOk === true : true);
->>>>>>> 37238de (Fix verify route structure and restore compile integrity)
 
     return res.json({
       ok: okFinal,
@@ -1833,11 +1821,9 @@ app.post("/verify", async (req, res) => {
 
   try {
     await Promise.race([
-<<<<<<< HEAD
       verifyLogic(),
-=======
+
       work(),
->>>>>>> 37238de (Fix verify route structure and restore compile integrity)
       new Promise((_, rej) => setTimeout(() => rej(new Error("verify_timeout")), VERIFY_MAX_MS)),
     ]);
   } catch (e) {
@@ -1865,4 +1851,4 @@ initializeSignerConfigOrThrow();
 app.listen(PORT, HOST, () => {
   console.log(`runtime listening on http://${HOST}:${PORT}`);
 });
-}); // <-- closes app.post("/verify", ... )
+}); // <-- closes app.post("/verify", ... )