@sundaeswap/wallet-lite 0.0.23 → 0.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/@types/observer.ts

@@ -66,6 +66,7 @@ export interface IResolvedWalletObserverOptions<
   persistence: boolean;
   peerConnectArgs: DAppPeerConnectParameters;
   connectTimeout: number;
+  debug: boolean;
 }
 
 /**

package/src/classes/WalletObserver.class.ts

@@ -78,6 +78,7 @@ export class WalletObserver<
         metadataResolver: this.fallbackMetadataResolver,
         persistence: false,
         connectTimeout: 10000,
+        debug: false,
         peerConnectArgs: {
           dAppInfo: {
             name: "Placeholder dApp Connecter Name",
@@ -141,6 +142,8 @@ export class WalletObserver<
       );
     }
 
+    const start = performance.now();
+
     try {
       this._performingSync = true;
       this.dispatch(EWalletObserverEvents.SYNCING_WALLET_START);
@@ -185,6 +188,10 @@ export class WalletObserver<
       this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END, result);
       this._performingSync = false;
 
+      const end = performance.now();
+      if (this._options.debug) {
+        console.log(`sync: ${end - start}ms`);
+      }
       return result;
     } catch (e) {
       this._performingSync = false;
@@ -267,6 +274,7 @@ export class WalletObserver<
   connectWallet = async (
     extension: TSupportedWalletExtensions
   ): Promise<void> => {
+    const start = performance.now();
     this.dispatch(EWalletObserverEvents.CONNECT_WALLET_START);
 
     let attempts = 0;
@@ -310,9 +318,15 @@ export class WalletObserver<
     this.dispatch(EWalletObserverEvents.CONNECT_WALLET_END, {
       extension,
     });
+
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`connectWallet: ${end - start}ms`);
+    }
   };
 
   getCip45Instance = async () => {
+    const start = performance.now();
     if (!this.peerConnectInstance) {
       const { DAppPeerConnect } = await getPeerConnect();
       this.peerConnectInstance = new DAppPeerConnect(
@@ -320,6 +334,11 @@ export class WalletObserver<
       );
     }
 
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getCip45Instance: ${end - start}ms`);
+    }
+
     return {
       name: this._options.peerConnectArgs.dAppInfo.name,
       icon: this.peerConnectInstance.getIdenticon(),
@@ -376,6 +395,8 @@ export class WalletObserver<
       throw new Error("Attempted to query balance without an API instance.");
     }
 
+    const start = performance.now();
+
     this.dispatch(EWalletObserverEvents.GET_BALANCE_MAP_START);
     const [cbor, { Serialization }, { typedHex }] = await Promise.all([
       this.api.getBalance(),
@@ -411,6 +432,10 @@ export class WalletObserver<
       balanceMap,
     });
 
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getBalanceMap: ${end - start}ms`);
+    }
     return balanceMap;
   };
 
@@ -424,8 +449,15 @@ export class WalletObserver<
       throw new Error("Attempted to query network without an API instance.");
     }
 
+    const start = performance.now();
+
     const val = await this.api.getNetworkId();
     this.network = val;
+
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getNetwork: ${end - start}ms`);
+    }
     return val;
   };
 
@@ -441,6 +473,8 @@ export class WalletObserver<
       );
     }
 
+    const start = performance.now();
+
     const [cbor, { Cardano }, { typedHex }] = await Promise.all([
       this.api.getUsedAddresses(),
       getCardanoCore(),
@@ -451,6 +485,10 @@ export class WalletObserver<
       Cardano.Address.fromBytes(typedHex(val)).toBech32()
     );
 
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getUsedAddresses: ${end - start}ms`);
+    }
     return data;
   };
 
@@ -466,6 +504,8 @@ export class WalletObserver<
       );
     }
 
+    const start = performance.now();
+
     const [cbor, { Cardano }, { typedHex }] = await Promise.all([
       this.api.getUnusedAddresses(),
       getCardanoCore(),
@@ -476,6 +516,10 @@ export class WalletObserver<
       Cardano.Address.fromBytes(typedHex(val)).toBech32()
     );
 
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getUnusedAddresses: ${end - start}ms`);
+    }
     return data;
   };
 
@@ -489,6 +533,8 @@ export class WalletObserver<
       throw new Error("Attempted to query UTXOs without an API instance.");
     }
 
+    const start = performance.now();
+
     const [cbor, { Serialization }, { typedHex }] = await Promise.all([
       this.api.getUtxos(),
       getCardanoCore(),
@@ -506,6 +552,10 @@ export class WalletObserver<
       return txOutput;
     });
 
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getUtxos: ${end - start}ms`);
+    }
     return data;
   };
 
@@ -519,6 +569,8 @@ export class WalletObserver<
       throw new Error("Attempted to query UTXOs without an API instance.");
     }
 
+    const start = performance.now();
+
     const [cbor, { Serialization }, { typedHex }] = await Promise.all([
       (async () => {
         const funcCall =
@@ -545,6 +597,10 @@ export class WalletObserver<
       return txOutput;
     });
 
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getCollateral: ${end - start}ms`);
+    }
     return data;
   };
 
@@ -558,6 +614,8 @@ export class WalletObserver<
   private __metadataResolverWithCache = async (
     assetIds: string[]
   ): Promise<Map<string, AssetMetadata>> => {
+    const start = performance.now();
+
     if (this._cachedMetadata) {
       const cachedKeys = new Set(this._cachedMetadata.keys());
       const inputKeys = new Set(assetIds);
@@ -566,13 +624,17 @@ export class WalletObserver<
         cachedKeys.size === inputKeys.size &&
         [...cachedKeys].every((key) => inputKeys.has(key))
       ) {
+        const end = performance.now();
+        if (this._options.debug) {
+          console.log(`metadataResolver (cached): ${end - start}ms`);
+        }
         return this._cachedMetadata;
       }
     }
 
     let attempts = 0;
     let newMetadata: Map<string, AssetMetadata> | undefined;
-    while (attempts <= 3) {
+    while (attempts <= 3 && !newMetadata) {
       try {
         newMetadata = await this._options.metadataResolver(
           assetIds.map(normalizeAssetIdWithDot),
@@ -593,6 +655,11 @@ export class WalletObserver<
     }
 
     this._cachedMetadata = newMetadata;
+
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`metadataResolver: ${end - start}ms`);
+    }
     return newMetadata;
   };
 

package/src/react-components/WalletObserverProvider/hooks/effects/useProviderEventListeners.ts

@@ -80,9 +80,7 @@ export const useProviderEventListeners = (
    * Ensure the wallet syncs on connect and disconnect.
    */
   useEffect(() => {
-    window.addEventListener("focus", () => {
-      syncWallet;
-    });
+    window.addEventListener("focus", syncWallet);
 
     observer.addEventListener(
       EWalletObserverEvents.CONNECT_WALLET_END,

package/src/react-components/WalletObserverProvider/hooks/useWalletObserverState.ts

@@ -1,6 +1,7 @@
 import type { TransactionUnspentOutput } from "@cardano-sdk/core/dist/cjs/Serialization/index.js";
 import { AssetAmount } from "@sundaeswap/asset";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useState } from "react";
+import { unstable_batchedUpdates } from "react-dom";
 
 import {
   TAssetAmountMap,
@@ -19,7 +20,6 @@ import { THandleMetadata } from "../../contexts/observer/index.js";
  * @param {WalletObserver} observer
  */
 export const useWalletObserverState = (observer: WalletObserver) => {
-  const prevActiveWallet = useRef<TSupportedWalletExtensions>();
   const [activeWallet, setActiveWallet] =
     useState<TSupportedWalletExtensions>();
   const [adaBalance, setAdaBalance] = useState<AssetAmount>(
@@ -47,77 +47,82 @@ export const useWalletObserverState = (observer: WalletObserver) => {
     const newWallet = observer.getActiveWallet();
 
     if (!newWallet) {
-      setAdaBalance(new AssetAmount(0n));
-      setBalance(new WalletBalanceMap(observer));
-      setUsedAddresses([]);
-      setUnusedAddresses([]);
-      setActiveWallet(undefined);
-      setNetwork(undefined);
-      setUtxos(undefined);
-      setCollateral(undefined);
+      unstable_batchedUpdates(() => {
+        setAdaBalance(new AssetAmount(0n));
+        setBalance(new WalletBalanceMap(observer));
+        setUsedAddresses([]);
+        setUnusedAddresses([]);
+        setActiveWallet(undefined);
+        setNetwork(undefined);
+        setUtxos(undefined);
+        setCollateral(undefined);
+      });
       return;
     }
 
-    prevActiveWallet.current = newWallet;
-    setActiveWallet((prevWallet) =>
-      newWallet === prevWallet ? prevWallet : newWallet
-    );
-
     const freshData = await observer.sync();
 
-    const newAdaBalance = freshData.balanceMap.get(WalletObserver.ADA_ASSET_ID);
-    if (newAdaBalance) {
-      setAdaBalance((prevBalance) =>
-        prevBalance.amount === newAdaBalance.amount
-          ? prevBalance
-          : newAdaBalance
+    unstable_batchedUpdates(() => {
+      setActiveWallet((prevWallet) =>
+        newWallet === prevWallet ? prevWallet : newWallet
       );
-    }
 
-    setBalance((prevBalance) =>
-      areAssetMapsEqual(prevBalance, freshData.balanceMap)
-        ? prevBalance
-        : freshData.balanceMap
-    );
-
-    setUsedAddresses((prevValue) =>
-      JSON.stringify(prevValue) === JSON.stringify(freshData.usedAddresses)
-        ? prevValue
-        : freshData.usedAddresses
-    );
-
-    setUnusedAddresses((prevValue) =>
-      JSON.stringify(prevValue) === JSON.stringify(freshData.unusedAddresses)
-        ? prevValue
-        : freshData.unusedAddresses
-    );
-
-    setNetwork((prevValue) =>
-      prevValue === freshData.network ? prevValue : freshData.network
-    );
-
-    setUtxos((prevValue) => {
-      const prevValueRep = prevValue?.map((v) => v.toCbor());
-      const newValueRep = freshData.utxos?.map((v) => v.toCbor());
-      if (prevValueRep !== newValueRep) {
-        return freshData.utxos;
+      const newAdaBalance = freshData.balanceMap.get(
+        WalletObserver.ADA_ASSET_ID
+      );
+      if (newAdaBalance) {
+        setAdaBalance((prevBalance) =>
+          prevBalance.amount === newAdaBalance.amount
+            ? prevBalance
+            : newAdaBalance
+        );
       }
 
-      return prevValue;
-    });
+      setBalance((prevBalance) =>
+        areAssetMapsEqual(prevBalance, freshData.balanceMap)
+          ? prevBalance
+          : freshData.balanceMap
+      );
 
-    setCollateral((prevValue) => {
-      const prevValueRep = prevValue?.map((v) => v.toCbor());
-      const newValueRep = freshData.utxos?.map((v) => v.toCbor());
-      if (prevValueRep !== newValueRep) {
-        return freshData.utxos;
-      }
+      setUsedAddresses((prevValue) =>
+        JSON.stringify(prevValue) === JSON.stringify(freshData.usedAddresses)
+          ? prevValue
+          : freshData.usedAddresses
+      );
 
-      return prevValue;
-    });
+      setUnusedAddresses((prevValue) =>
+        JSON.stringify(prevValue) === JSON.stringify(freshData.unusedAddresses)
+          ? prevValue
+          : freshData.unusedAddresses
+      );
+
+      setNetwork((prevValue) =>
+        prevValue === freshData.network ? prevValue : freshData.network
+      );
+
+      setUtxos((prevValue) => {
+        const prevValueRep = prevValue?.map((v) => v.toCbor());
+        const newValueRep = freshData.utxos?.map((v) => v.toCbor());
+        if (prevValueRep !== newValueRep) {
+          return freshData.utxos;
+        }
 
-    setReady(true);
-    setIsCip45(newWallet.includes("p2p"));
+        return prevValue;
+      });
+
+      setCollateral((prevValue) => {
+        const prevValueRep = prevValue?.map((v) => v.toCbor());
+        const newValueRep = freshData.utxos?.map((v) => v.toCbor());
+        if (prevValueRep !== newValueRep) {
+          return freshData.utxos;
+        }
+
+        return prevValue;
+      });
+
+      setReady(true);
+      setIsCip45(newWallet.includes("p2p"));
+    });
   }, [observer]);
 
   return {