@toon-protocol/rig 2.4.0 → 2.4.1

package/dist/cli/rig.js

@@ -3439,7 +3439,9 @@ pays). 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
 faucetUrl config field, or the deployed devnet faucet when the network is
 devnet \u2014 including when a configured *.devnet.toonprotocol.dev origin infers
-it. The faucet drips a FIXED amount per chain (there is no --amount). On a
+it (a devnet relay/proxy/btp endpoint, or the git origin remote from
+\`rig remote add origin <devnet relay>\`). The faucet drips a FIXED amount per
+chain (there is no --amount). On a
 network without a faucet, prints the wallet address(es) to fund externally
 instead.
 
@@ -3450,24 +3452,50 @@ Options:
   --json               machine-readable envelope
   -h, --help           show this help`;
 var SHARED_DEVNET_SUFFIX = ".devnet.toonprotocol.dev";
-function sharedDevnetOrigin(env, file) {
+function devnetHost(url) {
+  if (!url) return void 0;
+  try {
+    const { hostname } = new URL(url);
+    if (hostname.endsWith(SHARED_DEVNET_SUFFIX) || hostname === SHARED_DEVNET_SUFFIX.slice(1)) {
+      return url;
+    }
+  } catch {
+  }
+  return void 0;
+}
+function sharedDevnetOrigin(env, file, originRelays = []) {
   const candidates = [
     env["TOON_CLIENT_RELAY_URL"] ?? file.relayUrl,
     env["TOON_CLIENT_PROXY_URL"] ?? file.proxyUrl,
-    env["TOON_CLIENT_BTP_URL"] ?? file.btpUrl
+    env["TOON_CLIENT_BTP_URL"] ?? file.btpUrl,
+    ...originRelays
   ];
   for (const url of candidates) {
-    if (!url) continue;
-    try {
-      const { hostname } = new URL(url);
-      if (hostname.endsWith(SHARED_DEVNET_SUFFIX) || hostname === SHARED_DEVNET_SUFFIX.slice(1)) {
-        return url;
-      }
-    } catch {
-    }
+    const hit = devnetHost(url);
+    if (hit) return hit;
   }
   return void 0;
 }
+async function resolveOriginRelays(cwd) {
+  let repoRoot;
+  try {
+    repoRoot = await resolveRepoRoot(cwd);
+  } catch {
+    return [];
+  }
+  try {
+    const toonConfig = await readToonConfig(repoRoot);
+    const resolved = await resolveRelays({
+      relayFlags: [],
+      remoteName: void 0,
+      repoRoot,
+      toonRelays: toonConfig.relays
+    });
+    return resolved.relays;
+  } catch {
+    return [];
+  }
+}
 function noFaucetGuidance(network, devnetOrigin) {
   const head = `no faucet is configured for network ${JSON.stringify(network ?? "custom")}`;
   const external = "To fund the wallet externally instead, send the settlement token plus native gas to the address below for the chain your channels settle on.";
@@ -3534,7 +3562,9 @@ async function runFund(args, deps) {
       );
     }
     const network = env["TOON_CLIENT_NETWORK"] ?? file.network;
-    const devnetOrigin = sharedDevnetOrigin(env, file);
+    const canInfer = network === void 0 || network === "custom";
+    const originRelays = canInfer ? await resolveOriginRelays(deps.cwd) : [];
+    const devnetOrigin = sharedDevnetOrigin(env, file, originRelays);
     const inferredDevnet = devnetOrigin !== void 0 && (network === void 0 || network === "custom");
     const effectiveNetwork = inferredDevnet ? "devnet" : network;
     const faucetUrl = env["TOON_CLIENT_FAUCET_URL"] ?? file.faucetUrl ?? (effectiveNetwork === "devnet" ? DEVNET_FAUCET_URL : void 0);