@toon-protocol/rig 2.10.1 → 2.10.3

package/dist/cli/rig.js

@@ -18,7 +18,7 @@ import {
   setHeadSymref,
   updateRef,
   writeGitObjects
-} from "../chunk-PG5PUKDR.js";
+} from "../chunk-EEUHZNWS.js";
 import {
   DEFAULT_KEYSTORE_PASSWORD,
   MissingIdentityError,
@@ -37,8 +37,9 @@ import {
   resolveConflictingPath
 } from "../chunk-FQXNLPUR.js";
 import {
-  MAX_OBJECT_SIZE
-} from "../chunk-B5ISARMU.js";
+  MAX_OBJECT_SIZE,
+  flooredUploadFee
+} from "../chunk-35ALWUDJ.js";
 import {
   COMMENT_KIND,
   authorizedStatusAuthors,
@@ -1073,7 +1074,7 @@ function loadPaidSession(deps, relayUrl) {
   });
 }
 var defaultLoadStandalone = async (options) => {
-  const mod = await import("../standalone-mode-T6H7OOBQ.js");
+  const mod = await import("../standalone-mode-YMIY4GL3.js");
   return mod.createStandaloneContext(options);
 };
 function identityReport(ctx) {
@@ -1245,7 +1246,7 @@ function planRigPointer(args) {
     html,
     contentHash,
     bytes,
-    fee: BigInt(bytes) * args.uploadFeePerByte
+    fee: flooredUploadFee(bytes, args.uploadFeePerByte, args.minUploadFee)
   };
 }
 async function runPush(args, deps) {
@@ -1365,7 +1366,8 @@ async function runPush(args, deps) {
           ownerPubkey: ctx.ownerPubkey,
           repoId,
           relay: relaysUsed[0],
-          uploadFeePerByte: feeRates.uploadFeePerByte
+          uploadFeePerByte: feeRates.uploadFeePerByte,
+          ...feeRates.minUploadFee !== void 0 ? { minUploadFee: feeRates.minUploadFee } : {}
         });
       }
     } else {
@@ -3818,21 +3820,35 @@ import { join as join3 } from "path";
 import { parseArgs as parseArgs9 } from "util";
 var DEVNET_FAUCET_URL = "https://faucet.devnet.toonprotocol.dev";
 var CHAINS = ["evm", "solana", "mina"];
-var CHAIN_CHOICES = [...CHAINS, "all"];
-var NATIVE_COIN = {
-  evm: "ETH",
-  solana: "SOL",
-  mina: "MINA"
+var CHAIN_ALIASES = {
+  evm: "evm",
+  eth: "evm",
+  sol: "solana",
+  solana: "solana",
+  mina: "mina",
+  all: "all"
 };
-var FUND_USAGE = `Usage: rig fund [options]
+var CHAIN_ARG_LIST = "evm | sol | solana | mina | all";
+function resolveChainArg(raw) {
+  if (raw === void 0) return void 0;
+  const canonical = CHAIN_ALIASES[raw.toLowerCase()];
+  if (!canonical) {
+    throw new Error(
+      `chain must be one of ${CHAIN_ARG_LIST}, got ${JSON.stringify(raw)}`
+    );
+  }
+  return canonical;
+}
+var FUND_USAGE = `Usage: rig fund [chain] [options]
 
-Drip devnet test funds to the active identity's wallet \u2014 free (the faucet
-pays). By default funds ALL supported chains (evm + solana + mina), each drip
-covering the native coin AND USDC, so the wallet matches the multi-chain
-\`rig balance\` view in one run. The per-chain drips run in parallel and are
-independent \u2014 one chain's faucet failing does not abort the others (exit 0
-only when every targeted chain funded; exit 1 if any failed, with the
-per-chain breakdown always shown).
+Drip devnet USDC to the active identity's wallet \u2014 free (the faucet pays). Each
+drip funds ONLY the settlement token (USDC) and assumes the wallet already holds
+enough native gas to transact. By default funds ALL supported chains (evm +
+solana + mina) so the wallet matches the multi-chain \`rig balance\` view in one
+run; name a chain \u2014 positional (\`rig fund sol\`) or \`--chain\` \u2014 to narrow to
+one. The per-chain drips run in parallel and are independent \u2014 one chain's
+faucet failing does not abort the others (exit 0 only when every targeted chain
+funded; exit 1 if any failed, with the per-chain breakdown always shown).
 
 The identity comes from RIG_MNEMONIC (env or a project .env) or the
 ~/.toon-client keystore/config; the faucet from TOON_CLIENT_FAUCET_URL, the
@@ -3844,10 +3860,11 @@ chain (there is no --amount). On a network without a faucet, prints the wallet
 address(es) to fund externally instead.
 
 Options:
-  --chain <chain>      evm | solana | mina | all \u2014 fund one chain, or all
-                       (default: all supported chains)
+  [chain]              evm | sol | solana | mina | all \u2014 positional chain to
+                       fund (default: all supported chains)
+  --chain <chain>      same as the positional chain argument
   --address <address>  fund this address instead of the identity's own
-                       (requires an explicit single --chain)
+                       (requires an explicit single chain)
   --json               machine-readable envelope (per-chain results array)
   -h, --help           show this help`;
 var SHARED_DEVNET_SUFFIX = ".devnet.toonprotocol.dev";
@@ -3922,12 +3939,13 @@ function readFundConfig(env) {
 }
 async function runFund(args, deps) {
   const { io: io2, env } = deps;
-  let chainFlag;
+  let resolvedChain;
   let addressFlag;
   let json = false;
   try {
-    const { values } = parseArgs9({
+    const { values, positionals } = parseArgs9({
       args,
+      allowPositionals: true,
       options: {
         chain: { type: "string" },
         address: { type: "string" },
@@ -3939,17 +3957,23 @@ async function runFund(args, deps) {
       io2.out(FUND_USAGE);
       return 0;
     }
-    chainFlag = values.chain;
-    addressFlag = values.address;
-    json = values.json ?? false;
-    if (chainFlag !== void 0 && !CHAIN_CHOICES.includes(chainFlag)) {
+    if (positionals.length > 1) {
       throw new Error(
-        `--chain must be one of ${CHAIN_CHOICES.join(" | ")}, got ${JSON.stringify(chainFlag)}`
+        `rig fund takes at most one chain argument, got ${positionals.length}: ${positionals.join(" ")}`
       );
     }
-    if (addressFlag !== void 0 && (chainFlag === void 0 || chainFlag === "all")) {
+    const positionalChain = positionals[0];
+    if (positionalChain !== void 0 && values.chain !== void 0) {
       throw new Error(
-        "--address requires an explicit single --chain (evm | solana | mina) \u2014 a single address cannot fund every chain"
+        "give the chain as a positional argument (`rig fund sol`) OR with --chain, not both"
+      );
+    }
+    resolvedChain = resolveChainArg(positionalChain ?? values.chain);
+    addressFlag = values.address;
+    json = values.json ?? false;
+    if (addressFlag !== void 0 && (resolvedChain === void 0 || resolvedChain === "all")) {
+      throw new Error(
+        `--address requires an explicit single chain (${CHAIN_ARG_LIST}) \u2014 a single address cannot fund every chain`
       );
     }
   } catch (err) {
@@ -3959,7 +3983,7 @@ async function runFund(args, deps) {
   }
   try {
     const { file } = readFundConfig(env);
-    const targetChains = chainFlag === void 0 || chainFlag === "all" ? [...CHAINS] : [chainFlag];
+    const targetChains = resolvedChain === void 0 || resolvedChain === "all" ? [...CHAINS] : [resolvedChain];
     const network = env["TOON_CLIENT_NETWORK"] ?? file.network;
     const canInfer = network === void 0 || network === "custom";
     const originRelays = canInfer ? await resolveOriginRelays(deps.cwd) : [];
@@ -4022,7 +4046,7 @@ async function runFund(args, deps) {
     if (!json) {
       const list = targetChains.join(", ");
       io2.out(
-        `Requesting ${targetChains.length === 1 ? "" : "parallel "}drip${targetChains.length === 1 ? "" : "s"} from ${faucetUrl} for ${list} \u2026` + (targetChains.includes("mina") ? " (mina settles slowly; this can take ~2 minutes)" : "")
+        `Requesting ${targetChains.length === 1 ? "" : "parallel "}USDC drip${targetChains.length === 1 ? "" : "s"} from ${faucetUrl} for ${list} \u2026` + (targetChains.includes("mina") ? " (mina settles slowly; this can take ~2 minutes)" : "")
       );
     }
     const singleChain = targetChains.length === 1;
@@ -4079,7 +4103,7 @@ async function runFund(args, deps) {
       if (r.funded) {
         const slow = r.elapsedMs !== void 0 && r.elapsedMs >= 5e3;
         const time = slow ? ` (${Math.round(r.elapsedMs / 1e3)}s)` : "";
-        io2.out(`  ${label} \u2713 funded (${NATIVE_COIN[r.chain]} + USDC)${addr}${time}`);
+        io2.out(`  ${label} \u2713 funded (USDC)${addr}${time}`);
       } else {
         io2.out(`  ${label} \u2717${addr} \u2014 ${r.error ?? "failed"}`);
       }
@@ -4691,7 +4715,7 @@ async function resolveProfileRelay(flagRelay, originRelay, toonRelays) {
   ].filter((u) => u !== void 0 && isWebSocketRelay2(u));
   if (candidates[0] !== void 0) return candidates[0];
   try {
-    const { loadGenesisSeed } = await import("../network-bootstrap-HV5VUZFU.js");
+    const { loadGenesisSeed } = await import("../network-bootstrap-IHQ4PWUW.js");
     const seed = loadGenesisSeed();
     if (seed?.relayUrl && isWebSocketRelay2(seed.relayUrl)) return seed.relayUrl;
   } catch {
@@ -5632,6 +5656,11 @@ Commands:
                        gas-station path (kind:5096) \u2014 you author and
                        partial-sign, the DVM co-signs as fee payer and pays
                        the lamports; needs ZERO SOL in this wallet.
+                       <txId> may instead be given via --tx-id <id> \u2014 use
+                       that instead of the positional when the txId leads
+                       with '-' or '_' (Arweave txids are base64url). For a
+                       leading '-' write --tx-id=<id> (the '=' form), since
+                       "--tx-id -XYZ..." is itself ambiguous to the parser.
   name status <name>   FREE: registry record (lease/permabuy, expiry), ANT
                        process id, current target txId(s), TTL, undernames.
 
@@ -5642,6 +5671,10 @@ Options:
   --undername <sub>    target the undername <sub>_<name> instead of the base
                        name (set)
   --ttl <seconds>      record TTL in seconds (set; default 3600)
+  --tx-id <id>         set only: the Arweave txId to point at, as an
+                       explicit option instead of the positional (mutually
+                       exclusive with the positional <txId>). For a value
+                       leading with '-' use --tx-id=<id>.
   --network <net>      cluster: mainnet | devnet (default mainnet; or
                        RIG_ARIO_NETWORK). ar.io has no Solana-testnet
                        deployment. Non-mainnet gateway resolution is
@@ -5710,6 +5743,7 @@ function parseNameFlags(args, env) {
       network: { type: "string" },
       "process-id": { type: "string" },
       via: { type: "string" },
+      "tx-id": { type: "string" },
       yes: { type: "boolean", default: false },
       json: { type: "boolean", default: false },
       help: { type: "boolean", short: "h", default: false }
@@ -5775,6 +5809,7 @@ function parseNameFlags(args, env) {
       network: networkRaw,
       ...processId !== void 0 ? { processId } : {},
       ...via !== void 0 ? { via } : {},
+      ...values["tx-id"] !== void 0 ? { txId: values["tx-id"] } : {},
       yes: values.yes ?? false,
       json: values.json ?? false
     }
@@ -6167,10 +6202,15 @@ async function runName(args, deps) {
   try {
     if (sub === "buy") return await runBuy(name, flags, deps);
     if (sub === "status") return await runStatus(name, flags, deps);
-    const txId = positionals[1];
+    if (flags.txId !== void 0 && positionals[1] !== void 0) {
+      io2.err("`--tx-id` and a positional <txId> are mutually exclusive");
+      io2.err(NAME_USAGE);
+      return 2;
+    }
+    const txId = flags.txId ?? positionals[1];
     if (txId === void 0) {
       io2.err(
-        "`rig name set` needs a <txId> (the Arweave transaction to point at)"
+        "`rig name set` needs a <txId> (the Arweave transaction to point at) \u2014 as a positional or via --tx-id"
       );
       io2.err(NAME_USAGE);
       return 2;
@@ -6194,7 +6234,7 @@ function buildArweaveManifest(entries, indexPath = DEFAULT_INDEX, fallbackTxId)
   return {
     manifest: "arweave/paths",
     version: "0.2.0",
-    index: { path: indexPath },
+    ...Object.hasOwn(paths, indexPath) ? { index: { path: indexPath } } : {},
     ...fallbackTxId ? { fallback: { id: fallbackTxId } } : {},
     paths
   };
@@ -6419,7 +6459,8 @@ async function runSitePublish(args, deps) {
         );
       }
     }
-    const { uploadFeePerByte } = await ctx.publisher.getFeeRates();
+    const feeRates = await ctx.publisher.getFeeRates();
+    const { uploadFeePerByte, minUploadFee } = feeRates;
     const previewEntries = blobs.map((b) => ({
       path: b.path,
       txId: known.get(b.sha) ?? PLACEHOLDER_TX
@@ -6431,12 +6472,20 @@ async function runSitePublish(args, deps) {
     );
     const manifestBytes = Buffer.byteLength(JSON.stringify(previewManifest));
     let reuploadBytes = 0;
+    let reuploadFee = 0n;
     if (flags.forceReupload) {
       const { objects } = await reader.statObjects(uniqueShas);
       reuploadBytes = objects.reduce((sum, o) => sum + o.size, 0);
+      reuploadFee = objects.reduce(
+        (sum, o) => sum + flooredUploadFee(o.size, uploadFeePerByte, minUploadFee),
+        0n
+      );
     }
-    const manifestFee = BigInt(manifestBytes) * uploadFeePerByte;
-    const reuploadFee = BigInt(reuploadBytes) * uploadFeePerByte;
+    const manifestFee = flooredUploadFee(
+      manifestBytes,
+      uploadFeePerByte,
+      minUploadFee
+    );
     const totalFee = manifestFee + reuploadFee;
     const gateway = flags.gateway ?? deps.env["RIG_ARWEAVE_GATEWAY"] ?? DEFAULT_GATEWAY;
     const baseJson = () => ({