@inversealtruism/cairn-cli 0.3.13 → 0.3.15

package/dist/cli.js

@@ -11,7 +11,28 @@ import { cairnxGet, activeCairnxBase, defaultBases, buildTransferRecord, humanTo
 import { randomBytes } from "node:crypto";
 import { createInterface } from "node:readline";
 import { c, banner, bannerAnimated, rule, badge, bar, csd as csdFmt, ok, warn, err, key as kdim, pad, spinner, sleep, isTty, anim, clearScreen, cursorHome, san } from "./lib/ui.js";
-const CSD = (n) => Number.isFinite(n) ? Math.round(n * CSD_PER_COIN) : NaN; // CSD → base units
+// CSD → base units via EXACT decimal-string parsing (Plan 57 B5a; Plan 56 A.4 finding 3). The
+// old `Math.round(n * 1e8)` float path silently lost precision above ~9e7 CSD; this reuses the
+// token path's exact converter (humanToBase, 8 dp), so both money paths speak the same input
+// language (plain decimals; no exponent/hex forms). Unparseable or beyond-2^53 amounts return
+// NaN, which every call site's isSafeInteger guard treats as invalid (fail-loud, never silently
+// wrong; the three registry fee sites gained that guard in this same change, closing an old
+// Math.max(MIN, NaN) fee-poison path that could reach the signer as a literal "NaN").
+const CSD = (v) => {
+    try {
+        const b = humanToBase(String(v), 8);
+        return b <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(b) : NaN;
+    }
+    catch {
+        return NaN;
+    }
+};
+// P8 (Plan 57 B8a review): an unparseable --fee falls back to the default/minimum (safe
+// direction, fee only falls DOWN), but silently: say so, or a typo like `--fee 2e-2` looks
+// accepted while a different fee is used.
+const warnBadFee = (v, usedBase) => {
+    console.log(warn(`unparseable --fee ${String(v)}: using ${csdToCoins(usedBase)} CSD (pass a plain decimal like 0.25)`));
+};
 // ── max-fee sanity guard (UTXO-VALUE-1) ──────────────────────────────────────────────────────
 // A CSD fee is implicit (Σin − Σout) and the chain enforces NO maximum, so a hostile proxy that
 // UNDER-reports the picked UTXO's value would make `csd` compute too-small a change and the
@@ -25,7 +46,7 @@ const MAX_FEE_ABS = 100_000_000; // 1 CSD absolute floor — every honest fee is
 const MAX_FEE_VALUE_FRACTION = 0.25; // …and ≤ 25% of the value moved
 function feeCap(txValue, a) {
     if (a.flags["max-fee"] !== undefined) {
-        const m = CSD(Number(a.flags["max-fee"]));
+        const m = CSD(a.flags["max-fee"]);
         if (Number.isSafeInteger(m) && m >= 0)
             return m;
     }
@@ -485,10 +506,10 @@ function gatherOutputs(a) {
         const i = String(spec).lastIndexOf(":");
         if (i < 0)
             return `bad --output (want <addr>:<CSD>): ${spec}`;
-        outs.push({ to: String(spec).slice(0, i), value: CSD(Number(String(spec).slice(i + 1))) });
+        outs.push({ to: String(spec).slice(0, i), value: CSD(String(spec).slice(i + 1)) });
     }
     if (a.flags.to !== undefined || a.flags.amount !== undefined)
-        outs.push({ to: String(a.flags.to ?? ""), value: CSD(Number(a.flags.amount ?? 0)) });
+        outs.push({ to: String(a.flags.to ?? ""), value: CSD(a.flags.amount ?? 0) });
     for (const o of outs) {
         if (!/^0x[0-9a-fA-F]{40}$/.test(o.to))
             return `bad recipient: ${o.to}`;
@@ -510,8 +531,10 @@ async function cmdSend(a) {
         console.log(err("could not resolve your address — pass --address or run ") + c.cyan("cairn setup"));
         return;
     }
-    const feeCsd = a.flags.fee !== undefined ? Number(a.flags.fee) : 0.01;
-    const fee = (Number.isFinite(feeCsd) && feeCsd >= 0) ? CSD(feeCsd) : 1_000_000;
+    const feeFlag = a.flags.fee !== undefined ? CSD(a.flags.fee) : 1_000_000;
+    const fee = (Number.isSafeInteger(feeFlag) && feeFlag >= 0) ? feeFlag : 1_000_000;
+    if (a.flags.fee !== undefined && fee !== feeFlag)
+        warnBadFee(a.flags.fee, fee);
     const total = outs.reduce((s, o) => s + o.value, 0);
     console.log(`${kdim("from")}    ${c.cyan(addr)}`);
     for (const o of outs)
@@ -587,8 +610,10 @@ async function cmdPropose(a) {
         console.log(warn("usage: ") + c.cyan("cairn propose --domain csd:features --title <t> --body <b> [--link <url>] [--fee <CSD>] [--expires-days N]"));
         return;
     }
-    const feeCsd = a.flags.fee !== undefined ? Number(a.flags.fee) : 0.25;
-    const fee = Math.max(MIN_FEE_PROPOSE, Number.isFinite(feeCsd) ? CSD(feeCsd) : MIN_FEE_PROPOSE);
+    const feeFlag = a.flags.fee !== undefined ? CSD(a.flags.fee) : MIN_FEE_PROPOSE;
+    const fee = Math.max(MIN_FEE_PROPOSE, Number.isSafeInteger(feeFlag) ? feeFlag : MIN_FEE_PROPOSE);
+    if (a.flags.fee !== undefined && !Number.isSafeInteger(feeFlag))
+        warnBadFee(a.flags.fee, fee);
     // operator-token path stays available for the instance operator
     if (CAIRN_TOKEN && !(await csd.available())) {
         const sp = spinner("posting via operator token");
@@ -654,8 +679,10 @@ async function cmdSupport(a) {
         console.log(err("proposal id must be 0x…64-hex"));
         return;
     }
-    const feeCsd = a.flags.fee !== undefined ? Number(a.flags.fee) : 0.05;
-    const fee = Math.max(MIN_FEE_ATTEST, Number.isFinite(feeCsd) ? CSD(feeCsd) : MIN_FEE_ATTEST);
+    const feeFlag = a.flags.fee !== undefined ? CSD(a.flags.fee) : MIN_FEE_ATTEST;
+    const fee = Math.max(MIN_FEE_ATTEST, Number.isSafeInteger(feeFlag) ? feeFlag : MIN_FEE_ATTEST);
+    if (a.flags.fee !== undefined && !Number.isSafeInteger(feeFlag))
+        warnBadFee(a.flags.fee, fee);
     const score = Math.max(0, Math.min(100, parseInt(String(a.flags.score ?? 75)) || 0));
     const confidence = Math.max(0, Math.min(100, parseInt(String(a.flags.confidence ?? 60)) || 0));
     if (CAIRN_TOKEN && !(await csd.available())) {
@@ -967,7 +994,10 @@ async function cmdGateway(a) {
     if (!p)
         return;
     const rec = buildGatewayRecord({ priv: p.priv, url, kind: a.flags.pin ? "pin" : "gateway", address: p.addr });
-    const fee = Math.max(MIN_FEE_PROPOSE, a.flags.fee !== undefined ? CSD(Number(a.flags.fee)) : MIN_FEE_PROPOSE);
+    const feeFlag = a.flags.fee !== undefined ? CSD(a.flags.fee) : MIN_FEE_PROPOSE;
+    const fee = Math.max(MIN_FEE_PROPOSE, Number.isSafeInteger(feeFlag) ? feeFlag : MIN_FEE_PROPOSE);
+    if (a.flags.fee !== undefined && !Number.isSafeInteger(feeFlag))
+        warnBadFee(a.flags.fee, fee); // NaN-guard: the old Math.max(MIN, NaN) poisoned the fee on a garbage --fee
     if (a.flags["dry-run"]) {
         console.log(`${kdim("domain")} ${c.cyan(rec.domain)}\n${kdim("url")}    ${c.white(url)}\n${kdim("hash")}   ${c.magenta(rec.payloadHash)}`);
         console.log(c.gray("\n[dry-run] not signed or submitted"));
@@ -991,7 +1021,10 @@ async function cmdPeer(a) {
         return;
     const caps = (a.multi.cap ?? (a.flags.cap ? [String(a.flags.cap)] : [])).filter(Boolean);
     const rec = buildPeerRecord({ priv: p.priv, peer_id: peerId, multiaddrs, caps: caps.length ? caps : undefined, address: p.addr });
-    const fee = Math.max(MIN_FEE_PROPOSE, a.flags.fee !== undefined ? CSD(Number(a.flags.fee)) : MIN_FEE_PROPOSE);
+    const feeFlag = a.flags.fee !== undefined ? CSD(a.flags.fee) : MIN_FEE_PROPOSE;
+    const fee = Math.max(MIN_FEE_PROPOSE, Number.isSafeInteger(feeFlag) ? feeFlag : MIN_FEE_PROPOSE);
+    if (a.flags.fee !== undefined && !Number.isSafeInteger(feeFlag))
+        warnBadFee(a.flags.fee, fee); // NaN-guard: the old Math.max(MIN, NaN) poisoned the fee on a garbage --fee
     if (a.flags["dry-run"]) {
         console.log(`${kdim("domain")} ${c.cyan(rec.domain)}\n${kdim("peer")}   ${c.white(peerId)}\n${kdim("hash")}   ${c.magenta(rec.payloadHash)}`);
         console.log(c.gray("\n[dry-run] not signed or submitted"));
@@ -1014,7 +1047,10 @@ async function cmdIdentity(a) {
     const p = await registryPrep(a);
     if (!p)
         return;
-    const fee = Math.max(MIN_FEE_PROPOSE, a.flags.fee !== undefined ? CSD(Number(a.flags.fee)) : MIN_FEE_PROPOSE);
+    const feeFlag = a.flags.fee !== undefined ? CSD(a.flags.fee) : MIN_FEE_PROPOSE;
+    const fee = Math.max(MIN_FEE_PROPOSE, Number.isSafeInteger(feeFlag) ? feeFlag : MIN_FEE_PROPOSE);
+    if (a.flags.fee !== undefined && !Number.isSafeInteger(feeFlag))
+        warnBadFee(a.flags.fee, fee); // NaN-guard: the old Math.max(MIN, NaN) poisoned the fee on a garbage --fee
     if (a.flags.reveal) {
         const salt = String(a.flags.salt ?? "");
         if (!/^[0-9a-f]{16,}$/i.test(salt)) {
@@ -1090,6 +1126,13 @@ async function tokenDecimals() {
             map[t.ticker] = t.decimals;
     return map;
 }
+// A name in `acct.nameDetails` with pending:true is a v2.5/v2.6 reservation (revealed, not yet finalized):
+// the resolver gives it no send address and no owner actions until nfinalize. Mark it so a reservation is
+// never shown as an owned name. Defensive — an older resolver that omits nameDetails yields an empty set.
+function pendingNames(acct) {
+    return new Set((acct?.nameDetails ?? []).filter((d) => d?.pending).map((d) => String(d.name)));
+}
+const nameCell = (n, pend) => pend.has(n) ? c.cyan(san(n)) + c.gray(" (finalizing)") : c.green(san(n));
 async function cmdTokens(a) {
     const addr = await resolveCairnxAddr(a, a._[1]);
     if (!addr)
@@ -1109,7 +1152,8 @@ async function cmdTokens(a) {
         console.log(`  ${c.cyan(pad(san(ticker), 14))} ${c.white(tokAmt(String(b.available ?? "0"), dec[ticker]))}${locked > 0n ? c.gray(` · ${tokAmt(String(b.locked), dec[ticker])} locked in open offers`) : ""}`);
     }
     const names = acct.names ?? [];
-    console.log(`\n  ${kdim(".csd names")} ${names.length ? names.map((n) => c.green(san(n))).join(c.gray(" · ")) : c.gray("none")}`);
+    const pend = pendingNames(acct);
+    console.log(`\n  ${kdim(".csd names")} ${names.length ? names.map((n) => nameCell(n, pend)).join(c.gray(" · ")) : c.gray("none")}`);
 }
 async function cmdTokenInfo(a) {
     const ticker = String(a._[1] ?? "").toUpperCase();
@@ -1263,8 +1307,9 @@ async function cmdNames(a) {
         console.log(c.gray("  no names owned — claim one on " + (activeCairnxBase()?.includes("127.0.0.1") ? "the /trade marketplace" : "https://cairn-substrate.com/trade")));
         return;
     }
+    const pend = pendingNames(acct);
     for (const n of names)
-        console.log(`  ${c.green(san(n))}`);
+        console.log(`  ${nameCell(n, pend)}${pend.has(n) ? c.gray("  · complete on /trade") : ""}`);
     console.log(c.gray(`\n  ${names.length} name${names.length === 1 ? "" : "s"} · cairn name <name> for detail`));
 }
 async function cmdName(a) {

package/dist/lib/cairnx.js

@@ -9,18 +9,22 @@
 //     the latent dual-canonicaliser seam).
 //   • exact human↔base-unit amount math as STRING/BigInt arithmetic — floats never touch
 //     token amounts (no "1.1 * 1e8 = 110000000.00000001" class of bug, no silent truncation).
-import { sha256Hex } from "./item.js";
-import { canonicalJson, MIN_FEE_PROPOSE } from "@inversealtruism/csd-codec";
-// ★ Consensus shapes/constants are IMPORTED from cairnx-core, not hand-declared (shared-core de-dup,
-// cairn docs/Plans/46): they validate a record BEFORE the CLI spends the anchor fee, so a drifted regex /
-// limit would build a record the resolver no-ops (a lost fee). One source = the published convention.
-import { DOMAIN, TICKER_RE, NAME_RE, ADDR_RE, MAX_AMOUNT, MAX_RECORD_BYTES } from "@inversealtruism/cairnx-core";
+import { MIN_FEE_PROPOSE } from "@inversealtruism/csd-codec";
+// ★ Consensus shapes/constants AND the record builder are IMPORTED from cairnx-core, not
+// hand-declared (shared-core de-dup, cairn docs/Plans/46 + 57 B5a): they validate a record BEFORE
+// the CLI spends the anchor fee, so a drifted regex / limit would build a record the resolver
+// no-ops (a lost fee). One source = the published convention.
+import { DOMAIN, TICKER_RE, NAME_RE, ADDR_RE, MAX_AMOUNT, transfer } from "@inversealtruism/cairnx-core";
 export const CAIRNX_DOMAIN = DOMAIN; // "cairnx:v1"
 export const CAIRNX_ANCHOR_FEE = MIN_FEE_PROPOSE; // 0.25 CSD — the consensus min Propose fee that anchors a record
 // re-export the §4 shapes the CLI's public surface exposed (now single-sourced from cairnx-core)
 export { TICKER_RE, NAME_RE, MAX_AMOUNT };
 export function buildTransferRecord(p) {
     const to = String(p.to).toLowerCase();
+    // Friendly pre-checks first (CLI-grade error messages), then the CANONICAL builder does the
+    // authoritative work (Plan 57 B5a): cairnx-core transfer() round-trips through parseRecord, so
+    // what the CLI anchors is valid-by-construction against CONVENTION.md, not a hand-kept mirror.
+    // Output is byte-identical to the old hand-assembly (same record keys; canonicalJson sorts).
     if (!TICKER_RE.test(p.ticker))
         throw new Error(`bad ticker "${p.ticker}" — want 3–12 chars [A-Z0-9], starting with a letter`);
     if (!ADDR_RE.test(to))
@@ -29,11 +33,8 @@ export function buildTransferRecord(p) {
         throw new Error("amount must be > 0");
     if (p.amount > MAX_AMOUNT)
         throw new Error("amount exceeds the 96-bit token-amount limit");
-    const record = { amount: p.amount.toString(), t: "transfer", ticker: p.ticker, to, v: 1 };
-    const uri = canonicalJson(record);
-    if (Buffer.byteLength(uri, "utf8") > MAX_RECORD_BYTES)
-        throw new Error("record exceeds 512 bytes"); // unreachable for a transfer, kept as a guard
-    return { record, uri, payloadHash: sha256Hex(uri) };
+    const built = transfer({ ticker: p.ticker, to, amount: p.amount.toString() });
+    return { record: built.record, uri: built.uri, payloadHash: built.payloadHash };
 }
 // ── exact amount math (strings + BigInt only) ─────────────────────────────────────────────
 // "1.5" with decimals 8 → 150000000n. Fails LOUDLY instead of truncating: "1.5" on a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inversealtruism/cairn-cli",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "CLI for Compute Substrate / Cairn — browse the board/wall/network, and send CSD, propose, attest, and place stones non-custodially by driving your own installed `csd` wallet (cairn never holds your key; works node-less via the Cairn proxy).",
   "type": "module",
   "bin": {
@@ -33,9 +33,9 @@
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "@inversealtruism/cairnx-core": "0.1.30",
-    "@inversealtruism/csd-codec": "0.1.14",
-    "@inversealtruism/csd-registry": "0.1.14"
+    "@inversealtruism/cairnx-core": "0.1.31",
+    "@inversealtruism/csd-codec": "0.1.15",
+    "@inversealtruism/csd-registry": "0.1.15"
   },
   "scripts": {
     "clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",