@caatinga/client 2.0.0 → 2.0.2

package/README.md

@@ -22,7 +22,7 @@ The `@caatinga/client/freighter` subpath is optional and only needed when you wa
 For multi-wallet support, add Stellar Wallets Kit:
 
 ```bash
-pnpm add github:Creit-Tech/Stellar-Wallets-Kit#v0.0.7
+pnpm add @creit.tech/stellar-wallets-kit
 ```
 
 ```ts
@@ -82,7 +82,7 @@ Primary flow:
 ```ts
 import { createCaatingaClient } from "@caatinga/client";
 import { createStellarWalletsKitAdapter } from "@caatinga/client/stellar-wallets-kit";
-import * as Counter from "./contracts/generated/counter";
+import * as Counter from "./contracts/generated/counter/src/index.js";
 import artifacts from "../caatinga.artifacts.json";
 
 const wallet = createStellarWalletsKitAdapter();

package/dist/stellar-wallets-kit.cjs

@@ -20,90 +20,88 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/stellar-wallets-kit.ts
 var stellar_wallets_kit_exports = {};
 __export(stellar_wallets_kit_exports, {
+  WalletNetwork: () => import_stellar_wallets_kit.WalletNetwork,
   createStellarWalletsKitAdapter: () => createStellarWalletsKitAdapter
 });
 module.exports = __toCommonJS(stellar_wallets_kit_exports);
 
 // src/adapters/stellar-wallets-kit.ts
-var import_stellar_wallets_kit = require("stellar-wallets-kit");
+var import_stellar_wallets_kit = require("@creit.tech/stellar-wallets-kit");
+var import_walletconnect = require("@creit.tech/stellar-wallets-kit/modules/walletconnect.module");
 function createStellarWalletsKitAdapter(options = {}) {
+  const network = options.network ?? import_stellar_wallets_kit.WalletNetwork.TESTNET;
   const kit = options.kit ?? new import_stellar_wallets_kit.StellarWalletsKit({
-    network: options.network ?? import_stellar_wallets_kit.WalletNetwork.TESTNET,
-    selectedWallet: options.selectedWallet ?? import_stellar_wallets_kit.WalletType.XBULL
+    network,
+    selectedWalletId: options.selectedWalletId ?? import_stellar_wallets_kit.FREIGHTER_ID,
+    modules: options.modules ?? buildModules(network, options.walletConnectMetadata)
   });
-  let publicKey;
-  let isWalletConnectStarted = false;
-  const sessionDeletedCallbacks = /* @__PURE__ */ new Set();
+  let address;
   return {
     kit,
-    async setWallet(wallet) {
-      await kit.setWallet(wallet);
-      publicKey = void 0;
+    setWallet(walletId) {
+      kit.setWallet(walletId);
+      address = void 0;
     },
-    async setNetwork(network) {
-      await kit.setNetwork(network);
-      publicKey = void 0;
+    getSupportedWallets() {
+      return kit.getSupportedWallets();
     },
-    async getPublicKey() {
-      publicKey = await kit.getPublicKey();
-      return publicKey;
-    },
-    async signTransaction({ xdr, networkPassphrase }) {
-      const walletNetwork = resolveWalletNetwork(networkPassphrase);
-      if (walletNetwork) {
-        await kit.setNetwork(walletNetwork);
-      }
-      const signer = publicKey ?? await kit.getPublicKey();
-      publicKey = signer;
-      const response = await kit.sign({ xdr, publicKey: signer });
-      return response.signedXDR;
-    },
-    async startWalletConnect(metadata = options.walletConnectMetadata) {
-      if (!metadata) {
-        throw new Error("WalletConnect metadata is required before starting WalletConnect.");
-      }
-      await kit.startWalletConnect(metadata);
-      isWalletConnectStarted = true;
-      for (const callback of sessionDeletedCallbacks) {
-        kit.onSessionDeleted((sessionId) => {
-          publicKey = void 0;
-          callback(sessionId);
+    openModal(modalOptions = {}) {
+      return new Promise((resolve, reject) => {
+        void kit.openModal({
+          ...modalOptions.modalTitle ? { modalTitle: modalOptions.modalTitle } : {},
+          ...modalOptions.notAvailableText ? { notAvailableText: modalOptions.notAvailableText } : {},
+          onWalletSelected: (option) => {
+            kit.setWallet(option.id);
+            kit.getAddress().then((result) => {
+              address = result.address;
+              resolve(result.address);
+            }).catch((error) => {
+              reject(error instanceof Error ? error : new Error(String(error)));
+            });
+          },
+          onClosed: (error) => {
+            modalOptions.onClosed?.(error);
+            reject(error);
+          }
         });
-      }
-    },
-    async connectWalletConnect(connectOptions) {
-      await kit.connectWalletConnect(connectOptions);
-      publicKey = void 0;
-    },
-    async getWalletConnectSessions() {
-      return kit.getSessions();
+      });
     },
-    setWalletConnectSession(sessionId) {
-      kit.setSession(sessionId);
-      publicKey = void 0;
+    async getPublicKey() {
+      const result = await kit.getAddress();
+      address = result.address;
+      return result.address;
     },
-    onWalletConnectSessionDeleted(callback) {
-      sessionDeletedCallbacks.add(callback);
-      if (!isWalletConnectStarted) {
-        return;
-      }
-      kit.onSessionDeleted((sessionId) => {
-        publicKey = void 0;
-        callback(sessionId);
+    async signTransaction({ xdr, networkPassphrase }) {
+      const result = await kit.signTransaction(xdr, {
+        networkPassphrase,
+        ...address ? { address } : {}
       });
+      return result.signedTxXdr;
+    },
+    async disconnect() {
+      await kit.disconnect();
+      address = void 0;
     }
   };
 }
-function resolveWalletNetwork(networkPassphrase) {
-  if (networkPassphrase === "Test SDF Network ; September 2015") {
-    return import_stellar_wallets_kit.WalletNetwork.TESTNET;
-  }
-  if (networkPassphrase === "Public Global Stellar Network ; September 2015") {
-    return import_stellar_wallets_kit.WalletNetwork.PUBLIC;
+var HOTWALLET_ID = "hot-wallet";
+function buildModules(network, walletConnectMetadata) {
+  const modules = (0, import_stellar_wallets_kit.allowAllModules)({
+    filterBy: (module2) => module2.productId !== HOTWALLET_ID
+  });
+  if (walletConnectMetadata) {
+    modules.push(
+      new import_walletconnect.WalletConnectModule({
+        ...walletConnectMetadata,
+        network,
+        method: import_walletconnect.WalletConnectAllowedMethods.SIGN
+      })
+    );
   }
-  return void 0;
+  return modules;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  WalletNetwork,
   createStellarWalletsKitAdapter
 });

package/dist/stellar-wallets-kit.d.cts

@@ -1,7 +1,12 @@
-import { StellarWalletsKit, WalletType, WalletNetwork, IConnectWalletConnectParams } from 'stellar-wallets-kit';
+import { StellarWalletsKit, ISupportedWallet, WalletNetwork, ModuleInterface } from '@creit.tech/stellar-wallets-kit';
+export { WalletNetwork } from '@creit.tech/stellar-wallets-kit';
 import { C as CaatingaWalletAdapter } from './types-D4XEyX4J.cjs';
 import '@caatinga/core/browser';
 
+/**
+ * Optional WalletConnect metadata. When provided, a WalletConnect module is
+ * registered alongside the auto-detected wallets so it shows up in the modal.
+ */
 interface StellarWalletsKitMetadata {
     name: string;
     description: string;
@@ -12,35 +17,29 @@ interface StellarWalletsKitMetadata {
 interface StellarWalletsKitAdapterOptions {
     kit?: StellarWalletsKit;
     network?: WalletNetwork;
-    selectedWallet?: WalletType;
+    /** Wallet pre-selected before the user opens the modal. Defaults to Freighter. */
+    selectedWalletId?: string;
+    /** Override the registered modules. Defaults to every auto-detectable wallet. */
+    modules?: ModuleInterface[];
     walletConnectMetadata?: StellarWalletsKitMetadata;
 }
-interface StellarWalletsKitConnectOptions {
-    chains?: IConnectWalletConnectParams["chains"];
-    methods?: IConnectWalletConnectParams["methods"];
-    pairingTopic?: IConnectWalletConnectParams["pairingTopic"];
-}
-interface StellarWalletsKitSession {
-    id: string;
-    name: string;
-    description: string;
-    url: string;
-    icons: string;
-    accounts: Array<{
-        network: "pubnet" | "testnet";
-        publicKey: string;
-    }>;
+interface StellarWalletsKitOpenModalOptions {
+    modalTitle?: string;
+    notAvailableText?: string;
+    onClosed?: (error: Error) => void;
 }
 interface StellarWalletsKitAdapter extends CaatingaWalletAdapter {
     kit: StellarWalletsKit;
-    setWallet(wallet: WalletType): Promise<void>;
-    setNetwork(network: WalletNetwork): Promise<void>;
-    startWalletConnect(metadata?: StellarWalletsKitMetadata): Promise<void>;
-    connectWalletConnect(options?: StellarWalletsKitConnectOptions): Promise<void>;
-    getWalletConnectSessions(): Promise<StellarWalletsKitSession[]>;
-    setWalletConnectSession(sessionId: string): void;
-    onWalletConnectSessionDeleted(callback: (sessionId: string) => void): void;
+    /**
+     * Opens the wallet-selection modal (lists only installed/available wallets),
+     * sets the chosen wallet as active, and resolves with the connected address.
+     * Rejects if the user closes the modal without selecting a wallet.
+     */
+    openModal(options?: StellarWalletsKitOpenModalOptions): Promise<string>;
+    setWallet(walletId: string): void;
+    getSupportedWallets(): Promise<ISupportedWallet[]>;
+    disconnect(): Promise<void>;
 }
 declare function createStellarWalletsKitAdapter(options?: StellarWalletsKitAdapterOptions): StellarWalletsKitAdapter;
 
-export { type StellarWalletsKitAdapter, type StellarWalletsKitAdapterOptions, type StellarWalletsKitConnectOptions, type StellarWalletsKitMetadata, type StellarWalletsKitSession, createStellarWalletsKitAdapter };
+export { type StellarWalletsKitAdapter, type StellarWalletsKitAdapterOptions, type StellarWalletsKitMetadata, type StellarWalletsKitOpenModalOptions, createStellarWalletsKitAdapter };

package/dist/stellar-wallets-kit.d.ts

@@ -1,7 +1,12 @@
-import { StellarWalletsKit, WalletType, WalletNetwork, IConnectWalletConnectParams } from 'stellar-wallets-kit';
+import { StellarWalletsKit, ISupportedWallet, WalletNetwork, ModuleInterface } from '@creit.tech/stellar-wallets-kit';
+export { WalletNetwork } from '@creit.tech/stellar-wallets-kit';
 import { C as CaatingaWalletAdapter } from './types-D4XEyX4J.js';
 import '@caatinga/core/browser';
 
+/**
+ * Optional WalletConnect metadata. When provided, a WalletConnect module is
+ * registered alongside the auto-detected wallets so it shows up in the modal.
+ */
 interface StellarWalletsKitMetadata {
     name: string;
     description: string;
@@ -12,35 +17,29 @@ interface StellarWalletsKitMetadata {
 interface StellarWalletsKitAdapterOptions {
     kit?: StellarWalletsKit;
     network?: WalletNetwork;
-    selectedWallet?: WalletType;
+    /** Wallet pre-selected before the user opens the modal. Defaults to Freighter. */
+    selectedWalletId?: string;
+    /** Override the registered modules. Defaults to every auto-detectable wallet. */
+    modules?: ModuleInterface[];
     walletConnectMetadata?: StellarWalletsKitMetadata;
 }
-interface StellarWalletsKitConnectOptions {
-    chains?: IConnectWalletConnectParams["chains"];
-    methods?: IConnectWalletConnectParams["methods"];
-    pairingTopic?: IConnectWalletConnectParams["pairingTopic"];
-}
-interface StellarWalletsKitSession {
-    id: string;
-    name: string;
-    description: string;
-    url: string;
-    icons: string;
-    accounts: Array<{
-        network: "pubnet" | "testnet";
-        publicKey: string;
-    }>;
+interface StellarWalletsKitOpenModalOptions {
+    modalTitle?: string;
+    notAvailableText?: string;
+    onClosed?: (error: Error) => void;
 }
 interface StellarWalletsKitAdapter extends CaatingaWalletAdapter {
     kit: StellarWalletsKit;
-    setWallet(wallet: WalletType): Promise<void>;
-    setNetwork(network: WalletNetwork): Promise<void>;
-    startWalletConnect(metadata?: StellarWalletsKitMetadata): Promise<void>;
-    connectWalletConnect(options?: StellarWalletsKitConnectOptions): Promise<void>;
-    getWalletConnectSessions(): Promise<StellarWalletsKitSession[]>;
-    setWalletConnectSession(sessionId: string): void;
-    onWalletConnectSessionDeleted(callback: (sessionId: string) => void): void;
+    /**
+     * Opens the wallet-selection modal (lists only installed/available wallets),
+     * sets the chosen wallet as active, and resolves with the connected address.
+     * Rejects if the user closes the modal without selecting a wallet.
+     */
+    openModal(options?: StellarWalletsKitOpenModalOptions): Promise<string>;
+    setWallet(walletId: string): void;
+    getSupportedWallets(): Promise<ISupportedWallet[]>;
+    disconnect(): Promise<void>;
 }
 declare function createStellarWalletsKitAdapter(options?: StellarWalletsKitAdapterOptions): StellarWalletsKitAdapter;
 
-export { type StellarWalletsKitAdapter, type StellarWalletsKitAdapterOptions, type StellarWalletsKitConnectOptions, type StellarWalletsKitMetadata, type StellarWalletsKitSession, createStellarWalletsKitAdapter };
+export { type StellarWalletsKitAdapter, type StellarWalletsKitAdapterOptions, type StellarWalletsKitMetadata, type StellarWalletsKitOpenModalOptions, createStellarWalletsKitAdapter };

package/dist/stellar-wallets-kit.js

@@ -2,85 +2,86 @@
 import {
   StellarWalletsKit,
   WalletNetwork,
-  WalletType
-} from "stellar-wallets-kit";
+  allowAllModules,
+  FREIGHTER_ID
+} from "@creit.tech/stellar-wallets-kit";
+import {
+  WalletConnectAllowedMethods,
+  WalletConnectModule
+} from "@creit.tech/stellar-wallets-kit/modules/walletconnect.module";
 function createStellarWalletsKitAdapter(options = {}) {
+  const network = options.network ?? WalletNetwork.TESTNET;
   const kit = options.kit ?? new StellarWalletsKit({
-    network: options.network ?? WalletNetwork.TESTNET,
-    selectedWallet: options.selectedWallet ?? WalletType.XBULL
+    network,
+    selectedWalletId: options.selectedWalletId ?? FREIGHTER_ID,
+    modules: options.modules ?? buildModules(network, options.walletConnectMetadata)
   });
-  let publicKey;
-  let isWalletConnectStarted = false;
-  const sessionDeletedCallbacks = /* @__PURE__ */ new Set();
+  let address;
   return {
     kit,
-    async setWallet(wallet) {
-      await kit.setWallet(wallet);
-      publicKey = void 0;
-    },
-    async setNetwork(network) {
-      await kit.setNetwork(network);
-      publicKey = void 0;
+    setWallet(walletId) {
+      kit.setWallet(walletId);
+      address = void 0;
     },
-    async getPublicKey() {
-      publicKey = await kit.getPublicKey();
-      return publicKey;
+    getSupportedWallets() {
+      return kit.getSupportedWallets();
     },
-    async signTransaction({ xdr, networkPassphrase }) {
-      const walletNetwork = resolveWalletNetwork(networkPassphrase);
-      if (walletNetwork) {
-        await kit.setNetwork(walletNetwork);
-      }
-      const signer = publicKey ?? await kit.getPublicKey();
-      publicKey = signer;
-      const response = await kit.sign({ xdr, publicKey: signer });
-      return response.signedXDR;
-    },
-    async startWalletConnect(metadata = options.walletConnectMetadata) {
-      if (!metadata) {
-        throw new Error("WalletConnect metadata is required before starting WalletConnect.");
-      }
-      await kit.startWalletConnect(metadata);
-      isWalletConnectStarted = true;
-      for (const callback of sessionDeletedCallbacks) {
-        kit.onSessionDeleted((sessionId) => {
-          publicKey = void 0;
-          callback(sessionId);
+    openModal(modalOptions = {}) {
+      return new Promise((resolve, reject) => {
+        void kit.openModal({
+          ...modalOptions.modalTitle ? { modalTitle: modalOptions.modalTitle } : {},
+          ...modalOptions.notAvailableText ? { notAvailableText: modalOptions.notAvailableText } : {},
+          onWalletSelected: (option) => {
+            kit.setWallet(option.id);
+            kit.getAddress().then((result) => {
+              address = result.address;
+              resolve(result.address);
+            }).catch((error) => {
+              reject(error instanceof Error ? error : new Error(String(error)));
+            });
+          },
+          onClosed: (error) => {
+            modalOptions.onClosed?.(error);
+            reject(error);
+          }
         });
-      }
-    },
-    async connectWalletConnect(connectOptions) {
-      await kit.connectWalletConnect(connectOptions);
-      publicKey = void 0;
-    },
-    async getWalletConnectSessions() {
-      return kit.getSessions();
+      });
     },
-    setWalletConnectSession(sessionId) {
-      kit.setSession(sessionId);
-      publicKey = void 0;
+    async getPublicKey() {
+      const result = await kit.getAddress();
+      address = result.address;
+      return result.address;
     },
-    onWalletConnectSessionDeleted(callback) {
-      sessionDeletedCallbacks.add(callback);
-      if (!isWalletConnectStarted) {
-        return;
-      }
-      kit.onSessionDeleted((sessionId) => {
-        publicKey = void 0;
-        callback(sessionId);
+    async signTransaction({ xdr, networkPassphrase }) {
+      const result = await kit.signTransaction(xdr, {
+        networkPassphrase,
+        ...address ? { address } : {}
       });
+      return result.signedTxXdr;
+    },
+    async disconnect() {
+      await kit.disconnect();
+      address = void 0;
     }
   };
 }
-function resolveWalletNetwork(networkPassphrase) {
-  if (networkPassphrase === "Test SDF Network ; September 2015") {
-    return WalletNetwork.TESTNET;
-  }
-  if (networkPassphrase === "Public Global Stellar Network ; September 2015") {
-    return WalletNetwork.PUBLIC;
+var HOTWALLET_ID = "hot-wallet";
+function buildModules(network, walletConnectMetadata) {
+  const modules = allowAllModules({
+    filterBy: (module) => module.productId !== HOTWALLET_ID
+  });
+  if (walletConnectMetadata) {
+    modules.push(
+      new WalletConnectModule({
+        ...walletConnectMetadata,
+        network,
+        method: WalletConnectAllowedMethods.SIGN
+      })
+    );
   }
-  return void 0;
+  return modules;
 }
 export {
+  WalletNetwork,
   createStellarWalletsKitAdapter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caatinga/client",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Browser and Node client for Soroban smart contracts — connects generated bindings, Caatinga artifacts, and wallet adapters",
   "keywords": [
     "stellar",
@@ -51,23 +51,23 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@caatinga/core": "^2.0.0"
+    "@caatinga/core": "^2.0.2"
   },
   "devDependencies": {
     "tsup": "^8.3.5",
-    "stellar-wallets-kit": "github:Creit-Tech/Stellar-Wallets-Kit#v0.0.7",
+    "@creit.tech/stellar-wallets-kit": "^1.9.5",
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"
   },
   "peerDependencies": {
     "@stellar/freighter-api": "^4.0.0",
-    "stellar-wallets-kit": "github:Creit-Tech/Stellar-Wallets-Kit#v0.0.7"
+    "@creit.tech/stellar-wallets-kit": "^1.9.5"
   },
   "peerDependenciesMeta": {
     "@stellar/freighter-api": {
       "optional": true
     },
-    "stellar-wallets-kit": {
+    "@creit.tech/stellar-wallets-kit": {
       "optional": true
     }
   },