@dotdm/env 0.3.2 → 1.0.0

package/dist/index.d.ts

@@ -1,7 +1,9 @@
 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 { ChainClient } from '@polkadot-apps/chain-client';
+import { paseo_asset_hub } from '@polkadot-apps/descriptors/paseo-asset-hub';
+import { bulletin } from '@polkadot-apps/descriptors/bulletin';
 export { ss58Address } from '@polkadot-labs/hdkd-helpers';
 
 interface ChainFaucet {
@@ -18,38 +20,68 @@ declare const KNOWN_CHAINS: Record<string, ChainPreset>;
 type KnownChainName = keyof typeof KNOWN_CHAINS;
 declare function getChainPreset(name: string): ChainPreset;
 
+/**
+ * Shape of a CDM chain client — both Asset Hub and Bulletin connected
+ * under one `ChainClient` managed by `@polkadot-apps/chain-client`.
+ *
+ * Uses `@polkadot-apps/descriptors` for the chain descriptors so the
+ * resulting `TypedApi` types line up natively with `ContractDeployer`,
+ * `MetadataPublisher`, and the @polkadot-apps 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 = ChainClient<{
+    assetHub: typeof paseo_asset_hub;
+    bulletin: typeof bulletin;
+}>;
+/** Asset-Hub-only variant for callers that don't need Bulletin (e.g., `install`). */
+type CdmAssetHubClient = ChainClient<{
+    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 using `@polkadot-apps/chain-client`.
+ *
+ * Accepts either a known chain name (`"polkadot"`, `"paseo"`, `"local"`,
+ * `"preview-net"`) resolved through `getChainPreset`, or explicit URLs.
+ *
+ * The returned `ChainClient` manages both connections — one `.destroy()`
+ * call tears everything down. `chain-client` caches by genesis-hash
+ * fingerprint, so repeated calls with the same descriptor set share a
+ * single instance.
  */
-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.
+ *
+ * `@polkadot-apps/bulletin` offers gateway helpers (`getGateway`, `fetchBytes`,
+ * `fetchJson`), but those key off a fixed `Environment` enum
+ * (polkadot/kusama/paseo) and don't yet cover CDM's custom networks
+ * (local, preview-net). Keep this thin wrapper until CDM can map its
+ * `KNOWN_CHAINS` onto that enum.
+ */
 declare function connectIpfsGateway(url: string): IpfsGateway;
 
 /**
@@ -68,4 +100,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,27 @@ 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 { createChainClient } from "@polkadot-apps/chain-client";
+import { paseo_asset_hub } from "@polkadot-apps/descriptors/paseo-asset-hub";
+import { bulletin } from "@polkadot-apps/descriptors/bulletin";
+async function createCdmChainClient(arg) {
+  const endpoints = typeof arg === "string" ? {
+    assethubUrl: getChainPreset(arg).assethubUrl,
+    bulletinUrl: getChainPreset(arg).bulletinUrl
+  } : arg;
+  return createChainClient({
+    chains: { assetHub: paseo_asset_hub, bulletin },
+    rpcs: {
+      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]
+async function createCdmAssetHubClient(assethubUrl) {
+  return createChainClient({
+    chains: { assetHub: paseo_asset_hub },
+    rpcs: { assetHub: [assethubUrl] }
   });
-  const client = createClient(getSmProvider(parachain));
-  return { client, api: client.getTypedApi(assetHub) };
 }
 function connectIpfsGateway(url) {
   return {
@@ -116,11 +105,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",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,11 +17,12 @@
     "access": "public"
   },
   "dependencies": {
+    "@polkadot-apps/chain-client": "^2.0.4",
+    "@polkadot-apps/descriptors": "^1.0.1",
     "@polkadot-labs/hdkd": "^0.0.26",
     "@polkadot-labs/hdkd-helpers": "^0.0.27",
     "polkadot-api": "^1.23.3",
     "smoldot": "^2.0.40",
-    "@dotdm/descriptors": "0.1.9",
     "@dotdm/utils": "0.3.1"
   },
   "devDependencies": {