@dotdm/env 0.3.2 → 1.0.0-dev.1778274929

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 export { DEFAULT_NODE_URL, REGISTRY_ADDRESS } from '@dotdm/utils';
 import * as polkadot_api from 'polkadot-api';
-import { PolkadotClient, TypedApi } from 'polkadot-api';
-import { AssetHub, Bulletin } from '@dotdm/descriptors';
+import { PolkadotClient, TypedApi, ChainDefinition } from 'polkadot-api';
+import { paseo_asset_hub } from '@parity/product-sdk-descriptors/paseo-asset-hub';
+import { bulletin } from '@parity/product-sdk-descriptors/bulletin';
 export { ss58Address } from '@polkadot-labs/hdkd-helpers';
 
 interface ChainFaucet {
@@ -18,38 +19,74 @@ declare const KNOWN_CHAINS: Record<string, ChainPreset>;
 type KnownChainName = keyof typeof KNOWN_CHAINS;
 declare function getChainPreset(name: string): ChainPreset;
 
+type CdmDirectChainClient<TChains extends Record<string, ChainDefinition>> = {
+    [K in keyof TChains]: TypedApi<TChains[K]>;
+} & {
+    raw: {
+        [K in keyof TChains]: PolkadotClient;
+    };
+    destroy: () => void;
+};
+/**
+ * Shape of a CDM chain client — both Asset Hub and Bulletin connected
+ * under one chain-client-shaped object.
+ *
+ * Uses `@parity/product-sdk-descriptors` for the chain descriptors so the
+ * resulting `TypedApi` types line up natively with `ContractDeployer`,
+ * `MetadataPublisher`, and the product-sdk batch/bulletin helpers
+ * (no casts required). We pin AssetHub to the Paseo flavor — it's the
+ * primary test target, and the pallet surface matches Polkadot/Kusama
+ * AssetHub at the queries/txs we use.
+ */
+type CdmChainClient = CdmDirectChainClient<{
+    assetHub: typeof paseo_asset_hub;
+    bulletin: typeof bulletin;
+}>;
+/** Asset-Hub-only variant for callers that don't need Bulletin (e.g., `install`). */
+type CdmAssetHubClient = CdmDirectChainClient<{
+    assetHub: typeof paseo_asset_hub;
+}>;
 interface AssetHubConnection {
     client: PolkadotClient;
-    api: TypedApi<AssetHub>;
+    api: TypedApi<typeof paseo_asset_hub>;
 }
-/**
- * Detect connection type from URL.
- * - ws:// or wss:// -> WebSocket
- * - file path -> smoldot with chainspec
- */
-declare function detectConnectionType(url: string): "websocket" | "smoldot";
-/**
- * Connect to a chain via WebSocket.
- */
-declare function connectAssetHubWebSocket(url: string): AssetHubConnection;
 interface BulletinConnection {
     client: PolkadotClient;
-    api: TypedApi<Bulletin>;
+    api: TypedApi<typeof bulletin>;
+}
+interface CdmChainEndpoints {
+    assethubUrl: string;
+    bulletinUrl: string;
 }
 /**
- * Connect to the Bulletin chain via WebSocket.
+ * Connect to both Asset Hub and Bulletin over direct WebSocket RPC.
+ *
+ * Accepts either a known chain name (`"polkadot"`, `"paseo"`, `"local"`,
+ * `"preview-net"`) resolved through `getChainPreset`, or explicit URLs.
+ *
+ * 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
+ * product-sdk's published chain-client is host-provider-only and ignores RPC
+ * URLs, while the CLI must keep working as a standalone process.
  */
-declare function connectBulletinWebSocket(url: string): BulletinConnection;
+declare function createCdmChainClient(arg: string | CdmChainEndpoints): Promise<CdmChainClient>;
 /**
- * Connect to a parachain via smoldot light client.
- *
- * @param parachainChainspec - Path to the parachain chainspec JSON file
- * @param relayChainspec - Path to the relay chain chainspec JSON file
+ * Connect to Asset Hub only (no Bulletin). Used by commands that don't
+ * publish metadata — e.g., `install`, `account map`, `deploy-registry`.
  */
-declare function connectSmoldot(parachainChainspec: string, relayChainspec: string): Promise<AssetHubConnection>;
+declare function createCdmAssetHubClient(assethubUrl: string): Promise<CdmAssetHubClient>;
 interface IpfsGateway {
     fetch: (cid: string) => Promise<Response>;
 }
+/**
+ * Minimal IPFS gateway HTTP client used by `install` to fetch metadata JSON
+ * by CID. Unrelated to chain-client; kept here alongside the chain-connection
+ * 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.
+ */
 declare function connectIpfsGateway(url: string): IpfsGateway;
 
 /**
@@ -68,4 +105,4 @@ declare function prepareSignerFromMnemonic(mnemonic: string): polkadot_api.Polka
  */
 declare function prepareSignerFromSuri(suri: string): polkadot_api.PolkadotSigner;
 
-export { type AssetHubConnection, type BulletinConnection, type ChainFaucet, type ChainPreset, type IpfsGateway, KNOWN_CHAINS, type KnownChainName, connectAssetHubWebSocket, connectBulletinWebSocket, connectIpfsGateway, connectSmoldot, detectConnectionType, getChainPreset, prepareSigner, prepareSignerFromMnemonic, prepareSignerFromSuri };
+export { type AssetHubConnection, type BulletinConnection, type CdmAssetHubClient, type CdmChainClient, type CdmChainEndpoints, type ChainFaucet, type ChainPreset, type IpfsGateway, KNOWN_CHAINS, type KnownChainName, connectIpfsGateway, createCdmAssetHubClient, createCdmChainClient, getChainPreset, prepareSigner, prepareSignerFromMnemonic, prepareSignerFromSuri };

package/dist/index.js

@@ -41,38 +41,24 @@ function getChainPreset(name) {
 import { DEFAULT_NODE_URL, REGISTRY_ADDRESS } from "@dotdm/utils";
 
 // src/connection.ts
-import { createClient } from "polkadot-api";
-import { getSmProvider } from "polkadot-api/sm-provider";
-import { start } from "polkadot-api/smoldot";
-import { getWsProvider } from "polkadot-api/ws-provider";
-import { withPolkadotSdkCompat } from "polkadot-api/polkadot-sdk-compat";
-import { assetHub, bulletin } from "@dotdm/descriptors";
-function detectConnectionType(url) {
-  if (url.startsWith("ws://") || url.startsWith("wss://")) {
-    return "websocket";
-  }
-  return "smoldot";
-}
-function connectAssetHubWebSocket(url) {
-  const client = createClient(withPolkadotSdkCompat(getWsProvider(url)));
-  return { client, api: client.getTypedApi(assetHub) };
-}
-function connectBulletinWebSocket(url) {
-  const client = createClient(withPolkadotSdkCompat(getWsProvider(url)));
-  return { client, api: client.getTypedApi(bulletin) };
+import {
+  createClient
+} from "polkadot-api";
+import { getWsProvider } from "polkadot-api/ws";
+import { paseo_asset_hub } from "@parity/product-sdk-descriptors/paseo-asset-hub";
+import { bulletin } from "@parity/product-sdk-descriptors/bulletin";
+async function createCdmChainClient(arg) {
+  const endpoints = typeof arg === "string" ? {
+    assethubUrl: getChainPreset(arg).assethubUrl,
+    bulletinUrl: getChainPreset(arg).bulletinUrl
+  } : arg;
+  return createDirectChainClient(
+    { assetHub: paseo_asset_hub, bulletin },
+    { assetHub: endpoints.assethubUrl, bulletin: endpoints.bulletinUrl }
+  );
 }
-async function connectSmoldot(parachainChainspec, relayChainspec) {
-  const smoldot = start();
-  const { readFileSync } = await import("fs");
-  const relaySpec = readFileSync(relayChainspec, "utf-8");
-  const parachainSpec = readFileSync(parachainChainspec, "utf-8");
-  const relayChain = await smoldot.addChain({ chainSpec: relaySpec });
-  const parachain = await smoldot.addChain({
-    chainSpec: parachainSpec,
-    potentialRelayChains: [relayChain]
-  });
-  const client = createClient(getSmProvider(parachain));
-  return { client, api: client.getTypedApi(assetHub) };
+async function createCdmAssetHubClient(assethubUrl) {
+  return createDirectChainClient({ assetHub: paseo_asset_hub }, { assetHub: assethubUrl });
 }
 function connectIpfsGateway(url) {
   return {
@@ -82,6 +68,24 @@ function connectIpfsGateway(url) {
     })
   };
 }
+function createDirectChainClient(chains, rpcs) {
+  const apis = {};
+  const raw = {};
+  for (const name of Object.keys(chains)) {
+    const client = createClient(getWsProvider(rpcs[name]));
+    raw[name] = client;
+    apis[name] = client.getTypedApi(chains[name]);
+  }
+  return {
+    ...apis,
+    raw,
+    destroy() {
+      for (const client of Object.values(raw)) {
+        client.destroy();
+      }
+    }
+  };
+}
 
 // src/signer.ts
 import { getPolkadotSigner } from "polkadot-api/signer";
@@ -116,11 +120,9 @@ export {
   DEFAULT_NODE_URL,
   KNOWN_CHAINS,
   REGISTRY_ADDRESS,
-  connectAssetHubWebSocket,
-  connectBulletinWebSocket,
   connectIpfsGateway,
-  connectSmoldot,
-  detectConnectionType,
+  createCdmAssetHubClient,
+  createCdmChainClient,
   getChainPreset,
   prepareSigner,
   prepareSignerFromMnemonic,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotdm/env",
-  "version": "0.3.2",
+  "version": "1.0.0-dev.1778274929",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,11 +17,11 @@
     "access": "public"
   },
   "dependencies": {
+    "@parity/product-sdk-descriptors": "^0.2.1",
     "@polkadot-labs/hdkd": "^0.0.26",
     "@polkadot-labs/hdkd-helpers": "^0.0.27",
-    "polkadot-api": "^1.23.3",
+    "polkadot-api": "^2.1.2",
     "smoldot": "^2.0.40",
-    "@dotdm/descriptors": "0.1.9",
     "@dotdm/utils": "0.3.1"
   },
   "devDependencies": {