@parity/dotns-cli 0.5.6 → 0.6.0

package/dist/cli.js

@@ -240167,6 +240167,20 @@ var require_bn = __commonJS((exports, module) => {
 });
 
 // src/utils/contractInteractions.ts
+function isRevertFlag(flags) {
+  return (flags & 1n) === 1n;
+}
+function buildRevertError(data, abi) {
+  if (data === "0x") {
+    return new Error(UNMAPPED_ORIGIN_REVERT_HINT);
+  }
+  let revertReason = data;
+  try {
+    const decoded = decodeErrorResult({ abi, data });
+    revertReason = decoded.args ? `${decoded.errorName}(${decoded.args.map(String).join(", ")})` : decoded.errorName;
+  } catch {}
+  return new Error(`Contract reverted: ${revertReason}`);
+}
 async function performContractCall(clientWrapper, originSubstrateAddress, contractAddress, abi, functionName, args) {
   const encodedData = encodeFunctionData({
     abi,
@@ -240176,13 +240190,8 @@ async function performContractCall(clientWrapper, originSubstrateAddress, contra
   const call = await clientWrapper.performDryRunCall(originSubstrateAddress, contractAddress, 0n, encodedData);
   const data = call?.result?.value?.data ?? "0x";
   const flags = call?.result?.value?.flags ?? 1n;
-  if ((flags & 1n) === 1n) {
-    let revertReason = data;
-    try {
-      const decoded2 = decodeErrorResult({ abi, data });
-      revertReason = decoded2.args ? `${decoded2.errorName}(${decoded2.args.map(String).join(", ")})` : decoded2.errorName;
-    } catch {}
-    throw new Error(`Contract reverted: ${revertReason}`);
+  if (isRevertFlag(flags)) {
+    throw buildRevertError(data, abi);
   }
   const decoded = decodeFunctionResult({
     abi,
@@ -240225,10 +240234,12 @@ function computeDomainTokenId(label) {
   const node = keccak256(concatHex([DOT_NODE, labelhash]));
   return BigInt(node);
 }
+var UNMAPPED_ORIGIN_REVERT_HINT;
 var init_contractInteractions = __esm(() => {
   init__esm();
   init_constants();
   init_formatting();
+  UNMAPPED_ORIGIN_REVERT_HINT = "Contract reverted with empty data. The origin SS58 is likely not mapped on " + "Asset Hub Revive. Run `dotns account map` (or any signed transaction from " + "this account), then retry.";
 });
 
 // abis/Multicall3.json
@@ -264950,6 +264961,9 @@ async function createAccountFromSource(source, isKeyUri) {
   const keyring = new Keyring({ type: "sr25519" });
   return isKeyUri ? keyring.addFromUri(source) : keyring.addFromMnemonic(source);
 }
+function createSubstrateSigner(keypair3) {
+  return getPolkadotSigner(keypair3.publicKey, "Sr25519", async (input) => keypair3.sign(input));
+}
 async function readDefaultAccountName2(keystoreDirectoryPath) {
   try {
     const defaultPointerPath = path8.join(keystoreDirectoryPath, ".default");
@@ -265071,7 +265085,7 @@ async function prepareAssetHubContext(options2) {
   }));
   const account = await step("Loading keypair", async () => createAccountFromSource(auth.source, auth.isKeyUri));
   const substrateAddress = account.address;
-  const signer = getPolkadotSigner(account.publicKey, "Sr25519", async (input) => account.sign(input));
+  const signer = createSubstrateSigner(account);
   const clientWrapper = new ReviveClientWrapper(client);
   const evmAddress = await step("Resolving EVM address", async () => clientWrapper.getEvmAddress(substrateAddress));
   console.log(source_default.bold(`
@@ -265117,7 +265131,7 @@ async function prepareBulletinContext(options2) {
   }));
   const account = await step("Loading keypair", async () => createAccountFromSource(auth.source, auth.isKeyUri));
   const substrateAddress = account.address;
-  const signer = getPolkadotSigner(account.publicKey, "Sr25519", async (input) => account.sign(input));
+  const signer = createSubstrateSigner(account);
   console.log(source_default.bold(`
 \uD83D\uDCCB Configuration
 `));
@@ -266429,11 +266443,18 @@ async function waitForMinimumCommitmentAge(clientWrapper, originSubstrateAddress
   clearInterval(intervalId);
   waitSpinner.text = "Verifying commitment age on-chain";
   const pollDeadline = Date.now() + COMMITMENT_POLL_TIMEOUT_MS;
+  const timestampQuery = clientWrapper.client.query?.Timestamp?.Now;
   while (Date.now() < pollDeadline) {
     const polledTimestamp = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_REGISTRAR_CONTROLLER, DOTNS_REGISTRAR_CONTROLLER_ABI, "commitments", [commitment]);
     const polledCommitTime = typeof polledTimestamp === "bigint" ? Number(polledTimestamp) : polledTimestamp;
-    const nowSeconds = Math.floor(Date.now() / 1000);
-    if (polledCommitTime > 0 && nowSeconds - polledCommitTime >= minimumAgeSeconds) {
+    let chainNowSeconds;
+    if (timestampQuery?.getValue) {
+      const timestampMs = await timestampQuery.getValue();
+      chainNowSeconds = Math.floor(Number(timestampMs) / 1000);
+    } else {
+      chainNowSeconds = Math.floor(Date.now() / 1000);
+    }
+    if (polledCommitTime > 0 && chainNowSeconds - polledCommitTime >= minimumAgeSeconds) {
       waitSpinner.succeed("Commitment age requirement met (verified on-chain)");
       return;
     }
@@ -266950,12 +266971,23 @@ async function prepareReadOnlyContext(options2) {
     };
   });
   const keypair3 = await step("Loading keypair", async () => createAccountFromSource(auth.source, auth.isKeyUri));
+  await ensureAccountMappedWhenAuthenticated(clientWrapper, keypair3, auth.resolvedFrom);
   const evmAddress = await step("Resolving EVM address", async () => clientWrapper.getEvmAddress(keypair3.address));
   console.log(source_default.gray(`
   RPC:     `) + source_default.white(rpc));
   console.log(source_default.gray("  Account: ") + source_default.white(keypair3.address));
   return { clientWrapper, account: { address: keypair3.address }, rpc, evmAddress };
 }
+async function ensureAccountMappedWhenAuthenticated(clientWrapper, keypair3, resolvedFrom) {
+  if (resolvedFrom === "default")
+    return;
+  const signer = createSubstrateSigner(keypair3);
+  try {
+    await step("Ensuring account mapped", async () => clientWrapper.ensureAccountMapped(keypair3.address, signer));
+  } catch (mapError) {
+    console.log(source_default.yellow(`  ⚠ Account mapping skipped: ${mapError instanceof Error ? mapError.message : String(mapError)}`));
+  }
+}
 async function resolveRecipientByKind(clientWrapper, substrateAddress, destination) {
   const kind = classifyTransferDestination(destination);
   switch (kind) {
@@ -267208,29 +267240,37 @@ init_constants();
 init_contractInteractions();
 async function viewDomainText(clientWrapper, originSubstrateAddress, label, key, spinner) {
   const namehashNode = namehash(`${label}.dot`);
+  const domain = `${label}.dot`;
   spinner.start("Querying registry");
   const recordExists = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_REGISTRY, DOTNS_REGISTRY_ABI, "recordExists", [namehashNode]);
   const ownerAddress = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_REGISTRY, DOTNS_REGISTRY_ABI, "owner", [namehashNode]);
   spinner.succeed("Registry read");
   console.log(source_default.gray("  registry: ") + source_default.white(CONTRACTS.DOTNS_REGISTRY));
-  console.log(source_default.gray("  domain:   ") + source_default.cyan(`${label}.dot`));
+  console.log(source_default.gray("  domain:   ") + source_default.cyan(domain));
   console.log(source_default.gray("  node:     ") + source_default.white(namehashNode));
   console.log(source_default.gray("  exists:   ") + source_default.white(String(recordExists)));
   console.log(source_default.gray("  owner:    ") + source_default.white(ownerAddress));
   console.log();
   if (!recordExists || ownerAddress === zeroAddress) {
     console.log(source_default.yellow("  status: Domain not registered"));
-    return;
+    return { domain, key, exists: false, owner: null, value: null };
   }
   const value3 = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_CONTENT_RESOLVER, DOTNS_CONTENT_RESOLVER_ABI, "text", [namehashNode, key]);
   console.log(source_default.gray("  resolver: ") + source_default.white(CONTRACTS.DOTNS_CONTENT_RESOLVER));
   console.log(source_default.gray("  key:      ") + source_default.white(key));
   console.log(source_default.gray("  value:    ") + source_default.cyan(value3 || "(not set)"));
-  return value3;
+  return {
+    domain,
+    key,
+    exists: true,
+    owner: ownerAddress,
+    value: value3 === "" ? null : value3
+  };
 }
 async function setDomainText(clientWrapper, originSubstrateAddress, signer, label, key, value3, spinner) {
   const namehashNode = namehash(`${label}.dot`);
-  console.log(source_default.gray("  domain: ") + source_default.cyan(`${label}.dot`));
+  const domain = `${label}.dot`;
+  console.log(source_default.gray("  domain: ") + source_default.cyan(domain));
   console.log(source_default.gray("  node:   ") + source_default.white(namehashNode));
   console.log();
   const { exists: exists2, owner, caller } = await getResolverNodeInfo(clientWrapper, originSubstrateAddress, namehashNode);
@@ -267239,7 +267279,7 @@ async function setDomainText(clientWrapper, originSubstrateAddress, signer, labe
   console.log(source_default.gray("  caller:  ") + source_default.white(caller));
   console.log();
   if (!exists2) {
-    throw new Error(`Domain ${label}.dot is not registered`);
+    throw new Error(`Domain ${domain} is not registered`);
   }
   await requireResolverAuthorization(clientWrapper, originSubstrateAddress, owner, caller);
   console.log(source_default.gray("  status: ") + source_default.green("Ownership verified"));
@@ -267261,46 +267301,45 @@ async function setDomainText(clientWrapper, originSubstrateAddress, signer, labe
   const updatedValue = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_CONTENT_RESOLVER, DOTNS_CONTENT_RESOLVER_ABI, "text", [namehashNode, key]);
   console.log();
   console.log(source_default.gray("  new: ") + source_default.cyan(updatedValue));
+  return {
+    ok: true,
+    domain,
+    key,
+    value: value3,
+    txHash: transactionHash
+  };
 }
 
 // src/cli/commands/text.ts
-init_formatting();
 init_ora();
 function attachTextCommands(root) {
   const textCommand = root.command("text").description("Manage domain text records");
   addAuthOptions(textCommand);
-  const viewTextCommand = textCommand.command("view <name> <key>").description("View a domain text record");
+  const viewTextCommand = textCommand.command("view <name> <key>").description("View a domain text record").option("--json", "Output result as JSON (suppresses all other output)", false);
   addAuthOptions(viewTextCommand).action(async (name10, key, options2, command) => {
-    const piped = !process.stdout.isTTY;
-    const origWrite = process.stdout.write.bind(process.stdout);
-    if (piped) {
-      console.log = console.error;
-      process.stdout.write = process.stderr.write.bind(process.stderr);
-    }
+    const jsonOutput = getJsonFlag(command);
     try {
       const mergedOptions = getMergedOptions(command, options2);
-      const context = await prepareReadOnlyContext(mergedOptions);
-      console.error(source_default.bold(`
+      const context = await maybeQuiet(jsonOutput, () => prepareReadOnlyContext(mergedOptions));
+      if (!jsonOutput)
+        console.log(source_default.bold(`
 ▶ Text View
 `));
-      const spinner = ora({ stream: process.stderr });
-      const value3 = await viewDomainText(context.clientWrapper, context.account.address, name10, key, spinner);
-      console.error(source_default.green(`
+      const spinner = ora();
+      const result = await maybeQuiet(jsonOutput, () => viewDomainText(context.clientWrapper, context.account.address, name10, key, spinner));
+      if (!emitJsonResult(jsonOutput, result)) {
+        console.log(source_default.green(`
 ✓ Complete
 `));
-      if (piped && value3 != null) {
-        origWrite(value3);
       }
       process.exit(0);
     } catch (error2) {
-      console.error(source_default.red(`
-✗ Error: ${formatErrorMessage(error2)}
-`));
-      process.exit(1);
+      handleCommandError(jsonOutput, error2);
     }
   });
-  const setTextCommand = textCommand.command("set <name> <key> [value]").description("Set a domain text record (reads from stdin if value omitted)");
+  const setTextCommand = textCommand.command("set <name> <key> [value]").description("Set a domain text record (reads from stdin if value omitted)").option("--json", "Output result as JSON (suppresses all other output)", false);
   addAuthOptions(setTextCommand).action(async (name10, key, value3, options2, command) => {
+    const jsonOutput = getJsonFlag(command);
     try {
       const mergedOptions = getMergedOptions(command, options2);
       if (!value3) {
@@ -267316,21 +267355,21 @@ function attachTextCommands(root) {
       if (mergedOptions.mnemonic && mergedOptions.keyUri) {
         throw new Error("Cannot specify both --mnemonic and --key-uri");
       }
-      const context = await prepareContext({ ...mergedOptions, useRevive: true });
-      console.log(source_default.bold(`
+      const context = await maybeQuiet(jsonOutput, () => prepareContext({ ...mergedOptions, useRevive: true }));
+      if (!jsonOutput)
+        console.log(source_default.bold(`
 ▶ Text Set
 `));
       const spinner = ora();
-      await setDomainText(context.clientWrapper, context.substrateAddress, context.signer, name10, key, value3, spinner);
-      console.log(source_default.green(`
+      const result = await maybeQuiet(jsonOutput, () => setDomainText(context.clientWrapper, context.substrateAddress, context.signer, name10, key, value3, spinner));
+      if (!emitJsonResult(jsonOutput, result)) {
+        console.log(source_default.green(`
 ✓ Complete
 `));
+      }
       process.exit(0);
     } catch (error2) {
-      console.error(source_default.red(`
-✗ Error: ${formatErrorMessage(error2)}
-`));
-      process.exit(1);
+      handleCommandError(jsonOutput, error2);
     }
   });
 }
@@ -267674,7 +267713,7 @@ function attachAccountCommands(root) {
   });
 }
 // package.json
-var version5 = "0.5.2";
+var version5 = "0.6.0";
 
 // src/cli/commands/store.ts
 init_source();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@parity/dotns-cli",
   "module": "index.ts",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "type": "module",
   "packageManager": "bun@1.2.6",
   "files": [