@dotdm/env 0.3.2-dev.1776660158 → 1.0.0-dev.1778274929

package/dist/index.d.ts

@@ -1,9 +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 { ChainClient } from '@polkadot-apps/chain-client';
-import { paseo_asset_hub } from '@polkadot-apps/descriptors/paseo-asset-hub';
-import { bulletin } from '@polkadot-apps/descriptors/bulletin';
+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 {
@@ -20,23 +19,31 @@ 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 `ChainClient` managed by `@polkadot-apps/chain-client`.
+ * under one chain-client-shaped object.
  *
- * Uses `@polkadot-apps/descriptors` for the chain descriptors so the
+ * Uses `@parity/product-sdk-descriptors` for the chain descriptors so the
  * resulting `TypedApi` types line up natively with `ContractDeployer`,
- * `MetadataPublisher`, and the @polkadot-apps batch/bulletin helpers
+ * `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 = ChainClient<{
+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 = ChainClient<{
+type CdmAssetHubClient = CdmDirectChainClient<{
     assetHub: typeof paseo_asset_hub;
 }>;
 interface AssetHubConnection {
@@ -52,15 +59,15 @@ interface CdmChainEndpoints {
     bulletinUrl: string;
 }
 /**
- * Connect to both Asset Hub and Bulletin using `@polkadot-apps/chain-client`.
+ * 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 `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.
+ * 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 createCdmChainClient(arg: string | CdmChainEndpoints): Promise<CdmChainClient>;
 /**
@@ -76,11 +83,9 @@ interface IpfsGateway {
  * 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.
+ * 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;
 

package/dist/index.js

@@ -41,27 +41,24 @@ function getChainPreset(name) {
 import { DEFAULT_NODE_URL, REGISTRY_ADDRESS } from "@dotdm/utils";
 
 // src/connection.ts
-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";
+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 createChainClient({
-    chains: { assetHub: paseo_asset_hub, bulletin },
-    rpcs: {
-      assetHub: [endpoints.assethubUrl],
-      bulletin: [endpoints.bulletinUrl]
-    }
-  });
+  return createDirectChainClient(
+    { assetHub: paseo_asset_hub, bulletin },
+    { assetHub: endpoints.assethubUrl, bulletin: endpoints.bulletinUrl }
+  );
 }
 async function createCdmAssetHubClient(assethubUrl) {
-  return createChainClient({
-    chains: { assetHub: paseo_asset_hub },
-    rpcs: { assetHub: [assethubUrl] }
-  });
+  return createDirectChainClient({ assetHub: paseo_asset_hub }, { assetHub: assethubUrl });
 }
 function connectIpfsGateway(url) {
   return {
@@ -71,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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotdm/env",
-  "version": "0.3.2-dev.1776660158",
+  "version": "1.0.0-dev.1778274929",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,11 +17,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@polkadot-apps/chain-client": "^2.0.4",
-    "@polkadot-apps/descriptors": "^1.0.1",
+    "@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/utils": "0.3.1"
   },