Merge pull request #13 from kojibai/main

Phinetwork · web-flow · commit 2bc0e24f4842 · 2026-01-08T19:40:21.000-05:00
v2.5.0
diff --git a/src/SigilMarkets/utils/prophecySigil.ts b/src/SigilMarkets/utils/prophecySigil.ts
@@ -6,6 +6,8 @@ import type { ProphecyId, ProphecySigilPayloadV1, ProphecySigilZkBundle } from "
 import { asProphecyId } from "../types/prophecySigilTypes";
 import type { KaiPulse, MicroDecimalString, PhiMicro } from "../types/marketTypes";
 import type { KaiMoment as KaiMomentExact } from "../../utils/kai_pulse";
+import { STEPS_BEAT } from "../../utils/kai_pulse";
+import { stepIndexFromPulse, stepProgressWithinStepFromPulse } from "../../utils/kaiMath";
 import { asMicroDecimalString } from "../types/marketTypes";
 import type { KaiSignature, UserPhiKey } from "../types/vaultTypes";
 import { sha256Hex } from "./ids";
@@ -263,25 +265,31 @@ export const buildProphecyPayloadBase = (args: Readonly<{
   userPhiKey: UserPhiKey;
   kaiSignature: KaiSignature;
   moment: KaiMomentExact;
-}>): Omit<ProphecySigilPayloadV1, "canonicalHash" | "zk"> => ({
-  v: "SM-PROPHECY-1",
-  kind: "prophecy",
-  prophecyId: args.prophecyId,
-  text: args.text,
-  textEnc: args.textEnc,
-  category: args.category,
-  expirationPulse: args.expirationPulse,
-  escrowPhiMicro: args.escrowPhiMicro,
-  evidence: args.evidence,
-  userPhiKey: args.userPhiKey,
-  kaiSignature: args.kaiSignature,
-  pulse: args.moment.pulse,
-  beat: args.moment.beat,
-  stepIndex: args.moment.stepIndex,
-  stepPct: args.moment.stepPctAcrossBeat,
-  chakraDay: args.moment.chakraDay,
-  createdAtPulse: args.moment.pulse,
-});
+}>): Omit<ProphecySigilPayloadV1, "canonicalHash" | "zk"> => {
+  const stepIndex = stepIndexFromPulse(args.moment.pulse, STEPS_BEAT);
+  const stepProgress = stepProgressWithinStepFromPulse(args.moment.pulse, STEPS_BEAT);
+  const stepPct = (stepIndex + stepProgress) / STEPS_BEAT;
+
+  return {
+    v: "SM-PROPHECY-1",
+    kind: "prophecy",
+    prophecyId: args.prophecyId,
+    text: args.text,
+    textEnc: args.textEnc,
+    category: args.category,
+    expirationPulse: args.expirationPulse,
+    escrowPhiMicro: args.escrowPhiMicro,
+    evidence: args.evidence,
+    userPhiKey: args.userPhiKey,
+    kaiSignature: args.kaiSignature,
+    pulse: args.moment.pulse,
+    beat: args.moment.beat,
+    stepIndex,
+    stepPct,
+    chakraDay: args.moment.chakraDay,
+    createdAtPulse: args.moment.pulse,
+  };
+};
 
 export const buildProphecySvg = (payload: ProphecySigilPayloadV1, textEncoded?: string): string => {
   const textEnc = payload.textEnc ?? "uri";
diff --git a/src/config/buildInfo.ts b/src/config/buildInfo.ts
@@ -1,5 +1,5 @@
 export const APP_NAME = "Vérahai";
-export const APP_VERSION = "2.3.0";
+export const APP_VERSION = "2.5.0";
 export const GITHUB_REPO_URL = "https://github.com/phinetwork/verahai";
 
 export const GITHUB_RELEASE_URL = (version: string): string =>
diff --git a/src/pages/SigilPage/SigilPage.tsx b/src/pages/SigilPage/SigilPage.tsx
@@ -475,6 +475,12 @@ export default function SigilPage() {
     const candidate = raw as ProphecySigilPayloadV1;
     return candidate.kind === "prophecy" ? candidate : null;
   }, [payload]);
+  const prophecyPayloadExtras = useMemo(
+    () => (prophecyPayload ? { prophecyPayload } : undefined),
+    [prophecyPayload],
+  );
+  const prophecyPhiKey = prophecyPayload?.userPhiKey ?? null;
+  const prophecyKaiSignature = prophecyPayload?.kaiSignature ?? null;
 
   const prophecyDetails = useMemo<ProphecyDetails | null>(() => {
     if (!prophecyPayload) return null;
@@ -1460,14 +1466,16 @@ const openHistoryPress = useFastPress<HTMLButtonElement>(() => setHistoryOpen(tr
       const rawAmount = (meta as Partial<{ claimExtendAmount?: unknown }>).claimExtendAmount;
       const amountForShare: number | null = typeof rawAmount === "number" ? rawAmount : null;
 
+      const resolvedUserPhiKey = meta.userPhiKey ?? prophecyPhiKey;
+      const resolvedKaiSignature = meta.kaiSignature ?? prophecyKaiSignature;
       const shareable: ShareableSigilMeta = {
         pulse: meta.pulse,
         beat: meta.beat,
         chakraDay: meta.chakraDay ?? "Root",
         stepsPerBeat: stepsNum,
         stepIndex: sealedStepIndex,
-        userPhiKey: meta.userPhiKey ?? null,
-        kaiSignature: meta.kaiSignature ?? null,
+        userPhiKey: resolvedUserPhiKey ?? null,
+        kaiSignature: resolvedKaiSignature ?? null,
         canonicalHash: canonical,
         transferNonce: meta.transferNonce ?? null,
         expiresAtPulse: meta.expiresAtPulse ?? null,
@@ -1480,7 +1488,7 @@ const openHistoryPress = useFastPress<HTMLButtonElement>(() => setHistoryOpen(tr
         routeHash,
         stepsPerBeat: STEPS_PER_BEAT,
         stepIndexFromPulse,
-      });
+      }, prophecyPayloadExtras);
 
       let finalUrl = out?.url || `/s/${canonical}`;
 try {
@@ -1506,7 +1514,7 @@ current.searchParams.forEach((v, k) => {
       setSealOpen(true);
       return finalUrl;
     },
-    [localHash, routeHash]
+    [localHash, routeHash, prophecyKaiSignature, prophecyPayloadExtras, prophecyPhiKey]
   );
 
   /* 11-breath upgrade claim window helper */
@@ -1689,14 +1697,15 @@ current.searchParams.forEach((v, k) => {
             stepIndex: payload.stepIndex ?? null,
             exportedAtPulse: payload.exportedAtPulse ?? null,
             canonicalHash: payload.canonicalHash ?? null,
-            userPhiKey: payload.userPhiKey ?? null,
-            kaiSignature: payload.kaiSignature ?? null,
+            userPhiKey: payload.userPhiKey ?? prophecyPhiKey ?? null,
+            kaiSignature: payload.kaiSignature ?? prophecyKaiSignature ?? null,
             transferNonce: payload.transferNonce ?? null,
             expiresAtPulse: payload.expiresAtPulse ?? null,
             claimExtendUnit: unitForExport,
             claimExtendAmount: amountForExport,
             attachment: payload.attachment ?? null,
             provenance: (payload.provenance as ProvenanceEntry[] | null) ?? null,
+            payloadExtras: prophecyPayloadExtras,
           }
         : null,
       isFutureSealed,
@@ -2720,8 +2729,8 @@ return () => document.body.classList.remove(cls);
         >
           <KaiSigil
             pulse={pulse}
-            beat={payload.beat}
-            stepIndex={typeof payload.stepIndex === "number" ? payload.stepIndex : undefined}
+            beat={beatIndexFromPulse(pulse)}
+            stepIndex={stepIndex}
             chakraDay={chakraDay}
             size={sigilSize}
             hashMode="deterministic"
diff --git a/src/pages/SigilPage/exportZip.ts b/src/pages/SigilPage/exportZip.ts
@@ -25,6 +25,14 @@ type ChakraDay =
   | "Third Eye"
   | "Crown";
 
+type UnknownRecord = Record<string, unknown>;
+
+const SVG_NS = "http://www.w3.org/2000/svg";
+const PROOF_METADATA_ID = "kai-voh-proof";
+
+const isRecord = (value: unknown): value is UnknownRecord =>
+  typeof value === "object" && value !== null && !Array.isArray(value);
+
 function stableStringify(v: unknown): string {
   if (v === null || typeof v !== "object") return JSON.stringify(v);
   if (Array.isArray(v)) return "[" + v.map(stableStringify).join(",") + "]";
@@ -58,6 +66,7 @@ export type ExportableSigilMeta = {
   /** misc */
   attachment?: { name?: string | null } | null;
   provenance?: Array<Record<string, unknown>> | null;
+  payloadExtras?: Record<string, unknown>;
 };
 
 /** Coerce any free-form value into a valid ChakraDay; default to "Root". */
@@ -158,6 +167,47 @@ function updateSvgUrlSurfaces(svgEl: SVGSVGElement, fullUrl: string): void {
   });
 }
 
+function buildProphecyZkBundle(payloadExtras?: Record<string, unknown>, shareUrl?: string): UnknownRecord | null {
+  if (!payloadExtras) return null;
+  const rawProphecy = isRecord(payloadExtras.prophecyPayload) ? payloadExtras.prophecyPayload : null;
+  const rawZk = rawProphecy && isRecord(rawProphecy.zk) ? rawProphecy.zk : null;
+  if (!rawZk) return null;
+
+  const zkPoseidonHash = typeof rawZk.poseidonHash === "string" ? rawZk.poseidonHash : undefined;
+  const zkProof = "proof" in rawZk ? rawZk.proof : undefined;
+  const zkPublicInputs =
+    Array.isArray(rawZk.publicInputs) || typeof rawZk.publicInputs === "string"
+      ? rawZk.publicInputs
+      : undefined;
+
+  if (!zkPoseidonHash && zkProof === undefined && zkPublicInputs === undefined) return null;
+
+  const bundle: UnknownRecord = {
+    shareUrl,
+    zkPoseidonHash,
+    zkProof,
+    zkPublicInputs,
+  };
+
+  Object.keys(bundle).forEach((key) => {
+    if (bundle[key] === undefined) delete bundle[key];
+  });
+
+  return bundle;
+}
+
+function upsertProofMetadata(svgEl: SVGSVGElement, bundle: UnknownRecord): void {
+  const doc = svgEl.ownerDocument ?? document;
+  let meta = svgEl.querySelector<SVGMetadataElement>(`metadata#${PROOF_METADATA_ID}`);
+  if (!meta) {
+    meta = doc.createElementNS(SVG_NS, "metadata") as SVGMetadataElement;
+    meta.setAttribute("id", PROOF_METADATA_ID);
+    meta.setAttribute("type", "application/json");
+    svgEl.appendChild(meta);
+  }
+  meta.textContent = JSON.stringify(bundle);
+}
+
 export async function exportZIP(ctx: {
   expired: boolean;
   exporting: boolean;
@@ -240,6 +290,7 @@ export async function exportZIP(ctx: {
       claimExtendUnit: payload.claimExtendUnit ?? expiryUnit,
       claimExtendAmount: payload.claimExtendAmount ?? expiryAmount,
       canonicalHash: (localHash || payload.canonicalHash || routeHash || null)?.toString() ?? null,
+      payloadExtras: payload.payloadExtras,
     };
 
     // canonical Σ and Φ (0-based stepIndex)
@@ -258,8 +309,11 @@ export async function exportZIP(ctx: {
     const claimedMetaCanon: ExportableSigilMeta = {
       ...claimedMeta,
       kaiSignature: canonicalSig,
-      userPhiKey: claimedMeta.userPhiKey || phiKeyCanon,
+      userPhiKey: phiKeyCanon,
     };
+    svgEl.setAttribute("data-kai-signature", canonicalSig);
+    svgEl.setAttribute("data-phi-key", phiKeyCanon);
+    const payloadExtras = claimedMetaCanon.payloadExtras ?? {};
 
     // Build the canonical share URL for manifest — canonical is in the path, NOT the payload
     const canonicalLower = (localHash || routeHash || "").toLowerCase();
@@ -279,20 +333,29 @@ export async function exportZIP(ctx: {
 
     const fullUrlForManifest = rewriteUrlPayload(
       baseUrlForManifest,
-      sharePayloadForManifest,
+      { ...payloadExtras, ...sharePayloadForManifest },
       tokenForManifest
     );
 
     // Canonical payload write only (single call) — include URL hints for readers
     const { putMetadata } = await import("../../utils/svgMeta");
     const metaForSvg: Record<string, unknown> = {
+      ...payloadExtras,
       ...claimedMetaCanon,
       stepsPerBeat: stepsNum,
       shareUrl: fullUrlForManifest, // hint for consumers
       fullUrl: fullUrlForManifest,  // alias
     };
+    if (typeof metaForSvg.userPhiKey === "string" && !metaForSvg.phiKey) {
+      metaForSvg.phiKey = metaForSvg.userPhiKey;
+    }
     putMetadata(svgEl, metaForSvg);
 
+    const zkBundle = buildProphecyZkBundle(payloadExtras, fullUrlForManifest);
+    if (zkBundle) {
+      upsertProofMetadata(svgEl, zkBundle);
+    }
+
     // Display-only exposure (non-canonical marker)
     try {
       svgEl.setAttribute("data-step-index", String(sealedStepIndex));
@@ -383,6 +446,7 @@ export async function exportZIP(ctx: {
       fullUrl: fullUrlForManifest,
       p: pValue,
       urlQuery: { p: pValue, t: tValue },
+      payloadExtras: Object.keys(payloadExtras).length ? payloadExtras : null,
     };
     const manifestHash = await sha256HexCanon(stableStringify(manifestPayload));
     const manifest = { ...manifestPayload, manifestHash };
diff --git a/src/pages/SigilPage/linkShare.ts b/src/pages/SigilPage/linkShare.ts
@@ -122,7 +122,8 @@ function resolveStepIndex(
 export function shareTransferLink(
   meta: ShareableSigilMeta,
   forcedToken: string | undefined,
-  deps: ShareDeps
+  deps: ShareDeps,
+  payloadExtras?: Record<string, unknown>
 ): { url: string; token: string } | null {
   // Canonical hash goes in the path, not in the payload
   const canonical = ((meta.canonicalHash ?? deps.localHash ?? deps.routeHash) ?? "").toLowerCase();
@@ -161,7 +162,10 @@ export function shareTransferLink(
     claimExtendAmount: meta.claimExtendAmount ?? undefined,
   };
 
-  const url = ensureClaimTimeInUrl(withToken, metaForP as SigilPayload);
+  const url = ensureClaimTimeInUrl(withToken, {
+    ...(payloadExtras ?? {}),
+    ...metaForP,
+  } as SigilPayload);
   return { url, token };
 }
 
diff --git a/src/utils/payload.ts b/src/utils/payload.ts
@@ -253,6 +253,9 @@ export function decodePayloadFromQuery(search: string): SigilPayload | null {
       if (rawProphecy.evidence && typeof rawProphecy.evidence === "object") {
         trimmedProphecy.evidence = rawProphecy.evidence;
       }
+      if (rawProphecy.zk && typeof rawProphecy.zk === "object") {
+        trimmedProphecy.zk = rawProphecy.zk;
+      }
       (payload as SigilPayload & { prophecyPayload?: unknown }).prophecyPayload =
         trimmedProphecy;
     }

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,9 @@ export function decodePayloadFromQuery(search: string): SigilPayload \| null {`
`253`	`253`	`if (rawProphecy.evidence && typeof rawProphecy.evidence === "object") {`
`254`	`254`	`trimmedProphecy.evidence = rawProphecy.evidence;`
`255`	`255`	`}`
	`256`	`+ if (rawProphecy.zk && typeof rawProphecy.zk === "object") {`
	`257`	`+ trimmedProphecy.zk = rawProphecy.zk;`
	`258`	`+ }`
`256`	`259`	`(payload as SigilPayload & { prophecyPayload?: unknown }).prophecyPayload =`
`257`	`260`	`trimmedProphecy;`
`258`	`261`	`}`