diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c34a3675..a93cd845 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,10 +52,9 @@ jobs: continue-on-error: true run: npm run lint - name: Type check - # Pre-existing type errors exist outside this change's scope; surfaced but - # non-blocking until tracked and fixed separately. - continue-on-error: true run: npm run typecheck + - name: Unit tests + run: npm test - name: Build run: npm run build env: diff --git a/PROJECT_ARCHITECTURE.md b/PROJECT_ARCHITECTURE.md index db18ba82..2e7e796a 100644 --- a/PROJECT_ARCHITECTURE.md +++ b/PROJECT_ARCHITECTURE.md @@ -211,8 +211,7 @@ is a fixed-size digest of the canonical payload, keeping it under wallet | `phase-167` | `NEXT_PUBLIC_FEATURE_PHASE_167` / `FEATURE_PHASE_167` | WalletConnect v2 mobile session resilience (`lib/walletconnect-resilience.ts`): configurable relay URL, multi-chain support, session persistence, chain-switch guard, and mobile deep-link return. Spike 623 (issue #486) | off | Unset var, restart — WalletConnect banner and reconnect actions disabled, kit falls back to default single-session behavior | | `phase-168` | `NEXT_PUBLIC_FEATURE_PHASE_168` / `FEATURE_PHASE_168` | xBull wallet full support and parity (`lib/xbull-adapter.ts`): Freighter-difference matrix, xBull module detection, sign result normalization, trustline error translation, and badge surfacing. Spike 624 (issue #487) | off | Unset var, restart — xBull transactions fall through generic kit handlers, badge hidden | | `phase-169` | `NEXT_PUBLIC_FEATURE_PHASE_169` / `FEATURE_PHASE_169` | Ledger blind-signing to clear-signing review for Soroban (`lib/ledger-soroban-decoder.ts`): invokeHostFunction pre-image decode, verification code, on-device review modal, Gate #13 preemptive validation, and hardware error humanizer. Spike 625 (issue #488) | off | Unset var, restart — Ledger transactions fall back to default blind-signing flow without preflight review modal | - - +| `phase-creator-cli` | `FEATURE_PHASE_CREATOR_CLI` / `NEXT_PUBLIC_FEATURE_PHASE_CREATOR_CLI` | Creator CLI (spike 661 / #524): `phase-creator` (`npm run creator --`) with `scaffold`/`validate`/`env`/`pin`/`deploy`/`run`, `--json`/`--dry-run`/`--network testnet`, exit codes 0–5; offline validation byte-identical to `str_is_safe_for_json_fragment` (shared vectors in `contracts/phase-protocol/test-vectors/`); headless pin with the JWT scrubbed; `diagnoseCreatorEnv` reused by `diagnose-env.ts`. Validate/env/dry-run work with the flag off | off | Unset var — pin/deploy/run/scaffold exit 5, read-only commands unchanged; nothing persisted | Flags are read via `lib/feature-flags.ts:isFeatureEnabled`. Client flags use `NEXT_PUBLIC_*`, server also accepts `FEATURE_*`. Zero regression when off. diff --git a/app/api/governance/ve-lock/route.ts b/app/api/governance/ve-lock/route.ts index af037f9b..2fec85f2 100644 --- a/app/api/governance/ve-lock/route.ts +++ b/app/api/governance/ve-lock/route.ts @@ -92,7 +92,7 @@ export async function POST(request: NextRequest) { if (!claimRes.ok) { return NextResponse.json({ error: claimRes.error }, { status: 400, headers: CORS }); } - return NextResponse.json({ ok: true, ...claimRes }, { status: 200, headers: CORS }); + return NextResponse.json({ ...claimRes }, { status: 200, headers: CORS }); } if (action === "withdraw") { @@ -100,7 +100,7 @@ export async function POST(request: NextRequest) { if (!withdrawRes.ok) { return NextResponse.json({ error: withdrawRes.error }, { status: 400, headers: CORS }); } - return NextResponse.json({ ok: true, ...withdrawRes }, { status: 200, headers: CORS }); + return NextResponse.json({ ...withdrawRes }, { status: 200, headers: CORS }); } if (action === "lock") { diff --git a/app/api/ipfs/[...cid]/route.ts b/app/api/ipfs/[...cid]/route.ts index d5b053be..18a516e0 100644 --- a/app/api/ipfs/[...cid]/route.ts +++ b/app/api/ipfs/[...cid]/route.ts @@ -50,7 +50,7 @@ export async function GET( // the 1-year shared cache. const { verifyCID, cacheControlForCid } = await import("@/lib/cid-verification") const requestedCid = parsed.data[0] ?? "" - const verification = verifyCID(requestedCid, result.bytes) + const verification = verifyCID(requestedCid, new Uint8Array(result.bytes)) const gated = request.headers.get("x-phase-gated") === "1" if (!verification.ok && verification.code === "CID_MISMATCH") { diff --git a/app/api/ipfs/route.ts b/app/api/ipfs/route.ts index a75b7e32..1f9879b1 100644 --- a/app/api/ipfs/route.ts +++ b/app/api/ipfs/route.ts @@ -5,6 +5,7 @@ import { isPhase120Enabled, parseAndValidateChecksumHeader, pinFileToIpfsWithRetry, + resolvePinataJwt, resolveRetryConfig, } from "@/lib/ipfs-upload-retry" @@ -13,17 +14,9 @@ const PinataRetryQuerySchema = z.object({ baseDelayMs: z.coerce.number().int().min(100).max(10_000).optional(), }) -function pinataJwt(): string | undefined { - const a = process.env.PINATA_JWT?.trim() - if (a) return a - const b = process.env.PINATA_API_JWT?.trim() - if (b) return b - return undefined -} - /** Returns whether server-side file upload is available (no secrets exposed). */ export async function GET() { - const configured = Boolean(pinataJwt()) + const configured = Boolean(resolvePinataJwt()) return NextResponse.json({ configured }) } @@ -32,7 +25,7 @@ export async function GET() { * Fallback (flag off): legacy single-shot path (no retry). */ export async function POST(req: NextRequest) { - const jwt = pinataJwt() + const jwt = resolvePinataJwt() if (!jwt) { return NextResponse.json({ error: "La subida de imágenes no está configurada en el servidor." }, { status: 503 }) } diff --git a/app/api/market/[id]/offers/[offer_id]/route.ts b/app/api/market/[id]/offers/[offer_id]/route.ts index 6fdf59f4..ec629c15 100644 --- a/app/api/market/[id]/offers/[offer_id]/route.ts +++ b/app/api/market/[id]/offers/[offer_id]/route.ts @@ -53,6 +53,7 @@ export async function POST( // If accepted, mark listing as sold let royalty: Awaited> | null = null + let splits: Awaited> | null = null if (action === "accept") { await soldListing(id) @@ -65,6 +66,12 @@ export async function POST( } } + // Spike 674 (flag-gated): N-way fan-out at accept (dust → first payee, idempotent per offer). + if (isPhaseCollabSplitsEnabled() && listing.split_payees && listing.split_payees.length > 0) { + const computed = computeCollabSplits(offer.amount_phaselq, listing.split_payees) + splits = await recordCollabSplits(id, offer.id, computed) + } + // phase-140: split proceeds with the original creator on a secondary sale. if (isPhase140Enabled()) { const split = computeRoyaltySplit(listing, offer.amount_phaselq) diff --git a/app/api/nft-index/subscribe/route.ts b/app/api/nft-index/subscribe/route.ts index d4eadd6a..83bfeccc 100644 --- a/app/api/nft-index/subscribe/route.ts +++ b/app/api/nft-index/subscribe/route.ts @@ -157,8 +157,21 @@ export function validateWebhookUrl( if (/^\d+$/.test(host) || /^\[/.test(host) || host.includes(":")) { return { ok: false, error: "webhookUrl must use a public hostname", reason: "ip_literal" } } - if (host === "169.254.169.254" || host.startsWith("10.") || host.startsWith("192.168.")) { - return { ok: false, error: "webhookUrl must use a public hostname", reason: "private_network" } + const v4 = host.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/) + if (v4) { + const [a, b] = [Number(v4[1]), Number(v4[2])] + if (a === 127 || a === 0) { + return { ok: false, error: "webhookUrl host is not routable", reason: "loopback" } + } + const isPrivate = + a === 10 || + (a === 100 && b >= 64 && b <= 127) || // CGNAT + (a === 169 && b === 254) || // link-local, incl. cloud metadata + (a === 172 && b >= 16 && b <= 31) || + (a === 192 && b === 168) + if (isPrivate) { + return { ok: false, error: "webhookUrl must use a public hostname", reason: "private_network" } + } } return { ok: true, url } } diff --git a/app/api/notifications/winback/route.ts b/app/api/notifications/winback/route.ts index 43dd8d2f..6e074534 100644 --- a/app/api/notifications/winback/route.ts +++ b/app/api/notifications/winback/route.ts @@ -1,7 +1,7 @@ import { type NextRequest, NextResponse } from "next/server"; import { isFeatureEnabled } from "@/lib/feature-flags"; import { evaluateWinbackCampaign, recordWinbackDispatch, getWinbackStore } from "@/lib/churn-winback"; -import { addNotification } from "@/lib/notification-store"; +import { createNotification } from "@/lib/notification-store"; export const runtime = "nodejs"; export const dynamic = "force-dynamic"; @@ -88,16 +88,12 @@ export async function POST(request: NextRequest) { if (body.dispatch && evaluation.eligible && evaluation.cohort !== "control") { await recordWinbackDispatch(wallet, evaluation.cohort, evaluation.hook, experimentId); try { - await addNotification({ - recipientWallet: wallet, - type: "system", + await createNotification(wallet, "winback_reactivation", { title: evaluation.title, body: evaluation.body, - data: { - cohort: evaluation.cohort, - hook: evaluation.hook, - experimentId, - }, + cohort: evaluation.cohort, + hook: evaluation.hook, + experimentId, }); dispatched = true; } catch { diff --git a/app/api/profile/avatar/route.ts b/app/api/profile/avatar/route.ts index 6028b5c7..498f1d20 100644 --- a/app/api/profile/avatar/route.ts +++ b/app/api/profile/avatar/route.ts @@ -259,13 +259,7 @@ export async function verifyAvatarOwnershipSignature( imageUrl: string, signatureBase64: string, ): Promise { - try { - const { Keypair } = await import("@stellar/stellar-sdk") - const { SIGNATURE_PREFIX, sha256Hex } = await import("@/lib/viewer-signature") - const message = `phase-avatar:v1:${await sha256Hex(JSON.stringify({ wallet, imageUrl }))}` - const data = new TextEncoder().encode(SIGNATURE_PREFIX + message) - return Keypair.fromPublicKey(wallet).verify(data, Buffer.from(signatureBase64, "base64")) - } catch { - return false - } + const { sha256Hex, verifySep53Signature } = await import("@/lib/viewer-signature") + const message = `phase-avatar:v1:${await sha256Hex(JSON.stringify({ wallet, imageUrl }))}` + return verifySep53Signature(wallet, message, signatureBase64) } \ No newline at end of file diff --git a/components/chamber/artifact-viewer.tsx b/components/chamber/artifact-viewer.tsx deleted file mode 100644 index b3a42524..00000000 --- a/components/chamber/artifact-viewer.tsx +++ /dev/null @@ -1 +0,0 @@ -placeholder \ No newline at end of file diff --git a/components/chamber/catalog-thumb.tsx b/components/chamber/catalog-thumb.tsx new file mode 100644 index 00000000..81c5028f --- /dev/null +++ b/components/chamber/catalog-thumb.tsx @@ -0,0 +1,25 @@ +"use client" + +// Extracted verbatim from components/fusion-chamber.tsx (refactor #33 imported it but never committed the file). + +import { useState } from "react" +import { IpfsDisplayImg } from "@/components/ipfs-display-img" + +export function ChamberCatalogThumb({ collectionId, uri }: { collectionId: number; uri: string }) { + const [broken, setBroken] = useState(false) + if (!uri.trim() || broken) { + return ( + + #{collectionId} + + ) + } + return ( + setBroken(true)} + /> + ) +} diff --git a/components/chamber/certificate-exporter.tsx b/components/chamber/certificate-exporter.tsx deleted file mode 100644 index b3a42524..00000000 --- a/components/chamber/certificate-exporter.tsx +++ /dev/null @@ -1 +0,0 @@ -placeholder \ No newline at end of file diff --git a/components/chamber/chamber-chrome.ts b/components/chamber/chamber-chrome.ts new file mode 100644 index 00000000..9919347f --- /dev/null +++ b/components/chamber/chamber-chrome.ts @@ -0,0 +1,11 @@ +// Extracted verbatim from components/fusion-chamber.tsx (refactor #33 imported it but never committed the file). + +/** Same zinc / violet chrome as `/dashboard` (Phase Market). */ +export const chamberChromeNav = + "inline-flex min-h-[36px] items-center rounded-sm border border-zinc-700 bg-zinc-900/60 px-3 py-1.5 text-[10px] font-semibold uppercase tracking-widest text-zinc-400 transition-colors hover:border-violet-500/50 hover:text-violet-300" +export const chamberChromeNavHere = + "inline-flex min-h-[36px] items-center rounded-sm border border-violet-600/50 bg-violet-950/50 px-3 py-1.5 text-[10px] font-semibold uppercase tracking-widest text-violet-300" +export const chamberChromePrimaryBtn = + "flex min-h-[46px] w-full items-center justify-center bg-gradient-to-r from-violet-600 to-cyan-500 py-3 text-center text-[11px] font-bold uppercase tracking-wide text-white shadow-[0_0_18px_rgba(139,92,246,0.35)] transition-opacity hover:opacity-90 disabled:pointer-events-none" +export const chamberChromeRefreshBtn = + "flex items-center gap-1.5 rounded-sm border border-zinc-700 bg-zinc-900/60 px-3 py-1.5 text-[10px] font-bold uppercase tracking-widest text-zinc-400 transition-colors hover:border-violet-500/50 hover:text-violet-300 disabled:opacity-40" diff --git a/components/chamber/energy-gauge-display.tsx b/components/chamber/energy-gauge-display.tsx deleted file mode 100644 index b3a42524..00000000 --- a/components/chamber/energy-gauge-display.tsx +++ /dev/null @@ -1 +0,0 @@ -placeholder \ No newline at end of file diff --git a/components/chamber/log-stream.tsx b/components/chamber/log-stream.tsx new file mode 100644 index 00000000..68ca66df --- /dev/null +++ b/components/chamber/log-stream.tsx @@ -0,0 +1,36 @@ +"use client" + +// Extracted verbatim from components/fusion-chamber.tsx (refactor #33 imported it but never committed the file). + +import type { RefObject } from "react" +import { cn } from "@/lib/utils" + +export function ChamberLogStream({ + lines, + endRef, +}: { + lines: { id: number; text: string }[] + endRef: RefObject +}) { + return ( + <> + {lines.map((l, i) => { + const fault = /FAIL|Failed|ERROR|FAULT|ABORT|REJECT|denied|timeout|sequence|desync/i.test(l.text) + return ( +
+ {l.text} +
+ ) + })} +
+ + ) +} diff --git a/components/chamber/phaser-liq-token-link.tsx b/components/chamber/phaser-liq-token-link.tsx new file mode 100644 index 00000000..d334c640 --- /dev/null +++ b/components/chamber/phaser-liq-token-link.tsx @@ -0,0 +1,45 @@ +"use client" + +// Extracted verbatim from components/fusion-chamber.tsx (refactor #33 imported it but never committed the file). + +import { TokenIcon } from "@/components/token-icon" +import { playTacticalUiClick } from "@/lib/tactical-ui-click" +import { cn } from "@/lib/utils" + +/** Enlace al asset PHASELQ en Stellar Expert (icono + símbolo). */ +export function PhaserLiqTokenLink({ + href, + symbol, + iconClassName, + className, + variant = "default", +}: { + href: string + symbol: string + iconClassName?: string + className?: string + variant?: "default" | "violet" +}) { + return ( + { + e.stopPropagation() + playTacticalUiClick() + }} + className={cn( + "inline-flex items-center gap-1.5 rounded-sm border border-transparent font-mono tracking-normal underline-offset-[3px] transition-colors hover:underline focus:outline-none", + variant === "violet" + ? "text-violet-200/95 hover:border-violet-500/45 hover:bg-violet-950/35 hover:text-violet-50 focus-visible:ring-2 focus-visible:ring-violet-400/55" + : "text-cyan-400/95 hover:border-cyan-500/45 hover:bg-cyan-950/35 hover:text-cyan-50 focus-visible:ring-2 focus-visible:ring-cyan-400/60", + className, + )} + > + + {symbol} + + ) +} diff --git a/components/chamber/settlement-wizard.tsx b/components/chamber/settlement-wizard.tsx deleted file mode 100644 index b3a42524..00000000 --- a/components/chamber/settlement-wizard.tsx +++ /dev/null @@ -1 +0,0 @@ -placeholder \ No newline at end of file diff --git a/components/chamber/terminal-header.tsx b/components/chamber/terminal-header.tsx deleted file mode 100644 index b3a42524..00000000 --- a/components/chamber/terminal-header.tsx +++ /dev/null @@ -1 +0,0 @@ -placeholder \ No newline at end of file diff --git a/components/fusion-chamber.tsx b/components/fusion-chamber.tsx index 75ed1d1a..34679ff8 100644 --- a/components/fusion-chamber.tsx +++ b/components/fusion-chamber.tsx @@ -1,4 +1,3 @@ -// @ts-nocheck "use client" import { albedoImplicitTxAllowed, isAlbedoSelectedInKit } from "@/lib/albedo-intent-client" @@ -22,6 +21,7 @@ import { pickCopy } from "@/lib/phase-copy" import { cn } from "@/lib/utils" import { GatewayHealthDashboard } from "@/components/gateway-health-dashboard" import { QrScannerModal } from "@/components/qr-scanner-modal" +import type { ParsedQrPayload } from "@/lib/qr-code" import { recordMobileDeepLinkReturn } from "@/lib/walletconnect-resilience" import { isFeatureEnabled } from "@/lib/feature-flags" import { decodeSorobanTransaction } from "@/lib/ledger-soroban-decoder" @@ -69,18 +69,12 @@ import { stroopsToLiqDisplay, } from "@/lib/phase-protocol" import { PhaseArtifactVisualizer, type ArtifactVerificationMode } from "@/components/phase-artifact-visualizer" -import { TerminalHeader } from "@/components/chamber/terminal-header" -import { ArtifactViewer } from "@/components/chamber/artifact-viewer" -import { SettlementWizard } from "@/components/chamber/settlement-wizard" -import { EnergyGaugeDisplay } from "@/components/chamber/energy-gauge-display" -import { CertificateExporter } from "@/components/chamber/certificate-exporter" -import { useChamberSettlement } from "@/components/chamber/use-chamber-settlement" import { ChamberLogStream } from "@/components/chamber/log-stream" import { ChamberCatalogThumb } from "@/components/chamber/catalog-thumb" import { PhaserLiqTokenLink } from "@/components/chamber/phaser-liq-token-link" import { chamberChromeNav, chamberChromeNavHere, chamberChromePrimaryBtn, chamberChromeRefreshBtn } from "@/components/chamber/chamber-chrome" -/** Primer `G…` válido en el texto del portapapeles (una línea o varias). */ +/** Primer `G…` válido en el texto del portapapeles (una línea o varias). */ function recipientGFromClipboardText(text: string, isValidG: (addr: string) => boolean): string { const u = text.trim() if (isValidG(u)) return u @@ -98,7 +92,7 @@ type PaymentPhase = "idle" | "busy" | "error" function truncateAddress(addr: string) { if (!addr || addr.length < 14) return addr - return `${addr.slice(0, 6)}…${addr.slice(-4)}` + return `${addr.slice(0, 6)}…${addr.slice(-4)}` } function formatPowerBp(bp: number) { @@ -110,7 +104,7 @@ function formatPowerBp(bp: number) { -/** Enlace al asset PHASELQ en Stellar Expert (icono + símbolo). */ +/** Enlace al asset PHASELQ en Stellar Expert (icono + símbolo). */ /** Same zinc / violet chrome as `/dashboard` (Phase Market). */ @@ -148,7 +142,7 @@ export function FusionChamber() { /** Stroops en el SAC que el contrato PHASE usa en `settle` (puede ser 0 con saldo en otro emisor). */ const [tokenBalance, setTokenBalance] = useState("0") - /** Máximo PHASELQ visto (Horizon + SACs) — solo informativo si difiere de `tokenBalance`. */ + /** Máximo PHASELQ visto (Horizon + SACs) — solo informativo si difiere de `tokenBalance`. */ const [walletLiqTotal, setWalletLiqTotal] = useState("0") const [hasPhased, setHasPhased] = useState(null) const [phaseId, setPhaseId] = useState(null) @@ -158,7 +152,7 @@ export function FusionChamber() { const [genesisLoading, setGenesisLoading] = useState(false) const [faucetEnabled, setFaucetEnabled] = useState(null) const [systemDesync, setSystemDesync] = useState(false) - /** Pedestal: acuñación NFT de fase en curso */ + /** Pedestal: acuñación NFT de fase en curso */ const [mintingArtifact, setMintingArtifact] = useState(false) /** THE_REACTOR: POST /api/phase-nft/custodian-release (mismo flujo que el panel COLLECT). */ const [claimToWalletBusy, setClaimToWalletBusy] = useState(false) @@ -166,9 +160,9 @@ export function FusionChamber() { const [operatorModalOpen, setOperatorModalOpen] = useState(false) const [collectionInfo, setCollectionInfo] = useState(null) const [collectionLoadState, setCollectionLoadState] = useState<"idle" | "loading" | "done">("idle") - /** `image` parseado de `token_uri` on-chain (colección 0 o refuerzo). */ + /** `image` parseado de `token_uri` on-chain (colección 0 o refuerzo). */ const [artifactImageFromUri, setArtifactImageFromUri] = useState(null) - /** `owner_of(phaseId)` — verificación de originalidad vs wallet conectada. */ + /** `owner_of(phaseId)` — verificación de originalidad vs wallet conectada. */ const [onChainTokenOwner, setOnChainTokenOwner] = useState(null) const [tokenOwnerLookupDone, setTokenOwnerLookupDone] = useState(false) /** `balance(wallet)` en contrato PHASE (recuento NFT utilidad). */ @@ -341,7 +335,7 @@ export function FusionChamber() { world = json.world } } catch { - /* no world — silent */ + /* no world — silent */ } if (cancelled) return setWorldData(world) @@ -390,7 +384,7 @@ export function FusionChamber() { if (!cancelled && json.narrative) setNarrativeData(json.narrative) } } catch { - /* narrator offline — no narrative shown */ + /* narrator offline — no narrative shown */ } finally { if (!cancelled) setNarrativeLoading(false) } @@ -679,7 +673,7 @@ export function FusionChamber() { const url = URL.createObjectURL(blob) window.open(url, "_blank", "noopener,noreferrer") window.setTimeout(() => URL.revokeObjectURL(url), 60_000) - toast.success(lang === "es" ? "Metadata abierta en nueva pestaña." : "Metadata opened in new tab.") + toast.success(lang === "es" ? "Metadata abierta en nueva pestaña." : "Metadata opened in new tab.") } catch { toast.error(lang === "es" ? "No se pudo leer metadata on-chain." : "Could not read on-chain metadata.") } @@ -704,13 +698,13 @@ export function FusionChamber() { const neededLiq = stroopsToLiqDisplay(effectivePriceStroops) const haveLiq = stroopsToLiqDisplay(tokenBalance) appendLog(`[ INSUFFICIENT_BALANCE ] ${friendly}`) - appendLog(`[ READOUT ] ${haveLiq} PHASELQ (UI) · need ≥ ${neededLiq} for this collection`) + appendLog(`[ READOUT ] ${haveLiq} PHASELQ (UI) · need ≥ ${neededLiq} for this collection`) appendLog(logs.lowEnergyWarning) - appendLog(`${logs.tracePrefix} HostError Contract #2 — PhaseError::InsufficientBalance`) + appendLog(`${logs.tracePrefix} HostError Contract #2 — PhaseError::InsufficientBalance`) if (faucetEnabled) { appendLog( lang === "es" - ? "[ SUGERENCIA ] Usá el faucet (Genesis o Daily) para PHASELQ en el SAC." + ? "[ SUGERENCIA ] Usá el faucet (Genesis o Daily) para PHASELQ en el SAC." : "[ HINT ] Use the faucet (Genesis or Daily) for PHASELQ on the SAC.", ) } @@ -764,13 +758,13 @@ export function FusionChamber() { const balDisplay = stroopsToLiqDisplay(bal) const reqDisplay = stroopsToLiqDisplay(effectivePriceStroops) appendLog( - `[ BALANCE_CHECK ] ${signerAddress.slice(0, 6)}… · ${balDisplay} PHASELQ, Required: ${reqDisplay} PHASELQ`, + `[ BALANCE_CHECK ] ${signerAddress.slice(0, 6)}… · ${balDisplay} PHASELQ, Required: ${reqDisplay} PHASELQ`, ) appendLog(logs.lowEnergyWarning) if (faucetEnabled && balBigInt === BigInt("0")) { appendLog( lang === "es" - ? "[ SUGERENCIA ] Esa cuenta tiene 0 PHASELQ en el SAC. Usá el faucet u otra wallet desde el modal." + ? "[ SUGERENCIA ] Esa cuenta tiene 0 PHASELQ en el SAC. Usá el faucet u otra wallet desde el modal." : "[ HINT ] That account has 0 PHASELQ on the SAC. Use the faucet or pick another wallet from the modal.", ) } @@ -871,7 +865,7 @@ export function FusionChamber() { const msg = data.code === "NOT_ISSUER_CUSTODY" ? lang === "es" - ? "El NFT no está en custodia del emisor (quizá ya está en tu wallet)." + ? "El NFT no está en custodia del emisor (quizá ya está en tu wallet)." : "This NFT is not held by the configured issuer (it may already be in your wallet)." : data.detail || data.error || `HTTP ${res.status}` appendLog(`[ NFT_COLLECT_FAIL ] ${msg}`) @@ -989,7 +983,7 @@ export function FusionChamber() { if (!res.ok) { const msg = typeof data.error === "string" ? data.error : `HTTP ${res.status}` const detail = typeof data.detail === "string" ? data.detail : undefined - appendLog(`${ch.logs.faucetFailPrefix} ${msg}${detail ? ` — ${detail}` : ""}`) + appendLog(`${ch.logs.faucetFailPrefix} ${msg}${detail ? ` — ${detail}` : ""}`) toast.error(normalizeToastError(msg), detail ? { description: detail } : undefined) return } @@ -997,7 +991,7 @@ export function FusionChamber() { const pendingMsg = data.note || (lang === "es" - ? "Transacción de faucet pendiente en ledger. Reintenta en unos segundos." + ? "Transacción de faucet pendiente en ledger. Reintenta en unos segundos." : "Faucet transaction pending on ledger. Retry in a few seconds.") appendLog(`${ch.logs.tracePrefix} ${pendingMsg}`) toast.message(pendingMsg) @@ -1042,7 +1036,7 @@ export function FusionChamber() { ) toast.success( lang === "es" - ? `Asset clásico acreditado: +${data.amount ?? classicBootstrapAmount} ${classicAsset.code}` + ? `Asset clásico acreditado: +${data.amount ?? classicBootstrapAmount} ${classicAsset.code}` : `Classic asset credited: +${data.amount ?? classicBootstrapAmount} ${classicAsset.code}`, ) await refreshClassicStatus() @@ -1168,7 +1162,7 @@ export function FusionChamber() { async (label: string, value: string) => { try { await navigator.clipboard.writeText(value) - const preview = value.length > 48 ? `${value.slice(0, 22)}…${value.slice(-10)}` : value + const preview = value.length > 48 ? `${value.slice(0, 22)}…${value.slice(-10)}` : value toast.success( lang === "es" ? `${label} copiado: ${preview}` @@ -1250,7 +1244,7 @@ export function FusionChamber() { const expertUrl = stellarExpertPhaserLiqUrl() const isOwnerOnChain = phased && phaseId != null && tokenOwnerLookupDone && isAuthentic(address, onChainTokenOwner) - /** `owner_of` = emisor clásico PHASELQ: el usuario puede usar COLLECT en el panel lateral (servidor firma transfer). */ + /** `owner_of` = emisor clásico PHASELQ: el usuario puede usar COLLECT en el panel lateral (servidor firma transfer). */ const issuerCustodyForCollect = useMemo(() => { if (!phased || phaseId == null || phaseId <= 0 || !tokenOwnerLookupDone || !onChainTokenOwner?.trim()) { return false @@ -1277,7 +1271,7 @@ export function FusionChamber() { Boolean(onChainTokenOwner) && tokenUriExists const manualAddEnabled = phased && phaseId != null && phaseId > 0 - /** Freighter “Token ID” = entero, sin `#`; evita confundir con asset `CODE:issuer`. */ + /** Freighter “Token ID” = entero, sin `#`; evita confundir con asset `CODE:issuer`. */ const nftNumericTokenIdStr = useMemo(() => { if (phaseId == null || !Number.isFinite(Number(phaseId))) return "" return String(Math.max(0, Math.floor(Number(phaseId)))) @@ -1415,7 +1409,7 @@ export function FusionChamber() { const msg = data.code === "NOT_ISSUER_CUSTODY" ? lang === "es" - ? "El NFT no está en custodia del emisor (quizá ya está en tu wallet)." + ? "El NFT no está en custodia del emisor (quizá ya está en tu wallet)." : "This NFT is not held by the configured issuer (it may already be in your wallet)." : data.detail || data.error || `HTTP ${res.status}` appendLog(`[ NFT_COLLECT_FAIL ] ${msg}`) @@ -1457,7 +1451,7 @@ export function FusionChamber() { if (data.ok === true && data.sep50Ready === true) { toast.success(lang === "es" ? "SEP-50: todas las comprobaciones OK." : "SEP-50: all checks passed.") } else if (data.ok === true) { - toast.message(lang === "es" ? "SEP-50: revisá el informe (algunos ítems fallan)." : "SEP-50: see report (some checks failed).") + toast.message(lang === "es" ? "SEP-50: revisá el informe (algunos ítems fallan)." : "SEP-50: see report (some checks failed).") } else { toast.error(chCopy.freighterSep50CheckFailToast) } @@ -1519,7 +1513,7 @@ export function FusionChamber() { }} className={chamberChromeRefreshBtn} > - ⟳ {ch.sync} + ⟳ {ch.sync} {!address ? (
)} @@ -1617,7 +1611,7 @@ export function FusionChamber() { {lowEnergy && address && !phased && !invalidCollection && (

- âš¡ {ch.lowEnergyTitle} + ⚡ {ch.lowEnergyTitle}

{ch.reqLiqPrefix}{" "} @@ -1687,7 +1681,7 @@ export function FusionChamber() {

{ch.classicAssetLabel}
- {displayPhaserLiqSymbol(classicAsset.code)} · {truncateAddress(classicAsset.issuer)} + {displayPhaserLiqSymbol(classicAsset.code)} · {truncateAddress(classicAsset.issuer)}
@@ -1705,7 +1699,7 @@ export function FusionChamber() {

- {lang === "es" ? "Colección / red" : "Collection / network"} + {lang === "es" ? "Colección / red" : "Collection / network"}

@@ -1739,7 +1733,7 @@ export function FusionChamber() {
{phased ? ( - {ch.nftMinted} · #{phaseId} + {ch.nftMinted} · #{phaseId} ) : ( {ch.liquid} @@ -1770,7 +1764,7 @@ export function FusionChamber() { className="tactical-interactive-glitch tactical-btn tactical-phosphor mt-2.5 w-full py-2.5 text-[9px] uppercase tracking-widest text-cyan-200 disabled:opacity-50" > - {connecting ? `â—Œ ${ch.uplinking}` : `â–£ ${ch.linkWallet}`} + {connecting ? `◌ ${ch.uplinking}` : `▣ ${ch.linkWallet}`} ) : ( @@ -1785,7 +1779,7 @@ export function FusionChamber() { }} className="tactical-interactive-glitch tactical-btn mt-2.5 w-full border-red-500/30 py-2 text-[9px] uppercase tracking-widest text-red-400/80 hover:border-red-500/60" > - â—‡ {ch.disconnect} + ◇ {ch.disconnect} )} @@ -1863,7 +1857,7 @@ export function FusionChamber() {
- {/* Exhibition pedestal — NFT de utilidad PHASE (Soroban) */} + {/* Exhibition pedestal — NFT de utilidad PHASE (Soroban) */}

{ch.pedestalVisualShort} @@ -2050,16 +2044,16 @@ export function FusionChamber() { onClick={() => playTacticalUiClick()} className="shrink-0 font-mono text-[9px] uppercase tracking-widest text-violet-400/80 transition hover:text-violet-200" > - Stellar Expert ↗ + Stellar Expert ↗

- owner_of(#{Math.max(0, Math.floor(phaseId))}) ≡ wallet ·{" "} + owner_of(#{Math.max(0, Math.floor(phaseId))}) ≡ wallet ·{" "} {phaseLedgerNftCountDone ? ch.artifactLedgerBalanceContract.replace("{count}", phaseLedgerNftCount ?? "0") : lang === "es" - ? "SINCRONIZANDO balance()…" - : "SYNCING balance()…"} + ? "SINCRONIZANDO balance()…" + : "SYNCING balance()…"}

) : issuerCustodyForCollect ? ( @@ -2080,18 +2074,18 @@ export function FusionChamber() {
) : null} - {/* ── Narrative World connection ── */} + {/* ── Narrative World connection ── */} {worldData && (
- {`[ MUNDO: ${worldData.world_name} ]`} ↗ + {`[ MUNDO: ${worldData.world_name} ]`} ↗ {narrativeLoading ? (

- [ NARRADOR: generando conexión... ] + [ NARRADOR: generando conexión... ]

) : narrativeData ? (

@@ -2105,7 +2099,7 @@ export function FusionChamber() {

{ch.chamberTechnicalDetails} - â–¾ + ▾
@@ -2122,9 +2116,9 @@ export function FusionChamber() {
-
{lang === "es" ? "Emisión" : "Supply"}
+
{lang === "es" ? "Emisión" : "Supply"}
- {collectionSupply?.minted ?? "—"} / {collectionSupply?.cap ?? "—"} + {collectionSupply?.minted ?? "—"} / {collectionSupply?.cap ?? "—"}
@@ -2141,7 +2135,7 @@ export function FusionChamber() {
{ch.artifact.powerLevel}
- {ch.artifact.stateSolid} · {formatPowerBp(energyLevelBp ?? 10_000)} + {ch.artifact.stateSolid} · {formatPowerBp(energyLevelBp ?? 10_000)}
@@ -2167,7 +2161,7 @@ export function FusionChamber() { onClick={() => playTacticalUiClick()} className="inline-flex rounded-sm border border-violet-500/40 bg-violet-950/50 px-2.5 py-1.5 text-[10px] font-semibold uppercase tracking-wide text-violet-100 transition-colors hover:border-violet-400 hover:bg-violet-900/40" > - {lang === "es" ? "Bóveda PHASE (Dashboard) ↗" : "PHASE vault (Dashboard) ↗"} + {lang === "es" ? "Bóveda PHASE (Dashboard) ↗" : "PHASE vault (Dashboard) ↗"} playTacticalUiClick()} className="inline-flex rounded-sm border border-violet-500/40 bg-violet-950/50 px-2.5 py-1.5 text-[10px] font-semibold uppercase tracking-wide text-violet-100 transition-colors hover:border-violet-400 hover:bg-violet-900/40" > - Stellar Expert ↗ + Stellar Expert ↗
@@ -2195,7 +2189,7 @@ export function FusionChamber() { ? "Aun si Freighter da error, ya puedes intentar Add manually con estos datos. Si falla, pulsa SYNC y reintenta en 30-90s." : "Even if Freighter errors, you can already try Add manually using these values. If it fails, press SYNC and retry in 30-90s." : lang === "es" - ? "Freighter puede usar su propio backend al añadir coleccionables. Si falla, usá el botón naranja Ping índice (self-transfer); para enviar el NFT a otra persona copiá su G… al portapapeles y usá el botón magenta. Tu lista oficial en PHASE está en el dashboard (bóveda RPC)." + ? "Freighter puede usar su propio backend al añadir coleccionables. Si falla, usá el botón naranja Ping índice (self-transfer); para enviar el NFT a otra persona copiá su G… al portapapeles y usá el botón magenta. Tu lista oficial en PHASE está en el dashboard (bóveda RPC)." : "Freighter may use its own backend when adding collectibles. If it fails, use the amber Ping index button (self-transfer); to send the NFT to someone else copy their G-address to the clipboard, then use the magenta button. Your authoritative PHASE list is the dashboard vault (RPC scan)."}

) : ( @@ -2214,7 +2208,7 @@ export function FusionChamber() { }} className="w-full rounded-sm border border-zinc-600 bg-zinc-900/80 py-2 text-[10px] font-semibold uppercase tracking-wide text-zinc-200 transition-colors hover:border-zinc-500 hover:bg-zinc-800 disabled:opacity-45" > - {freighterSep50Busy ? "…" : ch.freighterSep50CheckButton} + {freighterSep50Busy ? "…" : ch.freighterSep50CheckButton} {freighterSep50Report ? ( 
@@ -2259,7 +2253,7 @@ export function FusionChamber() {
                 

               ) : (
                 

-                  {/* Collection image preview — shown pre-mint when imageUri is available */}
+                  {/* Collection image preview — shown pre-mint when imageUri is available */}
                   {effectiveArtifactImage && (
                     

                       
                         {ch.collectionLine
                           .replace("{id}", String(collectionId))
-                          .replace("{name}", collectionInfo.name || "—")}
+                          .replace("{name}", collectionInfo.name || "—")}
                       

                     )}
                     {collectionId === 0 && (
@@ -2363,12 +2357,12 @@ export function FusionChamber() {
               >
                 
                   {genesisLoading
-                    ? `▶▶ ${ch.genesisSupplyLoading}`
+                    ? `▶▶ ${ch.genesisSupplyLoading}`
                     : processing && x402Tx === "busy"
-                      ? `▶▶ ${ch.x402StreamActive}`
+                      ? `▶▶ ${ch.x402StreamActive}`
                       : canInitializeGenesisSupply
                         ? ch.initializeGenesisSupply
-                        : `â–£ ${ch.executeSettlement}`}
+                        : `▣ ${ch.executeSettlement}`}
                 
               
             

@@ -2376,7 +2370,7 @@ export function FusionChamber() {
             

               {authenticityPending ? (
                 

-                  ◌ {ch.verifyingOwner}
+                  ◌ {ch.verifyingOwner}
                 

               ) : !address ? (
                 

@@ -2395,13 +2389,13 @@ export function FusionChamber() {
                 >
                   
                     {claimToWalletBusy
-                      ? `▶▶ ${ch.rewardsNftCollectSending}`
+                      ? `▶▶ ${ch.rewardsNftCollectSending}`
                       : ch.reactorClaimNftCta}
                   
                 
               ) : isOwnerOnChain ? (
                 

-                  ● {ch.solidStateStandby}
+                  ● {ch.solidStateStandby}
                 

               ) : tokenOwnerLookupDone && phaseId != null ? (
                 

@@ -2409,7 +2403,7 @@ export function FusionChamber() {
                 

               ) : (
                 

-                  ● {ch.solidStateStandby}
+                  ● {ch.solidStateStandby}
                 

               )}
             

@@ -2548,7 +2542,7 @@ export function FusionChamber() {
               

                 {ch.systemLogs}
               

-              ● {ch.live}
+              ● {ch.live}
             

             

               
@@ -2591,7 +2585,7 @@ export function FusionChamber() {
                     className="rounded-sm border border-zinc-600 px-2 py-1 font-mono text-sm leading-none text-zinc-300 transition-colors hover:bg-zinc-900"
                     aria-label={ch.operatorPanelBackdropClose}
                   >
-                    ×
+                    ×
                   
                 

                 

@@ -2649,17 +2643,17 @@ export function FusionChamber() {
             >
               

                 

-                  ┃ {ch.systemLogs}
+                  ┃ {ch.systemLogs}
                 

                 

-                  ● {ch.live}
+                  ● {ch.live}
                   
                 

               

@@ -2687,4 +2681,3 @@ export function FusionChamber() {
     

   )
 }
-
diff --git a/components/ipfs-display-img.tsx b/components/ipfs-display-img.tsx
index 4584ba6d..cac3e579 100644
--- a/components/ipfs-display-img.tsx
+++ b/components/ipfs-display-img.tsx
@@ -20,7 +20,7 @@ type Props = {
   fallback?: ReactNode
 }
 
-export function IpfsDisplayImg({ uri, alt = "", className, loading = "lazy", variant, focalPoint, onExhausted }: Props) {
+export function IpfsDisplayImg({ uri, alt = "", className, loading = "lazy", variant, focalPoint, onExhausted, fallback }: Props) {
   const candidates = useMemo(() => {
     const urls = ipfsHttpsGatewayUrls(uri)
     if (!variant) return urls
diff --git a/components/liquidity-faucet-control.tsx b/components/liquidity-faucet-control.tsx
index 38e4b0d0..b24a286a 100644
--- a/components/liquidity-faucet-control.tsx
+++ b/components/liquidity-faucet-control.tsx
@@ -25,6 +25,7 @@ import {
 } from "@/lib/phase-protocol"
 import { playTacticalUiClick } from "@/lib/tactical-ui-click"
 import { cn } from "@/lib/utils"
+import { albedoRetiredSignMessage, isAlbedoRetired } from "@/lib/albedo-sunset"
 
 function comparableStellarAccountG(addr: string): string {
   const t = addr.trim()
diff --git a/components/notifications-modal.tsx b/components/notifications-modal.tsx
index 3c895123..d76ef747 100644
--- a/components/notifications-modal.tsx
+++ b/components/notifications-modal.tsx
@@ -25,6 +25,7 @@ type NotificationType =
   | "moderation_appeal_resolved"
   | "quest_arc_generated"
   | "quest_arc_completed"
+  | "winback_reactivation"
 
 type Notification = {
   id: string
@@ -220,6 +221,7 @@ const NOTIF_LABELS: Record = {
   moderation_appeal_resolved: { en: phaseCopy.en.moderationQueue.notifyLabel, es: phaseCopy.es.moderationQueue.notifyLabel },
   quest_arc_generated: { en: phaseCopy.en.questArcs.notifyLabel, es: phaseCopy.es.questArcs.notifyLabel },
   quest_arc_completed: { en: phaseCopy.en.questArcs.notifyLabel, es: phaseCopy.es.questArcs.notifyLabel },
+  winback_reactivation: { en: "Welcome back", es: "Bienvenida de vuelta" },
 }
 
 const NOTIF_ICONS: Record = {
@@ -240,6 +242,7 @@ const NOTIF_ICONS: Record = {
   moderation_appeal_resolved: "⚖",
   quest_arc_generated: "➶",
   quest_arc_completed: "✓",
+  winback_reactivation: "↺",
 }
 
 function timeAgo(ts: number): string {
diff --git a/components/phase-artifact-visualizer.tsx b/components/phase-artifact-visualizer.tsx
index dd8771bf..684b7936 100644
--- a/components/phase-artifact-visualizer.tsx
+++ b/components/phase-artifact-visualizer.tsx
@@ -1,4 +1,3 @@
-// @ts-nocheck
 "use client"
 
 import type { ArtifactLabelsCopy } from "@/lib/phase-copy"
@@ -10,13 +9,13 @@ import { useCallback, useEffect, useId, useMemo, useState } from "react"
 
 export type ArtifactVerificationMode = "locked" | "verifying" | "verified"
 
-const GLITCH_CHARS = "ABCDEFGHKMNPQRSTUVWXYZ023456789#%â–‘â–’"
+const GLITCH_CHARS = "ABCDEFGHKMNPQRSTUVWXYZ023456789#%░▒"
 
 function scramblePreservingShape(target: string): string {
   let out = ""
   for (let i = 0; i < target.length; i++) {
     const ch = target[i]!
-    if (!/[A-Za-z0-9#%·/]/.test(ch)) {
+    if (!/[A-Za-z0-9#%·/]/.test(ch)) {
       out += ch
       continue
     }
@@ -125,7 +124,7 @@ type Props = {
   serial: number
   energyLevelBp: number
   collectionTitle?: string
-  /** Nombre legible para fila pública COLLECTION_NAME. */
+  /** Nombre legible para fila pública COLLECTION_NAME. */
   collectionDisplayName?: string
   imageUrl?: string | null
   className?: string
@@ -138,20 +137,20 @@ type Props = {
   isOwner?: boolean
   authenticityPending?: boolean
   onAccessPrivateMetadata?: () => void
-  /** `get_total_minted` / cap — null si RPC falla o aún no hay dato. */
+  /** `get_total_minted` / cap — null si RPC falla o aún no hay dato. */
   supplyMinted?: number | null
   supplyCap?: number | null
   /** Variante compacta para layouts con poco alto visible (p. ej. Chamber). */
   compact?: boolean
-  /** Mostrar panel público (collection/contract/supply) debajo del arte. */
+  /** Mostrar panel público (collection/contract/supply) debajo del arte. */
   showPublicMetaPanel?: boolean
   /** Mostrar panel privado (private channel/secret/power/signature) debajo del arte. */
   showPrivateMetaPanel?: boolean
-  /** Cámara: un solo panel limpio, sin ASCII ni banner ruidoso cuando el dueño está verificado. */
+  /** Cámara: un solo panel limpio, sin ASCII ni banner ruidoso cuando el dueño está verificado. */
   chamberPresentation?: boolean
   /** Marco exterior lo aporta el padre (split preview cian); sin tarjeta esmeralda duplicada. */
   chamberFrameless?: boolean
-  /** Cámara: preview clicable sin la fila «EXPAND» bajo la imagen. */
+  /** Cámara: preview clicable sin la fila «EXPAND» bajo la imagen. */
   suppressExpandLabel?: boolean
   /** Token ID exacto para copiar (p. ej. Freighter); por defecto entero derivado de `serial`. */
   dockCopyTokenId?: string
@@ -161,19 +160,19 @@ type Props = {
   collectNftBusy?: boolean
   collectLabel?: string
   collectBusyLabel?: string
-  /** Cámara: el padre muestra caption + copias; aquí solo el bloque de imagen (holo). */
+  /** Cámara: el padre muestra caption + copias; aquí solo el bloque de imagen (holo). */
   chamberMetaPanelExternal?: boolean
 }
 
 function truncateContractMid(id: string) {
   const t = id.trim()
-  if (!t) return "—"
+  if (!t) return "—"
   if (t.length <= 12) return t
-  return `${t.slice(0, 4)}…${t.slice(-4)}`
+  return `${t.slice(0, 4)}…${t.slice(-4)}`
 }
 
 /**
- * Monitor de escasez y propiedad: panel público (gris), canal privado (cian) con descifrado animado.
+ * Monitor de escasez y propiedad: panel público (gris), canal privado (cian) con descifrado animado.
  */
 export function PhaseArtifactVisualizer({
   mode,
@@ -213,8 +212,8 @@ export function PhaseArtifactVisualizer({
 
   const asciiInner = 38
   const line = (inner: string) => {
-    const t = inner.length > asciiInner ? `${inner.slice(0, asciiInner - 1)}…` : inner
-    return `â•‘ ${t.padEnd(asciiInner, " ")} â•‘`
+    const t = inner.length > asciiInner ? `${inner.slice(0, asciiInner - 1)}…` : inner
+    return `║ ${t.padEnd(asciiInner, " ")} ║`
   }
   const isVerified = mode === "verified"
   const isVerifying = mode === "verifying"
@@ -232,20 +231,20 @@ export function PhaseArtifactVisualizer({
         ? labels.verifying
         : labels.terminalRestricted
 
-  const topBlock = ["╔════════════════════════════════════════╗", line(head), "╠════════════════════════════════════════╣"].join("\n")
+  const topBlock = ["╔════════════════════════════════════════╗", line(head), "╠════════════════════════════════════════╣"].join("\n")
 
   const powerStateLabel = isVerified ? labels.stateSolid : labels.stateLiquid
-  const powerFinalPrivate = `${powerStateLabel} · ${formatPowerBp(energyLevelBp)}`
+  const powerFinalPrivate = `${powerStateLabel} · ${formatPowerBp(energyLevelBp)}`
   const secretFinal = `#${Math.max(0, Math.floor(serial))}`
   const contractPublic = truncateContractMid(contractId)
 
   const publicCollectionLine =
     collectionDisplayName?.trim() ||
     (collectionTitle != null && collectionTitle.length > 0 ? collectionTitle.replace(/\s*\/\/.*$/, "").trim() : "") ||
-    "—"
+    "—"
 
   const supplyLine =
-    supplyMinted != null && supplyCap != null ? `[ ${supplyMinted} / ${supplyCap} ]` : `[ — / — ]`
+    supplyMinted != null && supplyCap != null ? `[ ${supplyMinted} / ${supplyCap} ]` : `[ — / — ]`
   const supplyRemainingRatio =
     supplyCap != null && supplyCap > 0 && supplyMinted != null
       ? (supplyCap - supplyMinted) / supplyCap
@@ -712,7 +711,7 @@ export function PhaseArtifactVisualizer({
   )
 
   const chamberCaptionEl =
-    chamberMinimal && publicCollectionLine !== "—" ? (
+    chamberMinimal && publicCollectionLine !== "—" ? (
       

             

             

-              {dockTokenCopyValue.trim() ? `#${dockTokenCopyValue}` : "—"}
+              {dockTokenCopyValue.trim() ? `#${dockTokenCopyValue}` : "—"}
@@ -782,7 +781,7 @@ export function PhaseArtifactVisualizer({ onClick={() => void Promise.resolve(onCollectNft())} className="tactical-interactive-glitch inline-flex shrink-0 items-center justify-center self-end border border-violet-500/55 bg-violet-950/35 px-3 py-2 text-[9px] font-bold uppercase tracking-widest text-violet-100 shadow-[inset_0_0_0_1px_rgba(167,139,250,0.12)] transition-colors hover:border-violet-400 hover:bg-violet-900/40 hover:text-white disabled:cursor-not-allowed disabled:opacity-45 sm:self-auto" > - {collectNftBusy ? collectBusyLabel ?? "…" : collectLabel ?? "Collect"} + {collectNftBusy ? collectBusyLabel ?? "…" : collectLabel ?? "Collect"} ) : null} @@ -920,4 +919,3 @@ export function PhaseArtifactVisualizer({ ) } - diff --git a/components/phase-protected-preview.tsx b/components/phase-protected-preview.tsx index 3ffbb3f3..e0c877eb 100644 --- a/components/phase-protected-preview.tsx +++ b/components/phase-protected-preview.tsx @@ -1,4 +1,3 @@ -// @ts-nocheck "use client" import { IpfsDisplayImg } from "@/components/ipfs-display-img" @@ -6,16 +5,16 @@ import { cn } from "@/lib/utils" import { viewerSignatureShort } from "@/lib/viewer-signature" import { truncateAddress } from "@/lib/explore-domain" -// ── phase-92: push notifications for replies and mentions ── +// ── phase-92: push notifications for replies and mentions ── // This preview component renders independently of push-subscription state -// (core logic lives in lib/push-notifications.ts); no change needed here — +// (core logic lives in lib/push-notifications.ts); no change needed here — // verified for zero regression. -// ── phase-77: wash-trading detection heuristics for listings ── +// ── phase-77: wash-trading detection heuristics for listings ── // Renders independently while wash-trading analysis protects volume stats in // backend APIs and listing badges. Preserves preview wiring with zero regression. Rollback: unset FEATURE_PHASE_77. -// ── phase-122: off-chain delta display hint (flag-gated, zero regression when off) ── +// ── phase-122: off-chain delta display hint (flag-gated, zero regression when off) ── function isPhase122Enabled(): boolean { const v = (typeof process !== "undefined" ? (process.env.NEXT_PUBLIC_FEATURE_PHASE_122 ?? "") : "")?.trim().toLowerCase() return v === "1" || v === "true" || v === "yes" || v === "on" @@ -43,7 +42,7 @@ export type PhaseProtectedPreviewLabels = { * resolved ownership via full on-chain RPC (`chainVerified`), else derived * from comparing the truncated on-chain owner (as served by /api/explore) * against the connected viewer's own address using the same truncation. - * UI signal only — not a security gate. + * UI signal only — not a security gate. */ export function resolvePhaseProtectedPreviewVerified( chainVerified: boolean | undefined, @@ -57,26 +56,26 @@ export function resolvePhaseProtectedPreviewVerified( } type Props = { - /** `ipfs://…` o HTTPS (p. ej. metadatos / gateway); reintenta gateways si uno falla. */ + /** `ipfs://…` o HTTPS (p. ej. metadatos / gateway); reintenta gateways si uno falla. */ uri: string className?: string /** - * Dueño on-chain de la utilidad PHASE para esta colección (wallet conectada). - * Pásalo cuando ya hiciste la llamada RPC completa (p. ej. detalle/Reactor). - * Si se omite, el widget se autoverifica comparando `ownerTruncated` × `viewerAddress` - * (mismo truncado que sirve /api/explore) sin RPC extra — solo señal de UI, no gate de seguridad. + * Dueño on-chain de la utilidad PHASE para esta colección (wallet conectada). + * Pásalo cuando ya hiciste la llamada RPC completa (p. ej. detalle/Reactor). + * Si se omite, el widget se autoverifica comparando `ownerTruncated` × `viewerAddress` + * (mismo truncado que sirve /api/explore) sin RPC extra — solo señal de UI, no gate de seguridad. */ chainVerified?: boolean - /** Owner truncado (`GABCDE…WXYZ`) tal como lo devuelve /api/explore, para autoverificación cliente. */ + /** Owner truncado (`GABCDE…WXYZ`) tal como lo devuelve /api/explore, para autoverificación cliente. */ ownerTruncated?: string - /** Wallet conectada (para sello que varía por visor). */ + /** Wallet conectada (para sello que varía por visor). */ viewerAddress: string | null | undefined labels: PhaseProtectedPreviewLabels } /** * Mercado / listado: miniatura degradada + scanlines + PENDING_FUSION si no hay prueba on-chain. - * Si `chainVerified`, muestra arte más nítido y sello de cadena (HD reservado al Reactor). + * Si `chainVerified`, muestra arte más nítido y sello de cadena (HD reservado al Reactor). */ export function PhaseProtectedPreview({ uri, className, chainVerified, ownerTruncated, viewerAddress, labels }: Props) { const sig = viewerSignatureShort(viewerAddress) @@ -103,7 +102,7 @@ export function PhaseProtectedPreview({ uri, className, chainVerified, ownerTrun /> {isDelta ? (
- Δ off-chain + Δ off-chain
) : null} @@ -128,15 +127,14 @@ export function PhaseProtectedPreview({ uri, className, chainVerified, ownerTrun > {verified ? ( - {labels.chainVerifiedSeal} · SIG:{sig} + {labels.chainVerifiedSeal} · SIG:{sig} ) : ( - {labels.unverifiedCopy} · {sig} + {labels.unverifiedCopy} · {sig} )} ) } - diff --git a/components/wallet-provider.tsx b/components/wallet-provider.tsx index 71652cb3..54aa10de 100644 --- a/components/wallet-provider.tsx +++ b/components/wallet-provider.tsx @@ -1,4 +1,3 @@ -// @ts-nocheck "use client" import { @@ -46,9 +45,9 @@ import { LedgerClearSigningModal } from "@/components/ledger-clear-signing-modal import type { DecodedSorobanInvocation } from "@/lib/ledger-soroban-decoder" -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── // Types -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── type WalletContextValue = { address: string | null @@ -64,11 +63,11 @@ type WalletContextValue = { isXBull: boolean connect: () => Promise disconnect: () => void - /** Re-sync con la wallet vía kit; devuelve la dirección activa o null. */ + /** Re-sync con la wallet vía kit; devuelve la dirección activa o null. */ refresh: () => Promise /** - * Abre el modal de @creit.tech/stellar-wallets-kit para elegir o cambiar wallet (misma sesión que `connect`). - * Útil antes de firmar un settle: el usuario confirma qué G… firma y recibe el NFT. `null` si cierra el modal. + * Abre el modal de @creit.tech/stellar-wallets-kit para elegir o cambiar wallet (misma sesión que `connect`). + * Útil antes de firmar un settle: el usuario confirma qué G… firma y recibe el NFT. `null` si cierra el modal. */ openWalletPicker: () => Promise refreshArtistAlias: () => Promise @@ -78,9 +77,9 @@ type WalletContextValue = { } -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── // Constants -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── const WalletContext = createContext(null) @@ -99,9 +98,9 @@ const lastFaucetAutoClaimAt = new Map() const HEARTBEAT_INTERVAL_HW_MS = 8_000 const HEARTBEAT_INTERVAL_SW_MS = 30_000 -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── // Provider -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── export function WalletProvider({ children }: { children: ReactNode }) { if (typeof window !== "undefined") { @@ -118,7 +117,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { const [isXBull, setIsXBull] = useState(false) const [qrReceiveOpen, setQrReceiveOpen] = useState(false) - /** True when user deliberately disconnected — blocks session restoration. */ + /** True when user deliberately disconnected — blocks session restoration. */ const userDisconnectedRef = useRef(false) /** Spike 628: true once the biometric gate passed (or was skipped) this session. */ const biometricUnlockedRef = useRef(false) @@ -132,7 +131,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { const [albedoPrepBusy, setAlbedoPrepBusy] = useState(false) const [albedoPrepError, setAlbedoPrepError] = useState(null) - // Network passphrase mismatch alert — shown when Ledger is connected but the + // Network passphrase mismatch alert — shown when Ledger is connected but the // kit's active network doesn't match TESTNET_PASSPHRASE. const [networkMismatch, setNetworkMismatch] = useState(null) const [ledgerReviewModal, setLedgerReviewModal] = useState<{ @@ -151,7 +150,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { }) }, []) - // ── helpers ────────────────────────────────────────────────────────────── + // ── helpers ────────────────────────────────────────────────────────────── /** Sync module-type flags from localStorage (mirrors kit persisted selection). */ const syncModuleFlags = useCallback(() => { @@ -214,17 +213,17 @@ export function WalletProvider({ children }: { children: ReactNode }) { const { networkPassphrase } = await kit.getNetwork() if (networkPassphrase && networkPassphrase !== TESTNET_PASSPHRASE) { setNetworkMismatch( - `Ledger está conectado a "${networkPassphrase.slice(0, 48)}…" pero la app espera la testnet. Abrí la app Stellar en tu Ledger y seleccioná la red correcta (Test SDF Network). / Ledger is on the wrong network. Open the Stellar app on your Ledger and switch to the correct network.`, + `Ledger está conectado a "${networkPassphrase.slice(0, 48)}…" pero la app espera la testnet. Abrí la app Stellar en tu Ledger y seleccioná la red correcta (Test SDF Network). / Ledger is on the wrong network. Open the Stellar app on your Ledger and switch to the correct network.`, ) } else { setNetworkMismatch(null) } } catch { - // Not critical — leave any previous mismatch shown. + // Not critical — leave any previous mismatch shown. } }, []) - // ── session refresh ──────────────────────────────────────────────────────── + // ── session refresh ──────────────────────────────────────────────────────── const refresh = useCallback((): Promise => { const run = async (): Promise => { @@ -260,7 +259,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { }) }, []) - // ── heartbeat ───────────────────────────────────────────────────────────── + // ── heartbeat ───────────────────────────────────────────────────────────── /** * Start a recurring heartbeat that re-verifies the active wallet is still @@ -281,9 +280,9 @@ export function WalletProvider({ children }: { children: ReactNode }) { try { const { address: current } = await kit.getAddress() if (!current || current !== addr) { - // Session expired or wallet changed — surface a hint. + // Session expired or wallet changed — surface a hint. setHint( - "Wallet sesión expirada. Reconectá tu wallet. / Wallet session expired. Please reconnect.", + "Wallet sesión expirada. Reconectá tu wallet. / Wallet session expired. Please reconnect.", ) setAddress(null) clearInterval(heartbeatTimerRef.current!) @@ -294,7 +293,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { if (isHardwareWalletSelected()) { setAddress(null) setHint( - "Ledger desconectado. Volvé a enchufar el dispositivo y reconectá. / Ledger disconnected. Re-plug the device and reconnect.", + "Ledger desconectado. Volvé a enchufar el dispositivo y reconectá. / Ledger disconnected. Re-plug the device and reconnect.", ) } clearInterval(heartbeatTimerRef.current!) @@ -312,7 +311,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { } }, []) - // ── effects ─────────────────────────────────────────────────────────────── + // ── effects ─────────────────────────────────────────────────────────────── /** Spike 628: OS biometric passed — apply the sealed session. */ const handleBiometricUnlocked = useCallback( @@ -397,7 +396,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { }, [startHeartbeat, stopHeartbeat, gateBiometric]) /** - * HID device disconnect events — WebUSB fires `connect`/`disconnect` events + * HID device disconnect events — WebUSB fires `connect`/`disconnect` events * on `navigator.usb`. When the Ledger is physically unplugged the heartbeat * will catch it, but we also listen here for an immediate UX response. */ @@ -413,7 +412,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { stopHeartbeat() setAddress(null) setHint( - "Ledger desconectado (USB). Volvé a enchufar y reconectá. / Ledger disconnected (USB). Re-plug and reconnect.", + "Ledger desconectado (USB). Volvé a enchufar y reconectá. / Ledger disconnected (USB). Re-plug and reconnect.", ) } @@ -454,8 +453,6 @@ export function WalletProvider({ children }: { children: ReactNode }) { autoFundedWalletsRef.current.add(address) const controller = new AbortController() - const controller = new AbortController() - const autoClaimGenesis = async () => { const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms)) const postReward = async (reward: string) => { @@ -568,7 +565,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { void syncAlbedoTxPrep(address) }, [address, syncAlbedoTxPrep]) - // ── actions ─────────────────────────────────────────────────────────────── + // ── actions ─────────────────────────────────────────────────────────────── const connect = useCallback((): Promise => { const run = async (): Promise => { @@ -606,7 +603,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { const pe = parseError(e) setAddress(null) stopHeartbeat() - if (pe.code !== -1) { + if (Number(pe.code) !== -1) { setHint(pe.message || "Wallet connection failed") } } finally { @@ -684,7 +681,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { setIsXBull(false) }, [stopHeartbeat]) - // ── context value ───────────────────────────────────────────────────────── + // ── context value ───────────────────────────────────────────────────────── const value = useMemo( () => ({ @@ -725,7 +722,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { ) - // ── render ──────────────────────────────────────────────────────────────── + // ── render ──────────────────────────────────────────────────────────────── return ( <> @@ -733,7 +730,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { - {/* ── Network passphrase mismatch alert (Ledger on wrong network) ──── */} + {/* ── Network passphrase mismatch alert (Ledger on wrong network) ──── */} {networkMismatch && address && isHardwareWallet && (
{/* Ledger icon indicator */} - ⬡ + ⬡

- Ledger — red incorrecta.{" "} + Ledger — red incorrecta.{" "} {networkMismatch}

@@ -766,7 +763,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { )} - {/* ── Albedo implicit-tx permission banner ─────────────────────────── */} + {/* ── Albedo implicit-tx permission banner ─────────────────────────── */} {address && albedoTxPrep === "needed" && !networkMismatch && (

- Albedo: concedé permiso de firma en esta pestaña (una vez). Sin esto, el navegador suele - bloquear el diálogo tras cargar Horizon o armar Soroban (incl. trustline PHASELQ). /{" "} + Albedo: concedé permiso de firma en esta pestaña (una vez). Sin esto, el navegador suele + bloquear el diálogo tras cargar Horizon o armar Soroban (incl. trustline PHASELQ). /{" "} Grant signing once so wallet dialogs are not blocked after Horizon/Soroban (including PHASELQ trustline). @@ -809,7 +806,7 @@ export function WalletProvider({ children }: { children: ReactNode }) { .finally(() => setAlbedoPrepBusy(false)) }} > - {albedoPrepBusy ? "…" : "Permitir firma / Allow signing"} + {albedoPrepBusy ? "…" : "Permitir firma / Allow signing"}

@@ -844,9 +841,9 @@ export function WalletProvider({ children }: { children: ReactNode }) { } -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── // Hook -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── export function useWallet() { const ctx = useContext(WalletContext) @@ -856,13 +853,12 @@ export function useWallet() { return ctx } -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── // Internal types -// ───────────────────────────────────────────────────────────────────────────── +// ───────────────────────────────────────────────────────────────────────────── /** Minimal shape of the WebUSB manager (navigator.usb). */ interface USBManager extends EventTarget { addEventListener(type: "connect" | "disconnect", listener: EventListenerOrEventListenerObject): void removeEventListener(type: "connect" | "disconnect", listener: EventListenerOrEventListenerObject): void } - diff --git a/components/web-vitals-reporter.tsx b/components/web-vitals-reporter.tsx index 61347e6a..7d546659 100644 --- a/components/web-vitals-reporter.tsx +++ b/components/web-vitals-reporter.tsx @@ -2,6 +2,12 @@ import { useEffect } from "react" +declare global { + interface Window { + dataLayer?: Record[] + } +} + export interface WebVitalsMetric { name: "LCP" | "FID" | "CLS" | "TTFB" | "INP" value: number diff --git a/contracts/mock-token/Cargo.lock b/contracts/mock-token/Cargo.lock index 80960c04..2ec9e5ea 100644 --- a/contracts/mock-token/Cargo.lock +++ b/contracts/mock-token/Cargo.lock @@ -543,9 +543,9 @@ checksum = "2bfcf67fea2815c2fc3b90873fae90957be12ff417335dfadc7f52927feb03b2" [[package]] name = "ethnum" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca81e6b4777c89fd810c25a4be2b1bd93ea034fbe58e6a75216a34c6b82c539b" +checksum = "40404c3f5f511ec4da6fe866ddf6a717c309fdbb69fbbad7b0f3edab8f2e835f" [[package]] name = "ff" diff --git a/contracts/mock-token/src/lib.rs b/contracts/mock-token/src/lib.rs index 756c76c0..75b77424 100644 --- a/contracts/mock-token/src/lib.rs +++ b/contracts/mock-token/src/lib.rs @@ -535,13 +535,14 @@ mod test { #[test] fn test_initialize() { let env = Env::default(); + env.mock_all_auths(); let admin = Address::generate(&env); - let token = MockToken; + let client = MockTokenClient::new(&env, &env.register(MockToken, ())); let name = String::from_str(&env, "Mock Token"); let symbol = String::from_str(&env, "MOCK"); - token.initialize(env.clone(), admin, 7, name, symbol).unwrap(); - assert!(MockToken::is_initialized(env)); + client.initialize(&admin, &7, &name, &symbol); + assert!(client.is_initialized()); } } diff --git a/contracts/mock-token/test_snapshots/test/test_initialize.1.json b/contracts/mock-token/test_snapshots/test/test_initialize.1.json new file mode 100644 index 00000000..f7215e5b --- /dev/null +++ b/contracts/mock-token/test_snapshots/test/test_initialize.1.json @@ -0,0 +1,261 @@ +{ + "generators": { + "address": 2, + "nonce": 0 + }, + "auth": [ + [], + [], + [] + ], + "ledger": { + "protocol_version": 22, + "sequence_number": 0, + "timestamp": 0, + "network_id": "0000000000000000000000000000000000000000000000000000000000000000", + "base_reserve": 0, + "min_persistent_entry_ttl": 4096, + "min_temp_entry_ttl": 16, + "max_entry_ttl": 6312000, + "ledger_entries": [ + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "Admin" + } + ] + }, + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "Admin" + } + ] + }, + "durability": "persistent", + "val": { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "Initialized" + } + ] + }, + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "Initialized" + } + ] + }, + "durability": "persistent", + "val": { + "bool": true + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "Metadata" + } + ] + }, + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "Metadata" + } + ] + }, + "durability": "persistent", + "val": { + "map": [ + { + "key": { + "symbol": "decimal" + }, + "val": { + "u32": 7 + } + }, + { + "key": { + "symbol": "name" + }, + "val": { + "string": "Mock Token" + } + }, + { + "key": { + "symbol": "symbol" + }, + "val": { + "string": "MOCK" + } + } + ] + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "TotalSupply" + } + ] + }, + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": { + "vec": [ + { + "symbol": "TotalSupply" + } + ] + }, + "durability": "persistent", + "val": { + "i128": { + "hi": 0, + "lo": 0 + } + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": "ledger_key_contract_instance", + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4", + "key": "ledger_key_contract_instance", + "durability": "persistent", + "val": { + "contract_instance": { + "executable": { + "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + }, + "storage": null + } + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], + [ + { + "contract_code": { + "hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_code": { + "ext": "v0", + "hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "code": "" + } + }, + "ext": "v0" + }, + 4095 + ] + ] + ] + }, + "events": [] +} \ No newline at end of file diff --git a/contracts/phase-protocol/Cargo.lock b/contracts/phase-protocol/Cargo.lock index 8f3f0ce0..a380b7ff 100644 --- a/contracts/phase-protocol/Cargo.lock +++ b/contracts/phase-protocol/Cargo.lock @@ -543,9 +543,9 @@ checksum = "2bfcf67fea2815c2fc3b90873fae90957be12ff417335dfadc7f52927feb03b2" [[package]] name = "ethnum" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca81e6b4777c89fd810c25a4be2b1bd93ea034fbe58e6a75216a34c6b82c539b" +checksum = "40404c3f5f511ec4da6fe866ddf6a717c309fdbb69fbbad7b0f3edab8f2e835f" [[package]] name = "ff" diff --git a/contracts/phase-protocol/src/test.rs b/contracts/phase-protocol/src/test.rs index 22ecf147..eb26da8b 100644 --- a/contracts/phase-protocol/src/test.rs +++ b/contracts/phase-protocol/src/test.rs @@ -283,3 +283,70 @@ fn bond_challenge_slash_compensates_and_rejection_forfeits_stake() { assert_eq!(f.client.try_release_listing_bond(&r2), Err(Ok(PhaseError::BondNotActive))); let _ = &f.admin; } + +// ── 661 offline metadata validation parity ────────────────────────────────── +// The same vectors run in lib/__tests__/creator-metadata-rules.test.ts, so the +// creator CLI can never drift from the on-chain rule. + +const JSON_FRAGMENT_VECTORS: &str = include_str!("../test-vectors/json-fragment.tsv"); + +fn hex_nibble(c: u8) -> u8 { + match c { + b'0'..=b'9' => c - b'0', + b'a'..=b'f' => c - b'a' + 10, + _ => panic!("bad hex digit"), + } +} + +#[test] +fn json_fragment_rule_matches_shared_vectors() { + let env = Env::default(); + let mut checked = 0u32; + for line in JSON_FRAGMENT_VECTORS.lines() { + if line.is_empty() || line.starts_with('#') { + continue; + } + let mut cols = line.split('\t'); + let expect = cols.next().unwrap(); + let max_len: u32 = cols.next().unwrap().parse().unwrap(); + let hex = cols.next().unwrap_or("").as_bytes(); + let mut buf = [0u8; 512]; + let n = hex.len() / 2; + for i in 0..n { + buf[i] = (hex_nibble(hex[2 * i]) << 4) | hex_nibble(hex[2 * i + 1]); + } + let s = String::from_bytes(&env, &buf[..n]); + assert_eq!(str_is_safe_for_json_fragment(&s, max_len), expect == "ok", "vector: {}", line); + checked += 1; + } + assert!(checked >= 15); +} + +#[test] +fn create_collection_counts_utf8_bytes_not_chars() { + let f = setup(); + let creator = Address::generate(&f.env); + // 32 two-byte chars = 64 bytes: accepted. + let ok = f.client.try_create_collection( + &creator, + &String::from_str(&f.env, "éééééééééééééééééééééééééééééééé"), + &10_000_000i128, + &String::from_str(&f.env, "ipfs://x"), + ); + assert!(ok.is_ok()); + // 33 two-byte chars = 66 bytes: InvalidCollectionMetadata (#10). + let too_long = f.client.try_create_collection( + &creator, + &String::from_str(&f.env, "ééééééééééééééééééééééééééééééééé"), + &10_000_000i128, + &String::from_str(&f.env, "ipfs://x"), + ); + assert_eq!(too_long, Err(Ok(PhaseError::InvalidCollectionMetadata))); + let zero_price = f.client.try_create_collection( + &creator, + &String::from_str(&f.env, "Free"), + &0i128, + &String::from_str(&f.env, ""), + ); + assert_eq!(zero_price, Err(Ok(PhaseError::AmountBelowCollectionPrice))); +} diff --git a/contracts/phase-protocol/test-vectors/json-fragment.tsv b/contracts/phase-protocol/test-vectors/json-fragment.tsv new file mode 100644 index 00000000..1c6ada86 --- /dev/null +++ b/contracts/phase-protocol/test-vectors/json-fragment.tsv @@ -0,0 +1,22 @@ +# Parity vectors for str_is_safe_for_json_fragment (lib.rs) and +# lib/creator-metadata-rules.ts:checkJsonFragmentBytes. +# expectmax_lenhex bytesnote +ok 64 empty is allowed +ok 64 50484153452047656e65736973 plain ascii +ok 64 61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 exactly 64 bytes +too_long 64 6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 65 bytes +ok 256 697066733a2f2f626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262 exactly 256 bytes +too_long 256 697066733a2f2f62626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262 257 bytes +quote 64 7361792022686922 double quote +backslash 64 615c62 backslash +control_char 64 00 nul +control_char 64 7461620968657265 tab +control_char 64 6c696e650a627265616b newline +control_char 64 1f unit separator 0x1f +ok 64 20 space 0x20 is the first allowed byte +ok 64 7f DEL 0x7f is not rejected on-chain +ok 64 c3a9 non-ascii is not rejected on-chain +ok 64 c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9 32 x 2-byte char = 64 bytes +too_long 64 c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9c3a9 33 chars but 66 bytes +ok 64 f09f9880 4-byte utf-8 +ok 64 697427732066696e65 single quote is allowed diff --git a/diagnose-env.ts b/diagnose-env.ts index 1e07fdce..35cdc871 100644 --- a/diagnose-env.ts +++ b/diagnose-env.ts @@ -13,7 +13,10 @@ import { isPhase95Enabled, auditQuestExperimentWiring, isQuestExperimentEnabled, + diagnoseCreatorEnv, } from "@/lib/env-validation" +import { isFeatureEnabled } from "@/lib/feature-flags" +import fs from "node:fs" import { classicLiqIssuerForStellarToml, expectedClassicPhaserLiqSorobanContractId, @@ -199,7 +202,6 @@ console.log("=".repeat(70)) console.log("\n🔒 Content Security Policy (CSP) Compliance:") try { const nextConfigPath = "./next.config.mjs" - const fs = require("fs") if (fs.existsSync(nextConfigPath)) { const configContent = fs.readFileSync(nextConfigPath, "utf8") const hasCsp = configContent.includes("Content-Security-Policy") @@ -230,3 +232,11 @@ try { } catch (e) { console.error(" ❌ ERROR checking CSP configuration:", e instanceof Error ? e.message : String(e)) } + +// phase-creator-cli: same creator checks as `npm run creator -- env`, presence and format only. +if (isFeatureEnabled("phase-creator-cli")) { + console.log("\n🧰 Creator CLI (phase-creator-cli):") + for (const c of diagnoseCreatorEnv(process.env, ["pin", "deploy"]).checks) { + console.log(` ${c.ok ? "✅" : "❌"} ${c.variable}: ${c.detail}`) + } +} diff --git a/docs/TECHNICAL.md b/docs/TECHNICAL.md index 15cc590a..d47bd912 100644 --- a/docs/TECHNICAL.md +++ b/docs/TECHNICAL.md @@ -419,6 +419,7 @@ NEXT_PUBLIC_FEATURE_PHASE_158=1 NEXT_PUBLIC_FEATURE_PHASE_159=1 NEXT_PUBLIC_FEATURE_PHASE_160=1 NEXT_PUBLIC_FEATURE_PHASE_161=1 +FEATURE_PHASE_CREATOR_CLI=1 # creator CLI side effects (server/CLI only) # Server-only aliases also accepted: FEATURE_PHASE_104, etc. ``` @@ -435,6 +436,10 @@ Agent tuning (all optional, server-only): Rollback: unset the var or set `0` and restart. No ledger migration to revert; off-chain stores remain but are ignored when flag off. See `PROJECT_ARCHITECTURE.md` §10. +| Flag | Scope | Rollback | +|---|---|---| +| `phase-creator-cli` | Creator CLI (spike 661): `npm run creator -- `; exit 0 ok, 1 invalid, 2 usage, 3 env, 4 remote, 5 flag off. Rules in `lib/creator-metadata-rules.ts`, parity vectors in `contracts/phase-protocol/test-vectors/json-fragment.tsv` | Unset. Side-effecting commands exit 5, read-only ones keep working | + --- ## 10. Security and Operations @@ -479,7 +484,7 @@ Contract commands are documented in [`contracts/README.md`](../contracts/README. `.github/workflows/ci.yml` runs on every PR and push to `main`: - `contracts` — compiles and tests both Soroban crates (`mock-token`, `phase-protocol`) against `wasm32-unknown-unknown`. -- `web` — `npm run lint`, `npm run typecheck` (both currently non-blocking pending a cleanup of pre-existing errors — see the job for the tracked count), and `npm run build`. +- `web` — `npm run lint` (non-blocking: 286 pre-existing errors), `npm run typecheck` and `npm test` (both blocking), and `npm run build`. - `deploy-staging` — on push to `main` only, behind a `staging` GitHub environment: builds + optimizes `phase-protocol` and runs `scripts/deploy-phase-sep50.ts` against testnet using repo secrets/vars. --- diff --git a/docs/investigations/main-baseline-2026-10-17.md b/docs/investigations/main-baseline-2026-10-17.md new file mode 100644 index 00000000..8d959587 --- /dev/null +++ b/docs/investigations/main-baseline-2026-10-17.md @@ -0,0 +1,56 @@ +# Main baseline repair (2026-10-17) + +Branch `chore/fix-main-baseline`, cut from `main` at `74308a0`. + +| Check | Before | After | +|---|---|---| +| `tsc --noEmit` | 120 errors | 7, all in upstream's `lib/__tests__/xbull-adapter.test.ts` (below) | +| `vitest run` | 32 failed / 351 passed, 1 file not loading | 564 passed / 9 failed (77 files, after merging upstream to `11cb3bc`; upstream alone: 54 failed) | +| `next build` | failed, 12 errors | passes (3 file-tracing warnings, below) | +| `npm run lint` | could not start (no `eslint-config-next`) | runs: 286 errors, 106 warnings, all pre-existing | +| `cargo test` mock-token | failed to build | 1 passed | +| `cargo test` phase-protocol | failed to build | **still fails**: see "Blocked" | + +## What was wrong + +- **Dropped union members.** `PhaseFeatureFlag` lost `phase-146`..`phase-153`, `phase-editions`, `phase-timed-drops`. `SecurityCounterName` lost about 50 counters. That accounted for 94 of the 120 tsc errors. +- **Encoding damage (0d14b9a).** Several files were re-encoded as cp1252-decoded UTF-8 and given a BOM plus `// @ts-nocheck`. Spanish UI strings shipped as `Transacción` and `…`, and `●` / `”` were lost. Repaired. +- **Incomplete refactor (60001c5, #33).** `fusion-chamber.tsx` imported ten `components/chamber/*` modules. Four were never committed and five were one-word `placeholder` files. The four used ones are recreated verbatim from the deleted code. The placeholders are removed. +- **Merge losses.** The collab-split fan-out in the offers route, `IpfsDisplayImg`'s `fallback` prop, `washScreenReasonForEdition`, `viewerSignatureShort`, and the four b89c4f2 tables (`exhibitions`, `price_suggestions`, `moderation_queue`, `quest_arcs`) were all restored from the commits that introduced them. +- **Every page crashed in the browser.** `lib/stellar-wallet-kit.ts` (loaded by the wallet provider on every route) imported `randomUUID` from `node:crypto`, which the client polyfill doesn't provide, so hydration threw `randomUUID is not a function`. It now uses `globalThis.crypto.randomUUID()` (the code path is browser-only). Found with a headless Chromium smoke test. +- **No wallet signature could ever verify (SEP-53).** SEP-53 has the wallet sign `SHA256("Stellar Signed Message:\n" + message)`. Signals, world roles, avatar ownership and gated-preview viewer auth all verified the raw prefixed bytes instead, so a real Freighter signature was always rejected ("Invalid signature: payload not signed by this wallet", found during the spike 662 live proof). The tests passed because they signed the same raw bytes. All four sites now go through `verifySep53Signature`, which is tested against the official SEP-53 vectors. `tests/viewer-authorization.test.ts` also used a wallet address unrelated to its signing seed, so it could never pass; fixed. +- **Real bugs found on the way:** an SSRF gap in `validateWebhookUrl` (`127.0.0.1`, `172.16/12` and others accepted), settle verification in `lib/stellar.ts` that could never succeed (meta v4 unread, `ContractEventV0.contractId()` gone), artist attestation never reading `true`, and a winback route calling a function that never existed. + +## Blocked: phase-protocol error discriminants (needs a maintainer decision) + +`contracts/phase-protocol/src/lib.rs` has 36 errors because three merged spikes each numbered new `PhaseError` variants from 18 upward, and the merges kept only one set: + +| Spike / commit | Variants | Discriminants | +|---|---|---| +| Economy 694/697/698/699 (on main now) | `CoinAlreadyRegistered` … `InvalidSchedule` | 18–39 | +| Spikes 672–675, 3e4b562 | `EditionSupplyExhausted`, `DropNotLive`, `InvalidSplitPayees`, `DutchQuoteStale` | 18–21 | +| Raffle, dd3e75c | `RaffleNotFound` … `RaffleMintGated` | 18–33 | + +The `DataKey` variants from 3e4b562 (`EditionCounter`, `EditionCap`, `SplitPayees`, `DropWindow`, `DutchConfig`) and the raffle ones are missing too. `lib/phase-protocol.ts:spikeContractErrorCode` still maps `#18`..`#21` to the edition codes, which now collide with `Coin*` on main. + +The original values exist in history but conflict, so restoring them means choosing new numbers for two of the three sets. That changes on-chain error codes and the TS mapping, so it was not done here. A maintainer needs to decide the final numbering (and whether any of these WASMs is already deployed with its numbering). + +## Upstream merge to 11cb3bc (2026-10-20) + +Upstream main at `11cb3bc` has 152 tsc errors and 54 failing tests on its own. After merging it here: 7 tsc errors and 9 failing tests, all in code added by spikes 623, 624, 628, 629 and the moderation export. Fixed in the merge: `phase-170`..`phase-173` were used but never registered as flags, the `qrFlows` / `walletConnectResilience` / `xbullParity` / `ledgerClearSigning` copy blocks had no type, `legalHolds` / `termsConsents` / `legalDocuments` were missing from the data paths, the fusion chamber lost its QR scanner imports, `@ts-nocheck` and mojibake came back in `wallet-provider.tsx` and `fusion-chamber.tsx`, plus `Uint8Array` typing in `biometric-unlock.ts` and `window.dataLayer`. + +Left for the owning spikes (logic bugs, not merge damage): + +- `xbull-adapter.test.ts` (spike 624): imports five exports the adapter never defines and expects `USER_REJECTED` where the adapter returns `REJECTED`. The test and the module disagree, so one of them has to be rewritten by the author. 5 failing tests, 7 tsc errors. +- `moderation-audit-redaction.test.ts`: the regulator export still contains the raw reporter wallet. Privacy bug. +- `walletconnect-resilience.test.ts` (spike 623): session topic is not persisted. +- `biometric-unlock.test.ts` (spike 628): a user cancel surfaces as "no sealed envelope" instead of `CANCELLED`. +- `wallet-history.test.ts` (spike 629): stale-on-error serves `fresh`. + +## Also found, not fixed + +- **Flag collision:** b89c4f2 used `phase-142`/`phase-143` for the curator and pricing oracle, while `lib/feature-flags.ts` documents `phase-142` as AI thumbnails and `phase-143` as churn/winback. Both features read the same env var. +- **Other 3e4b562 losses:** most of its `app/api/market/route.ts` edition/split changes and its doc rows are gone. Restoring them is feature work, not a baseline fix. +- **Lint:** 286 pre-existing errors, so the CI lint step stays non-blocking. +- **CSP blocks the ticker:** `connect-src` doesn't allow `api.coingecko.com` or `timeapi.io`, which `components/system-ticker.tsx` fetches, so XLM price and EST time never load in the browser. Widening the CSP is a security call for a maintainer. +- **Build tracing warnings:** `lib/settlement-store.ts` makes Next trace the whole project from `/api/x402/verify`. diff --git a/docs/spikes/661-creator-cli-findings.md b/docs/spikes/661-creator-cli-findings.md new file mode 100644 index 00000000..d5affb61 --- /dev/null +++ b/docs/spikes/661-creator-cli-findings.md @@ -0,0 +1,74 @@ +# Spike 661 — Creator CLI (Scaffold, Metadata Validation, Pin, Deploy) Findings (Issue #524) + +## What the issue claimed + +Deploying is a manual, multi-step shell process. Fifteen one-off scripts share no CLI framework, bin or validation layer. Metadata rules are only enforced on-chain, so creators find violations after paying fees, and pinning needs a running Next.js server. The goal is a standalone terminal CLI with scaffolding, offline validation that mirrors the Rust rules, resumable pin-then-deploy, and CI-friendly output (`--json`, `--dry-run`, `--network`, exit codes). + +## What the code actually did at spike time + +- The scripts under `scripts/` each load `.env.local` their own way, print free-form text, and `process.exit(1)` for every kind of failure. None had tests. +- `scripts/package.json` is `"type": "module"`, which breaks named imports from `lib/` under tsx. `scripts/diagnose-env.ts` already documented this. +- `create_collection` in `lib.rs` rejects with `#9` when `price <= 0` and `#10` when `str_is_safe_for_json_fragment` fails for `name` (64) or `image_uri` (256). That check counts **UTF-8 bytes**, allows empty strings, and rejects `"`, `\` and bytes below `0x20`. **It does not reject non-ASCII.** +- `lib/phase-protocol.ts:validateCollectionImageUri` counts UTF-16 code units, so a multi-byte URI can pass the UI and still revert on-chain with `#10`. +- `scripts/setup_token.ts` hardcodes a token contract ID and an admin address as fallbacks. That predates this spike and is listed under follow-up. + +The issue asks for ASCII rejection, but the contract doesn't reject non-ASCII, so a validator that did would block names the chain accepts. The validator mirrors the contract and reports non-ASCII as a warning. + +## Delivered in this PR (phase-creator-cli) + +1. **One command tree** (`lib/creator-cli.ts`, entry `scripts/phase-creator.cts`, `bin: phase-creator`, `npm run creator --`): `scaffold`, `validate`, `env` (the diagnose command), `pin`, `deploy`, `run`. Global `--json`, `--dry-run`, `--network` (only `testnet`). Exit codes: 0 ok, 1 invalid input, 2 usage, 3 env missing, 4 remote failure, 5 flag off. +2. **Offline validation with Rust parity** (`lib/creator-metadata-rules.ts`): a byte-exact port of `str_is_safe_for_json_fragment` plus the price rule. Issues are tagged `chain` (would revert, with the PhaseError number), `app` or `warn`. Shared vectors in `contracts/phase-protocol/test-vectors/json-fragment.tsv` run in vitest and in `src/test.rs`. +3. **Headless pin**: `pin ` uses the shared `resolvePinataJwt` (the API route uses it too) and `pinFileToIpfsWithRetry` with checksum verification. The JWT and any Stellar seed are scrubbed from every message. +4. **Reusable env diagnostics** (`lib/env-validation.ts:diagnoseCreatorEnv`): presence and format per capability, a testnet passphrase check, and detection of a secret seed in a `NEXT_PUBLIC_*` var. It never returns a value. `diagnose-env.ts` shows the same section when the flag is on. +5. **Thin wrappers**: every listed script now calls `creatorPreflight()` (`scripts/creator-preflight.ts`) right before its `main()`. `--dry-run` prints that script's plan and exits 0 before any network call, key generation or file write. With `FEATURE_PHASE_CREATOR_CLI=1`, the script first runs `phase-creator env --json` and stops with exit 3 on a missing or malformed variable. With the flag off and no `--dry-run`, the preflight returns immediately and the script runs exactly as before. Each script's own logic is untouched. + +## Spike questions (from the issue) + +1. **Minimal testnet loop, and which listed files can break it?** For this CLI the loop is: validate the draft offline, pin the asset, deploy and `initialize` phase-protocol, `create_collection` with the validated draft, mint, then display it in `/chamber`. Files that can break it on their own: `lib/creator-metadata-rules.ts` (a validator that disagrees with `lib.rs` lets a draft through that reverts with `#10`; the shared vectors fence this), `lib/ipfs-upload-retry.ts` and `app/api/ipfs/route.ts` (JWT lookup and pin), `scripts/deploy-phase-sep50.ts` (deploy and `.env.local` rewrite), and `lib/env-validation.ts` (a wrong check blocks deploy with exit 3). The live run is in the checklist below. +2. **Replay and idempotency per write.** `validate` and `env` don't write. `pin` is content-addressed: pinning the same bytes twice returns the same CID, and the sha256 check catches corrupted retries. `deploy` is **not** idempotent, because each run deploys a new contract instance and rewrites `.env.local`. The CLI doesn't resume a half-finished deploy. That's the "resumable pin-then-deploy" ask, and it's listed under follow-up. A double submit after a timeout in `create_collection` creates two collections, since the contract has no dedupe key; the CLI doesn't call `create_collection` itself. +3. **Contract-ID drift, issuer rotation, gateway failover.** `env --needs deploy` checks that `NEXT_PUBLIC_PHASER_TOKEN_ID` is a valid `C…` and the treasury a valid `G…`, but it can't tell whether they point at the deployment you meant. Drift between `.env.local` and the deployed instance isn't detected (follow-up). Pinning goes through Pinata only; the multi-gateway paths (phase-117/123) are read-side and not used by `pin`. +4. **409/429/412 taxonomy.** The CLI maps outcomes to exit codes instead: Pinata 429/5xx is retried with backoff inside `pinFileToIpfsWithRetry`, then becomes exit 4 with the error code. No CLI command does an ETag/If-Match write. No input is lost because every command is file-based and nothing is overwritten (`scaffold` refuses an existing file). +5. **Migration and rollback.** No WASM change and no schema change. Rollback is unsetting `FEATURE_PHASE_CREATOR_CLI`: side-effecting CLI commands exit 5, the preflight goes back to a no-op, read-only commands keep working, and nothing is persisted. A deploy made through the CLI is the same as one made by the old script, so the existing "new instance, old NFTs stay on the old contract" story applies. + +## Acceptance criteria status + +| Criterion | Status | +|---|---| +| End-to-end testnet proof with tx hashes and contract IDs, no hardcoded IDs | Runner and checklist below. Needs the live run. The new code hardcodes no IDs. | +| Concurrency proof (409 with current version) | Not applicable: the CLI does no versioned writes. | +| Abuse proof (self-deal, sybil, replay, expired, tampered; no PII in labels) | Tampered or invalid metadata is rejected offline with the PhaseError it would cause. Secrets never reach output (tested). The rest is not applicable to a local tool. | +| Resilience proof (RPC/gateway/Horizon failover, circuit breaker) | Pin retry with backoff is tested. RPC/Horizon failover is not part of this CLI. | +| i18n, `#13` mapping, docs, flag row | CLI output is English-only by design (CI tool, no UI). `#13` handling is untouched. Flag row added in `PROJECT_ARCHITECTURE.md` §10 and `docs/TECHNICAL.md`. | +| No regression with flags off (tsc, vitest) | `tsc --noEmit` 0 errors, vitest green, `--dry-run` tested for every wrapped script. | + +## Live proof checklist (run by the maintainer) + +Prereqs: `stellar` CLI on PATH, a funded testnet admin account, a Pinata JWT, and the optimized WASM built (`cd contracts/phase-protocol && cargo build --target wasm32-unknown-unknown --release && stellar contract optimize ...`). + +1. Put these in `.env.local` (never commit it): `FEATURE_PHASE_CREATOR_CLI=1`, `PINATA_JWT`, `ADMIN_SECRET_KEY`, `NEXT_PUBLIC_PHASER_TOKEN_ID`, `NEXT_PUBLIC_CLASSIC_LIQ_ISSUER`, `STELLAR_NETWORK_PASSPHRASE=Test SDF Network ; September 2015`. +2. `npm run creator -- env --needs pin,deploy` should exit 0 with every check `ok`. +3. `npm run creator -- scaffold ./my-drop`, fill in `name` and `image_uri`, then `npm run creator -- validate ./my-drop/collection.json`. Then try a name with a `"` and confirm exit 1 with `PhaseError #10`. +4. Dry run: `npm run proof:661 -- --asset ./my-drop/cover.png --collection ./my-drop/collection.json`. +5. Live run: `npm run proof:661 -- --asset ./my-drop/cover.png --collection ./my-drop/collection.json --live`. +6. Wrapper check: `npx tsx scripts/reset-phase.ts --dry-run` and `npx tsx scripts/deploy-phase-sep50.ts --dry-run` print a plan and exit 0, and nothing appears on stellar.expert for the admin account. +7. Attach `.data/proofs/661-*.json` and fill in: + +| Item | Value | +|---|---| +| Pinned CID (`pin` step `uri`) | `<>` | +| Pin sha256 | `<>` | +| New phase-protocol contract ID (deploy output) | `<>` | +| Deploy tx hash | `<>` | +| `initialize` tx hash | `<>` | +| `create_collection` tx hash (via `/forge` or `stellar contract invoke`) | `<>` | +| Collection id shown in `/chamber?collection=` | `<>` | +| Proof file name | `<>` | + +## Follow-up / out of scope for this PR + +- **Resumable pin-then-deploy**: persist a step journal so a failed deploy resumes instead of starting over. +- **Contract-ID drift detection**: compare `.env.local` IDs with what the RPC reports for the WASM hash. +- **Fold the old scripts into the CLI**: they're wrappers now (preflight + dry-run), but their logic still lives in each file. +- **Fix `validateCollectionImageUri`'s UTF-16 counting** in `lib/phase-protocol.ts` (not in this issue's file list; changing it changes what the live UI accepts). +- **Remove the hardcoded fallback IDs** in `scripts/setup_token.ts`. +- **Run the Rust parity test in CI.** `phase-protocol` doesn't compile on main until the `PhaseError` discriminant collision is resolved (see `docs/investigations/main-baseline-2026-10-17.md`). Until then, the shared vectors have been verified against `str_is_safe_for_json_fragment` extracted verbatim into a scratch crate. diff --git a/docs/spikes/PR_661.md b/docs/spikes/PR_661.md new file mode 100644 index 00000000..95c8f330 --- /dev/null +++ b/docs/spikes/PR_661.md @@ -0,0 +1,46 @@ +# feat(cli): phase-creator command tree with offline metadata validation (spike 661) + + +The flag is the named `phase-creator-cli`. It was `phase-161`, then `phase-165`, and upstream took both numbers for other spikes, so it now has a name that cannot collide. Set `FEATURE_PHASE_CREATOR_CLI=1` to enable it. + +## Summary + +Adds `phase-creator`, one CLI for creators who never open the web app. It scaffolds a collection, validates it offline against the exact on-chain rules, pins assets headlessly, checks the env, and deploys to testnet. Output is CI-friendly: `--json`, `--dry-run`, `--network`, and exit codes 0–5. Everything is behind `phase-creator-cli` (default off). + +## Changes + +- `lib/creator-cli.ts`, `scripts/phase-creator.cts`, `bin: phase-creator`, `npm run creator --`: `scaffold`, `validate`, `env`, `pin`, `deploy`, `run`. +- `lib/creator-metadata-rules.ts`: a byte-exact port of `str_is_safe_for_json_fragment` plus the price rule, with shared parity vectors in `contracts/phase-protocol/test-vectors/` read by vitest and `src/test.rs`. +- `lib/ipfs-upload-retry.ts`: `resolvePinataJwt` (now also used by `POST /api/ipfs`) and `scrubSecret`. +- `lib/env-validation.ts`: `diagnoseCreatorEnv`, reused by `diagnose-env.ts`. +- `scripts/creator-preflight.ts`: thin-wrapper preflight called before `main()` in the ten listed scripts. `--dry-run` prints the plan and exits 0. The flag-on env check exits 3. Flag off, it's a no-op. +- `scripts/proof-creator-661.ts` (`npm run proof:661`): live proof runner. + +## Behavior notes + +- The contract accepts non-ASCII, so the validator warns on it instead of rejecting it (the issue asked for rejection; see the spike doc). +- Found: `validateCollectionImageUri` counts UTF-16 units while the contract counts UTF-8 bytes. Documented with a test, not changed here. + +## Flag and rollback + +`FEATURE_PHASE_CREATOR_CLI` / `NEXT_PUBLIC_FEATURE_PHASE_CREATOR_CLI`, default off. Rollback: unset it. Side-effecting commands exit 5, wrapped scripts behave exactly as before, and nothing is persisted. + +## Tests + +- `lib/__tests__/creator-metadata-rules.test.ts` (27), `creator-cli.test.ts` (14), `creator-preflight.test.ts` (2). +- `tsc --noEmit`: 0 errors. `vitest run`: all green with flags off. +- Rust: the shared-vector test passes against `str_is_safe_for_json_fragment` extracted verbatim. The crate itself doesn't compile on main until the `PhaseError` discriminant collision is resolved (`docs/investigations/main-baseline-2026-10-17.md`). + +## Live proof + +Checklist and placeholders: `docs/spikes/661-creator-cli-findings.md`, "Live proof checklist". Live proof file: pending. The testnet deploy is blocked by the `PhaseError` numbering question in #574. + +## Follow-up + +Resumable pin-then-deploy, contract-ID drift detection, folding the script logic into the CLI, the UTF-16 validator fix, and removing the hardcoded IDs in `setup_token.ts`. Details are in the spike doc. + +## Depends on + +#574 (`chore/fix-main-baseline`). Merge that first; until it merges, this diff also shows its commits. + +Closes PHASE-STELLAR/Phase#524 diff --git a/lib/__tests__/artist-profile-client.test.ts b/lib/__tests__/artist-profile-client.test.ts index 48fb8614..3ff7ccab 100644 --- a/lib/__tests__/artist-profile-client.test.ts +++ b/lib/__tests__/artist-profile-client.test.ts @@ -1,4 +1,4 @@ -import { afterEach, describe, it } from "node:test" +import { afterEach, describe, it } from "vitest" import * as assert from "node:assert/strict" import { fetchArtistAlias } from "../artist-profile-client" diff --git a/lib/__tests__/avatar-provenance.test.ts b/lib/__tests__/avatar-provenance.test.ts index c31fa896..986ee1b1 100644 --- a/lib/__tests__/avatar-provenance.test.ts +++ b/lib/__tests__/avatar-provenance.test.ts @@ -15,21 +15,19 @@ import assert from "node:assert/strict" import { describe, it } from "vitest" import { Keypair } from "@stellar/stellar-sdk" import { CidIntegrityError, sha256Hex, verifyCID, verifyBytesIntegrity } from "@/lib/cid-cache" - -const SIGNATURE_PREFIX = "Stellar Signed Message:\n" +import { sep53SignedBytes, verifySep53Signature } from "@/lib/viewer-signature" async function avatarMessage(wallet: string, imageUrl: string): Promise { - return `phase-avatar:v1:${await sha256Hex(JSON.stringify({ wallet, imageUrl }))}` + return `phase-avatar:v1:${sha256Hex(new TextEncoder().encode(JSON.stringify({ wallet, imageUrl })))}` } async function verifyOwnership(wallet: string, imageUrl: string, signatureBase64: string) { - try { - const message = await avatarMessage(wallet, imageUrl) - const data = new TextEncoder().encode(SIGNATURE_PREFIX + message) - return Keypair.fromPublicKey(wallet).verify(data, Buffer.from(signatureBase64, "base64")) - } catch { - return false - } + return verifySep53Signature(wallet, await avatarMessage(wallet, imageUrl), signatureBase64) +} + +/** What a wallet's SEP-53 signMessage produces for `message`. */ +async function walletSign(kp: Keypair, message: string): Promise { + return Buffer.from(kp.sign(Buffer.from(await sep53SignedBytes(message)))).toString("base64") } const CID = "bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy" @@ -38,9 +36,7 @@ describe("avatar wallet-ownership proof (Issue #226)", () => { it("accepts a signature over the exact wallet + imageUrl", async () => { const kp = Keypair.random() const url = "https://cdn.example/avatar.png" - const signature = Buffer.from( - kp.sign(Buffer.from(SIGNATURE_PREFIX + (await avatarMessage(kp.publicKey(), url)), "utf8")), - ).toString("base64") + const signature = await walletSign(kp, await avatarMessage(kp.publicKey(), url)) assert.equal(await verifyOwnership(kp.publicKey(), url, signature), true) }) @@ -49,9 +45,7 @@ describe("avatar wallet-ownership proof (Issue #226)", () => { const kp = Keypair.random() const honestUrl = "https://cdn.example/honest.png" const attackerUrl = "https://evil.example/phish.png" - const signature = Buffer.from( - kp.sign(Buffer.from(SIGNATURE_PREFIX + (await avatarMessage(kp.publicKey(), honestUrl)), "utf8")), - ).toString("base64") + const signature = await walletSign(kp, await avatarMessage(kp.publicKey(), honestUrl)) assert.equal(await verifyOwnership(kp.publicKey(), attackerUrl, signature), false) }) @@ -60,11 +54,7 @@ describe("avatar wallet-ownership proof (Issue #226)", () => { const victim = Keypair.random() const attacker = Keypair.random() const url = "https://evil.example/phish.png" - const signature = Buffer.from( - attacker.sign( - Buffer.from(SIGNATURE_PREFIX + (await avatarMessage(victim.publicKey(), url)), "utf8"), - ), - ).toString("base64") + const signature = await walletSign(attacker, await avatarMessage(victim.publicKey(), url)) assert.equal(await verifyOwnership(victim.publicKey(), url, signature), false) }) diff --git a/lib/__tests__/creator-cli.test.ts b/lib/__tests__/creator-cli.test.ts new file mode 100644 index 00000000..9144e8ab --- /dev/null +++ b/lib/__tests__/creator-cli.test.ts @@ -0,0 +1,174 @@ +import { Keypair, StrKey } from "@stellar/stellar-sdk" +import { describe, expect, it } from "vitest" +import { DEPLOY_WASM, EXIT, parseCliArgs, runCreatorCli, type CliDeps } from "@/lib/creator-cli" +import { diagnoseCreatorEnv } from "@/lib/env-validation" +import { resolvePinataJwt, scrubSecret } from "@/lib/ipfs-upload-retry" + +const JWT = "eyJhbGciOiJIUzI1NiJ9.test-only-not-a-real-token.sig" +// Throwaway keys generated per run; nothing here is a real account. +const ADMIN = Keypair.random().secret() +const TOKEN_ID = StrKey.encodeContract(Buffer.alloc(32, 1)) +const TREASURY = Keypair.random().publicKey() + +function makeDeps(over: Partial & { files?: Record } = {}) { + const files = new Map(Object.entries(over.files ?? {})) + const out: string[] = [] + const err: string[] = [] + const ran: { script: string; args: string[] }[] = [] + const deps: CliDeps = { + env: {}, + root: "/repo", + readFile: async (p) => { + const v = files.get(p) + if (v == null) throw new Error("ENOENT") + return new TextEncoder().encode(v) + }, + writeFile: async (p, d) => { + files.set(p, d) + }, + exists: (p) => files.has(p), + runScript: async (script, args) => { + ran.push({ script, args }) + return 0 + }, + out: (l) => out.push(l), + err: (l) => err.push(l), + ...over, + } + return { deps, out, err, ran, files } +} + +const json = (lines: string[]) => JSON.parse(lines[lines.length - 1]) + +describe("phase-creator-cli argument parsing", () => { + it("parses globals and passthrough args", () => { + expect(parseCliArgs(["run", "interact", "--json", "--dry-run", "--", "--foo"])).toMatchObject({ + command: "run", + positionals: ["interact"], + json: true, + dryRun: true, + passthrough: ["--foo"], + }) + }) + + it("rejects unknown commands, options and bad --needs", () => { + expect(parseCliArgs(["nope"])).toEqual({ error: "unknown command nope" }) + expect(parseCliArgs(["env", "--verbose"])).toEqual({ error: "unknown option --verbose" }) + expect(parseCliArgs(["env", "--needs", "mint"])).toEqual({ error: "--needs takes pin and/or deploy" }) + expect(parseCliArgs(["env", "--network"])).toEqual({ error: "--network needs a value" }) + }) +}) + +describe("phase-creator-cli exit codes", () => { + it("usage errors exit 2, non-testnet networks exit 2", async () => { + expect(await runCreatorCli(["bogus"], makeDeps().deps)).toBe(EXIT.usage) + const { deps, out } = makeDeps() + expect(await runCreatorCli(["validate", "x.json", "--network", "mainnet", "--json"], deps)).toBe(EXIT.usage) + expect(json(out)).toEqual({ ok: false, error: "network_not_supported", network: "mainnet" }) + }) + + it("side effects need phase-creator-cli; dry runs and read-only commands do not", async () => { + const files = { "a.png": "png" } + expect(await runCreatorCli(["pin", "a.png"], makeDeps({ files }).deps)).toBe(EXIT.disabled) + expect(await runCreatorCli(["deploy"], makeDeps().deps)).toBe(EXIT.disabled) + expect(await runCreatorCli(["run", "interact"], makeDeps().deps)).toBe(EXIT.disabled) + expect(await runCreatorCli(["scaffold", "c"], makeDeps().deps)).toBe(EXIT.disabled) + expect(await runCreatorCli(["pin", "a.png", "--dry-run"], makeDeps({ files }).deps)).toBe(EXIT.ok) + expect(await runCreatorCli(["env"], makeDeps().deps)).toBe(EXIT.ok) + }) +}) + +describe("phase-creator-cli commands", () => { + const on = { FEATURE_PHASE_CREATOR_CLI: "1" } + + it("scaffold writes a template that validate accepts once named, and never overwrites", async () => { + const { deps, files } = makeDeps({ env: on }) + expect(await runCreatorCli(["scaffold", "drop/"], deps)).toBe(EXIT.ok) + const written = JSON.parse(files.get("drop/collection.json")!) + expect(written).toHaveProperty("price_stroops") + expect(await runCreatorCli(["scaffold", "drop"], deps)).toBe(EXIT.usage) + files.set("drop/collection.json", JSON.stringify({ ...written, name: "Drop" })) + expect(await runCreatorCli(["validate", "drop/collection.json"], deps)).toBe(EXIT.ok) + }) + + it("validate exits 1 with PhaseError codes in --json", async () => { + const { deps, out } = makeDeps({ files: { "c.json": JSON.stringify({ name: "a\\\\b", price_stroops: "5", image_uri: "" }) } }) + expect(await runCreatorCli(["validate", "c.json", "--json"], deps)).toBe(EXIT.invalid) + expect(json(out).issues[0]).toMatchObject({ code: "name_backslash", phaseError: 10 }) + }) + + it("env exits 3 when a required capability is missing and never prints secret values", async () => { + const { deps, out } = makeDeps({ env: { ADMIN_SECRET_KEY: ADMIN, PINATA_JWT: JWT } }) + expect(await runCreatorCli(["env", "--needs", "pin,deploy", "--json"], deps)).toBe(EXIT.env) + const text = out.join("\n") + expect(text).not.toContain(ADMIN) + expect(text).not.toContain(JWT) + expect(json(out).checks.find((c: { variable: string }) => c.variable === "NEXT_PUBLIC_PHASER_TOKEN_ID").detail).toBe("missing") + }) + + it("pin succeeds headlessly and the JWT never reaches the output", async () => { + const fetchImpl = (async () => + new Response(JSON.stringify({ IpfsHash: "bafybeigdyrztexample" }), { status: 200 })) as unknown as typeof fetch + const { deps, out } = makeDeps({ env: { ...on, PINATA_JWT: JWT }, files: { "a.png": "png-bytes" }, fetchImpl }) + expect(await runCreatorCli(["pin", "a.png", "--json"], deps)).toBe(EXIT.ok) + expect(json(out)).toMatchObject({ ok: true, uri: "ipfs://bafybeigdyrztexample" }) + expect(out.join("\n")).not.toContain(JWT) + }) + + it("pin failures exit 4 with the JWT scrubbed even if the upstream echoes it", async () => { + const fetchImpl = (async () => new Response(`bad token ${JWT}`, { status: 401 })) as unknown as typeof fetch + const { deps, out, err } = makeDeps({ env: { ...on, PINATA_JWT: JWT }, files: { "a.png": "x" }, fetchImpl }) + expect(await runCreatorCli(["pin", "a.png", "--json"], deps)).toBe(EXIT.remote) + expect([...out, ...err].join("\n")).not.toContain(JWT) + }) + + it("pin without a JWT exits 3", async () => { + expect(await runCreatorCli(["pin", "a.png"], makeDeps({ env: on, files: { "a.png": "x" } }).deps)).toBe(EXIT.env) + }) + + it("deploy checks env and the WASM before delegating to the existing script", async () => { + const env = { + ...on, + ADMIN_SECRET_KEY: ADMIN, + NEXT_PUBLIC_PHASER_TOKEN_ID: TOKEN_ID, + NEXT_PUBLIC_CLASSIC_LIQ_ISSUER: TREASURY, + } + expect(await runCreatorCli(["deploy"], makeDeps({ env: on }).deps)).toBe(EXIT.env) + expect(await runCreatorCli(["deploy"], makeDeps({ env }).deps)).toBe(EXIT.invalid) + + const wasm = { [`/repo/${DEPLOY_WASM}`]: "wasm" } + const dry = makeDeps({ env, files: wasm }) + expect(await runCreatorCli(["deploy", "--dry-run"], dry.deps)).toBe(EXIT.ok) + expect(dry.ran).toEqual([]) + + const real = makeDeps({ env, files: wasm }) + expect(await runCreatorCli(["deploy"], real.deps)).toBe(EXIT.ok) + expect(real.ran).toEqual([{ script: "deploy-phase-sep50.ts", args: [] }]) + expect(real.out.join("\n")).not.toContain(ADMIN) + }) + + it("run only reaches allowlisted scripts and maps their exit code", async () => { + const { deps, ran } = makeDeps({ env: on, runScript: async () => 7 }) + expect(await runCreatorCli(["run", "../../etc/passwd"], deps)).toBe(EXIT.usage) + expect(await runCreatorCli(["run", "interact", "--", "status"], deps)).toBe(EXIT.remote) + expect(ran).toEqual([]) + const ok = makeDeps({ env: on }) + expect(await runCreatorCli(["run", "reset-phase", "--", "--yes"], ok.deps)).toBe(EXIT.ok) + expect(ok.ran).toEqual([{ script: "reset-phase.ts", args: ["--yes"] }]) + }) +}) + +describe("phase-creator-cli shared helpers", () => { + it("one JWT lookup order for the route and the CLI", () => { + expect(resolvePinataJwt({ PINATA_JWT: " a ", PINATA_API_JWT: "b" })).toBe("a") + expect(resolvePinataJwt({ PINATA_API_JWT: "b" })).toBe("b") + expect(resolvePinataJwt({})).toBeUndefined() + expect(scrubSecret(`x ${JWT} y`, JWT)).toBe("x [REDACTED] y") + }) + + it("flags a secret seed sitting in a public var", () => { + const r = diagnoseCreatorEnv({ NEXT_PUBLIC_OOPS: ADMIN }, []) + expect(r.ok).toBe(false) + expect(r.checks.at(-1)).toMatchObject({ variable: "NEXT_PUBLIC_OOPS", detail: "secret_in_public_var" }) + }) +}) diff --git a/lib/__tests__/creator-metadata-rules.test.ts b/lib/__tests__/creator-metadata-rules.test.ts new file mode 100644 index 00000000..d24c8ffd --- /dev/null +++ b/lib/__tests__/creator-metadata-rules.test.ts @@ -0,0 +1,81 @@ +import fs from "node:fs" +import path from "node:path" +import { describe, expect, it } from "vitest" +import { + checkJsonFragmentBytes, + COLLECTION_TEMPLATE, + PHASE_ERROR_AMOUNT_BELOW_COLLECTION_PRICE, + PHASE_ERROR_INVALID_COLLECTION_METADATA, + validateCollectionDraft, +} from "@/lib/creator-metadata-rules" +import { validateCollectionImageUri } from "@/lib/phase-protocol" + +const VECTORS = fs + .readFileSync(path.resolve(__dirname, "../../contracts/phase-protocol/test-vectors/json-fragment.tsv"), "utf8") + .split("\n") + .filter((l) => l && !l.startsWith("#")) + .map((l) => { + const [expect, max, hex, note] = l.split("\t") + return { expect, max: Number(max), bytes: Uint8Array.from(Buffer.from(hex, "hex")), note } + }) + +describe("phase-creator-cli parity with str_is_safe_for_json_fragment", () => { + it("loads the shared vectors", () => { + expect(VECTORS.length).toBeGreaterThanOrEqual(15) + }) + + for (const v of VECTORS) { + it(`${v.expect}: ${v.note}`, () => { + const r = checkJsonFragmentBytes(v.bytes, v.max) + expect(r.ok).toBe(v.expect === "ok") + if (!r.ok) expect(r.reason).toBe(v.expect) + }) + } + + it("documents the drift in the existing UTF-16 image URI check", () => { + // 129 two-byte chars: 129 UTF-16 units (old check passes), 258 bytes (contract rejects). + const uri = `ipfs://${"é".repeat(125)}` + expect(validateCollectionImageUri(uri).ok).toBe(true) + expect(checkJsonFragmentBytes(new TextEncoder().encode(uri), 256).ok).toBe(false) + }) +}) + +describe("phase-creator-cli collection draft validation", () => { + const draft = { name: "Genesis", price_stroops: "10000000", image_uri: "ipfs://bafybeigdyrzt" } + + it("accepts a clean draft", () => { + expect(validateCollectionDraft(draft)).toEqual({ valid: true, issues: [] }) + }) + + it("maps contract reverts to their PhaseError codes", () => { + const r = validateCollectionDraft({ ...draft, name: 'a"b', price_stroops: "0" }) + expect(r.valid).toBe(false) + expect(r.issues).toContainEqual(expect.objectContaining({ code: "name_quote", level: "chain", phaseError: PHASE_ERROR_INVALID_COLLECTION_METADATA })) + expect(r.issues).toContainEqual( + expect.objectContaining({ code: "price_not_positive", level: "chain", phaseError: PHASE_ERROR_AMOUNT_BELOW_COLLECTION_PRICE }), + ) + }) + + it("separates app policy from chain rules", () => { + const r = validateCollectionDraft({ ...draft, image_uri: "http://x.test/a.png" }) + expect(r.valid).toBe(false) + expect(r.issues).toEqual([expect.objectContaining({ code: "image_uri_scheme", level: "app" })]) + }) + + it("non-ASCII is a warning, not a failure, because the contract accepts it", () => { + const r = validateCollectionDraft({ ...draft, name: "Génesis" }) + expect(r.valid).toBe(true) + expect(r.issues).toEqual([expect.objectContaining({ code: "name_non_ascii", level: "warn" })]) + }) + + it("rejects malformed files and prices", () => { + expect(validateCollectionDraft([]).valid).toBe(false) + expect(validateCollectionDraft({ name: "x" }).issues.map((i) => i.code)).toEqual(["price_stroops_missing", "image_uri_missing"]) + expect(validateCollectionDraft({ ...draft, price_stroops: "1.5" }).issues[0].code).toBe("price_not_integer") + expect(validateCollectionDraft({ ...draft, price_stroops: (BigInt(1) << BigInt(127)).toString() }).issues[0].code).toBe("price_overflow") + }) + + it("the scaffold template validates once a name is filled in", () => { + expect(validateCollectionDraft({ ...COLLECTION_TEMPLATE, name: "Mine" }).valid).toBe(true) + }) +}) diff --git a/lib/__tests__/creator-preflight.test.ts b/lib/__tests__/creator-preflight.test.ts new file mode 100644 index 00000000..5c52b60b --- /dev/null +++ b/lib/__tests__/creator-preflight.test.ts @@ -0,0 +1,32 @@ +import { spawnSync } from "node:child_process" +import path from "node:path" +import { describe, expect, it } from "vitest" + +const ROOT = path.resolve(__dirname, "../..") + +// Only a read-only script and dry runs are spawned here, so nothing can reach testnet. +function run(script: string, args: string[], env: Record = {}) { + const res = spawnSync("npx", ["tsx", path.join("scripts", script), ...args], { + cwd: ROOT, + encoding: "utf8", + env: { NODE_ENV: "test", PATH: process.env.PATH ?? "", HOME: process.env.HOME ?? "", ...env }, + timeout: 60_000, + }) + return { code: res.status, out: `${res.stdout}${res.stderr}` } +} + +describe("phase-creator-cli thin-wrapper preflight", () => { + it("--dry-run prints the plan and exits 0 before any side effect", () => { + const r = run("check-secret-rotation.ts", ["--dry-run"]) + expect(r.code).toBe(0) + expect(r.out).toContain("[dry-run] check-secret-rotation.ts would:") + }, 60_000) + + it("with the flag on, a missing env stops the script with exit 3 and names only variables", () => { + const secretish = "SDUMMYVALUETHATMUSTNOTAPPEARINOUTPUT" + const r = run("deploy-phase-sep50.ts", ["--dry-run"], { FEATURE_PHASE_CREATOR_CLI: "1", PINATA_JWT: secretish }) + expect(r.code).toBe(3) + expect(r.out).toContain("ADMIN_SECRET_KEY: missing") + expect(r.out).not.toContain(secretish) + }, 60_000) +}) diff --git a/lib/__tests__/viewer-signature.test.ts b/lib/__tests__/viewer-signature.test.ts index f7053f73..a9dae90d 100644 --- a/lib/__tests__/viewer-signature.test.ts +++ b/lib/__tests__/viewer-signature.test.ts @@ -1,18 +1,19 @@ -// @ts-nocheck +// @ts-nocheck import assert from "node:assert/strict" import { test } from "vitest" import { Keypair } from "@stellar/stellar-sdk" import { - SIGNATURE_PREFIX, canonicalSignalPayload, + sep53SignedBytes, signalProofMessage, + verifySep53Signature, verifySignalSignature, } from "@/lib/viewer-signature" /** - * Simulates the client signing step (SEP-53 framing) without a real wallet. - * A SEP-53 signature is `ed25519_sign(sha256(prefix + message))`, which is - * exactly what `Keypair.sign(prefix + message)` produces in @stellar/stellar-sdk. + * Simulates a wallet's SEP-53 signMessage without a real wallet: + * ed25519_sign(sha256(prefix + message)). Keypair.sign does NOT hash, so it + * has to be given the digest; signing the raw prefixed bytes was the old bug. */ async function signPayload(payload: { title: string @@ -20,10 +21,38 @@ async function signPayload(payload: { timestamp: number }, keypair: Keypair): Promise { const message = await signalProofMessage(payload) - const data = SIGNATURE_PREFIX + message - return Buffer.from(keypair.sign(data)).toString("base64") + return Buffer.from(keypair.sign(Buffer.from(await sep53SignedBytes(message)))).toString("base64") } +// Official vectors from stellar-protocol ecosystem/sep-0053.md (published test key, no funds). +const SEP53_ADDRESS = "GBXFXNDLV4LSWA4VB7YIL5GBD7BVNR22SGBTDKMO2SBZZHDXSKZYCP7L" + +test("verifySep53Signature accepts the SEP-53 spec test vectors", async () => { + assert.equal( + await verifySep53Signature( + SEP53_ADDRESS, + "Hello, World!", + "fO5dbYhXUhBMhe6kId/cuVq/AfEnHRHEvsP8vXh03M1uLpi5e46yO2Q8rEBzu3feXQewcQE5GArp88u6ePK6BA==", + ), + true, + ) + assert.equal( + await verifySep53Signature( + SEP53_ADDRESS, + "こんにちは、世界！", + "CDU265Xs8y3OWbB/56H9jPgUss5G9A0qFuTqH2zs2YDgTm+++dIfmAEceFqB7bhfN3am59lCtDXrCtwH2k1GBA==", + ), + true, + ) +}) + +test("verifySep53Signature rejects a signature over the raw prefixed bytes", async () => { + const kp = Keypair.random() + const raw = Buffer.from("Stellar Signed Message:\nhello", "utf8") + const signature = Buffer.from(kp.sign(raw)).toString("base64") + assert.equal(await verifySep53Signature(kp.publicKey(), "hello", signature), false) +}) + test("verifySignalSignature accepts a genuine wallet signature", async () => { const kp = Keypair.random() const payload = { title: "Hello", body: "World", timestamp: 1234567890 } @@ -46,7 +75,7 @@ test("verifySignalSignature rejects tampered content", async () => { const kp = Keypair.random() const payload = { title: "Hello", body: "World", timestamp: 1234567890 } const signature = await signPayload(payload, kp) - // Body changed after signing — signature must no longer verify. + // Body changed after signing — signature must no longer verify. const tampered = await verifySignalSignature(kp.publicKey(), { ...payload, body: "Tampered" }, signature) assert.equal(tampered, false) }) diff --git a/lib/__tests__/wallet-history.test.ts b/lib/__tests__/wallet-history.test.ts index 02bf9b8e..4f6ea8ff 100644 --- a/lib/__tests__/wallet-history.test.ts +++ b/lib/__tests__/wallet-history.test.ts @@ -152,7 +152,7 @@ describe("mergeTimelineStreams — effects-first merge (Spike 629 requirement)", it("keeps failed transactions (they produce no effects)", () => { const failed = event({ id: "tx:2", - kind: "tx_failed", + kind: "tx", type: "tx_failed", tx_hash: "orphan-hash", failed: true, diff --git a/lib/__tests__/world-roles-rbac.test.ts b/lib/__tests__/world-roles-rbac.test.ts index 050ce4c1..af2ee8f9 100644 --- a/lib/__tests__/world-roles-rbac.test.ts +++ b/lib/__tests__/world-roles-rbac.test.ts @@ -31,7 +31,7 @@ before(async () => { }, } await writeFile( - path.join(TEST_DATA_DIR, "worldRoles.json"), + path.join(TEST_DATA_DIR, "world-roles.json"), JSON.stringify(store), "utf8", ) diff --git a/lib/artist-attestation.ts b/lib/artist-attestation.ts index 3cadba1d..fad37e0e 100644 --- a/lib/artist-attestation.ts +++ b/lib/artist-attestation.ts @@ -15,7 +15,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises" import path from "node:path" -import { Keypair, StrKey } from "@stellar/stellar-sdk" +import { Address, Keypair, scValToNative, StrKey } from "@stellar/stellar-sdk" import { z } from "zod" import { isFeatureEnabled } from "@/lib/feature-flags" @@ -256,7 +256,7 @@ export async function checkOnChainArtistAttestation( fee: "100", networkPassphrase: Networks.TESTNET, }) - .addOperation(contract.call("is_artist_attested", xdr.ScVal.scvAddress(wallet))) + .addOperation(contract.call("is_artist_attested", Address.fromString(wallet).toScVal())) .setTimeout(300) .build() @@ -267,9 +267,7 @@ export async function checkOnChainArtistAttestation( result = "not_attested" } else { const retval = sim.result?.retval - const decoded = retval ? xdr.ScVal.fromXDR(retval, "base64") : null - const isVerified = - decoded?.switch?.() === xdr.ScValType.scvBool && decoded.bool() === true + const isVerified = retval ? scValToNative(retval) === true : false result = isVerified ? "verified" : "not_attested" } } catch { diff --git a/lib/biometric-unlock.ts b/lib/biometric-unlock.ts index 2bc5383c..0c6bcd54 100644 --- a/lib/biometric-unlock.ts +++ b/lib/biometric-unlock.ts @@ -75,7 +75,7 @@ function bytesToBase64(bytes: Uint8Array): string { return btoa(binary); } -function base64ToBytes(b64: string): Uint8Array { +function base64ToBytes(b64: string): Uint8Array { const binary = atob(b64); const bytes = new Uint8Array(binary.length); for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i); @@ -116,8 +116,8 @@ export async function isPlatformAuthenticatorAvailable(): Promise { * only derive the key that opens this wallet's envelope (cross-wallet replay * fails at decrypt). */ -export function buildBiometricChallenge(wallet: string): Uint8Array { - return new TextEncoder().encode(`${BIOMETRIC_CHALLENGE_PREFIX}${wallet}`); +export function buildBiometricChallenge(wallet: string): Uint8Array { + return new Uint8Array(new TextEncoder().encode(`${BIOMETRIC_CHALLENGE_PREFIX}${wallet}`)); } /** @@ -131,7 +131,7 @@ export async function deriveUnlockKey( ): Promise { const bytes = assertionSignature instanceof Uint8Array - ? assertionSignature + ? new Uint8Array(assertionSignature) : new Uint8Array(assertionSignature); const baseKey = await subtle.importKey("raw", bytes, "HKDF", false, ["deriveKey"]); return subtle.deriveKey( @@ -139,7 +139,7 @@ export async function deriveUnlockKey( name: "HKDF", hash: "SHA-256", salt: buildBiometricChallenge(wallet), - info: new TextEncoder().encode("phase-biometric-envelope"), + info: new Uint8Array(new TextEncoder().encode("phase-biometric-envelope")), }, baseKey, { name: "AES-GCM", length: 256 }, @@ -154,7 +154,7 @@ export async function sealSessionEnvelope( subtle: SubtleCrypto = globalThis.crypto.subtle, ): Promise { const iv = globalThis.crypto.getRandomValues(new Uint8Array(12)); - const plaintext = new TextEncoder().encode(JSON.stringify(payload)); + const plaintext = new Uint8Array(new TextEncoder().encode(JSON.stringify(payload))); const ciphertext = await subtle.encrypt({ name: "AES-GCM", iv }, key, plaintext); return { v: 1, diff --git a/lib/creator-cli.ts b/lib/creator-cli.ts new file mode 100644 index 00000000..6e63e1db --- /dev/null +++ b/lib/creator-cli.ts @@ -0,0 +1,271 @@ +/** + * Spike 661 (phase-creator-cli): `phase-creator` command tree. + * + * phase-creator scaffold write /collection.json + * phase-creator validate offline check against the on-chain rules + * phase-creator env [--needs pin,deploy] + * phase-creator pin headless Pinata pin (JWT from env, never printed) + * phase-creator deploy build plan + scripts/deploy-phase-sep50.ts + * phase-creator run