@toon-protocol/rig 3.6.0 → 4.0.0

package/dist/cli/rig.js

@@ -18,34 +18,17 @@ import {
   setHeadSymref,
   updateRef,
   writeGitObjects
-} from "../chunk-HJDPM37T.js";
+} from "../chunk-ZZBA5VVL.js";
 import {
   DEFAULT_KEYSTORE_PASSWORD,
-  MinaZkAppStore,
   MissingIdentityError,
-  TOPOLOGY_CACHE_FILENAME,
   clientConfigPath,
   clientKeystorePath,
   linkKeystoreInClientConfig,
   readClientConfigFile,
   resolveAccountIndex,
   resolveIdentity
-} from "../chunk-PWNZWQOH.js";
-import {
-  ChannelMapStore,
-  RIG_STANDALONE_ENV,
-  channelStatus,
-  defaultDaemonPort,
-  resolveChannelPaths,
-  resolveConflictingPath,
-  standaloneForced
-} from "../chunk-LCYCKWAT.js";
-import {
-  MAX_OBJECT_SIZE
-} from "../chunk-B5ISARMU.js";
-import {
-  minaPresetForChain
-} from "../chunk-UZZ2RN7A.js";
+} from "../chunk-LTFMPOHU.js";
 import {
   ARWEAVE_GATEWAYS,
   COMMENT_KIND,
@@ -59,6 +42,20 @@ import {
   parseMaintainers,
   queryRelay
 } from "../chunk-2KJJ7LSO.js";
+import {
+  ChannelMapStore,
+  RIG_STANDALONE_ENV,
+  channelStatus,
+  defaultDaemonPort,
+  deriveNostrKeyFromMnemonic,
+  resolveChannelPaths,
+  resolveConflictingPath,
+  standaloneForced
+} from "../chunk-YZRR2UO6.js";
+import {
+  MAX_OBJECT_SIZE,
+  uploadChargeFor
+} from "../chunk-GVXBUL3C.js";
 
 // src/cli/rig.ts
 import { createInterface as createInterface2 } from "readline/promises";
@@ -624,6 +621,21 @@ function generateRigPointerHtml(options) {
 `;
 }
 
+// src/gateway-preference.ts
+var TESTNET_GATEWAY = /(^|\.)ar-io\.dev$/i;
+function isMainnetGateway(url) {
+  try {
+    return !TESTNET_GATEWAY.test(new URL(url).hostname);
+  } catch {
+    return false;
+  }
+}
+var PREFERRED_GATEWAY = ARWEAVE_GATEWAYS.find(isMainnetGateway) ?? "https://arweave.net";
+function mirrorGatewaysFor(primary) {
+  const p = primary.replace(/\/+$/, "");
+  return ARWEAVE_GATEWAYS.filter((g) => g.replace(/\/+$/, "") !== p);
+}
+
 // src/cli/rig-pointer-record.ts
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
@@ -1098,7 +1110,7 @@ function loadPaidSession(deps, relayUrl) {
   });
 }
 var defaultLoadStandalone = async (options) => {
-  const mod = await import("../standalone-mode-5MNNJC2D.js");
+  const mod = await import("../standalone-mode-LEAC4A2L.js");
   return mod.createStandaloneContext(options);
 };
 function identityReport(ctx) {
@@ -1240,11 +1252,10 @@ function parsePushArgs(args) {
   return flags;
 }
 function pointerGateway(env) {
-  const preferred = ARWEAVE_GATEWAYS[0] ?? "https://arweave.net";
-  return (env["RIG_ARWEAVE_GATEWAY"] ?? preferred).replace(/\/+$/, "");
+  return (env["RIG_ARWEAVE_GATEWAY"] ?? PREFERRED_GATEWAY).replace(/\/+$/, "");
 }
 function mirrorGateways(primary) {
-  return ARWEAVE_GATEWAYS.filter((g) => g.replace(/\/+$/, "") !== primary);
+  return mirrorGatewaysFor(primary);
 }
 function planRigPointer(args) {
   const html = generateRigPointerHtml({
@@ -1280,7 +1291,7 @@ function planRigPointer(args) {
     html,
     contentHash,
     bytes,
-    fee: args.uploadFee
+    fee: uploadChargeFor(args.feeRates, bytes)
   };
 }
 async function runPush(args, deps) {
@@ -1401,7 +1412,7 @@ async function runPush(args, deps) {
           ownerPubkey: ctx.ownerPubkey,
           repoId,
           relay: relaysUsed[0],
-          uploadFee: feeRates.uploadFee
+          feeRates
         });
       }
     } else {
@@ -2041,9 +2052,6 @@ async function runChain(args, deps) {
 }
 
 // src/cli/channel.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
 import { parseArgs as parseArgs5 } from "util";
 var CHANNEL_USAGE = `Usage: rig channel <subcommand>
 
@@ -2066,17 +2074,6 @@ Subcommands:
                    apex); --deposit adds that much extra collateral after the
                    open/resume. On-chain: asks for confirmation (--yes skips).
 
-  deploy-zkapp [--graphql-url <url>]
-                   deploy a dedicated Mina PaymentChannel zkApp for THIS
-                   identity (the zkApp is single-pair; Mina channels open on
-                   an identity-owned deployment). Normally automatic \u2014 the
-                   Mina open path deploys one when needed \u2014 this explicit
-                   form pre-deploys it (compile \u22481-3 min, inclusion \u22483-6 min).
-                   On-chain: costs the 1 MINA account-creation fee + tx fee
-                   from the wallet's MINA. The zkApp key is saved under
-                   TOON_CLIENT_HOME/keys/. Asks for confirmation (--yes
-                   skips).
-
   close <channelId>
                    close a recorded channel \u2014 an on-chain tx that starts the
                    settlement challenge window (the peer's settlementTimeout).
@@ -2100,8 +2097,6 @@ async function runChannel(args, deps) {
       return runChannelList(rest, deps);
     case "open":
       return runChannelOpen(rest, deps);
-    case "deploy-zkapp":
-      return runChannelDeployZkApp(rest, deps);
     case "close":
       return runChannelWithdrawStep(rest, deps, "close");
     case "settle":
@@ -2294,9 +2289,6 @@ async function runChannelOpen(args, deps) {
       io2.out(
         "If a live channel is already recorded for this peer it is RESUMED (no on-chain spend); otherwise an on-chain channel open locks the peer-negotiated initial deposit from your wallet (plus gas)."
       );
-      io2.out(
-        "On a Mina chain a first open may also deploy a dedicated PaymentChannel zkApp for this identity (~1.1 MINA + fees; compile \u22481-3 min, inclusion \u22483-6 min \u2014 progress is printed)."
-      );
     }
     const gate = await confirmOnChain(
       io2,
@@ -2355,160 +2347,6 @@ async function runChannelOpen(args, deps) {
     await stopQuietly(ctx);
   }
 }
-async function runChannelDeployZkApp(args, deps) {
-  const { io: io2, env } = deps;
-  let graphqlFlag;
-  let yes = false;
-  let json = false;
-  try {
-    const { values } = parseArgs5({
-      args,
-      options: {
-        "graphql-url": { type: "string" },
-        yes: { type: "boolean", default: false },
-        json: { type: "boolean", default: false },
-        help: { type: "boolean", short: "h", default: false }
-      }
-    });
-    if (values.help) {
-      io2.out(CHANNEL_USAGE);
-      return 0;
-    }
-    graphqlFlag = values["graphql-url"];
-    yes = values.yes ?? false;
-    json = values.json ?? false;
-  } catch (err) {
-    io2.err(err instanceof Error ? err.message : String(err));
-    io2.err(CHANNEL_USAGE);
-    return 2;
-  }
-  try {
-    const dir = env["TOON_CLIENT_HOME"] ?? join3(homedir3(), ".toon-client");
-    let file = {};
-    try {
-      file = JSON.parse(readFileSync3(join3(dir, "config.json"), "utf8"));
-    } catch {
-    }
-    const pinned = env["TOON_CLIENT_CHAIN"] ?? file.chain;
-    const chain = pinned !== void 0 && pinned.startsWith("mina:") ? pinned : "mina:devnet";
-    const graphqlUrl = graphqlFlag ?? file.minaChannel?.graphqlUrl ?? minaPresetForChain(chain)?.graphqlUrl;
-    if (!graphqlUrl) {
-      throw new Error(
-        `no Mina GraphQL endpoint for ${chain} \u2014 pass --graphql-url or set minaChannel.graphqlUrl in the client config`
-      );
-    }
-    const resolved = await resolveIdentity({
-      env,
-      cwd: deps.cwd,
-      warn: (line) => io2.err(line)
-    });
-    const identity = {
-      pubkey: resolved.pubkey,
-      source: resolved.source,
-      sourceLabel: resolved.sourceLabel
-    };
-    const store = MinaZkAppStore.forHome(dir);
-    const existing = store.lookup(resolved.pubkey, chain);
-    if (existing) {
-      if (json) {
-        io2.emitJson({
-          command: "channel deploy-zkapp",
-          identity,
-          executed: false,
-          plan: { chain, graphqlUrl },
-          result: {
-            zkAppAddress: existing.zkAppAddress,
-            deployTxHash: existing.deployTxHash ?? null,
-            vkHash: existing.vkHash ?? null,
-            storePath: store.filePath
-          },
-          hint: "a zkApp is already recorded for this identity/chain \u2014 the open path reuses it"
-        });
-        return 0;
-      }
-      io2.out(
-        `A Mina zkApp is already recorded for this identity on ${chain}: ` + existing.zkAppAddress
-      );
-      io2.out(`The open path reuses it (record: ${store.filePath}).`);
-      return 0;
-    }
-    const plan = { chain, graphqlUrl };
-    if (!json) {
-      io2.out("Mina zkApp deploy plan:");
-      io2.out(`  chain       ${chain}`);
-      io2.out(`  graphql     ${graphqlUrl}`);
-      io2.out(renderIdentityLine(identity));
-      io2.out(
-        "Deploys a dedicated PaymentChannel zkApp for this identity \u2014 on-chain: the 1 MINA account-creation fee + a 0.1 MINA tx fee from your wallet. Compile \u22481-3 min; inclusion \u22483-6 min."
-      );
-    }
-    const gate = await confirmOnChain(
-      io2,
-      { yes, json },
-      "Proceed with the on-chain zkApp deploy? [y/N] "
-    );
-    if (gate === "json-plan") {
-      io2.emitJson({
-        command: "channel deploy-zkapp",
-        identity,
-        executed: false,
-        plan,
-        hint: "plan only \u2014 re-run with --yes to deploy (on-chain: ~1.1 MINA + fees)"
-      });
-      return 0;
-    }
-    if (gate !== "proceed") return gate;
-    const client = await import("@toon-protocol/client");
-    const derived = await client.deriveFullIdentity(
-      resolved.mnemonic,
-      resolved.accountIndex
-    );
-    if (!derived.mina.privateKey) {
-      throw new Error(
-        "no Mina key derived \u2014 the optional `mina-signer` dependency is not installed"
-      );
-    }
-    const record = await client.deployMinaChannelZkApp({
-      graphqlUrl,
-      payerPrivateKey: derived.mina.privateKey,
-      onProgress: (line) => io2.err(`rig: mina: ${line}`)
-    });
-    store.save({
-      identity: resolved.pubkey,
-      chain,
-      zkAppAddress: record.zkAppAddress,
-      zkAppPrivateKey: record.zkAppPrivateKey,
-      feePayer: record.feePayer,
-      ...record.deployTxHash !== void 0 ? { deployTxHash: record.deployTxHash } : {},
-      ...record.vkHash !== void 0 ? { vkHash: record.vkHash } : {},
-      deployedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      source: "rig channel deploy-zkapp (npm @toon-protocol/mina-zkapp build)"
-    });
-    if (json) {
-      io2.emitJson({
-        command: "channel deploy-zkapp",
-        identity,
-        executed: true,
-        plan,
-        result: {
-          zkAppAddress: record.zkAppAddress,
-          deployTxHash: record.deployTxHash ?? null,
-          vkHash: record.vkHash ?? null,
-          storePath: store.filePath
-        }
-      });
-      return 0;
-    }
-    io2.out(`Deployed Mina PaymentChannel zkApp ${record.zkAppAddress}.`);
-    if (record.deployTxHash) io2.out(`  deploy tx   ${record.deployTxHash}`);
-    if (record.vkHash) io2.out(`  vk hash     ${record.vkHash}`);
-    io2.out(`  record      ${store.filePath} (holds the zkApp key \u2014 back it up)`);
-    io2.out("The next Mina channel open/push finds and reuses this zkApp.");
-    return 0;
-  } catch (err) {
-    return emitCliError(io2, json, "channel deploy-zkapp", err);
-  }
-}
 function withdrawPrecheck(step, channelId, watermark, nowSec) {
   const status = channelStatus(watermark, nowSec);
   if (status === "settled") {
@@ -2678,7 +2516,7 @@ async function stopQuietly(ctx) {
 
 // src/cli/clone.ts
 import { mkdtemp, mkdir, readdir, rename, rm, rmdir } from "fs/promises";
-import { basename, dirname as dirname2, join as join4, resolve } from "path";
+import { basename, dirname as dirname2, join as join3, resolve } from "path";
 import { parseArgs as parseArgs6 } from "util";
 var CLONE_USAGE = `Usage: rig clone <relay-url> <owner>/<repo-id> [dir] [options]
 
@@ -2849,7 +2687,7 @@ async function runClone(args, deps) {
     }
     const parent = dirname2(dest);
     await mkdir(parent, { recursive: true });
-    tempDir = await mkdtemp(join4(parent, `.${basename(dest)}.rig-clone-`));
+    tempDir = await mkdtemp(join3(parent, `.${basename(dest)}.rig-clone-`));
     await runGit(tempDir, [
       "init",
       "--quiet",
@@ -4102,48 +3940,39 @@ async function warnIfNotMaintainer(deps, args) {
 }
 
 // src/cli/entry.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync4, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir4 } from "os";
-import { dirname as dirname3, join as join5 } from "path";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname3, join as join4 } from "path";
 import { parseArgs as parseArgs9 } from "util";
-var SANDBOX_BTP_URL = "wss://proxy.sandbox.devnet.toonprotocol.dev:443";
-var SANDBOX_RELAY_URL = "wss://relay-ws.sandbox.devnet.toonprotocol.dev";
-var ENTRY_USAGE = `Usage: rig entry [apex | sandbox | <wss-url>] [options]
+var ENTRY_USAGE = `Usage: rig entry [<connector-url> | clear] [options]
 
-Choose which network entry node (payment ingress + relay) rig talks to. Free:
-only the local config file is touched.
+Name the TOON connector rig pays. A connector describes itself on GET /ilp
+(its addresses, routes and prices, settlement chains), so its URL is the
+whole configuration. Free: only the local config file is touched.
 
-  rig entry               show the effective entry endpoints and their source
-  rig entry apex          revert to the default apex: clears the btpUrl/
-                          relayUrl override so core's genesis seed (or a live
-                          announce) applies \u2014 settles evm | sol | mina
-  rig entry sandbox       the devnet sandbox entry (Mina USDC ONLY \u2014 the
-                          cross-currency multihop demo path):
-                            btp    ${SANDBOX_BTP_URL}
-                            relay  ${SANDBOX_RELAY_URL}
-  rig entry <wss-url>     an explicit BTP endpoint (ws:// or wss://); pass
-                          --relay <url> to also set the relay
+  rig entry                    show the effective connector + relay and their source
+  rig entry <connector-url>    record the node's client-edge URL (https://\u2026);
+                               pass --relay <wss-url> to also record its free-read relay
+  rig entry clear              forget the recorded connector (and relay)
 
-Switching entries deletes the cached topology (the next paid command
-re-discovers the new entry's announce) and leaves existing payment channels
-behind \u2014 channels are per-entry-peer; the next paid command opens or resumes
-one with the new peer.
+Existing payment channels are per node: after switching, the next paid
+command opens or adopts a channel with the new node.
 
 NOTE for repos: the relay a repo publishes to is its git \`origin\` remote,
-which OVERRIDES the config relayUrl. After switching entries, point the repo
-too: \`rig remote add origin <relay-url>\` (or use a fresh repo).
+which OVERRIDES the config relayUrl. After switching, point the repo too:
+\`rig remote add origin <relay-url>\` (or use a fresh repo).
 
 Options:
-  --relay <url>        with <wss-url>: also set the relay URL
+  --relay <url>        with <connector-url>: also record the relay URL (ws:// or wss://)
   --json               machine-readable envelope
   -h, --help           show this help`;
 function configPathFor2(env) {
-  const dir = env["TOON_CLIENT_HOME"] ?? join5(homedir4(), ".toon-client");
-  return join5(dir, "config.json");
+  const dir = env["TOON_CLIENT_HOME"] ?? join4(homedir3(), ".toon-client");
+  return join4(dir, "config.json");
 }
 function readEntryConfig(configPath) {
   try {
-    return JSON.parse(readFileSync4(configPath, "utf8"));
+    return JSON.parse(readFileSync3(configPath, "utf8"));
   } catch (err) {
     if (err.code === "ENOENT") return {};
     throw new Error(
@@ -4156,20 +3985,28 @@ function writeEntryConfig(configPath, file) {
   writeFileSync3(configPath, `${JSON.stringify(file, null, 2)}
 `, "utf8");
 }
-async function loadGenesisSeedDefault() {
-  try {
-    const { loadGenesisSeed } = await import("../network-bootstrap-27FYE3N7.js");
-    return loadGenesisSeed();
-  } catch {
-    return void 0;
-  }
-}
-function classifyEntry(btpUrl, seedBtp, btpSource) {
-  if (btpUrl === null) return null;
-  if (btpUrl === SANDBOX_BTP_URL) return "sandbox";
-  if (btpSource === "genesis-seed" || btpUrl === seedBtp) return "apex";
-  return "custom";
-}
+function effectiveEntry(env, file) {
+  let connectorUrl = null;
+  let connectorSource = null;
+  if (env["TOON_CONNECTOR"]) {
+    connectorUrl = env["TOON_CONNECTOR"];
+    connectorSource = "env";
+  } else if (env["TOON_CLIENT_PROXY_URL"]) {
+    connectorUrl = env["TOON_CLIENT_PROXY_URL"];
+    connectorSource = "legacy-env";
+  } else if (file.connectorUrl) {
+    connectorUrl = file.connectorUrl;
+    connectorSource = "config";
+  } else if (file.proxyUrl) {
+    connectorUrl = file.proxyUrl;
+    connectorSource = "legacy-config";
+  }
+  const relayUrl = env["TOON_CLIENT_RELAY_URL"] ?? file.relayUrl ?? null;
+  const relaySource = env["TOON_CLIENT_RELAY_URL"] ? "env" : file.relayUrl ? "config" : null;
+  return { connectorUrl, connectorSource, relayUrl, relaySource };
+}
+var HTTP_URL = /^https?:\/\/.+/i;
+var WS_URL = /^wss?:\/\/.+/i;
 async function runEntry(args, deps) {
   const { io: io2, env } = deps;
   let positionals;
@@ -4199,7 +4036,7 @@ async function runEntry(args, deps) {
   }
   if (positionals.length > 1) {
     io2.err(
-      `rig entry takes at most one argument, got ${positionals.length}: ${positionals.join(" ")}`
+      `rig entry takes at most one argument, got ${String(positionals.length)}: ${positionals.join(" ")}`
     );
     io2.err(ENTRY_USAGE);
     return 2;
@@ -4207,36 +4044,33 @@ async function runEntry(args, deps) {
   const target = positionals[0];
   let mutation;
   if (target !== void 0) {
-    if (target === "apex") {
+    if (target === "clear") {
       if (relayFlag !== void 0) {
-        io2.err("--relay only applies to an explicit <wss-url> entry");
+        io2.err("--relay only applies to a <connector-url> entry");
         io2.err(ENTRY_USAGE);
         return 2;
       }
-      mutation = { kind: "apex" };
-    } else if (target === "sandbox") {
-      if (relayFlag !== void 0) {
-        io2.err("--relay only applies to an explicit <wss-url> entry");
-        io2.err(ENTRY_USAGE);
-        return 2;
-      }
-      mutation = { kind: "sandbox" };
-    } else if (/^wss?:\/\/.+/.test(target)) {
-      if (relayFlag !== void 0 && !/^wss?:\/\/.+/.test(relayFlag)) {
-        io2.err(
-          `--relay must be a ws(s) URL, got ${JSON.stringify(relayFlag)}`
-        );
+      mutation = { kind: "clear" };
+    } else if (HTTP_URL.test(target)) {
+      if (relayFlag !== void 0 && !WS_URL.test(relayFlag)) {
+        io2.err(`--relay must be a ws(s) URL, got ${JSON.stringify(relayFlag)}`);
         io2.err(ENTRY_USAGE);
         return 2;
       }
       mutation = {
         kind: "url",
-        btpUrl: target,
+        connectorUrl: target.replace(/\/+$/, ""),
         ...relayFlag !== void 0 ? { relayUrl: relayFlag } : {}
       };
+    } else if (WS_URL.test(target)) {
+      io2.err(
+        `${JSON.stringify(target)} is a WebSocket URL \u2014 the entry is the connector's http(s) URL (the one whose GET /ilp describes it); pass the relay with --relay`
+      );
+      io2.err(ENTRY_USAGE);
+      return 2;
     } else {
       io2.err(
-        `unknown entry ${JSON.stringify(target)} \u2014 expected \`apex\`, \`sandbox\`, or a ws(s):// URL`
+        `unknown entry ${JSON.stringify(target)} \u2014 expected a connector http(s):// URL or \`clear\``
       );
       io2.err(ENTRY_USAGE);
       return 2;
@@ -4245,136 +4079,78 @@ async function runEntry(args, deps) {
   try {
     const configPath = configPathFor2(env);
     const file = readEntryConfig(configPath);
-    const seed = await (deps.loadGenesisSeed ?? loadGenesisSeedDefault)();
-    const effective = () => {
-      const btpExplicit = env["TOON_CLIENT_PROXY_URL"] ?? env["TOON_CLIENT_BTP_URL"] ?? file.proxyUrl ?? file.btpUrl;
-      const btpFromEnv = env["TOON_CLIENT_PROXY_URL"] ?? env["TOON_CLIENT_BTP_URL"];
-      const relayExplicit = env["TOON_CLIENT_RELAY_URL"] ?? file.relayUrl;
-      return {
-        btpUrl: btpExplicit ?? seed?.btpEndpoint ?? null,
-        btpSource: btpExplicit ? btpFromEnv ? "env" : "config" : seed?.btpEndpoint ? "genesis-seed" : null,
-        relayUrl: relayExplicit ?? seed?.relayUrl ?? null,
-        relaySource: env["TOON_CLIENT_RELAY_URL"] ? "env" : file.relayUrl ? "config" : seed?.relayUrl ? "genesis-seed" : null
-      };
-    };
+    const label = (source) => source === "env" ? "env" : source === "legacy-env" ? "env (TOON_CLIENT_PROXY_URL, pre-4.0 spelling \u2014 set TOON_CONNECTOR)" : source === "config" ? `config (${configPath})` : source === "legacy-config" ? `config proxyUrl (${configPath}, pre-4.0 spelling)` : "not configured";
     if (mutation === void 0) {
-      const state2 = effective();
-      const entry = classifyEntry(state2.btpUrl, seed?.btpEndpoint, state2.btpSource);
+      const state2 = effectiveEntry(env, file);
       if (json) {
         io2.emitJson({
           command: "entry",
-          entry,
-          btpUrl: state2.btpUrl,
-          btpSource: state2.btpSource,
-          relayUrl: state2.relayUrl,
-          relaySource: state2.relaySource,
+          ...state2,
           configPath
         });
         return 0;
       }
-      const label = (source) => source === "env" ? "env" : source === "config" ? `config (${configPath})` : source === "genesis-seed" ? "default apex \u2014 genesis seed" : "not configured";
       io2.out(
-        `Entry: ${entry ?? "(none)"}${entry === "sandbox" ? " (Mina USDC only \u2014 multihop demo path)" : ""}`
+        `Connector  ${state2.connectorUrl ?? "(none)"}  [${label(state2.connectorSource)}]`
       );
-      io2.out(`  btp    ${state2.btpUrl ?? "(none)"}  [${label(state2.btpSource)}]`);
-      io2.out(`  relay  ${state2.relayUrl ?? "(none)"}  [${label(state2.relaySource)}]`);
       io2.out(
-        "Switch with `rig entry apex`, `rig entry sandbox`, or `rig entry <wss-url>`."
+        `Relay      ${state2.relayUrl ?? "(none)"}  [${label(state2.relaySource)}]`
       );
-      return 0;
-    }
-    const warnings = [];
-    for (const envVar of [
-      "TOON_CLIENT_BTP_URL",
-      "TOON_CLIENT_PROXY_URL",
-      "TOON_CLIENT_RELAY_URL"
-    ]) {
-      if (env[envVar] !== void 0) {
-        warnings.push(
-          `${envVar}=${env[envVar]} is set in the environment and overrides the config value you just wrote \u2014 unset it for this entry to take effect.`
+      if (!state2.connectorUrl) {
+        io2.out(
+          "Set one with `rig entry <connector-url>` (or export TOON_CONNECTOR)."
         );
       }
+      return 0;
     }
-    warnings.push(
-      "Payment channels are per-entry-peer: existing channels (see `rig channels`) are not used with the new entry \u2014 the next paid command opens or resumes a channel with the new peer."
-    );
-    const hadProxyUrl = file.proxyUrl !== void 0;
-    let wroteBtp;
-    let wroteRelay;
-    if (mutation.kind === "apex") {
-      wroteBtp = null;
-      wroteRelay = null;
-      delete file.btpUrl;
-      delete file.relayUrl;
-      delete file.proxyUrl;
-    } else if (mutation.kind === "sandbox") {
-      wroteBtp = SANDBOX_BTP_URL;
-      wroteRelay = SANDBOX_RELAY_URL;
-      file.btpUrl = SANDBOX_BTP_URL;
-      file.relayUrl = SANDBOX_RELAY_URL;
-      delete file.proxyUrl;
-    } else {
-      wroteBtp = mutation.btpUrl;
-      wroteRelay = mutation.relayUrl ?? null;
-      file.btpUrl = mutation.btpUrl;
-      if (mutation.relayUrl !== void 0) file.relayUrl = mutation.relayUrl;
-      delete file.proxyUrl;
-    }
-    if (hadProxyUrl) {
+    const warnings = [];
+    const next = { ...file };
+    if (file.proxyUrl !== void 0 || file.btpUrl !== void 0) {
+      delete next.proxyUrl;
+      delete next.btpUrl;
       warnings.push(
-        "Removed the legacy `proxyUrl` config field \u2014 it outranks `btpUrl` and would have silently kept the old entry."
+        "removed the pre-4.0 proxyUrl/btpUrl fields (the connector URL replaces both)"
       );
     }
-    writeEntryConfig(configPath, file);
-    let clearedTopologyCache = false;
-    try {
-      unlinkSync(join5(dirname3(configPath), TOPOLOGY_CACHE_FILENAME));
-      clearedTopologyCache = true;
-    } catch {
+    if (mutation.kind === "clear") {
+      delete next.connectorUrl;
+      delete next.relayUrl;
+    } else {
+      next.connectorUrl = mutation.connectorUrl;
+      if (mutation.relayUrl !== void 0) next.relayUrl = mutation.relayUrl;
     }
-    if (mutation.kind === "sandbox") {
-      const effectiveChain = env["TOON_CLIENT_CHAIN"] ?? file.chain ?? file.supportedChains?.[0];
-      if (effectiveChain === void 0 || !effectiveChain.startsWith("mina")) {
-        warnings.push(
-          "The sandbox entry settles ONLY mina:devnet \u2014 run `rig chain set mina` " + (effectiveChain !== void 0 ? `(currently ${effectiveChain}).` : "to pin it.")
-        );
-      }
+    if (env["TOON_CONNECTOR"] || env["TOON_CLIENT_PROXY_URL"]) {
       warnings.push(
-        `Repos publish to their git \`origin\` relay, which OVERRIDES the config relayUrl \u2014 for the sandbox demo run \`rig remote add origin ${SANDBOX_RELAY_URL}\` in the repo (or use a fresh repo).`
+        "TOON_CONNECTOR / TOON_CLIENT_PROXY_URL is set in this shell and outranks the config file"
       );
     }
-    const state = effective();
+    writeEntryConfig(configPath, next);
+    const wrote = {
+      connectorUrl: next.connectorUrl ?? null,
+      relayUrl: next.relayUrl ?? null
+    };
+    const state = effectiveEntry(env, next);
     if (json) {
       io2.emitJson({
         command: "entry",
-        entry: mutation.kind === "url" ? "custom" : mutation.kind,
-        btpUrl: state.btpUrl,
-        btpSource: state.btpSource,
-        relayUrl: state.relayUrl,
-        relaySource: state.relaySource,
-        wrote: { btpUrl: wroteBtp, relayUrl: wroteRelay },
-        clearedTopologyCache,
+        ...state,
+        wrote,
         configPath,
-        ...warnings.length ? { warnings } : {}
+        ...warnings.length > 0 ? { warnings } : {}
       });
       return 0;
     }
-    if (mutation.kind === "apex") {
-      io2.out("Entry reverted to the default apex (cleared btpUrl/relayUrl/proxyUrl).");
-      io2.out(`  btp    ${state.btpUrl ?? "(genesis seed unavailable)"}`);
-      io2.out(`  relay  ${state.relayUrl ?? "(genesis seed unavailable)"}`);
-    } else if (mutation.kind === "sandbox") {
-      io2.out("Entry set to the devnet sandbox (Mina USDC only \u2014 multihop demo path).");
-      io2.out(`  btp    ${SANDBOX_BTP_URL}`);
-      io2.out(`  relay  ${SANDBOX_RELAY_URL}`);
+    if (mutation.kind === "clear") {
+      io2.out(`Cleared the recorded connector in ${configPath}.`);
     } else {
-      io2.out(`Entry set to ${mutation.btpUrl}.`);
-      if (mutation.relayUrl !== void 0) io2.out(`  relay  ${mutation.relayUrl}`);
+      io2.out(`Recorded connector ${mutation.connectorUrl} in ${configPath}.`);
+      if (mutation.relayUrl !== void 0)
+        io2.out(`Recorded relay ${mutation.relayUrl}.`);
     }
+    for (const w of warnings) io2.out(`warning: ${w}`);
     io2.out(
-      `Saved to ${configPath}.` + (clearedTopologyCache ? " Cleared the cached topology." : "")
+      `Effective connector: ${state.connectorUrl ?? "(none)"}  [${label(state.connectorSource)}]`
     );
-    for (const w of warnings) io2.err(`warning: ${w}`);
     return 0;
   } catch (err) {
     return emitCliError(io2, json, "entry", err);
@@ -4601,21 +4377,20 @@ async function runFetch(args, deps) {
 }
 
 // src/cli/fund.ts
-import { readFileSync as readFileSync5 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join6 } from "path";
+import { readFileSync as readFileSync4 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join5 } from "path";
 import { parseArgs as parseArgs11 } from "util";
 var DEVNET_FAUCET_URL = "https://faucet.devnet.toonprotocol.dev";
-var CHAINS = ["evm", "solana", "mina"];
+var CHAINS = ["evm", "solana"];
 var CHAIN_ALIASES = {
   evm: "evm",
   eth: "evm",
   sol: "solana",
   solana: "solana",
-  mina: "mina",
   all: "all"
 };
-var CHAIN_ARG_LIST2 = "evm | sol | solana | mina | all";
+var CHAIN_ARG_LIST2 = "evm | sol | solana | all";
 function resolveChainArg(raw) {
   if (raw === void 0) return void 0;
   const canonical = CHAIN_ALIASES[raw.toLowerCase()];
@@ -4681,13 +4456,8 @@ function sharedDevnetOrigin(env, file, originRelays = []) {
   }
   return void 0;
 }
-async function loadGenesisSeedDefault2() {
-  try {
-    const { loadGenesisSeed } = await import("../network-bootstrap-27FYE3N7.js");
-    return loadGenesisSeed();
-  } catch {
-    return void 0;
-  }
+async function loadGenesisSeedDefault() {
+  return void 0;
 }
 async function resolveEffectiveNetwork(opts) {
   const { env, cwd } = opts;
@@ -4705,7 +4475,7 @@ async function resolveEffectiveNetwork(opts) {
       ...originRelays
     ].some((url) => url !== void 0);
     if (!anyConfiguredOrigin) {
-      const seed = await (opts.loadGenesisSeed ?? loadGenesisSeedDefault2)();
+      const seed = await (opts.loadGenesisSeed ?? loadGenesisSeedDefault)();
       devnetOrigin = devnetHost(seed?.relayUrl) ?? devnetHost(seed?.btpEndpoint);
       seededOrigin = devnetOrigin !== void 0;
     }
@@ -4748,11 +4518,11 @@ function noFaucetGuidance(network, devnetOrigin) {
   return `${head}. If you meant the shared devnet, set TOON_CLIENT_NETWORK=devnet and re-run \`rig fund\` \u2014 no faucet URL is needed there. If this is a self-hosted network with its own faucet, set TOON_CLIENT_FAUCET_URL (or the faucetUrl config field). ${external}`;
 }
 function readFundConfig(env) {
-  const dir = env["TOON_CLIENT_HOME"] ?? join6(homedir5(), ".toon-client");
-  const configPath = join6(dir, "config.json");
+  const dir = env["TOON_CLIENT_HOME"] ?? join5(homedir4(), ".toon-client");
+  const configPath = join5(dir, "config.json");
   try {
     return {
-      file: JSON.parse(readFileSync5(configPath, "utf8")),
+      file: JSON.parse(readFileSync4(configPath, "utf8")),
       configPath
     };
   } catch (err) {
@@ -4830,14 +4600,13 @@ async function runFund(args, deps) {
       sourceLabel: resolved.sourceLabel
     };
     const client = await import("@toon-protocol/client");
-    const derived = await client.deriveFullIdentity(
-      resolved.mnemonic,
-      resolved.accountIndex
-    );
+    const derived = client.deriveFullIdentity(resolved.mnemonic, {
+      accountIndex: resolved.accountIndex,
+      scheme: "legacy"
+    });
     const addresses = {
       evm: derived.evm.address || null,
-      solana: derived.solana.publicKey || null,
-      mina: derived.mina.publicKey || null
+      solana: derived.solana.publicKey || null
     };
     if (!faucetUrl) {
       const guidance = noFaucetGuidance(network, devnetOrigin);
@@ -4857,14 +4626,13 @@ async function runFund(args, deps) {
       io2.out("Wallet addresses:");
       io2.out(`  evm     ${addresses.evm ?? "(no key derived)"}`);
       io2.out(`  solana  ${addresses.solana ?? "(no key derived)"}`);
-      io2.out(`  mina    ${addresses.mina ?? "(no key derived \u2014 optional mina-signer dependency missing)"}`);
       return 0;
     }
     const timeoutEnv = env["TOON_CLIENT_FAUCET_TIMEOUT_MS"];
-    const timeoutFor = (chain) => {
+    const timeoutFor = () => {
       if (timeoutEnv && Number.isFinite(Number(timeoutEnv))) return Number(timeoutEnv);
       if (file.faucetTimeoutMs !== void 0) return file.faucetTimeoutMs;
-      return chain === "mina" ? 13e4 : 9e4;
+      return 9e4;
     };
     if (!json && inferredDevnet) {
       io2.out(
@@ -4874,7 +4642,7 @@ async function runFund(args, deps) {
     if (!json) {
       const list = targetChains.join(", ");
       io2.out(
-        `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)" : "")
+        `Requesting ${targetChains.length === 1 ? "" : "parallel "}USDC drip${targetChains.length === 1 ? "" : "s"} from ${faucetUrl} for ${list} \u2026`
       );
     }
     const singleChain = targetChains.length === 1;
@@ -4885,13 +4653,13 @@ async function runFund(args, deps) {
           chain,
           funded: false,
           address: null,
-          error: `no ${chain} address could be derived for this identity` + (chain === "mina" ? " (install the optional mina-signer dependency)" : "")
+          error: `no ${chain} address could be derived for this identity`
         };
       }
       const started = Date.now();
       try {
         const { response } = await client.fundWallet(faucetUrl, address, chain, {
-          timeout: timeoutFor(chain),
+          timeout: timeoutFor(),
           ...deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}
         });
         return {
@@ -5000,7 +4768,8 @@ import { dirname as dirname4 } from "path";
 import { createInterface } from "readline/promises";
 import { parseArgs as parseArgs12 } from "util";
 async function loadKeyOps() {
-  return await import("@toon-protocol/client");
+  const { generateKeystore, importKeystore } = await import("@toon-protocol/client");
+  return { generateKeystore, importKeystore, deriveNostrKeyFromMnemonic };
 }
 var IdentityExistsError = class extends Error {
   constructor(pubkey, sourceLabel) {
@@ -5544,12 +5313,6 @@ async function resolveProfileRelay(flagRelay, originRelay, toonRelays) {
     ...toonRelays
   ].filter((u) => u !== void 0 && isWebSocketRelay2(u));
   if (candidates[0] !== void 0) return candidates[0];
-  try {
-    const { loadGenesisSeed } = await import("../network-bootstrap-27FYE3N7.js");
-    const seed = loadGenesisSeed();
-    if (seed?.relayUrl && isWebSocketRelay2(seed.relayUrl)) return seed.relayUrl;
-  } catch {
-  }
   return void 0;
 }
 async function resolveOrInitGitRepo(deps, flags) {
@@ -6314,57 +6077,39 @@ var DvmBuyJobError = class extends Error {
   }
 };
 var defaultSubmitDvmBuyJob = async (request) => {
-  const { finalizeEvent } = await import("nostr-tools/pure");
-  const event = finalizeEvent(
-    {
+  let answer;
+  try {
+    answer = await request.submit({
       kind: ARNS_BUY_JOB_KIND,
-      created_at: Math.floor(Date.now() / 1e3),
-      content: "",
-      tags: [
-        ["param", "name", request.name],
-        ["param", "type", request.type],
-        ...request.years !== null ? [["param", "years", String(request.years)]] : [],
-        ["param", "processId", request.processId]
+      params: [
+        ["name", request.name],
+        ["type", request.type],
+        ...request.years !== null ? [["years", String(request.years)]] : [],
+        ["processId", request.processId]
       ]
-    },
-    request.nostrSecretKey
-  );
-  const url = `${request.viaUrl.replace(/\/+$/, "")}/store`;
-  let response;
-  try {
-    response = await fetch(url, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ event })
     });
   } catch (err) {
     throw new DvmBuyJobError(
-      `could not reach the DVM at ${url}: ${err instanceof Error ? err.message : String(err)}`
+      `could not reach the DVM at ${request.destination}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
-  let body;
-  try {
-    body = await response.json();
-  } catch {
+  if (!answer.accept) {
     throw new DvmBuyJobError(
-      `the DVM at ${url} returned a non-JSON response (HTTP ${response.status})`
+      `the DVM at ${request.destination} rejected the kind:${ARNS_BUY_JOB_KIND} buy job (HTTP ${answer.status}${answer.code ? `, ${answer.code}` : ""})${answer.message ? `: ${answer.message}` : ""}`
     );
   }
-  if (!response.ok || body.accept !== true) {
-    throw new DvmBuyJobError(
-      `the DVM rejected the kind:${ARNS_BUY_JOB_KIND} buy job (HTTP ${response.status}${body.code ? `, ${body.code}` : ""})${body.message ? `: ${body.message}` : ""}`
-    );
-  }
-  const registryTxId = body.result?.registryTxId;
+  const registryTxId = answer.result?.["registryTxId"];
   if (typeof registryTxId !== "string" || registryTxId.length === 0) {
     throw new DvmBuyJobError(
-      `the DVM accepted the job but returned no registryTxId \u2014 response: ` + JSON.stringify(body.result ?? null)
+      `the DVM accepted the job but returned no registryTxId \u2014 response: ` + JSON.stringify(answer.result ?? null)
     );
   }
+  const quotedMario = answer.result?.["quotedMario"];
+  const syncAttributesTxId = answer.result?.["syncAttributesTxId"];
   return {
     registryTxId,
-    quotedMario: typeof body.result?.quotedMario === "string" ? body.result.quotedMario : null,
-    syncAttributesTxId: typeof body.result?.syncAttributesTxId === "string" ? body.result.syncAttributesTxId : null
+    quotedMario: typeof quotedMario === "string" ? quotedMario : null,
+    syncAttributesTxId: typeof syncAttributesTxId === "string" ? syncAttributesTxId : null
   };
 };
 var GAS_STATION_JOB_KIND = 5096;
@@ -6376,47 +6121,23 @@ var GasStationJobError = class extends Error {
   }
   reason;
 };
-async function postGasStationJob(viaUrl, params, nostrSecretKey) {
-  const { finalizeEvent } = await import("nostr-tools/pure");
-  const event = finalizeEvent(
-    {
-      kind: GAS_STATION_JOB_KIND,
-      created_at: Math.floor(Date.now() / 1e3),
-      content: "",
-      tags: params.map(([k, v]) => ["param", k, v])
-    },
-    nostrSecretKey
-  );
-  const url = `${viaUrl.replace(/\/+$/, "")}/store`;
-  let response;
+async function submitGasStationJob(destination, params, submit) {
+  let answer;
   try {
-    response = await fetch(url, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ event })
-    });
+    answer = await submit({ kind: GAS_STATION_JOB_KIND, params });
   } catch (err) {
     throw new GasStationJobError(
       "unreachable",
-      `could not reach the DVM at ${url}: ${err instanceof Error ? err.message : String(err)}`
+      `could not reach the DVM at ${destination}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
-  let body;
-  try {
-    body = await response.json();
-  } catch {
-    throw new GasStationJobError(
-      "bad_response",
-      `the DVM at ${url} returned a non-JSON response (HTTP ${response.status})`
-    );
-  }
-  if (!response.ok || body.accept !== true || !body.result) {
+  if (!answer.accept || !answer.result) {
     throw new GasStationJobError(
-      String(body.code ?? "rejected"),
-      `the DVM rejected the kind:${GAS_STATION_JOB_KIND} job (HTTP ${response.status}${body.code ? `, ${body.code}` : ""})${body.message ? `: ${body.message}` : ""}`
+      String(answer.code ?? "rejected"),
+      `the DVM at ${destination} rejected the kind:${GAS_STATION_JOB_KIND} job (HTTP ${answer.status}${answer.code ? `, ${answer.code}` : ""})${answer.message ? `: ${answer.message}` : ""}`
     );
   }
-  const result = body.result;
+  const result = answer.result;
   if (result["status"] === "failed") {
     throw new GasStationJobError(
       String(result["reason"] ?? "failed"),
@@ -6427,13 +6148,13 @@ async function postGasStationJob(viaUrl, params, nostrSecretKey) {
 }
 var defaultGasStationClient = {
   quote: async (args) => {
-    const result = await postGasStationJob(
-      args.viaUrl,
+    const result = await submitGasStationJob(
+      args.destination,
       [
         ["phase", "quote"],
         ...args.transaction !== void 0 ? [["transaction", args.transaction]] : []
       ],
-      args.nostrSecretKey
+      args.submit
     );
     const { quoteId, feePayer, maxLamports, recentBlockhash, expiresAt } = result;
     if (typeof quoteId !== "string" || typeof feePayer !== "string" || typeof maxLamports !== "string" || typeof recentBlockhash !== "string" || typeof expiresAt !== "number") {
@@ -6445,15 +6166,15 @@ var defaultGasStationClient = {
     return { quoteId, feePayer, maxLamports, recentBlockhash, expiresAt };
   },
   execute: async (args) => {
-    const result = await postGasStationJob(
-      args.viaUrl,
+    const result = await submitGasStationJob(
+      args.destination,
       [
         ["phase", "execute"],
         ["transaction", args.transaction],
         ["quoteId", args.quoteId],
         ["idempotencyKey", args.idempotencyKey]
       ],
-      args.nostrSecretKey
+      args.submit
     );
     const signature = result["signature"];
     if (typeof signature !== "string" || signature.length === 0) {
@@ -6470,7 +6191,7 @@ var defaultGasStationClient = {
     };
   }
 };
-var DEVNET_DVM_URL = "https://dvm.devnet.toonprotocol.dev";
+var DEVNET_DVM_DESTINATION = "g.toon.ario";
 var NAME_USAGE = `Usage: rig name <buy|set|status> <name> [options]
 
 ArNS naming for Arweave-served artifacts. A name registered on the ar.io
@@ -6483,7 +6204,7 @@ mnemonic that pays for pushes (derived at m/44'/501'/0'/0'). Fund it with
 registry program \u2014 NOT through TOON ILP payment channels.
 
 Commands:
-  name buy <name> [--years n | --permabuy] [--via <dvm-url>]
+  name buy <name> [--years n | --permabuy] [--via <destination>]
                        quote (mARIO) \u2192 confirm \u2192 register. The spawned ANT is
                        owned by this identity's Solana key. Default: 1-year
                        lease. PAID \u2014 spends mARIO from the Solana wallet.
@@ -6491,7 +6212,7 @@ Commands:
                        the ANT (dust SOL only), then a store DVM executes the
                        kind:5095 buy job and pays the mARIO from ITS wallet;
                        the name is owned by your ANT from inception.
-  name set <name> <txId> [--undername <sub>] [--ttl <seconds>] [--via <dvm-url>]
+  name set <name> <txId> [--undername <sub>] [--ttl <seconds>] [--via <destination>]
                        point the name (or an undername) at an Arweave txId
                        (typically a deployed path manifest). Signs an ANT
                        record update with the Solana key. With --via: the
@@ -6523,17 +6244,24 @@ Options:
                        unverified.
   --process-id <id>    explicit ArNS registry program id \u2014 a Solana program
                        address (overrides --network; or RIG_ARIO_PROCESS_ID)
-  --via <dvm-url>      broker buy/set through a store DVM's job endpoint (or
-                       RIG_ARNS_DVM_URL). The DVM pays the mARIO; you own the
-                       name via your spawned ANT. Direct backend targeting
-                       stubs the job payment (dev/e2e) \u2014 the paid path runs
-                       the same job through the connector payment proxy.
+  --via <destination>  broker buy/set through a store node's DVM, naming its
+                       ILP DESTINATION (or RIG_ARNS_DVM_DESTINATION), e.g.
+                       --via ${DEVNET_DVM_DESTINATION}. The DVM pays the mARIO;
+                       you own the name via your spawned ANT.
+                       The job travels as a PAID packet, exactly as a git-object
+                       store write does \u2014 the store sits behind the connector's
+                       payment termination, so there is no unpaid endpoint to
+                       aim at. That node's ingress, route price and payment
+                       channel are all discovered from its own announce, so the
+                       destination is the only thing you supply.
+                       Costs one store-route packet per job (two for set:
+                       quote + execute).
                        DEVNET DEFAULT: with --network devnet and the TOON
                        network on devnet too, buy/set default to the deployed
-                       devnet store DVM (${DEVNET_DVM_URL})
+                       devnet store DVM (${DEVNET_DVM_DESTINATION})
                        unless --direct opts out.
   --direct             force the direct wallet-paid path: never default (or
-                       read RIG_ARNS_DVM_URL as) a --via DVM. Mutually
+                       read RIG_ARNS_DVM_DESTINATION as) a --via DVM. Mutually
                        exclusive with an explicit --via.
   --yes                skip the confirmation (required when not a TTY) for
                        buy/set
@@ -6543,6 +6271,25 @@ Options:
 var DEFAULT_TTL_SECONDS = 3600;
 var DEFAULT_LEASE_YEARS = 1;
 var NETWORKS = ["mainnet", "devnet"];
+async function openStoreJobSession(deps, destination) {
+  const ctx = await (deps.loadStandalone ?? defaultLoadStandalone)({
+    env: deps.env,
+    cwd: deps.cwd,
+    warn: (line) => deps.io.err(line),
+    storeDestination: destination
+  });
+  const submitStoreJob = ctx.publisher.submitStoreJob;
+  if (!submitStoreJob) {
+    await ctx.stop();
+    throw new Error(
+      "the active publisher cannot submit a store job (submitStoreJob unavailable) \u2014 `rig name --via` requires the standalone publisher"
+    );
+  }
+  return {
+    submit: (request) => submitStoreJob.call(ctx.publisher, request),
+    stop: () => ctx.stop()
+  };
+}
 async function resolveNameContext(deps, network, processId, mode) {
   const { io: io2, env } = deps;
   const resolved = await resolveIdentity({
@@ -6556,10 +6303,10 @@ async function resolveNameContext(deps, network, processId, mode) {
     sourceLabel: resolved.sourceLabel
   };
   const client = await import("@toon-protocol/client");
-  const derived = await client.deriveFullIdentity(
-    resolved.mnemonic,
-    resolved.accountIndex
-  );
+  const derived = client.deriveFullIdentity(resolved.mnemonic, {
+    accountIndex: resolved.accountIndex,
+    scheme: "legacy"
+  });
   const solanaAddress = derived.solana.publicKey;
   if (!solanaAddress) {
     throw new Error(
@@ -6573,7 +6320,7 @@ async function resolveNameContext(deps, network, processId, mode) {
     network,
     ...processId !== void 0 ? { processId } : {}
   });
-  const nostrSecretKey = client.deriveNostrKeyFromMnemonic(
+  const nostrSecretKey = deriveNostrKeyFromMnemonic(
     resolved.mnemonic,
     resolved.accountIndex
   ).secretKey;
@@ -6644,12 +6391,17 @@ function parseNameFlags(args, env) {
       "--direct and --via are mutually exclusive: --direct forces the wallet-paid path, --via brokers through a DVM"
     );
   }
-  const viaRaw = values.direct ? void 0 : values.via ?? env["RIG_ARNS_DVM_URL"];
+  const viaRaw = values.direct ? void 0 : values.via ?? env["RIG_ARNS_DVM_DESTINATION"] ?? env["RIG_ARNS_DVM_URL"];
   let via;
   if (viaRaw !== void 0) {
-    if (!/^https?:\/\/.+/.test(viaRaw)) {
+    if (/^[a-z][a-z0-9+.-]*:\/\//i.test(viaRaw)) {
+      throw new Error(
+        `--via names an ILP destination, not a URL (got ${JSON.stringify(viaRaw)}). Brokered ArNS jobs travel as paid packets to a store node, e.g. --via ${DEVNET_DVM_DESTINATION}. The node's endpoint, price and payment channel are discovered from its own announce.`
+      );
+    }
+    if (!/^g\.[a-z0-9]+(\.[a-z0-9-]+)*$/i.test(viaRaw)) {
       throw new Error(
-        `--via must be an http(s) DVM endpoint URL, got ${JSON.stringify(viaRaw)}`
+        `--via must be an ILP destination like ${DEVNET_DVM_DESTINATION}, got ${JSON.stringify(viaRaw)}`
       );
     }
     via = viaRaw;
@@ -6755,14 +6507,20 @@ async function runBuy(name, flags, deps) {
       io2.out(`Spawned ANT ${spawn3.processId} (tx ${spawn3.signature})`);
     }
     const submit = deps.submitDvmBuyJob ?? defaultSubmitDvmBuyJob;
-    const receipt2 = await submit({
-      viaUrl: via,
-      name,
-      type,
-      years,
-      processId: spawn3.processId,
-      nostrSecretKey: signed.nostrSecretKey
-    });
+    const session = await openStoreJobSession(deps, via);
+    let receipt2;
+    try {
+      receipt2 = await submit({
+        destination: via,
+        name,
+        type,
+        years,
+        processId: spawn3.processId,
+        submit: session.submit
+      });
+    } finally {
+      await session.stop();
+    }
     const result2 = {
       registryTxId: receipt2.registryTxId,
       antProcessId: spawn3.processId,
@@ -6910,25 +6668,32 @@ async function runSet(name, txId, flags, deps) {
   );
   if (via !== null) {
     const gas = deps.gasStation ?? defaultGasStationClient;
-    const quote = await gas.quote({
-      viaUrl: via,
-      nostrSecretKey: signed.nostrSecretKey
-    });
-    const wireTx = await signed.sdk.buildSetRecordTransaction({
-      antProcessId,
-      undername: undername ?? "@",
-      transactionId: txId,
-      ttlSeconds: flags.ttl,
-      feePayer: quote.feePayer,
-      recentBlockhash: quote.recentBlockhash
-    });
-    const executed = await gas.execute({
-      viaUrl: via,
-      transaction: wireTx,
-      quoteId: quote.quoteId,
-      idempotencyKey: randomUUID(),
-      nostrSecretKey: signed.nostrSecretKey
-    });
+    const session = await openStoreJobSession(deps, via);
+    let quote;
+    let executed;
+    try {
+      quote = await gas.quote({
+        destination: via,
+        submit: session.submit
+      });
+      const wireTx = await signed.sdk.buildSetRecordTransaction({
+        antProcessId,
+        undername: undername ?? "@",
+        transactionId: txId,
+        ttlSeconds: flags.ttl,
+        feePayer: quote.feePayer,
+        recentBlockhash: quote.recentBlockhash
+      });
+      executed = await gas.execute({
+        destination: via,
+        transaction: wireTx,
+        quoteId: quote.quoteId,
+        idempotencyKey: randomUUID(),
+        submit: session.submit
+      });
+    } finally {
+      await session.stop();
+    }
     const gasStation = {
       quoteId: quote.quoteId,
       feePayer: quote.feePayer,
@@ -7092,9 +6857,9 @@ async function runName(args, deps) {
     } catch {
     }
     if (toonDevnet) {
-      flags = { ...flags, via: DEVNET_DVM_URL };
+      flags = { ...flags, via: DEVNET_DVM_DESTINATION };
       io2.err(
-        `Brokering via the devnet store DVM ${DEVNET_DVM_URL} (no --via given; pass --direct for a wallet-paid ${sub}).`
+        `Brokering via the devnet store DVM ${DEVNET_DVM_DESTINATION} (no --via given; pass --direct for a wallet-paid ${sub}).`
       );
     }
   }
@@ -7140,22 +6905,22 @@ function buildArweaveManifest(entries, indexPath = DEFAULT_INDEX, fallbackTxId)
 }
 
 // src/cli/site-record.ts
-import { mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
+import { mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join6 } from "path";
 var SITE_MANIFEST_FILENAME = "site-manifests.json";
 function storeDir2(env) {
-  return env["TOON_CLIENT_HOME"] ?? join7(homedir6(), ".toon-client");
+  return env["TOON_CLIENT_HOME"] ?? join6(homedir5(), ".toon-client");
 }
 function storePath2(env) {
-  return join7(storeDir2(env), SITE_MANIFEST_FILENAME);
+  return join6(storeDir2(env), SITE_MANIFEST_FILENAME);
 }
 function keyOf(repoId, ref) {
   return `${repoId}\0${ref}`;
 }
 function readFile2(env) {
   try {
-    const parsed = JSON.parse(readFileSync6(storePath2(env), "utf8"));
+    const parsed = JSON.parse(readFileSync5(storePath2(env), "utf8"));
     if (parsed && typeof parsed === "object") return parsed;
     return {};
   } catch {
@@ -7176,7 +6941,7 @@ function writeSiteRecord(env, record) {
 
 // src/cli/site.ts
 var MANIFEST_CONTENT_TYPE = "application/x.arweave-manifest+json";
-var DEFAULT_GATEWAY = ARWEAVE_GATEWAYS[0] ?? "https://arweave.net";
+var DEFAULT_GATEWAY = PREFERRED_GATEWAY;
 var SITE_USAGE = `Usage: rig site <publish|url> [ref] [options]
 
 Serve a pushed repo as a permanent, path-routed website. \`rig push\` already
@@ -7364,7 +7129,6 @@ async function runSitePublish(args, deps) {
       }
     }
     const feeRates = await ctx.publisher.getFeeRates();
-    const { uploadFee } = feeRates;
     const previewEntries = blobs.map((b) => ({
       path: b.path,
       txId: known.get(b.sha) ?? PLACEHOLDER_TX
@@ -7380,9 +7144,12 @@ async function runSitePublish(args, deps) {
     if (flags.forceReupload) {
       const { objects } = await reader.statObjects(uniqueShas);
       reuploadBytes = objects.reduce((sum, o) => sum + o.size, 0);
-      reuploadFee = BigInt(objects.length) * uploadFee;
+      reuploadFee = objects.reduce(
+        (sum, o) => sum + uploadChargeFor(feeRates, o.size),
+        0n
+      );
     }
-    const manifestFee = uploadFee;
+    const manifestFee = uploadChargeFor(feeRates, manifestBytes);
     const totalFee = manifestFee + reuploadFee;
     const gateway = flags.gateway ?? deps.env["RIG_ARWEAVE_GATEWAY"] ?? DEFAULT_GATEWAY;
     const baseJson = () => ({