Merge pull request #14 from kojibai/main

Phinetwork · web-flow · commit 17b579ca6bdb · 2026-01-08T20:42:15.000-05:00
v2.6.0
diff --git a/src/SigilMarkets/SigilMarketsShell.tsx b/src/SigilMarkets/SigilMarketsShell.tsx
@@ -44,7 +44,8 @@ export type SigilMarketsShellProps = Readonly<{
 
 type AppliedResolutionKey = string;
 
-const isResolvedLike = (status: string): boolean => status === "resolved" || status === "voided" || status === "canceled";
+const isResolvedLike = (status: string, hasResolution: boolean): boolean =>
+  hasResolution || status === "resolved" || status === "voided" || status === "canceled";
 
 const resolutionKey = (m: Market): AppliedResolutionKey => {
   const rid = m.state.resolution;
@@ -209,7 +210,7 @@ const ShellInner = (props: Readonly<{ windowScroll: boolean }>) => {
     let shouldRefresh = false;
 
     for (const m of list) {
-      if (isResolvedLike(m.state.status)) continue;
+      if (isResolvedLike(m.state.status, !!m.state.resolution)) continue;
 
       const closePulse = m.def.timing.closePulse;
       const resolvePulse = Math.max(
@@ -259,7 +260,6 @@ const ShellInner = (props: Readonly<{ windowScroll: boolean }>) => {
       .filter((m): m is Market => m !== undefined);
 
     for (const m of list) {
-      if (!isResolvedLike(m.state.status)) continue;
       const r = m.state.resolution;
       if (!r) continue;
 
diff --git a/src/SigilMarkets/hooks/useMarketGrid.ts b/src/SigilMarkets/hooks/useMarketGrid.ts
@@ -75,7 +75,8 @@ const tagsAllowed = (tags: readonly string[], required?: readonly string[]): boo
   return true;
 };
 
-const isResolvedLike = (status: string): boolean => status === "resolved" || status === "voided" || status === "canceled";
+const isResolvedLike = (status: string, hasResolution: boolean): boolean =>
+  hasResolution || status === "resolved" || status === "voided" || status === "canceled";
 
 const microToNumberSafe = (v?: PhiMicro): number => {
   if (v === undefined) return 0;
@@ -216,7 +217,7 @@ export const useMarketGrid = (nowPulse: KaiPulse): UseMarketGridResult => {
 
     for (const m of markets) {
       // includeResolved gate
-      if (!filters.includeResolved && isResolvedLike(m.state.status)) continue;
+      if (!filters.includeResolved && isResolvedLike(m.state.status, !!m.state.resolution)) continue;
 
       // query
       if (!matchesQuery(m, filters.query)) continue;
diff --git a/src/SigilMarkets/sigils/PositionSigilMint.tsx b/src/SigilMarkets/sigils/PositionSigilMint.tsx
@@ -927,8 +927,8 @@ export const buildClaimPayload = async (
     openedAt: coerceKaiMoment(pos.entry.openedAt as unknown),
     claimedAt: claimMoment,
     marketDefinitionHash: pos.entry.marketDefinitionHash,
-    label: `Victory ${outcome}`,
-    note: pos.status === "lost" ? "Loss settled" : "Won Sealed",
+    label: pos.status === "lost" ? `Loss ${outcome}` : `Victory ${outcome}`,
+    note: pos.status === "lost" ? "Loss settled" : "Won sealed",
     lineageRootSigilId: lineageRoot.lineageRootSigilId,
     lineageRootSvgHash: lineageRoot.lineageRootSvgHash,
     lineageId,
@@ -1193,13 +1193,15 @@ const amountW = wholeW + fracW;
 
 
   // Center ring microtext (official feel)
+  const claimTone = payload.label?.toLowerCase().includes("loss") ? "LOSS" : "VICTORY";
+  const claimLabel = claimTone === "LOSS" ? "Loss" : "Victory";
   const microSeal = isClaim
-    ? `ΦNET • VICTORY • ${seal.scheme} • ${payload.claimedAt.pulse} • ${String(payload.marketId)} •`
+    ? `ΦNET • ${claimTone} • ${seal.scheme} • ${payload.claimedAt.pulse} • ${String(payload.marketId)} •`
     : `ΦNET • ${okWord} • ${seal.scheme} • ${openedShort} • ${String(payload.marketId)} •`;
 
   const dataKind = isClaim ? "sigilmarkets-claim" : "sigilmarkets-position";
   const ariaLabel = isClaim
-    ? `SigilMarkets Victory — ${payload.outcome} — pulse ${payload.claimedAt.pulse}`
+    ? `SigilMarkets ${claimLabel} — ${payload.outcome} — pulse ${payload.claimedAt.pulse}`
     : `SigilMarkets Position — ${payload.side} — pulse ${payload.openedAt.pulse}`;
 
   return `<?xml version="1.0" encoding="UTF-8"?>
diff --git a/src/SigilMarkets/sigils/SigilExport.tsx b/src/SigilMarkets/sigils/SigilExport.tsx
@@ -239,7 +239,10 @@ const manifestFromSigil = async (opts: {
   return { manifestHash, ...manifestPayload };
 };
 
-const ensureZkProofInSvg = async (svgText: string): Promise<string> => {
+const ensureZkProofInSvg = async (
+  svgText: string,
+  opts?: Readonly<{ allowMissingZkProof?: boolean }>,
+): Promise<string> => {
   const metadataRegex = /<metadata(?:\s[^>]*)?>([\s\S]*?)<\/metadata>/gi;
   let match: RegExpExecArray | null;
 
@@ -292,11 +295,15 @@ const ensureZkProofInSvg = async (svgText: string): Promise<string> => {
         proofHints,
       });
       if (!generated) {
-        throw new Error("ZK proof unavailable for export");
+        if (!opts?.allowMissingZkProof) {
+          throw new Error("ZK proof unavailable for export");
+        }
+        payload.proofHints = proofHints;
+      } else {
+        payload.zkProof = generated.proof as unknown;
+        payload.zkPublicInputs = generated.zkPublicInputs;
+        payload.proofHints = generated.proofHints;
       }
-      payload.zkProof = generated.proof as unknown;
-      payload.zkPublicInputs = generated.zkPublicInputs;
-      payload.proofHints = generated.proofHints;
     } else {
       payload.proofHints = proofHints;
     }
@@ -371,6 +378,9 @@ export type SigilExportOptions = Readonly<{
   /** Export which formats. Default: both */
   exportSvg?: boolean;
   exportPng?: boolean;
+
+  /** Allow export without an embedded ZK proof. */
+  allowMissingZkProof?: boolean;
 }>;
 
 export type SigilZipOptions = Readonly<{
@@ -383,6 +393,9 @@ export type SigilZipOptions = Readonly<{
 
   /** PNG size px (square). Default: 1024 */
   pngSizePx?: number;
+
+  /** Allow export without an embedded ZK proof. */
+  allowMissingZkProof?: boolean;
 }>;
 
 export const exportSigil = async (opts: SigilExportOptions): Promise<ExportResult> => {
@@ -397,7 +410,15 @@ export const exportSigil = async (opts: SigilExportOptions): Promise<ExportResul
     const svgText = opts.svgText ?? (opts.svgUrl ? await fetchText(opts.svgUrl) : null);
     if (!svgText) return { ok: false, error: "Missing svgText/svgUrl" };
 
-    const svgWithProof = await ensureZkProofInSvg(svgText);
+    let svgWithProof = svgText;
+    try {
+      svgWithProof = await ensureZkProofInSvg(svgText, { allowMissingZkProof: opts.allowMissingZkProof });
+    } catch (err) {
+      const message = err instanceof Error ? err.message : "export failed";
+      if (!opts.allowMissingZkProof || message !== "Sigil metadata missing; cannot generate ZK proof") {
+        throw err;
+      }
+    }
 
     if (exportSvg) {
       const blob = new Blob([svgWithProof], { type: "image/svg+xml" });
@@ -423,7 +444,15 @@ export const exportSigilZip = async (opts: SigilZipOptions): Promise<ExportResul
     const svgText = opts.svgText ?? (opts.svgUrl ? await fetchText(opts.svgUrl) : null);
     if (!svgText) return { ok: false, error: "Missing svgText/svgUrl" };
 
-    const svgWithProof = await ensureZkProofInSvg(svgText);
+    let svgWithProof = svgText;
+    try {
+      svgWithProof = await ensureZkProofInSvg(svgText, { allowMissingZkProof: opts.allowMissingZkProof });
+    } catch (err) {
+      const message = err instanceof Error ? err.message : "export failed";
+      if (!opts.allowMissingZkProof || message !== "Sigil metadata missing; cannot generate ZK proof") {
+        throw err;
+      }
+    }
     const size = Math.max(256, Math.min(4096, Math.floor(opts.pngSizePx ?? 1024)));
     const png = await svgToPngBlob(svgWithProof, size);
     const exportMoment = momentFromUTC(new Date());
@@ -459,6 +488,7 @@ export type SigilExportButtonProps = Readonly<{
   mode?: "pair" | "zip";
   className?: string;
   label?: string;
+  allowMissingZkProof?: boolean;
 }>;
 
 export const SigilExportButton = (props: SigilExportButtonProps) => {
@@ -478,6 +508,7 @@ export const SigilExportButton = (props: SigilExportButtonProps) => {
             svgText: props.svgText,
             svgUrl: props.svgUrl,
             pngSizePx: props.pngSizePx ?? 1400,
+            allowMissingZkProof: props.allowMissingZkProof,
           })
         : await exportSigil({
             filenameBase: props.filenameBase,
@@ -486,6 +517,7 @@ export const SigilExportButton = (props: SigilExportButtonProps) => {
             pngSizePx: props.pngSizePx ?? 1024,
             exportSvg: true,
             exportPng: true,
+            allowMissingZkProof: props.allowMissingZkProof,
           });
     if (!res.ok) ui.toast("error", "Export failed", res.error);
     else {
diff --git a/src/SigilMarkets/utils/marketTiming.ts b/src/SigilMarkets/utils/marketTiming.ts
@@ -10,7 +10,11 @@ const clampPulse = (p: KaiPulse): number => {
 
 export const deriveMarketStatus = (market: Market, nowPulse: KaiPulse): MarketStatus => {
   const status = market.state.status;
-  if (status === "resolved" || status === "voided" || status === "canceled") return status;
+  if (status === "canceled") return status;
+  if (market.state.resolution) {
+    return market.state.resolution.outcome === "VOID" ? "voided" : "resolved";
+  }
+  if (status === "resolved" || status === "voided") return status;
   if (status === "resolving" || status === "closed") return status;
 
   const closePulse = clampPulse(market.def.timing.closePulse);
diff --git a/src/SigilMarkets/views/Positions/ExportPositionSheet.tsx b/src/SigilMarkets/views/Positions/ExportPositionSheet.tsx
@@ -51,7 +51,7 @@ export const ExportPositionSheet = (props: ExportPositionSheetProps) => {
 
   const hasResolution = !!p.resolution;
   const shouldLabelClaimProof = hasResolution && (p.status === "claimable" || p.status === "lost");
-  const exportLabel = shouldLabelClaimProof ? "Download victory proof" : undefined;
+  const exportLabel = shouldLabelClaimProof ? (p.status === "lost" ? "Download loss proof" : "Download victory proof") : undefined;
 
   const filenameBase = useMemo(() => {
     const pid = p.id as unknown as string;
@@ -187,6 +187,7 @@ export const ExportPositionSheet = (props: ExportPositionSheetProps) => {
               pngSizePx={2048}
               mode="zip"
               label={exportLabel}
+              allowMissingZkProof={p.status === "lost"}
             />
           ) : (
             <Button
diff --git a/src/SigilMarkets/views/Positions/PositionDetail.tsx b/src/SigilMarkets/views/Positions/PositionDetail.tsx
@@ -114,7 +114,11 @@ export const PositionDetail = (props: PositionDetailProps) => {
   const position = p;
   const hasClaimProof =
     !!position.resolution && (position.status === "claimable" || position.status === "lost");
-  const exportLabel = hasClaimProof ? "Download victory proof" : "Export";
+  const exportLabel = hasClaimProof
+    ? position.status === "lost"
+      ? "Download loss proof"
+      : "Download victory proof"
+    : "Export";
   const canAccessVault = !!activeVault && activeVault.vaultId === position.lock.vaultId;
 
   const openClaimSheet = (): void => {
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.5.0";
+export const APP_VERSION = "2.6.0";
 export const GITHUB_REPO_URL = "https://github.com/phinetwork/verahai";
 
 export const GITHUB_RELEASE_URL = (version: string): string =>
