@txnlab/use-wallet-solid 3.0.0-beta.9 → 3.0.0-rc.2

package/dist/dev.cjs

@@ -1,9 +1,12 @@
 'use strict';
 
-var useWallet$1 = require('@txnlab/use-wallet');
 var solidStore = require('@tanstack/solid-store');
+var algosdk = require('algosdk');
+var useWallet$1 = require('@txnlab/use-wallet');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-// src/index.tsx
+var algosdk__default = /*#__PURE__*/_interopDefault(algosdk);
 
 // ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
@@ -694,8 +697,6 @@ var booleans = [
   "playsInline",
   ...booleans
 ]);
-
-// src/WalletProvider.tsx
 var WalletContext = createContext();
 exports.WalletProvider = (props) => {
   const store = () => props.manager;
@@ -713,7 +714,7 @@ exports.WalletProvider = (props) => {
     }
   });
 };
-var useWalletManager = () => {
+exports.useWalletManager = () => {
   const manager = useContext(WalletContext);
   if (!manager) {
     throw new Error("useWalletManager must be used within a WalletProvider");
@@ -721,14 +722,11 @@ var useWalletManager = () => {
   return manager();
 };
 function useWallet() {
-  const manager = createMemo(() => useWalletManager());
-  const walletStore = solidStore.useStore(manager().store, (state) => {
-    return state.wallets;
-  });
+  const manager = createMemo(() => exports.useWalletManager());
+  const [algodClient, setAlgodClient] = createSignal(manager().algodClient);
+  const walletStore = solidStore.useStore(manager().store, (state) => state.wallets);
   const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = solidStore.useStore(manager().store, (state) => {
-    return state.activeWallet;
-  });
+  const activeWalletId = solidStore.useStore(manager().store, (state) => state.activeWallet);
   const activeWallet = () => manager().getWallet(activeWalletId()) || null;
   const activeWalletState = () => walletState(activeWalletId());
   const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
@@ -737,18 +735,34 @@ function useWallet() {
   const activeAddress = () => activeAccount()?.address ?? null;
   const isWalletActive = (walletId) => walletId === activeWalletId();
   const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
-  const activeNetworkState = createMemo(() => {
-    return solidStore.useStore(manager().store, (state) => state.activeNetwork);
-  });
-  const activeNetwork = () => activeNetworkState()();
-  const setActiveNetwork = (network) => manager().setActiveNetwork(network);
-  const algodClient = createMemo(() => manager().algodClient);
-  const signTransactions = (txnGroup, indexesToSign, returnGroup) => {
+  const activeNetwork = solidStore.useStore(manager().store, (state) => state.activeNetwork);
+  const setActiveNetwork = async (networkId) => {
+    if (activeNetwork() === networkId) {
+      return;
+    }
+    await manager().disconnect();
+    console.info(`[Solid] Creating Algodv2 client for ${networkId}...`);
+    const {
+      token,
+      baseServer,
+      port,
+      headers
+    } = manager().networkConfig[networkId];
+    const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+    setAlgodClient(newClient);
+    manager().algodClient = newClient;
+    manager().store.setState((state) => ({
+      ...state,
+      activeNetwork: networkId
+    }));
+    console.info(`[Solid] \u2705 Active network set to ${networkId}.`);
+  };
+  const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
       throw new Error("No active wallet");
     }
-    return wallet.signTransactions(txnGroup, indexesToSign, returnGroup);
+    return wallet.signTransactions(txnGroup, indexesToSign);
   };
   const transactionSigner = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
@@ -771,6 +785,7 @@ function useWallet() {
     isWalletActive,
     isWalletConnected,
     setActiveNetwork,
+    setAlgodClient,
     signTransactions,
     transactionSigner,
     wallets: manager().wallets

package/dist/dev.js

@@ -1,7 +1,6 @@
-export * from '@txnlab/use-wallet';
 import { useStore } from '@tanstack/solid-store';
-
-// src/index.tsx
+import algosdk from 'algosdk';
+export * from '@txnlab/use-wallet';
 
 // ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
@@ -692,8 +691,6 @@ var booleans = [
   "playsInline",
   ...booleans
 ]);
-
-// src/WalletProvider.tsx
 var WalletContext = createContext();
 var WalletProvider = (props) => {
   const store = () => props.manager;
@@ -720,13 +717,10 @@ var useWalletManager = () => {
 };
 function useWallet() {
   const manager = createMemo(() => useWalletManager());
-  const walletStore = useStore(manager().store, (state) => {
-    return state.wallets;
-  });
+  const [algodClient, setAlgodClient] = createSignal(manager().algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
   const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => {
-    return state.activeWallet;
-  });
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
   const activeWallet = () => manager().getWallet(activeWalletId()) || null;
   const activeWalletState = () => walletState(activeWalletId());
   const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
@@ -735,18 +729,34 @@ function useWallet() {
   const activeAddress = () => activeAccount()?.address ?? null;
   const isWalletActive = (walletId) => walletId === activeWalletId();
   const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
-  const activeNetworkState = createMemo(() => {
-    return useStore(manager().store, (state) => state.activeNetwork);
-  });
-  const activeNetwork = () => activeNetworkState()();
-  const setActiveNetwork = (network) => manager().setActiveNetwork(network);
-  const algodClient = createMemo(() => manager().algodClient);
-  const signTransactions = (txnGroup, indexesToSign, returnGroup) => {
+  const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const setActiveNetwork = async (networkId) => {
+    if (activeNetwork() === networkId) {
+      return;
+    }
+    await manager().disconnect();
+    console.info(`[Solid] Creating Algodv2 client for ${networkId}...`);
+    const {
+      token,
+      baseServer,
+      port,
+      headers
+    } = manager().networkConfig[networkId];
+    const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    setAlgodClient(newClient);
+    manager().algodClient = newClient;
+    manager().store.setState((state) => ({
+      ...state,
+      activeNetwork: networkId
+    }));
+    console.info(`[Solid] \u2705 Active network set to ${networkId}.`);
+  };
+  const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
       throw new Error("No active wallet");
     }
-    return wallet.signTransactions(txnGroup, indexesToSign, returnGroup);
+    return wallet.signTransactions(txnGroup, indexesToSign);
   };
   const transactionSigner = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
@@ -769,10 +779,11 @@ function useWallet() {
     isWalletActive,
     isWalletConnected,
     setActiveNetwork,
+    setAlgodClient,
     signTransactions,
     transactionSigner,
     wallets: manager().wallets
   };
 }
 
-export { WalletProvider, useWallet };
+export { WalletProvider, useWallet, useWalletManager };

package/dist/dev.jsx

@@ -1,5 +1,6 @@
 // src/index.tsx
-export * from "@txnlab/use-wallet";
+import { useStore } from "@tanstack/solid-store";
+import algosdk from "algosdk";
 
 // ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
@@ -637,7 +638,8 @@ function createProvider(id, options) {
 var FALLBACK = Symbol("fallback");
 var SuspenseListContext = createContext();
 
-// src/WalletProvider.tsx
+// src/index.tsx
+export * from "@txnlab/use-wallet";
 var WalletContext = createContext();
 var WalletProvider = (props) => {
   const store = () => props.manager;
@@ -657,18 +659,12 @@ var useWalletManager = () => {
   }
   return manager();
 };
-
-// src/useWallet.ts
-import { useStore } from "@tanstack/solid-store";
 function useWallet() {
   const manager = createMemo(() => useWalletManager());
-  const walletStore = useStore(manager().store, (state) => {
-    return state.wallets;
-  });
+  const [algodClient, setAlgodClient] = createSignal(manager().algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
   const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => {
-    return state.activeWallet;
-  });
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
   const activeWallet = () => manager().getWallet(activeWalletId()) || null;
   const activeWalletState = () => walletState(activeWalletId());
   const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
@@ -677,18 +673,29 @@ function useWallet() {
   const activeAddress = () => activeAccount()?.address ?? null;
   const isWalletActive = (walletId) => walletId === activeWalletId();
   const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
-  const activeNetworkState = createMemo(() => {
-    return useStore(manager().store, (state) => state.activeNetwork);
-  });
-  const activeNetwork = () => activeNetworkState()();
-  const setActiveNetwork = (network) => manager().setActiveNetwork(network);
-  const algodClient = createMemo(() => manager().algodClient);
-  const signTransactions = (txnGroup, indexesToSign, returnGroup) => {
+  const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const setActiveNetwork = async (networkId) => {
+    if (activeNetwork() === networkId) {
+      return;
+    }
+    await manager().disconnect();
+    console.info(`[Solid] Creating Algodv2 client for ${networkId}...`);
+    const { token, baseServer, port, headers } = manager().networkConfig[networkId];
+    const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    setAlgodClient(newClient);
+    manager().algodClient = newClient;
+    manager().store.setState((state) => ({
+      ...state,
+      activeNetwork: networkId
+    }));
+    console.info(`[Solid] \u2705 Active network set to ${networkId}.`);
+  };
+  const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
       throw new Error("No active wallet");
     }
-    return wallet.signTransactions(txnGroup, indexesToSign, returnGroup);
+    return wallet.signTransactions(txnGroup, indexesToSign);
   };
   const transactionSigner = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
@@ -711,6 +718,7 @@ function useWallet() {
     isWalletActive,
     isWalletConnected,
     setActiveNetwork,
+    setAlgodClient,
     signTransactions,
     transactionSigner,
     wallets: manager().wallets
@@ -718,5 +726,6 @@ function useWallet() {
 }
 export {
   WalletProvider,
-  useWallet
+  useWallet,
+  useWalletManager
 };

package/dist/index.cjs

@@ -1,9 +1,12 @@
 'use strict';
 
-var useWallet$1 = require('@txnlab/use-wallet');
 var solidStore = require('@tanstack/solid-store');
+var algosdk = require('algosdk');
+var useWallet$1 = require('@txnlab/use-wallet');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-// src/index.tsx
+var algosdk__default = /*#__PURE__*/_interopDefault(algosdk);
 
 // ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
@@ -694,8 +697,6 @@ var booleans = [
   "playsInline",
   ...booleans
 ]);
-
-// src/WalletProvider.tsx
 var WalletContext = createContext();
 exports.WalletProvider = (props) => {
   const store = () => props.manager;
@@ -712,7 +713,7 @@ exports.WalletProvider = (props) => {
     }
   });
 };
-var useWalletManager = () => {
+exports.useWalletManager = () => {
   const manager = useContext(WalletContext);
   if (!manager) {
     throw new Error("useWalletManager must be used within a WalletProvider");
@@ -720,14 +721,11 @@ var useWalletManager = () => {
   return manager();
 };
 function useWallet() {
-  const manager = createMemo(() => useWalletManager());
-  const walletStore = solidStore.useStore(manager().store, (state) => {
-    return state.wallets;
-  });
+  const manager = createMemo(() => exports.useWalletManager());
+  const [algodClient, setAlgodClient] = createSignal(manager().algodClient);
+  const walletStore = solidStore.useStore(manager().store, (state) => state.wallets);
   const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = solidStore.useStore(manager().store, (state) => {
-    return state.activeWallet;
-  });
+  const activeWalletId = solidStore.useStore(manager().store, (state) => state.activeWallet);
   const activeWallet = () => manager().getWallet(activeWalletId()) || null;
   const activeWalletState = () => walletState(activeWalletId());
   const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
@@ -736,18 +734,32 @@ function useWallet() {
   const activeAddress = () => activeAccount()?.address ?? null;
   const isWalletActive = (walletId) => walletId === activeWalletId();
   const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
-  const activeNetworkState = createMemo(() => {
-    return solidStore.useStore(manager().store, (state) => state.activeNetwork);
-  });
-  const activeNetwork = () => activeNetworkState()();
-  const setActiveNetwork = (network) => manager().setActiveNetwork(network);
-  const algodClient = createMemo(() => manager().algodClient);
-  const signTransactions = (txnGroup, indexesToSign, returnGroup) => {
+  const activeNetwork = solidStore.useStore(manager().store, (state) => state.activeNetwork);
+  const setActiveNetwork = async (networkId) => {
+    if (activeNetwork() === networkId) {
+      return;
+    }
+    await manager().disconnect();
+    const {
+      token,
+      baseServer,
+      port,
+      headers
+    } = manager().networkConfig[networkId];
+    const newClient = new algosdk__default.default.Algodv2(token, baseServer, port, headers);
+    setAlgodClient(newClient);
+    manager().algodClient = newClient;
+    manager().store.setState((state) => ({
+      ...state,
+      activeNetwork: networkId
+    }));
+  };
+  const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
       throw new Error("No active wallet");
     }
-    return wallet.signTransactions(txnGroup, indexesToSign, returnGroup);
+    return wallet.signTransactions(txnGroup, indexesToSign);
   };
   const transactionSigner = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
@@ -770,6 +782,7 @@ function useWallet() {
     isWalletActive,
     isWalletConnected,
     setActiveNetwork,
+    setAlgodClient,
     signTransactions,
     transactionSigner,
     wallets: manager().wallets

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _txnlab_use_wallet from '@txnlab/use-wallet';
-import { WalletManager, WalletId, WalletState, NetworkId, WalletAccount } from '@txnlab/use-wallet';
+import { WalletManager, WalletMetadata, WalletAccount, WalletId, WalletState, NetworkId } from '@txnlab/use-wallet';
 export * from '@txnlab/use-wallet';
 import * as solid_js from 'solid-js';
 import { JSX } from 'solid-js';
@@ -10,12 +10,24 @@ interface WalletProviderProps {
     children: JSX.Element;
 }
 declare const WalletProvider: (props: WalletProviderProps) => JSX.Element;
-
+declare const useWalletManager: () => WalletManager;
+interface Wallet {
+    id: () => string;
+    metadata: () => WalletMetadata;
+    accounts: () => WalletAccount[];
+    activeAccount: () => WalletAccount | null;
+    isConnected: () => boolean;
+    isActive: () => boolean;
+    connect: (args?: Record<string, any>) => Promise<WalletAccount[]>;
+    disconnect: () => Promise<void>;
+    setActive: () => void;
+    setActiveAccount: (address: string) => void;
+}
 declare function useWallet(): {
     activeWalletId: solid_js.Accessor<WalletId | null>;
     walletStore: solid_js.Accessor<Partial<Record<WalletId, WalletState>>>;
     algodClient: solid_js.Accessor<algosdk.Algodv2>;
-    activeNetwork: () => NetworkId;
+    activeNetwork: solid_js.Accessor<NetworkId>;
     activeWallet: () => _txnlab_use_wallet.BaseWallet | null;
     activeWalletAccounts: () => WalletAccount[] | null;
     activeWalletAddresses: () => string[] | null;
@@ -24,10 +36,11 @@ declare function useWallet(): {
     activeAddress: () => string | null;
     isWalletActive: (walletId: WalletId) => boolean;
     isWalletConnected: (walletId: WalletId) => boolean;
-    setActiveNetwork: (network: NetworkId) => void;
-    signTransactions: (txnGroup: algosdk.Transaction[] | algosdk.Transaction[][] | Uint8Array[] | Uint8Array[][], indexesToSign?: number[], returnGroup?: boolean) => Promise<Uint8Array[]>;
+    setActiveNetwork: (networkId: NetworkId) => Promise<void>;
+    setAlgodClient: solid_js.Setter<algosdk.Algodv2>;
+    signTransactions: <T extends algosdk.Transaction[] | Uint8Array[]>(txnGroup: T | T[], indexesToSign?: number[]) => Promise<(Uint8Array | null)[]>;
     transactionSigner: (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => Promise<Uint8Array[]>;
     wallets: _txnlab_use_wallet.BaseWallet[];
 };
 
-export { WalletProvider, useWallet };
+export { type Wallet, WalletProvider, useWallet, useWalletManager };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _txnlab_use_wallet from '@txnlab/use-wallet';
-import { WalletManager, WalletId, WalletState, NetworkId, WalletAccount } from '@txnlab/use-wallet';
+import { WalletManager, WalletMetadata, WalletAccount, WalletId, WalletState, NetworkId } from '@txnlab/use-wallet';
 export * from '@txnlab/use-wallet';
 import * as solid_js from 'solid-js';
 import { JSX } from 'solid-js';
@@ -10,12 +10,24 @@ interface WalletProviderProps {
     children: JSX.Element;
 }
 declare const WalletProvider: (props: WalletProviderProps) => JSX.Element;
-
+declare const useWalletManager: () => WalletManager;
+interface Wallet {
+    id: () => string;
+    metadata: () => WalletMetadata;
+    accounts: () => WalletAccount[];
+    activeAccount: () => WalletAccount | null;
+    isConnected: () => boolean;
+    isActive: () => boolean;
+    connect: (args?: Record<string, any>) => Promise<WalletAccount[]>;
+    disconnect: () => Promise<void>;
+    setActive: () => void;
+    setActiveAccount: (address: string) => void;
+}
 declare function useWallet(): {
     activeWalletId: solid_js.Accessor<WalletId | null>;
     walletStore: solid_js.Accessor<Partial<Record<WalletId, WalletState>>>;
     algodClient: solid_js.Accessor<algosdk.Algodv2>;
-    activeNetwork: () => NetworkId;
+    activeNetwork: solid_js.Accessor<NetworkId>;
     activeWallet: () => _txnlab_use_wallet.BaseWallet | null;
     activeWalletAccounts: () => WalletAccount[] | null;
     activeWalletAddresses: () => string[] | null;
@@ -24,10 +36,11 @@ declare function useWallet(): {
     activeAddress: () => string | null;
     isWalletActive: (walletId: WalletId) => boolean;
     isWalletConnected: (walletId: WalletId) => boolean;
-    setActiveNetwork: (network: NetworkId) => void;
-    signTransactions: (txnGroup: algosdk.Transaction[] | algosdk.Transaction[][] | Uint8Array[] | Uint8Array[][], indexesToSign?: number[], returnGroup?: boolean) => Promise<Uint8Array[]>;
+    setActiveNetwork: (networkId: NetworkId) => Promise<void>;
+    setAlgodClient: solid_js.Setter<algosdk.Algodv2>;
+    signTransactions: <T extends algosdk.Transaction[] | Uint8Array[]>(txnGroup: T | T[], indexesToSign?: number[]) => Promise<(Uint8Array | null)[]>;
     transactionSigner: (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => Promise<Uint8Array[]>;
     wallets: _txnlab_use_wallet.BaseWallet[];
 };
 
-export { WalletProvider, useWallet };
+export { type Wallet, WalletProvider, useWallet, useWalletManager };

package/dist/index.js

@@ -1,7 +1,6 @@
-export * from '@txnlab/use-wallet';
 import { useStore } from '@tanstack/solid-store';
-
-// src/index.tsx
+import algosdk from 'algosdk';
+export * from '@txnlab/use-wallet';
 
 // ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
@@ -692,8 +691,6 @@ var booleans = [
   "playsInline",
   ...booleans
 ]);
-
-// src/WalletProvider.tsx
 var WalletContext = createContext();
 var WalletProvider = (props) => {
   const store = () => props.manager;
@@ -719,13 +716,10 @@ var useWalletManager = () => {
 };
 function useWallet() {
   const manager = createMemo(() => useWalletManager());
-  const walletStore = useStore(manager().store, (state) => {
-    return state.wallets;
-  });
+  const [algodClient, setAlgodClient] = createSignal(manager().algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
   const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => {
-    return state.activeWallet;
-  });
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
   const activeWallet = () => manager().getWallet(activeWalletId()) || null;
   const activeWalletState = () => walletState(activeWalletId());
   const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
@@ -734,18 +728,32 @@ function useWallet() {
   const activeAddress = () => activeAccount()?.address ?? null;
   const isWalletActive = (walletId) => walletId === activeWalletId();
   const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
-  const activeNetworkState = createMemo(() => {
-    return useStore(manager().store, (state) => state.activeNetwork);
-  });
-  const activeNetwork = () => activeNetworkState()();
-  const setActiveNetwork = (network) => manager().setActiveNetwork(network);
-  const algodClient = createMemo(() => manager().algodClient);
-  const signTransactions = (txnGroup, indexesToSign, returnGroup) => {
+  const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const setActiveNetwork = async (networkId) => {
+    if (activeNetwork() === networkId) {
+      return;
+    }
+    await manager().disconnect();
+    const {
+      token,
+      baseServer,
+      port,
+      headers
+    } = manager().networkConfig[networkId];
+    const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    setAlgodClient(newClient);
+    manager().algodClient = newClient;
+    manager().store.setState((state) => ({
+      ...state,
+      activeNetwork: networkId
+    }));
+  };
+  const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
       throw new Error("No active wallet");
     }
-    return wallet.signTransactions(txnGroup, indexesToSign, returnGroup);
+    return wallet.signTransactions(txnGroup, indexesToSign);
   };
   const transactionSigner = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
@@ -768,10 +776,11 @@ function useWallet() {
     isWalletActive,
     isWalletConnected,
     setActiveNetwork,
+    setAlgodClient,
     signTransactions,
     transactionSigner,
     wallets: manager().wallets
   };
 }
 
-export { WalletProvider, useWallet };
+export { WalletProvider, useWallet, useWalletManager };

package/dist/index.jsx

@@ -1,5 +1,6 @@
 // src/index.tsx
-export * from "@txnlab/use-wallet";
+import { useStore } from "@tanstack/solid-store";
+import algosdk from "algosdk";
 
 // ../../node_modules/.pnpm/solid-js@1.8.16/node_modules/solid-js/dist/solid.js
 var sharedConfig = {
@@ -637,7 +638,8 @@ function createProvider(id, options) {
 var FALLBACK = Symbol("fallback");
 var SuspenseListContext = createContext();
 
-// src/WalletProvider.tsx
+// src/index.tsx
+export * from "@txnlab/use-wallet";
 var WalletContext = createContext();
 var WalletProvider = (props) => {
   const store = () => props.manager;
@@ -656,18 +658,12 @@ var useWalletManager = () => {
   }
   return manager();
 };
-
-// src/useWallet.ts
-import { useStore } from "@tanstack/solid-store";
 function useWallet() {
   const manager = createMemo(() => useWalletManager());
-  const walletStore = useStore(manager().store, (state) => {
-    return state.wallets;
-  });
+  const [algodClient, setAlgodClient] = createSignal(manager().algodClient);
+  const walletStore = useStore(manager().store, (state) => state.wallets);
   const walletState = (walletId) => walletStore()[walletId] || null;
-  const activeWalletId = useStore(manager().store, (state) => {
-    return state.activeWallet;
-  });
+  const activeWalletId = useStore(manager().store, (state) => state.activeWallet);
   const activeWallet = () => manager().getWallet(activeWalletId()) || null;
   const activeWalletState = () => walletState(activeWalletId());
   const activeWalletAccounts = () => activeWalletState()?.accounts ?? null;
@@ -676,18 +672,27 @@ function useWallet() {
   const activeAddress = () => activeAccount()?.address ?? null;
   const isWalletActive = (walletId) => walletId === activeWalletId();
   const isWalletConnected = (walletId) => !!walletState(walletId)?.accounts.length || false;
-  const activeNetworkState = createMemo(() => {
-    return useStore(manager().store, (state) => state.activeNetwork);
-  });
-  const activeNetwork = () => activeNetworkState()();
-  const setActiveNetwork = (network) => manager().setActiveNetwork(network);
-  const algodClient = createMemo(() => manager().algodClient);
-  const signTransactions = (txnGroup, indexesToSign, returnGroup) => {
+  const activeNetwork = useStore(manager().store, (state) => state.activeNetwork);
+  const setActiveNetwork = async (networkId) => {
+    if (activeNetwork() === networkId) {
+      return;
+    }
+    await manager().disconnect();
+    const { token, baseServer, port, headers } = manager().networkConfig[networkId];
+    const newClient = new algosdk.Algodv2(token, baseServer, port, headers);
+    setAlgodClient(newClient);
+    manager().algodClient = newClient;
+    manager().store.setState((state) => ({
+      ...state,
+      activeNetwork: networkId
+    }));
+  };
+  const signTransactions = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
     if (!wallet) {
       throw new Error("No active wallet");
     }
-    return wallet.signTransactions(txnGroup, indexesToSign, returnGroup);
+    return wallet.signTransactions(txnGroup, indexesToSign);
   };
   const transactionSigner = (txnGroup, indexesToSign) => {
     const wallet = activeWallet();
@@ -710,6 +715,7 @@ function useWallet() {
     isWalletActive,
     isWalletConnected,
     setActiveNetwork,
+    setAlgodClient,
     signTransactions,
     transactionSigner,
     wallets: manager().wallets
@@ -717,5 +723,6 @@ function useWallet() {
 }
 export {
   WalletProvider,
-  useWallet
+  useWallet,
+  useWalletManager
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@txnlab/use-wallet-solid",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.0-rc.2",
   "description": "Solid.js library for integrating Algorand wallets into decentralized applications",
   "author": "Doug Richar <drichar@gmail.com>",
   "license": "MIT",
@@ -54,7 +54,7 @@
   ],
   "dependencies": {
     "@tanstack/solid-store": "0.4.1",
-    "@txnlab/use-wallet": "3.0.0-beta.9"
+    "@txnlab/use-wallet": "3.0.0-rc.2"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.5",
@@ -66,16 +66,25 @@
   },
   "peerDependencies": {
     "@blockshake/defly-connect": "^1.1.6",
+    "@magic-ext/algorand": "^23.0.2",
+    "@perawallet/connect": "^1.3.4",
     "@perawallet/connect-beta": "^2.0.11",
     "@walletconnect/modal": "^2.6.2",
     "@walletconnect/sign-client": "^2.10.2",
     "algosdk": "^2.7.0",
-    "lute-connect": "^1.2.0"
+    "lute-connect": "^1.2.0",
+    "magic-sdk": "^28.0.3"
   },
   "peerDependenciesMeta": {
     "@blockshake/defly-connect": {
       "optional": true
     },
+    "@magic-ext/algorand": {
+      "optional": true
+    },
+    "@perawallet/connect": {
+      "optional": true
+    },
     "@perawallet/connect-beta": {
       "optional": true
     },
@@ -87,6 +96,9 @@
     },
     "lute-connect": {
       "optional": true
+    },
+    "magic-sdk": {
+      "optional": true
     }
   },
   "browser": {},