@txnlab/use-wallet 1.0.2 → 1.0.3

package/dist/cjs/clients/algosigner/client.d.ts

@@ -5,7 +5,7 @@ import type { AlgoSignerTransaction, AlgoSignerClientConstructor, InitParams } f
 declare class AlgoSignerClient extends BaseWallet {
     #private;
     network: Network;
-    constructor({ client, algosdk, algodClient, network, }: AlgoSignerClientConstructor);
+    constructor({ metadata, client, algosdk, algodClient, network, }: AlgoSignerClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/algosigner/types.d.ts

@@ -1,6 +1,6 @@
 import type _algosdk from "algosdk";
 import { PROVIDER_ID } from "../../constants";
-import type { AlgodClientOptions, Network } from "../../types";
+import type { AlgodClientOptions, Network, Metadata } from "../../types";
 export declare type WindowExtended = {
     AlgoSigner: AlgoSigner;
 } & Window & typeof globalThis;
@@ -27,6 +27,7 @@ export declare type AlgoSigner = {
     };
 };
 export declare type AlgoSignerClientConstructor = {
+    metadata: Metadata;
     client: AlgoSigner;
     id: PROVIDER_ID;
     algosdk: typeof _algosdk;

package/dist/cjs/clients/base/base.d.ts

@@ -1,22 +1,17 @@
 import type _algosdk from "algosdk";
-import { PROVIDER_ID } from "../../constants";
-import type { Asset, Wallet, AccountInfo, TransactionsArray } from "../../types";
+import type { Asset, Wallet, AccountInfo, TransactionsArray, Metadata } from "../../types";
 declare abstract class BaseClient {
     algosdk: typeof _algosdk;
     algodClient: _algosdk.Algodv2;
     keepWCAlive: HTMLAudioElement;
-    static metadata: {
-        id: PROVIDER_ID;
-        name: string;
-        icon: string;
-        isWalletConnect: boolean;
-    };
+    metadata: Metadata;
+    static metadata: Metadata;
     abstract connect(onDisconnect: () => void): Promise<Wallet>;
     abstract disconnect(): Promise<void>;
     abstract reconnect(onDisconnect: () => void): Promise<Wallet | null>;
     abstract signTransactions(connectedAccounts: string[], transactions: Array<Uint8Array>): Promise<Uint8Array[]>;
     abstract signEncodedTransactions(transactions: TransactionsArray): Promise<Uint8Array[]>;
-    protected constructor(algosdk: typeof _algosdk, algodClient: _algosdk.Algodv2);
+    protected constructor(metadata: Metadata, algosdk: typeof _algosdk, algodClient: _algosdk.Algodv2);
     healthCheck(): Promise<{}>;
     getAccountInfo(address: string): Promise<AccountInfo>;
     getAssets(address: string): Promise<Asset[]>;

package/dist/cjs/clients/defly/client.d.ts

@@ -7,7 +7,7 @@ import { DeflyTransaction, InitParams, DeflyWalletClientConstructor } from "./ty
 declare class DeflyWalletClient extends BaseWallet {
     #private;
     network: Network;
-    constructor({ client, algosdk, algodClient, network, }: DeflyWalletClientConstructor);
+    constructor({ metadata, client, algosdk, algodClient, network, }: DeflyWalletClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/defly/types.d.ts

@@ -1,5 +1,5 @@
 import type { Transaction } from "algosdk";
-import type { AlgodClientOptions, Network } from "../../types";
+import type { AlgodClientOptions, Network, Metadata } from "../../types";
 import type { DeflyWalletConnect } from "@blockshake/defly-connect";
 import type _algosdk from "algosdk";
 export declare type ClientOptions = {
@@ -22,6 +22,7 @@ export declare type DeflyTransaction = {
     signers?: string[];
 };
 export declare type DeflyWalletClientConstructor = {
+    metadata: Metadata;
     client: DeflyWalletConnect;
     algosdk: typeof _algosdk;
     algodClient: _algosdk.Algodv2;

package/dist/cjs/clients/exodus/client.d.ts

@@ -5,7 +5,7 @@ import { InitParams, ExodusClientConstructor } from "./types";
 declare class ExodusClient extends BaseWallet {
     #private;
     network: Network;
-    constructor({ client, algosdk, algodClient, onlyIfTrusted, network, }: ExodusClientConstructor);
+    constructor({ metadata, client, algosdk, algodClient, onlyIfTrusted, network, }: ExodusClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/exodus/types.d.ts

@@ -1,6 +1,6 @@
 import { PROVIDER_ID } from "../../constants";
 import type _algosdk from "algosdk";
-import type { AlgodClientOptions, Network } from "../../types";
+import type { AlgodClientOptions, Network, Metadata } from "../../types";
 export declare type ClientOptions = {
     onlyIfTrusted: boolean;
 };
@@ -25,6 +25,7 @@ export declare type Exodus = {
     signTransaction(transactions: Bytes[]): Promise<Bytes[]>;
 };
 export declare type ExodusClientConstructor = {
+    metadata: Metadata;
     client: Exodus;
     id: PROVIDER_ID;
     algosdk: typeof _algosdk;

package/dist/cjs/clients/kmd/client.d.ts

@@ -7,7 +7,7 @@ declare class KMDWalletClient extends BaseWallet {
     walletId: string;
     id: PROVIDER_ID;
     network: Network;
-    constructor({ client, id, wallet, password, algosdk, algodClient, network, }: KMDWalletClientConstructor);
+    constructor({ metadata, client, id, wallet, password, algosdk, algodClient, network, }: KMDWalletClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/kmd/types.d.ts

@@ -1,5 +1,5 @@
 import type _algosdk from "algosdk";
-import type { AlgodClientOptions, Network } from "../../types";
+import type { AlgodClientOptions, Network, Metadata } from "../../types";
 import { PROVIDER_ID } from "../../constants";
 export declare type ClientOptions = {
     wallet: string;
@@ -22,6 +22,7 @@ export interface InitWalletHandle {
     error?: boolean;
 }
 export declare type KMDWalletClientConstructor = {
+    metadata: Metadata;
     client: _algosdk.Kmd;
     id: PROVIDER_ID;
     algosdk: typeof _algosdk;

package/dist/cjs/clients/myalgo/client.d.ts

@@ -9,7 +9,7 @@ import { MyAlgoWalletClientConstructor, InitParams } from "./types";
 declare class MyAlgoWalletClient extends BaseWallet {
     #private;
     network: Network;
-    constructor({ client, algosdk, algodClient, network, }: MyAlgoWalletClientConstructor);
+    constructor({ metadata, client, algosdk, algodClient, network, }: MyAlgoWalletClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/myalgo/types.d.ts

@@ -4,8 +4,9 @@
  */
 import type _MyAlgoConnect from "@randlabs/myalgo-connect";
 import type _algosdk from "algosdk";
-import { AlgodClientOptions, Network } from "../../types";
+import { AlgodClientOptions, Network, Metadata } from "../../types";
 export declare type MyAlgoWalletClientConstructor = {
+    metadata: Metadata;
     client: _MyAlgoConnect;
     algosdk: typeof _algosdk;
     algodClient: _algosdk.Algodv2;

package/dist/cjs/clients/pera/client.d.ts

@@ -5,7 +5,7 @@ import { PeraTransaction, PeraWalletClientConstructor, InitParams } from "./type
 declare class PeraWalletClient extends BaseWallet {
     #private;
     network: Network;
-    constructor({ client, algosdk, algodClient, network, }: PeraWalletClientConstructor);
+    constructor({ metadata, client, algosdk, algodClient, network, }: PeraWalletClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/pera/types.d.ts

@@ -1,7 +1,7 @@
 import type _algosdk from "algosdk";
 import type { PeraWalletConnect } from "@perawallet/connect";
 import type { Transaction } from "algosdk";
-import type { AlgodClientOptions, Network } from "../../types";
+import type { AlgodClientOptions, Network, Metadata } from "../../types";
 export declare type ClientOptions = {
     bridge?: string;
     deep_link?: string;
@@ -22,6 +22,7 @@ export interface PeraTransaction {
     signers?: string[];
 }
 export declare type PeraWalletClientConstructor = {
+    metadata: Metadata;
     client: PeraWalletConnect;
     algosdk: typeof _algosdk;
     algodClient: _algosdk.Algodv2;

package/dist/cjs/clients/walletconnect/client.d.ts

@@ -1,12 +1,11 @@
-import type { Wallet } from "../../types";
 import { PROVIDER_ID } from "../../constants";
 import BaseWallet from "../base";
-import { TransactionsArray, Network } from "../../types";
+import { Wallet, TransactionsArray, Network } from "../../types";
 import { WalletConnectClientConstructor, InitParams, WalletConnectTransaction } from "./types";
 declare class WalletConnectClient extends BaseWallet {
     #private;
     network: Network;
-    constructor({ client, algosdk, algodClient, network, }: WalletConnectClientConstructor);
+    constructor({ metadata, client, algosdk, algodClient, network, }: WalletConnectClientConstructor);
     static metadata: {
         id: PROVIDER_ID;
         name: string;

package/dist/cjs/clients/walletconnect/types.d.ts

@@ -1,7 +1,7 @@
 import type _algosdk from "algosdk";
 import type WalletConnect from "@walletconnect/client";
 import QRCodeModal from "algorand-walletconnect-qrcode-modal";
-import type { AlgodClientOptions, Network } from "../../types";
+import type { AlgodClientOptions, Network, Metadata } from "../../types";
 export interface IClientMeta {
     description: string;
     url: string;
@@ -47,6 +47,7 @@ export declare type InitParams = {
     network?: Network;
 };
 export declare type WalletConnectClientConstructor = {
+    metadata: Metadata;
     client: WalletConnect;
     algosdk: typeof _algosdk;
     algodClient: _algosdk.Algodv2;

package/dist/cjs/index.js

@@ -941,11 +941,13 @@ class BaseClient {
     algosdk;
     algodClient;
     keepWCAlive;
+    metadata;
     static metadata;
-    constructor(algosdk, algodClient) {
+    constructor(metadata, algosdk, algodClient) {
         this.algosdk = algosdk;
         this.algodClient = algodClient;
         this.keepWCAlive = new Audio();
+        this.metadata = metadata;
     }
     async healthCheck() {
         return await this.algodClient.healthCheck().do();
@@ -1063,10 +1065,11 @@ const ICON$6 = "data:image/svg+xml;base64," +
 class PeraWalletClient extends BaseClient {
     #client;
     network;
-    constructor({ client, algosdk, algodClient, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, algosdk, algodClient, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.network = network;
+        this.metadata = PeraWalletClient.metadata;
     }
     static metadata = {
         id: exports.PROVIDER_ID.PERA,
@@ -1083,6 +1086,7 @@ class PeraWalletClient extends BaseClient {
                 ...(clientOptions ? clientOptions : { shouldShowSignTxnToast: false }),
             });
             return new PeraWalletClient({
+                metadata: PeraWalletClient.metadata,
                 client: peraWallet,
                 algosdk,
                 algodClient,
@@ -1112,8 +1116,10 @@ class PeraWalletClient extends BaseClient {
     }
     async reconnect(onDisconnect) {
         const accounts = await this.#client.reconnectSession().catch(console.info);
+        console.log("accounts?", accounts);
         this.#client.connector?.on("disconnect", onDisconnect);
         if (!accounts) {
+            onDisconnect();
             return null;
         }
         return {
@@ -1214,10 +1220,11 @@ const ICON$5 = "data:image/svg+xml;base64," +
 class MyAlgoWalletClient extends BaseClient {
     #client;
     network;
-    constructor({ client, algosdk, algodClient, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, algosdk, algodClient, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.network = network;
+        this.metadata = MyAlgoWalletClient.metadata;
     }
     static metadata = {
         id: exports.PROVIDER_ID.MYALGO,
@@ -1234,6 +1241,7 @@ class MyAlgoWalletClient extends BaseClient {
                 ...(clientOptions ? clientOptions : { disableLedgerNano: false }),
             });
             return new MyAlgoWalletClient({
+                metadata: MyAlgoWalletClient.metadata,
                 client: myAlgo,
                 algosdk: algosdk,
                 algodClient: algodClient,
@@ -1328,10 +1336,11 @@ const ICON$4 = "data:image/svg+xml;base64," +
 class DeflyWalletClient extends BaseClient {
     #client;
     network;
-    constructor({ client, algosdk, algodClient, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, algosdk, algodClient, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.network = network;
+        this.metadata = DeflyWalletClient.metadata;
     }
     static metadata = {
         id: exports.PROVIDER_ID.DEFLY,
@@ -1349,6 +1358,7 @@ class DeflyWalletClient extends BaseClient {
                 ...(clientOptions ? clientOptions : { shouldShowSignTxnToast: false }),
             });
             return new DeflyWalletClient({
+                metadata: DeflyWalletClient.metadata,
                 client: deflyWallet,
                 algosdk,
                 algodClient,
@@ -1477,11 +1487,12 @@ class ExodusClient extends BaseClient {
     #client;
     #onlyIfTrusted;
     network;
-    constructor({ client, algosdk, algodClient, onlyIfTrusted, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, algosdk, algodClient, onlyIfTrusted, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.#onlyIfTrusted = onlyIfTrusted;
         this.network = network;
+        this.metadata = ExodusClient.metadata;
     }
     static metadata = {
         id: exports.PROVIDER_ID.EXODUS,
@@ -1499,6 +1510,7 @@ class ExodusClient extends BaseClient {
             const algodClient = await getAlgodClient(algosdk, algodOptions);
             const exodus = window.exodus.algorand;
             return new ExodusClient({
+                metadata: ExodusClient.metadata,
                 id: exports.PROVIDER_ID.EXODUS,
                 client: exodus,
                 algosdk: algosdk,
@@ -1618,8 +1630,8 @@ const getNetwork = (network) => {
 class AlgoSignerClient extends BaseClient {
     #client;
     network;
-    constructor({ client, algosdk, algodClient, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, algosdk, algodClient, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.network = network;
     }
@@ -1639,6 +1651,7 @@ class AlgoSignerClient extends BaseClient {
             const algodClient = await getAlgodClient(algosdk, algodOptions);
             const algosigner = window.AlgoSigner;
             return new AlgoSignerClient({
+                metadata: AlgoSignerClient.metadata,
                 id: exports.PROVIDER_ID.ALGOSIGNER,
                 client: algosigner,
                 algosdk: algosdk,
@@ -1758,10 +1771,11 @@ const DEFAULT_NETWORK = "mainnet";
 class WalletConnectClient extends BaseClient {
     #client;
     network;
-    constructor({ client, algosdk, algodClient, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, algosdk, algodClient, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.network = network;
+        this.metadata = WalletConnectClient.metadata;
     }
     static metadata = {
         id: exports.PROVIDER_ID.WALLETCONNECT,
@@ -1785,6 +1799,7 @@ class WalletConnectClient extends BaseClient {
             const algosdk = algosdkStatic || (await Algod.init(algodOptions)).algosdk;
             const algodClient = await getAlgodClient(algosdk, algodOptions);
             const initWallet = {
+                metadata: WalletConnectClient.metadata,
                 client: walletConnect,
                 algosdk: algosdk,
                 algodClient: algodClient,
@@ -1952,14 +1967,15 @@ class KMDWalletClient extends BaseClient {
     walletId;
     id;
     network;
-    constructor({ client, id, wallet, password, algosdk, algodClient, network, }) {
-        super(algosdk, algodClient);
+    constructor({ metadata, client, id, wallet, password, algosdk, algodClient, network, }) {
+        super(metadata, algosdk, algodClient);
         this.#client = client;
         this.#wallet = wallet;
         this.#password = password;
         this.id = id;
         this.walletId = "";
         this.network = network;
+        this.metadata = KMDWalletClient.metadata;
     }
     static metadata = {
         id: exports.PROVIDER_ID.KMD,
@@ -1969,11 +1985,12 @@ class KMDWalletClient extends BaseClient {
     };
     static async init({ clientOptions, algodOptions, algosdkStatic, network = DEFAULT_NETWORK$1, }) {
         try {
-            const { token = "a".repeat(64), host = "http://localhost", port = "4002", wallet = "", password = "", } = clientOptions || {};
+            const { token = "a".repeat(64), host = "http://localhost", port = "4002", wallet = "unencrypted-default-wallet", password = "", } = clientOptions || {};
             const algosdk = algosdkStatic || (await Algod.init(algodOptions)).algosdk;
             const algodClient = await getAlgodClient(algosdk, algodOptions);
             const kmdClient = new algosdk.Kmd(token, host, port);
             return new KMDWalletClient({
+                metadata: KMDWalletClient.metadata,
                 id: exports.PROVIDER_ID.KMD,
                 password,
                 wallet,
@@ -1999,10 +2016,7 @@ class KMDWalletClient extends BaseClient {
         return;
     }
     async reconnect() {
-        return {
-            ...KMDWalletClient.metadata,
-            accounts: await this.listAccounts(this.#wallet, this.#password || (await this.requestPassword())),
-        };
+        return null;
     }
     async requestPassword() {
         // TODO: store it locally?
@@ -2100,6 +2114,13 @@ var allClients = {
     [KMDWalletClient.metadata.id]: KMDWalletClient,
 };
 
+const clearActiveAccount = useWalletStore.getState().clearActiveAccount;
+const removeAccounts = useWalletStore.getState().removeAccounts;
+const clearAccounts = (id) => {
+    clearActiveAccount(id);
+    removeAccounts(id);
+};
+
 function shallow(objA, objB) {
   if (Object.is(objA, objB)) {
     return true;
@@ -2121,7 +2142,7 @@ function shallow(objA, objB) {
 
 function useWallet() {
     const clients = require$$0.useContext(ClientContext);
-    const { activeAccount, accounts: connectedAccounts, setActiveAccount: _setActiveAccount, clearActiveAccount, addAccounts, removeAccounts, } = useWalletStore(walletStoreSelector, shallow);
+    const { activeAccount, accounts: connectedAccounts, setActiveAccount: _setActiveAccount, addAccounts, } = useWalletStore(walletStoreSelector, shallow);
     const getAccountsByProvider = (id) => {
         return connectedAccounts.filter((account) => account.providerId === id);
     };
@@ -2183,7 +2204,7 @@ function useWallet() {
         try {
             await disconnectWCSessions(id);
             const walletClient = await getClient(id);
-            const walletInfo = await walletClient?.connect(() => disconnect(id));
+            const walletInfo = await walletClient?.connect(() => clearAccounts(id));
             if (!walletInfo || !walletInfo.accounts.length) {
                 throw new Error("Failed to connect " + id);
             }
@@ -2197,7 +2218,7 @@ function useWallet() {
     const reconnect = async (id) => {
         try {
             const walletClient = await getClient(id);
-            const walletInfo = await walletClient?.reconnect(() => disconnect(id));
+            const walletInfo = await walletClient?.reconnect(() => clearAccounts(id));
             if (walletInfo && walletInfo.accounts.length) {
                 addAccounts(walletInfo.accounts);
             }
@@ -2216,8 +2237,7 @@ function useWallet() {
             console.error(e);
         }
         finally {
-            clearActiveAccount(id);
-            removeAccounts(id);
+            clearAccounts(id);
         }
     };
     const setActive = async (id) => {
@@ -2327,7 +2347,7 @@ const reconnectProviders = async (providers) => {
         const clients = Object.values(providers);
         for (const client of clients) {
             const c = await client;
-            c?.reconnect(c?.disconnect);
+            c?.reconnect(() => clearAccounts(c?.metadata.id));
         }
     }
     catch (e) {