diff --git a/example-apps/dashmint-lab/public/dashmint-lite.html b/example-apps/dashmint-lab/public/dashmint-lite.html index 60c5a0f..9f8e131 100644 --- a/example-apps/dashmint-lab/public/dashmint-lite.html +++ b/example-apps/dashmint-lab/public/dashmint-lite.html @@ -124,14 +124,19 @@

Browse cards

// The token-enabled "card" data contract is already published on testnet by // the React app. Anyone querying with the same contract id hits the same // documents. - const CONTRACT_ID = 'GDBN1h52Zcs8hSSKBoz67WDyWmUwcRyCSJjXBgKPty94'; + const CONTRACT_ID = '5hK6SMfN4m2vU1t9qhvngUUQjsXeMNwr8MZdFeGBH8Aa'; const DOC_TYPE = 'card'; // Connect to testnet. testnetTrusted() uses the SDK's bundled list of trusted // nodes — no node URL or config needed. connect() does the gRPC handshake // + initial sync. No identity or signing is required for read-only queries. + // + // Workaround: pin the platform protocol version for evo-sdk dev.6 so the + // SDK doesn't ask testnet for a newer protocol it can't decode. Mirrors + // PLATFORM_VERSION_OVERRIDE in setupDashClient-core.mjs. Remove once a + // fixed SDK release lands. async function connectSdk() { - const sdk = EvoSDK.testnetTrusted(); + const sdk = EvoSDK.testnetTrusted({ version: 11 }); await sdk.connect(); return sdk; } diff --git a/example-apps/dashmint-lab/src/App.tsx b/example-apps/dashmint-lab/src/App.tsx index 3f6bd0c..e6b9c5d 100644 --- a/example-apps/dashmint-lab/src/App.tsx +++ b/example-apps/dashmint-lab/src/App.tsx @@ -89,6 +89,14 @@ function App() { else if (status === "browsing") setSubTab("all"); }, [status]); + // Re-fetch token balance whenever the Mint tab becomes active. The balance + // effect in SessionContext only runs on login/logout/contract change, so + // without this prompt the value could be stale (read-after-write lag from + // a recent mint elsewhere, or simply a value from many minutes ago). + useEffect(() => { + if (tab === "mint" && status === "authenticated") refreshBalance(); + }, [tab, status, refreshBalance]); + // Load cards for the current sub-tab whenever dependencies change. // Keeps any previously-cached results visible while refetching so tab // switches don't tear down the grid — only the first load shows the diff --git a/example-apps/dashmint-lab/src/components/MintForm.tsx b/example-apps/dashmint-lab/src/components/MintForm.tsx index 8a24b5e..2f4b468 100644 --- a/example-apps/dashmint-lab/src/components/MintForm.tsx +++ b/example-apps/dashmint-lab/src/components/MintForm.tsx @@ -2,14 +2,23 @@ * Mint-a-card form. Calls src/dash/mintCard directly; session provides * sdk, keyManager, and the contract ID. */ -import { useState, type FormEvent } from "react"; +import { useEffect, useState, type FormEvent } from "react"; import { drawStarterPack, STARTER_PACK_SIZE } from "../data/starterPack"; import { errorMessage } from "../dash/logger"; import { mintCard } from "../dash/mintCard"; -import { DASHMINT_TOKEN_COST } from "../dash/dashMintToken"; +import { + DASHMINT_TOKEN_COST, + DASHMINT_TOKEN_SUPPLY, + fetchCardsMintedCount, +} from "../dash/dashMintToken"; import { useSession } from "../session/useSession"; import { OddsTable } from "./OddsTable"; +// Module-level cache so the supply count survives tab unmounts. When the +// user navigates back to Mint we render the last known value immediately +// and silently refetch — no "—" placeholder flash. +const mintedCountCache = new Map(); + export interface MintFormProps { contractId: string; dashMintTokenBalance?: bigint | null; @@ -26,17 +35,47 @@ export function MintForm({ const [description, setDescription] = useState(""); const [submitting, setSubmitting] = useState(false); const [mintingPack, setMintingPack] = useState(false); + const [mintedCount, setMintedCount] = useState( + () => mintedCountCache.get(contractId) ?? null, + ); const starterPackTokenCost = BigInt(STARTER_PACK_SIZE); + + useEffect(() => { + if (!session.sdk) return; + let cancelled = false; + fetchCardsMintedCount({ sdk: session.sdk, contractId }) + .then((count) => { + mintedCountCache.set(contractId, count); + if (!cancelled) setMintedCount(count); + }) + .catch(() => { + // Keep the previous (possibly cached) value on failure so the UI + // doesn't regress to "—" just because a refetch hiccuped. + }); + return () => { + cancelled = true; + }; + }, [session.sdk, contractId, submitting, mintingPack]); + const soldOut = mintedCount !== null && mintedCount >= DASHMINT_TOKEN_SUPPLY; + const starterPackSoldOut = + mintedCount !== null && + DASHMINT_TOKEN_SUPPLY - mintedCount < starterPackTokenCost; const hasInsufficientTokensForCard = dashMintTokenBalance !== null && dashMintTokenBalance < DASHMINT_TOKEN_COST; const hasInsufficientTokensForStarterPack = dashMintTokenBalance !== null && dashMintTokenBalance < starterPackTokenCost; + const mintedPercent = + mintedCount === null + ? 0 + : Math.min(100, Number((mintedCount * 100n) / DASHMINT_TOKEN_SUPPLY)); async function handleSubmit(e: FormEvent) { e.preventDefault(); if (!session.sdk || !session.keyManager) return; - if (submitting || mintingPack || hasInsufficientTokensForCard) return; + if (submitting || mintingPack || soldOut || hasInsufficientTokensForCard) { + return; + } setSubmitting(true); try { await mintCard({ @@ -58,7 +97,12 @@ export function MintForm({ async function handleStarterPack() { if (!session.sdk || !session.keyManager) return; - if (submitting || mintingPack || hasInsufficientTokensForStarterPack) { + if ( + submitting || + mintingPack || + starterPackSoldOut || + hasInsufficientTokensForStarterPack + ) { return; } setMintingPack(true); @@ -83,6 +127,41 @@ export function MintForm({ } } + const supplyBlock = ( +
+
+ Supply +
+
+ {mintedCount === null + ? "—" + : `${mintedCount.toString()} / ${DASHMINT_TOKEN_SUPPLY.toString()} minted`} +
+ {mintedCount !== null && ( +
+
+
+ )} + {soldOut && ( +

+ All cards have been minted. +

+ )} +
+ ); + + if (soldOut) { + return ( +
+ {supplyBlock} + +
+ ); + } + return (
@@ -93,9 +172,11 @@ export function MintForm({

+ {supplyBlock} +
- DashMint tokens + Your DashMint token balance
{dashMintTokenBalance === null @@ -176,23 +257,37 @@ export function MintForm({ Starter Pack

- Mint a random set of sample cards from the tutorial collection. Costs{" "} - {STARTER_PACK_SIZE} DashMint tokens. + Mint {STARTER_PACK_SIZE} random cards from the tutorial collection. + Costs {STARTER_PACK_SIZE} DashMint tokens (1 per card).

- {hasInsufficientTokensForStarterPack && ( + {starterPackSoldOut ? (

- You need {STARTER_PACK_SIZE} DashMint tokens to open a Starter Pack. + Not enough remaining supply for a Starter Pack.

+ ) : ( + hasInsufficientTokensForStarterPack && ( +

+ You need {STARTER_PACK_SIZE} DashMint tokens to open a Starter + Pack. +

+ ) )}
diff --git a/example-apps/dashmint-lab/src/dash/contractStorage.ts b/example-apps/dashmint-lab/src/dash/contractStorage.ts index a8e953c..9e2d48d 100644 --- a/example-apps/dashmint-lab/src/dash/contractStorage.ts +++ b/example-apps/dashmint-lab/src/dash/contractStorage.ts @@ -16,7 +16,7 @@ const STORAGE_KEY = "dashmint-lab.contractId"; * the Settings modal or register their own. */ export const DEFAULT_CONTRACT_ID = - "GDBN1h52Zcs8hSSKBoz67WDyWmUwcRyCSJjXBgKPty94"; + "5hK6SMfN4m2vU1t9qhvngUUQjsXeMNwr8MZdFeGBH8Aa"; export function loadStoredContractId(): string | null { return localStorage.getItem(STORAGE_KEY) ?? DEFAULT_CONTRACT_ID; diff --git a/example-apps/dashmint-lab/src/dash/dashMintToken.ts b/example-apps/dashmint-lab/src/dash/dashMintToken.ts index e883408..82453dc 100644 --- a/example-apps/dashmint-lab/src/dash/dashMintToken.ts +++ b/example-apps/dashmint-lab/src/dash/dashMintToken.ts @@ -38,3 +38,21 @@ export async function fetchDashMintTokenBalance({ const balances = await sdk.tokens.identityBalances(identityId, [tokenId]); return balances.get(tokenId) ?? 0n; } + +// Every mint burns exactly one DashMint token (manual burns/mints are locked +// in the contract), so cards minted = SUPPLY - current circulating supply. +export async function fetchCardsMintedCount({ + sdk, + contractId, +}: { + sdk: DashSdk; + contractId: string; +}): Promise { + const tokenId = await sdk.tokens.calculateId( + contractId, + DASHMINT_TOKEN_POSITION, + ); + const supply = await sdk.tokens.totalSupply(tokenId); + const remaining = supply?.totalSupply ?? DASHMINT_TOKEN_SUPPLY; + return DASHMINT_TOKEN_SUPPLY - remaining; +} diff --git a/example-apps/dashmint-lab/src/dash/types.ts b/example-apps/dashmint-lab/src/dash/types.ts index 6389c57..43f5b9c 100644 --- a/example-apps/dashmint-lab/src/dash/types.ts +++ b/example-apps/dashmint-lab/src/dash/types.ts @@ -108,6 +108,9 @@ export interface DashSdk { identityId: string, tokenIds: string[], ): Promise>; + totalSupply( + tokenId: string, + ): Promise<{ totalSupply: bigint; tokenId: string } | undefined>; }; dpns: { username(identityId: string): Promise; diff --git a/example-apps/dashmint-lab/test/MintForm.test.tsx b/example-apps/dashmint-lab/test/MintForm.test.tsx index c96d7d7..72fd073 100644 --- a/example-apps/dashmint-lab/test/MintForm.test.tsx +++ b/example-apps/dashmint-lab/test/MintForm.test.tsx @@ -7,18 +7,22 @@ import { screen, waitFor, } from "@testing-library/react"; -import { afterEach, describe, expect, it, vi } from "vitest"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { MintForm } from "../src/components/MintForm"; import type { DashKeyManager, DashSdk } from "../src/dash/types"; -const { mockUseSession, mockMintCard, mockDrawStarterPack } = vi.hoisted( - () => ({ - mockUseSession: vi.fn(), - mockMintCard: vi.fn(), - mockDrawStarterPack: vi.fn(), - }), -); +const { + mockUseSession, + mockMintCard, + mockDrawStarterPack, + mockFetchCardsMintedCount, +} = vi.hoisted(() => ({ + mockUseSession: vi.fn(), + mockMintCard: vi.fn(), + mockDrawStarterPack: vi.fn(), + mockFetchCardsMintedCount: vi.fn(), +})); vi.mock("../src/session/useSession", () => ({ useSession: mockUseSession, @@ -28,6 +32,16 @@ vi.mock("../src/dash/mintCard", () => ({ mintCard: mockMintCard, })); +vi.mock("../src/dash/dashMintToken", async () => { + const actual = await vi.importActual< + typeof import("../src/dash/dashMintToken") + >("../src/dash/dashMintToken"); + return { + ...actual, + fetchCardsMintedCount: mockFetchCardsMintedCount, + }; +}); + vi.mock("../src/data/starterPack", () => ({ STARTER_PACK_SIZE: 3, drawStarterPack: mockDrawStarterPack, @@ -61,6 +75,14 @@ afterEach(() => { vi.clearAllMocks(); }); +beforeEach(() => { + // Test stub: a never-resolving promise so `mintedCount` stays at its + // initial `null` (the "supply unknown" branch — full form visible, no + // sold-out gating). Tests that need a concrete count override this with + // `mockResolvedValueOnce(...)`. + mockFetchCardsMintedCount.mockReturnValue(new Promise(() => {})); +}); + describe("MintForm", () => { it("keeps submit disabled for an empty name and does not mint", () => { mockUseSession.mockReturnValue(sessionValue); @@ -242,7 +264,7 @@ describe("MintForm", () => { /Mint a unique collectible card\. Costs 1 DashMint token\./, ), ).toBeTruthy(); - expect(screen.getByText("DashMint tokens")).toBeTruthy(); + expect(screen.getByText("Your DashMint token balance")).toBeTruthy(); expect(screen.getByText("0")).toBeTruthy(); expect( screen.getByText("You need at least 1 DashMint token to mint a card."), @@ -302,4 +324,85 @@ describe("MintForm", () => { ), ).toBeTruthy(); }); + + it("shows the supply count and progress once the minted count loads", async () => { + mockUseSession.mockReturnValue(sessionValue); + mockFetchCardsMintedCount.mockResolvedValueOnce(42n); + + render( + , + ); + + expect(await screen.findByText("42 / 100 minted")).toBeTruthy(); + // Mint form still rendered while supply remains. + expect(screen.getByRole("button", { name: "Mint Card" })).toBeTruthy(); + }); + + it("collapses to the supply notice and hides the form when sold out", async () => { + mockUseSession.mockReturnValue(sessionValue); + mockFetchCardsMintedCount.mockResolvedValueOnce(100n); + + render( + , + ); + + expect(await screen.findByText("100 / 100 minted")).toBeTruthy(); + expect(screen.getByText("All cards have been minted.")).toBeTruthy(); + + // Form, token-balance block, and both mint buttons should be gone. + expect(screen.queryByRole("button", { name: "Mint Card" })).toBeNull(); + expect( + screen.queryByRole("button", { name: "Open Starter Pack" }), + ).toBeNull(); + expect(screen.queryByPlaceholderText("e.g. Fire Dragon")).toBeNull(); + expect(screen.queryByText("Your DashMint token balance")).toBeNull(); + expect( + screen.queryByText("You need at least 1 DashMint token to mint a card."), + ).toBeNull(); + }); + + it("disables the starter pack when fewer than pack-size mints remain", async () => { + mockUseSession.mockReturnValue(sessionValue); + // 2 mints left, pack size is 3. + mockFetchCardsMintedCount.mockResolvedValueOnce(98n); + + render( + , + ); + + expect(await screen.findByText("98 / 100 minted")).toBeTruthy(); + expect( + screen.getByText("Not enough remaining supply for a Starter Pack."), + ).toBeTruthy(); + expect( + ( + screen.getByRole("button", { + name: "Sold out", + }) as HTMLButtonElement + ).disabled, + ).toBe(true); + // Single-card mint is still available once the name is filled in. + fireEvent.change(screen.getByPlaceholderText("e.g. Fire Dragon"), { + target: { value: "Sky Hunter" }, + }); + expect( + ( + screen.getByRole("button", { + name: "Mint Card", + }) as HTMLButtonElement + ).disabled, + ).toBe(false); + }); }); diff --git a/example-apps/dashmint-lab/test/e2e/browse.spec.ts b/example-apps/dashmint-lab/test/e2e/browse.spec.ts index fd7afef..7ae8685 100644 --- a/example-apps/dashmint-lab/test/e2e/browse.spec.ts +++ b/example-apps/dashmint-lab/test/e2e/browse.spec.ts @@ -190,13 +190,23 @@ test("Price sort puts the highest-priced card first in the Marketplace", async ( const inspect = Math.min(count, 8); const prices: number[] = []; + const SUFFIX_SCALE: Record = { + K: 1e3, + M: 1e6, + B: 1e9, + T: 1e12, + Q: 1e15, + }; for (let i = 0; i < inspect; i += 1) { const text = await cards.nth(i).innerText(); - const match = text.match(/([\d,]+)\s*cr/); + // Matches both `1,234 cr` and compact forms like `999.9B cr`. + const match = text.match(/([\d,]+(?:\.\d+)?)\s*([KMBTQ])?\s*cr/); if (!match) { throw new Error(`Could not parse price chip for card ${i}: ${text}`); } - prices.push(Number(match[1].replace(/,/g, ""))); + const base = Number(match[1].replace(/,/g, "")); + const scale = match[2] ? SUFFIX_SCALE[match[2]] : 1; + prices.push(base * scale); } for (let i = 1; i < prices.length; i += 1) { @@ -246,8 +256,10 @@ rawTest.describe("Mobile viewport", () => { await hamburger.click(); await expect(collectionNavBtn).toBeInViewport(); - // Click outside the drawer to close. - await page.mouse.click(380, 10); + // Click the backdrop to close the drawer. The drawer is 208px wide and + // the mobile top bar covers roughly the first 52px vertically — aim well + // outside both so the click lands on the backdrop, not the hamburger. + await page.mouse.click(360, 400); await expect(collectionNavBtn).not.toBeInViewport(); }); diff --git a/example-apps/dashnote-starter/src/components/SignIn.tsx b/example-apps/dashnote-starter/src/components/SignIn.tsx index 7d09a1a..3b2d75f 100644 --- a/example-apps/dashnote-starter/src/components/SignIn.tsx +++ b/example-apps/dashnote-starter/src/components/SignIn.tsx @@ -20,18 +20,21 @@ interface SignInProps { // bundle before the user has signaled any intent to use it. const SAMPLE_NOTES = [ { - title: "Shopping list", - message: "Coffee beans, oat milk, sourdough.", + title: "Identity-owned data follows you", + message: + "Notes belong to your identity, not your device. Sign in from another browser and they're still there.", meta: "Updated 2 hours ago", }, { - title: "Reading queue", - message: "Finish chapter 4 of the Dash Platform overview.", + title: "One contract, many writers", + message: + "Every note is stored in a shared data contract, but each identity only sees its own notes.", meta: "Updated yesterday", }, { - title: "(no title)", - message: "Remember: notes are owned by the identity, not the device.", + title: "Revisions prevent conflicts", + message: + "If two clients edit the same note, stale updates are rejected instead of overwriting newer data.", meta: "Updated 3 days ago", }, ]; @@ -41,61 +44,69 @@ export function SignIn({ onSignIn, busy, status }: SignInProps) { return (
-

Dashnote Starter

-

- Paste a BIP-39 mnemonic for a funded testnet identity. The starter uses - a hardcoded note contract on testnet so you can create your first note - immediately. +

Dash Platform tutorial

+

Personal notes, stored on a public blockchain.

+

+ Sign in with a mnemonic to create, edit, and query notes stored against + your Dash Platform testnet identity.

-

- Don't have one yet?{" "} - + { + event.preventDefault(); + const trimmed = mnemonic.trim(); + if (!trimmed) return; + onSignIn(trimmed); + }} > - Use Dash Bridge - {" "} - to generate a mnemonic and register a funded testnet identity in one - flow. -

- { - event.preventDefault(); - const trimmed = mnemonic.trim(); - if (!trimmed) return; - onSignIn(trimmed); - }} - > - -