@lydianpay/lydianconnect 1.3.0 → 1.5.0

package/dist/index.d.cts

@@ -46,6 +46,13 @@ interface Connection {
     readonly account: string;
     /** CAIP-2 chain id, e.g. "eip155:1". */
     readonly chainId: string;
+    /**
+     * The CAIP-2 chains the wallet's session granted, across all namespaces.
+     * WalletConnect only — SDK and injected connections leave it undefined, since
+     * switching (`wallet_switchEthereumChain`) has no approval concept and any
+     * chain in the provider's family is reachable anyway.
+     */
+    readonly approvedChains?: readonly string[];
     request<T = unknown>(args: {
         method: string;
         params?: unknown;
@@ -67,13 +74,28 @@ interface LydianConnectConfig extends AppConfig {
     /** WalletConnect Cloud project id — powers the fallback. */
     walletConnectProjectId: string;
 }
-interface ConnectInput {
+/**
+ * Input to {@link LydianConnect.connect} — one of two operations:
+ *
+ * - `chainId` **pins**: requests target that chain and EVM wallets switch onto it.
+ * - `chains` **discovers**: propose several chains, the wallet approves a subset
+ *   (see {@link Connection.approvedChains}), nothing is pinned. Connect again
+ *   with `chainId` once the user picks one — a WalletConnect session that
+ *   approved it is reused without a second prompt.
+ */
+type ConnectInput = {
     walletId: string;
     /** Chain to connect on — a number (EVM, e.g. 137) or a CAIP-2 id ('eip155:137'). */
     chainId: number | string;
     /** Cancel a pending connection. */
     signal?: AbortSignal;
-}
+} | {
+    walletId: string;
+    /** Chains to discover across — same formats as `chainId`; must be non-empty. */
+    chains: readonly (number | string)[];
+    /** Cancel a pending connection. */
+    signal?: AbortSignal;
+};
 type LydianConnectEvent = 
 /**
  * WalletConnect only — the wc: URI.

package/dist/index.d.ts

@@ -46,6 +46,13 @@ interface Connection {
     readonly account: string;
     /** CAIP-2 chain id, e.g. "eip155:1". */
     readonly chainId: string;
+    /**
+     * The CAIP-2 chains the wallet's session granted, across all namespaces.
+     * WalletConnect only — SDK and injected connections leave it undefined, since
+     * switching (`wallet_switchEthereumChain`) has no approval concept and any
+     * chain in the provider's family is reachable anyway.
+     */
+    readonly approvedChains?: readonly string[];
     request<T = unknown>(args: {
         method: string;
         params?: unknown;
@@ -67,13 +74,28 @@ interface LydianConnectConfig extends AppConfig {
     /** WalletConnect Cloud project id — powers the fallback. */
     walletConnectProjectId: string;
 }
-interface ConnectInput {
+/**
+ * Input to {@link LydianConnect.connect} — one of two operations:
+ *
+ * - `chainId` **pins**: requests target that chain and EVM wallets switch onto it.
+ * - `chains` **discovers**: propose several chains, the wallet approves a subset
+ *   (see {@link Connection.approvedChains}), nothing is pinned. Connect again
+ *   with `chainId` once the user picks one — a WalletConnect session that
+ *   approved it is reused without a second prompt.
+ */
+type ConnectInput = {
     walletId: string;
     /** Chain to connect on — a number (EVM, e.g. 137) or a CAIP-2 id ('eip155:137'). */
     chainId: number | string;
     /** Cancel a pending connection. */
     signal?: AbortSignal;
-}
+} | {
+    walletId: string;
+    /** Chains to discover across — same formats as `chainId`; must be non-empty. */
+    chains: readonly (number | string)[];
+    /** Cancel a pending connection. */
+    signal?: AbortSignal;
+};
 type LydianConnectEvent = 
 /**
  * WalletConnect only — the wc: URI.

package/dist/index.js

@@ -150,6 +150,20 @@ function buildNamespace(chainId) {
     }
   };
 }
+function buildNamespaces(chains) {
+  const byName = /* @__PURE__ */ new Map();
+  chains.forEach((chain) => {
+    const single = buildNamespace(chain);
+    const caip = single.value.chains?.[0];
+    const merged = byName.get(single.name);
+    if (!merged) {
+      byName.set(single.name, single);
+    } else if (caip && !merged.value.chains?.includes(caip)) {
+      merged.value.chains = [...merged.value.chains ?? [], caip];
+    }
+  });
+  return [...byName.values()];
+}
 
 // node_modules/@lydianpay/lydianconnect-catalog/dist/index.js
 var ICON_BASE = "https://wallet-assets.lydian.com/wallets";
@@ -247,7 +261,7 @@ var WALLET_CATALOG = WALLETS.map((w) => ({
 
 // src/core/connector.ts
 function requestedChain(req) {
-  return req.namespace.value.chains?.[0];
+  return req.pinned;
 }
 var BaseConnector = class {
   constructor() {
@@ -298,6 +312,10 @@ var BaseConnector = class {
 function deriveUrl() {
   return typeof window !== "undefined" ? window.location.origin : "";
 }
+function deriveRedirectUrl() {
+  if (typeof window === "undefined") return "";
+  return window.location.origin + window.location.pathname;
+}
 
 // src/connectors/eip155/chain.ts
 var CHAIN_SETTLE = { timeoutMs: 4e3, intervalMs: 100 };
@@ -603,9 +621,8 @@ function rpcFor2(provider) {
   return ({ method, params }) => rpc(provider, method, params);
 }
 function evmChainIds(req) {
-  const wanted = req.namespace.value.chains?.[0];
-  const n = wanted ? Number(wanted.split(":")[1]) : NaN;
-  return Number.isFinite(n) && n > 0 ? [n] : void 0;
+  const ids = (req.namespace.value.chains ?? []).map((chain) => Number(chain.split(":")[1])).filter((n) => Number.isFinite(n) && n > 0);
+  return ids.length > 0 ? ids : void 0;
 }
 
 // src/connectors/injected/connector.ts
@@ -1258,13 +1275,16 @@ var WalletConnectConnector = class extends BaseConnector {
   }
   async getClient() {
     if (this.client) return this.client;
+    const redirectUrl = deriveRedirectUrl();
     const client = await SignClient.init({
       projectId: this.options.projectId,
       metadata: {
         name: this.app.appName,
         description: this.app.description ?? this.app.appName,
         url: deriveUrl(),
-        icons: this.app.icon ? [this.app.icon] : []
+        icons: this.app.icon ? [this.app.icon] : [],
+        // Wallets may use this to return the user after deep-link approvals.
+        ...redirectUrl ? { redirect: { universal: redirectUrl } } : {}
       },
       relayUrl: this.options.relayUrl
     });
@@ -1296,8 +1316,11 @@ var WalletConnectConnector = class extends BaseConnector {
     const client = await this.getClient();
     const reused = await this.tryReuse(client, req);
     if (reused) return reused;
+    const proposed = [req.namespace, ...req.extraNamespaces ?? []];
     const { uri, approval } = await client.connect({
-      requiredNamespaces: { [req.namespace.name]: req.namespace.value }
+      optionalNamespaces: Object.fromEntries(
+        proposed.map((ns) => [ns.name, ns.value])
+      )
     });
     if (!uri) throw new Error("WalletConnect did not return a pairing URI");
     const link = isMobile() ? this.links[req.walletId] : void 0;
@@ -1329,7 +1352,8 @@ var WalletConnectConnector = class extends BaseConnector {
       client,
       req.walletId,
       session,
-      req.namespace
+      req.namespace,
+      req.pinned
     );
     this.topics.set(req.walletId, session.topic);
     this.persist();
@@ -1396,21 +1420,32 @@ var WalletConnectConnector = class extends BaseConnector {
       return null;
     }
     const ns = session.namespaces[req.namespace.name];
-    const wanted = req.namespace.value.chains?.[0];
-    if (!ns || wanted && !ns.chains?.includes(wanted)) return null;
-    return this.toConnection(client, req.walletId, session, req.namespace);
+    if (!ns) return null;
+    if (req.pinned && !grantedChains(ns).includes(req.pinned)) return null;
+    return this.toConnection(
+      client,
+      req.walletId,
+      session,
+      req.namespace,
+      req.pinned
+    );
   }
-  toConnection(client, walletId, session, namespace) {
+  toConnection(client, walletId, session, namespace, wanted) {
     const ns = session.namespaces[namespace.name];
     const account = (ns?.accounts ?? []).map((a) => a.split(":")[2]).find((a) => !!a) ?? "";
-    const approved = ns?.chains?.length ? ns.chains : (ns?.accounts ?? []).map((a) => a.split(":").slice(0, 2).join(":"));
-    const wanted = namespace.value.chains?.[0];
+    const approved = grantedChains(ns);
     const chainId = wanted && approved.includes(wanted) ? wanted : approved[0] ?? `${namespace.name}:1`;
+    const approvedChains = [
+      ...new Set(
+        Object.values(session.namespaces).flatMap((n) => grantedChains(n))
+      )
+    ];
     const topic = session.topic;
     return {
       walletId,
       account,
       chainId,
+      approvedChains,
       request: (args) => client.request({
         topic,
         chainId,
@@ -1471,6 +1506,11 @@ var WalletConnectConnector = class extends BaseConnector {
     }
   }
 };
+function grantedChains(ns) {
+  if (!ns) return [];
+  if (ns.chains?.length) return ns.chains;
+  return (ns.accounts ?? []).map((a) => a.split(":").slice(0, 2).join(":"));
+}
 function firstNamespace(session) {
   const name = Object.keys(session.namespaces)[0];
   if (!name) return null;
@@ -1515,14 +1555,35 @@ var LydianConnect = class {
     return this.manager.init();
   }
   async connect(input) {
-    if (input.chainId === void 0 || input.chainId === null) {
+    const chains = "chains" in input ? input.chains : void 0;
+    const chainId = "chainId" in input ? input.chainId : void 0;
+    if (chains !== void 0 && chainId !== void 0) {
+      throw new Error(
+        "connect() takes either chainId (pinned) or chains (discovery), not both"
+      );
+    }
+    if (chains !== void 0) {
+      const [primary, ...extra] = buildNamespaces(chains);
+      if (!primary) {
+        throw new Error("connect() discovery requires a non-empty chains list");
+      }
+      return this.manager.connect({
+        walletId: input.walletId,
+        namespace: primary,
+        extraNamespaces: extra.length > 0 ? extra : void 0,
+        signal: input.signal
+      });
+    }
+    if (chainId === void 0 || chainId === null) {
       throw new Error(
-        'connect() requires a chainId (a number like 137 or an "eip155:<id>" string)'
+        'connect() requires a chainId (a number like 137 or an "eip155:<id>" string) or a chains list'
       );
     }
+    const namespace = buildNamespace(chainId);
     return this.manager.connect({
       walletId: input.walletId,
-      namespace: buildNamespace(input.chainId),
+      namespace,
+      pinned: namespace.value.chains?.[0],
       signal: input.signal
     });
   }