@dotdm/env 2.0.0 → 2.0.1-dev.1779942376

package/dist/chunk-HTQLXSDE.js

@@ -0,0 +1,12 @@
+// src/registry.ts
+var PASEO_V2_REGISTRY_ADDRESS = "0xf62c2ece29cd8df2e10040ecfa5a894a5c5d9cb0";
+function getRegistryAddress(name = "paseo") {
+  if (name === "paseo" || name === "paseo-next-v2" || name === "paseo-v2") {
+    return PASEO_V2_REGISTRY_ADDRESS;
+  }
+  return PASEO_V2_REGISTRY_ADDRESS;
+}
+
+export {
+  getRegistryAddress
+};

package/dist/index.d.ts

@@ -5,9 +5,7 @@ import * as polkadot_api from 'polkadot-api';
 import { PolkadotClient, TypedApi } from 'polkadot-api';
 import { polkadot_asset_hub } from '@parity/product-sdk-descriptors/polkadot-asset-hub';
 import { paseo_asset_hub } from '@parity/product-sdk-descriptors/paseo-asset-hub';
-import { previewnet_asset_hub } from '@parity/product-sdk-descriptors/previewnet-asset-hub';
 import { paseo_bulletin } from '@parity/product-sdk-descriptors/paseo-bulletin';
-import { previewnet_bulletin } from '@parity/product-sdk-descriptors/previewnet-bulletin';
 export { ss58Address } from '@polkadot-labs/hdkd-helpers';
 
 interface ChainFaucet {
@@ -44,13 +42,6 @@ declare const KNOWN_CHAINS: {
             readonly url: "https://paritytech.github.io/polkadot-bulletin-chain/authorizations?tab=faucet";
         }];
     };
-    readonly "preview-net": {
-        readonly assethubUrl: "wss://previewnet.substrate.dev/asset-hub";
-        readonly bulletinUrl: "wss://previewnet.substrate.dev/bulletin";
-        readonly ipfsGatewayUrl: "https://previewnet.substrate.dev/ipfs";
-        readonly registryAddress: string;
-        readonly productSdkEnvironment: "previewnet";
-    };
     readonly local: {
         readonly assethubUrl: "ws://127.0.0.1:10020";
         readonly bulletinUrl: "ws://127.0.0.1:10030";
@@ -62,9 +53,15 @@ type KnownChainName = keyof typeof KNOWN_CHAINS;
 declare function isKnownChainPreset(name: string): boolean;
 declare function getChainPreset(name: string): ChainPreset;
 
-type CdmDeployAssetHubDescriptor = typeof paseo_asset_hub | typeof previewnet_asset_hub;
+interface QueryOriginTarget {
+    chainName?: string;
+    assethubUrl?: string;
+}
+declare function resolveQueryOrigin(target?: string | QueryOriginTarget): string;
+
+type CdmDeployAssetHubDescriptor = typeof paseo_asset_hub;
 type CdmAssetHubDescriptor = CdmDeployAssetHubDescriptor | typeof polkadot_asset_hub;
-type CdmBulletinDescriptor = typeof paseo_bulletin | typeof previewnet_bulletin;
+type CdmBulletinDescriptor = typeof paseo_bulletin;
 type CdmDeployAssetHubApi = TypedApi<CdmDeployAssetHubDescriptor>;
 type CdmAssetHubApi = TypedApi<CdmAssetHubDescriptor>;
 type CdmBulletinApi = TypedApi<CdmBulletinDescriptor>;
@@ -116,10 +113,10 @@ interface CdmChainEndpoints {
 /**
  * Connect to both Asset Hub and Bulletin over direct WebSocket RPC.
  *
- * Accepts either a supported deploy chain name (`"paseo"`, `"preview-net"`,
- * `"local"`) resolved through `getChainPreset`, or explicit URLs. Polkadot
- * remains available for Asset-Hub-only install reads, but product-sdk does
- * not publish a Polkadot Bulletin descriptor yet.
+ * Accepts either a supported deploy chain name (`"paseo"` or `"local"`)
+ * resolved through `getChainPreset`, or explicit URLs. Polkadot remains
+ * available for Asset-Hub-only install reads, but product-sdk does not publish
+ * a Polkadot Bulletin descriptor yet.
  *
  * The returned object matches product-sdk's `ChainClient` shape closely enough
  * for callers to pass either one into CDM APIs. CDM builds this locally because
@@ -141,8 +138,8 @@ interface IpfsGateway {
  * factory for convenience.
  *
  * Product SDK's Bulletin read helpers go through the host preimage
- * subscription and do not cover CDM's custom gateway URLs (local,
- * preview-net). Keep this thin wrapper for install flows.
+ * subscription and do not cover CDM's custom gateway URLs (local/custom).
+ * Keep this thin wrapper for install flows.
  */
 declare function connectIpfsGateway(url: string): IpfsGateway;
 
@@ -162,4 +159,4 @@ declare function prepareSignerFromMnemonic(mnemonic: string): polkadot_api.Polka
  */
 declare function prepareSignerFromSuri(suri: string): polkadot_api.PolkadotSigner;
 
-export { type AssetHubConnection, type BulletinConnection, type CdmAssetHubApi, type CdmAssetHubClient, type CdmBulletinApi, type CdmChainClient, type CdmChainEndpoints, type CdmDeployAssetHubApi, type ChainFaucet, type ChainPreset, type IpfsGateway, type KnownChainName, ProductSdkEnvironment, connectIpfsGateway, createCdmAssetHubClient, createCdmChainClient, getChainPreset, isKnownChainPreset, prepareSigner, prepareSignerFromMnemonic, prepareSignerFromSuri };
+export { type AssetHubConnection, type BulletinConnection, type CdmAssetHubApi, type CdmAssetHubClient, type CdmBulletinApi, type CdmChainClient, type CdmChainEndpoints, type CdmDeployAssetHubApi, type ChainFaucet, type ChainPreset, type IpfsGateway, type KnownChainName, ProductSdkEnvironment, connectIpfsGateway, createCdmAssetHubClient, createCdmChainClient, getChainPreset, isKnownChainPreset, prepareSigner, prepareSignerFromMnemonic, prepareSignerFromSuri, resolveQueryOrigin };

package/dist/index.js

@@ -1,13 +1,11 @@
 import {
   getRegistryAddress
-} from "./chunk-3LTEJCST.js";
+} from "./chunk-HTQLXSDE.js";
 
 // src/known_chains.ts
 import { BULLETIN_RPCS } from "@parity/product-sdk-host";
 var PASEO_ASSET_HUB_URL = "wss://paseo-asset-hub-next-rpc.polkadot.io";
-var PREVIEW_NET_ASSET_HUB_URL = "wss://previewnet.substrate.dev/asset-hub";
 var PASEO_IPFS_GATEWAY_URL = "https://paseo-bulletin-next-ipfs.polkadot.io/ipfs";
-var PREVIEW_NET_IPFS_GATEWAY_URL = "https://previewnet.substrate.dev/ipfs";
 var KNOWN_CHAINS = {
   polkadot: {
     assethubUrl: "wss://polkadot-asset-hub-rpc.polkadot.io",
@@ -29,13 +27,6 @@ var KNOWN_CHAINS = {
       }
     ]
   },
-  "preview-net": {
-    assethubUrl: PREVIEW_NET_ASSET_HUB_URL,
-    bulletinUrl: BULLETIN_RPCS.previewnet[0],
-    ipfsGatewayUrl: PREVIEW_NET_IPFS_GATEWAY_URL,
-    registryAddress: getRegistryAddress("preview-net"),
-    productSdkEnvironment: "previewnet"
-  },
   local: {
     assethubUrl: "ws://127.0.0.1:10020",
     bulletinUrl: "ws://127.0.0.1:10030",
@@ -44,9 +35,8 @@ var KNOWN_CHAINS = {
   }
 };
 function normalizeChainName(name) {
-  if (name === "previewnet") return "preview-net";
   if (name === "paseo-next-v2" || name === "paseo-v2") return "paseo";
-  if (name === "preview-net" || name === "paseo" || name === "polkadot" || name === "local") {
+  if (name === "paseo" || name === "polkadot" || name === "local") {
     return name;
   }
   if (name === "custom") return "custom";
@@ -64,6 +54,81 @@ function getChainPreset(name) {
   }
   return preset;
 }
+function findKnownChainByAssetHubUrl(url) {
+  const normalizedUrl = url.replace(/\/+$/, "");
+  return Object.entries(KNOWN_CHAINS).find(
+    ([, preset]) => preset.assethubUrl.replace(/\/+$/, "") === normalizedUrl
+  )?.[0];
+}
+
+// src/query_origin.ts
+import { ALICE_SS58 } from "@dotdm/utils";
+import { getAccount } from "@dotdm/utils/accounts";
+function resolveQueryAccountName(target) {
+  const chainName = typeof target === "string" ? target : target?.chainName;
+  const normalized = chainName ? normalizeChainName(chainName) : void 0;
+  if (normalized && normalized !== "custom") return normalized;
+  const assethubUrl = typeof target === "string" ? void 0 : target?.assethubUrl;
+  return assethubUrl ? findKnownChainByAssetHubUrl(assethubUrl) : void 0;
+}
+function resolveQueryOrigin(target) {
+  const accountName = resolveQueryAccountName(target);
+  if (accountName) {
+    const account = getAccount(accountName);
+    if (account) return account.address;
+  }
+  return ALICE_SS58;
+}
+if (import.meta.vitest) {
+  const { afterEach, describe, expect, test } = import.meta.vitest;
+  const { mkdtempSync, rmSync } = await import("fs");
+  const { tmpdir } = await import("os");
+  const { join } = await import("path");
+  const { saveAccount } = await import("@dotdm/utils/accounts");
+  describe("resolveQueryOrigin", () => {
+    const originalCdmRoot = process.env.CDM_ROOT;
+    afterEach(() => {
+      if (originalCdmRoot === void 0) {
+        delete process.env.CDM_ROOT;
+      } else {
+        process.env.CDM_ROOT = originalCdmRoot;
+      }
+    });
+    test("uses the normalized chain account when present", () => {
+      const root = mkdtempSync(join(tmpdir(), "cdm-query-origin-"));
+      process.env.CDM_ROOT = root;
+      try {
+        saveAccount("paseo", { mnemonic: "test", address: "paseo-address" });
+        expect(resolveQueryOrigin("paseo-v2")).toBe("paseo-address");
+      } finally {
+        rmSync(root, { recursive: true, force: true });
+      }
+    });
+    test("infers a known chain account from the Asset Hub URL", () => {
+      const root = mkdtempSync(join(tmpdir(), "cdm-query-origin-"));
+      process.env.CDM_ROOT = root;
+      try {
+        saveAccount("paseo", { mnemonic: "test", address: "paseo-address" });
+        expect(
+          resolveQueryOrigin({
+            assethubUrl: "wss://paseo-asset-hub-next-rpc.polkadot.io"
+          })
+        ).toBe("paseo-address");
+      } finally {
+        rmSync(root, { recursive: true, force: true });
+      }
+    });
+    test("falls back to Alice when no chain account is available", () => {
+      const root = mkdtempSync(join(tmpdir(), "cdm-query-origin-"));
+      process.env.CDM_ROOT = root;
+      try {
+        expect(resolveQueryOrigin("paseo")).toBe(ALICE_SS58);
+      } finally {
+        rmSync(root, { recursive: true, force: true });
+      }
+    });
+  });
+}
 
 // src/index.ts
 import { DEFAULT_NODE_URL } from "@dotdm/utils";
@@ -75,25 +140,21 @@ import {
 import { getWsProvider } from "polkadot-api/ws";
 import { polkadot_asset_hub } from "@parity/product-sdk-descriptors/polkadot-asset-hub";
 import { paseo_asset_hub } from "@parity/product-sdk-descriptors/paseo-asset-hub";
-import { previewnet_asset_hub } from "@parity/product-sdk-descriptors/previewnet-asset-hub";
 import { paseo_bulletin } from "@parity/product-sdk-descriptors/paseo-bulletin";
-import { previewnet_bulletin } from "@parity/product-sdk-descriptors/previewnet-bulletin";
 var DEPLOY_CHAIN_DESCRIPTORS = {
   paseo: { assetHub: paseo_asset_hub, bulletin: paseo_bulletin },
-  "preview-net": { assetHub: previewnet_asset_hub, bulletin: previewnet_bulletin },
   local: { assetHub: paseo_asset_hub, bulletin: paseo_bulletin }
 };
 var ASSET_HUB_DESCRIPTORS = {
   polkadot: polkadot_asset_hub,
   paseo: paseo_asset_hub,
-  "preview-net": previewnet_asset_hub,
   local: paseo_asset_hub
 };
 function resolveExplicitChainName(chainName) {
   const normalized = normalizeChainName(chainName);
   if (!normalized) {
     throw new Error(
-      `Unknown chain "${chainName}". Valid names: polkadot, paseo, preview-net, local, custom`
+      `Unknown chain "${chainName}". Valid names: polkadot, paseo, local, custom`
     );
   }
   return normalized;
@@ -107,7 +168,7 @@ function resolveDeployDescriptors(chainName) {
   const descriptorChain = normalized && normalized !== "custom" ? normalized : "paseo";
   if (descriptorChain === "polkadot") {
     throw new Error(
-      'CDM deploy connections are only available for "paseo", "preview-net", and "local"; product-sdk does not publish a Polkadot Bulletin descriptor yet.'
+      'CDM deploy connections are only available for "paseo" and "local"; product-sdk does not publish a Polkadot Bulletin descriptor yet.'
     );
   }
   return DEPLOY_CHAIN_DESCRIPTORS[descriptorChain];
@@ -161,11 +222,10 @@ function createDirectChainClient(chains, rpcs) {
 }
 if (import.meta.vitest) {
   const { test, expect } = import.meta.vitest;
-  test("preview-net deploy connections use previewnet descriptors", () => {
-    const descriptors = resolveDeployDescriptors("preview-net");
-    expect(descriptors.assetHub).toBe(previewnet_asset_hub);
-    expect(descriptors.bulletin).toBe(previewnet_bulletin);
-    expect(descriptors.bulletin).not.toBe(paseo_bulletin);
+  test("local deploy connections use paseo descriptors", () => {
+    const descriptors = resolveDeployDescriptors("local");
+    expect(descriptors.assetHub).toBe(paseo_asset_hub);
+    expect(descriptors.bulletin).toBe(paseo_bulletin);
   });
 }
 
@@ -209,5 +269,6 @@ export {
   prepareSigner,
   prepareSignerFromMnemonic,
   prepareSignerFromSuri,
+  resolveQueryOrigin,
   ss58Address
 };

package/dist/registry.d.ts

@@ -1,4 +1,4 @@
-type ProductSdkEnvironment = "paseo" | "previewnet";
+type ProductSdkEnvironment = "paseo";
 declare function getRegistryAddress(name?: string): string;
 
 export { type ProductSdkEnvironment, getRegistryAddress };

package/dist/registry.js

@@ -1,6 +1,6 @@
 import {
   getRegistryAddress
-} from "./chunk-3LTEJCST.js";
+} from "./chunk-HTQLXSDE.js";
 export {
   getRegistryAddress
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotdm/env",
-  "version": "2.0.0",
+  "version": "2.0.1-dev.1779942376",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,8 +21,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@parity/product-sdk-descriptors": "^0.4.0",
-    "@parity/product-sdk-host": "^0.3.0",
+    "@parity/product-sdk-descriptors": "^0.5.0",
+    "@parity/product-sdk-host": "^0.5.0",
     "@polkadot-labs/hdkd": "^0.0.26",
     "@polkadot-labs/hdkd-helpers": "^0.0.27",
     "polkadot-api": "^2.1.2",

package/dist/chunk-3LTEJCST.js

@@ -1,16 +0,0 @@
-// src/registry.ts
-var PASEO_V2_REGISTRY_ADDRESS = "0xa7ae171c78f06c248a9b2556c793aa1df5c9173a";
-var PREVIEW_NET_REGISTRY_ADDRESS = "0xa7ae171c78f06c248a9b2556c793aa1df5c9173a";
-function getRegistryAddress(name = "paseo") {
-  if (name === "paseo" || name === "paseo-next-v2" || name === "paseo-v2") {
-    return PASEO_V2_REGISTRY_ADDRESS;
-  }
-  if (name === "preview-net" || name === "previewnet") {
-    return PREVIEW_NET_REGISTRY_ADDRESS;
-  }
-  return PASEO_V2_REGISTRY_ADDRESS;
-}
-
-export {
-  getRegistryAddress
-};