@sundaeswap/wallet-lite 0.0.73 → 0.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -38,7 +38,7 @@
     "@babel/cli": "^7.24.7",
     "@fabianbormann/cardano-peer-connect": "^1.2.17",
     "@koralabs/adahandle-sdk": "^1.5.5",
-    "@sundaeswap/asset": "^1.0.6",
+    "@sundaeswap/asset": "^1.0.7",
     "@sundaeswap/fraction": "1.0.5",
     "rxjs": "^7.8.1"
   },

package/src/@types/observer.ts

@@ -99,4 +99,5 @@ export interface IWalletObserverSync<
   utxos?: Error | TransactionUnspentOutput[];
   collateral?: Error | TransactionUnspentOutput[];
   network: Error | number;
+  feeAddress?: Error | string;
 }

package/src/classes/WalletObserver.class.ts

@@ -148,21 +148,24 @@ export class WalletObserver<
         newUnusedAddresses,
         newOutputs,
         newCollateral,
+        newFeeAddress,
       ] = await Promise.all([
         this.getBalanceMap(),
         this.getUsedAddresses(),
         this.getUnusedAddresses(),
         this.getUtxos(),
         this.getCollateral(),
+        this.getFeeAddress(),
       ]);
 
-      const result = {
+      const result: IWalletObserverSync<AssetMetadata> = {
         balanceMap: newBalanceMap,
         usedAddresses: newUsedAddresses,
         unusedAddresses: newUnusedAddresses,
         utxos: newOutputs,
         collateral: newCollateral,
         network: newNetwork,
+        feeAddress: newFeeAddress,
       };
 
       const end = performance.now();
@@ -582,6 +585,33 @@ export class WalletObserver<
     return data;
   };
 
+  /**
+   * Gets the fee address set by the wallet, if available.
+   *
+   * @returns {Promise<string | Error | undefined>} The fee address or an Error.
+   */
+  getFeeAddress = async (): Promise<string | Error | undefined> => {
+    if (!this.api) {
+      throw new Error(
+        "Attempted to query fee address without an API instance.",
+      );
+    }
+
+    const start = performance.now();
+    try {
+      const address = this.api.experimental?.feeAddress();
+      const end = performance.now();
+
+      if (this._options.debug) {
+        console.log(`getFeeAddress: ${end - start}ms`);
+      }
+
+      return address;
+    } catch (e) {
+      return e as Error;
+    }
+  };
+
   /**
    * Gets a list of wallet UTXOs suitable for collateral.
    *

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

@@ -28,6 +28,7 @@ export const useWalletObserverState = <
   const [network, setNetwork] = useState<number | undefined>();
   const [usedAddresses, setUsedAddresses] = useState<string[]>([]);
   const [unusedAddresses, setUnusedAddresses] = useState<string[]>([]);
+  const [feeAddress, setFeeAddress] = useState<string | undefined>();
   const [utxos, setUtxos] = useState<TransactionUnspentOutput[]>();
   const [collateral, setCollateral] = useState<TransactionUnspentOutput[]>();
   const [isCip45, setIsCip45] = useState(false);
@@ -54,6 +55,7 @@ export const useWalletObserverState = <
     setNetwork(undefined);
     setUtxos(undefined);
     setCollateral(undefined);
+    setFeeAddress(undefined);
     setIsCip45(false);
     setWillAutoConnect(false);
   }, [observer]);
@@ -94,8 +96,6 @@ export const useWalletObserverState = <
                 : newBalanceMap,
             );
           }
-        } else {
-          setErrorSyncing(true);
         }
 
         const newUsedAddresses = freshData.usedAddresses;
@@ -106,8 +106,6 @@ export const useWalletObserverState = <
               ? prevValue
               : newUsedAddresses;
           });
-        } else {
-          setErrorSyncing(true);
         }
 
         const newUnusedAddresses = freshData.unusedAddresses;
@@ -117,8 +115,6 @@ export const useWalletObserverState = <
               ? prevValue
               : newUnusedAddresses,
           );
-        } else {
-          setErrorSyncing(true);
         }
 
         const newNetwork = freshData.network;
@@ -126,8 +122,6 @@ export const useWalletObserverState = <
           setNetwork((prevValue) =>
             prevValue === newNetwork ? prevValue : newNetwork,
           );
-        } else {
-          setErrorSyncing(true);
         }
 
         const newUtxos = freshData.utxos;
@@ -141,8 +135,6 @@ export const useWalletObserverState = <
 
             return prevValue;
           });
-        } else {
-          setErrorSyncing(true);
         }
 
         const newCollateral = freshData.collateral;
@@ -156,14 +148,19 @@ export const useWalletObserverState = <
 
             return prevValue;
           });
-        } else {
-          setErrorSyncing(true);
+        }
+
+        const newFeeAddress = freshData.feeAddress;
+        if (typeof newFeeAddress === "string") {
+          setFeeAddress((prevValue) =>
+            prevValue === newFeeAddress ? prevValue : newFeeAddress,
+          );
         }
       });
     } catch (e) {
       setErrorSyncing(true);
       (e as Error).cause =
-        "The wallet through an error while the app was trying to sync with it. Please try again or contact your wallet provider.";
+        "The wallet threw an error while the app was trying to sync with it. Please try again or contact your wallet provider.";
       throw e;
     }
   }, [observer, disconnect]);
@@ -195,30 +192,32 @@ export const useWalletObserverState = <
 
   return {
     activeWallet,
-    setActiveWallet,
     adaBalance,
-    setAdaBalance,
     balance,
-    setBalance,
+    collateral,
+    connectWallet,
+    disconnect,
+    errorSyncing,
+    feeAddress,
     isCip45,
-    setIsCip45,
+    isPending,
     network,
+    setActiveWallet,
+    setAdaBalance,
+    setBalance,
+    setCollateral,
+    setFeeAddress,
+    setIsCip45,
     setNetwork,
-    unusedAddresses,
+    setSwitching,
     setUnusedAddresses,
-    usedAddresses,
     setUsedAddresses,
-    utxos,
     setUtxos,
-    collateral,
-    setCollateral,
-    syncWallet,
-    disconnect,
-    connectWallet,
     switching,
-    errorSyncing,
-    setSwitching,
-    isPending,
+    syncWallet,
+    unusedAddresses,
+    usedAddresses,
+    utxos,
     willAutoConnect,
   };
 };

package/src/react-components/contexts/observer/types.ts

@@ -84,4 +84,5 @@ export type TUseWalletObserverState<
   | "setIsCip45"
   | "setUtxos"
   | "setCollateral"
+  | "setFeeAddress"
 >;

package/src/react-components/hooks/useWalletObserver.ts

@@ -24,46 +24,48 @@ export const useWalletObserver = <
     "ready" | "connectingWallet" | "syncingWallet"
   > = useMemo(
     () => ({
-      isCip45: state.isCip45,
       activeWallet: state.activeWallet,
       adaBalance: state.adaBalance,
       balance: state.balance,
+      collateral: state.collateral,
+      connectWallet: state.connectWallet,
+      disconnect: state.disconnect,
+      errorSyncing: state.errorSyncing,
+      feeAddress: state.feeAddress,
+      isCip45: state.isCip45,
+      isPending: state.isPending,
       mainAddress: state.mainAddress,
-      stakeAddress: state.stakeAddress,
       network: state.network,
-      utxos: state.utxos,
-      collateral: state.collateral,
       observer: state.observer,
+      stakeAddress: state.stakeAddress,
+      switching: state.switching,
+      syncWallet: state.syncWallet,
       unusedAddresses: state.unusedAddresses,
       usedAddresses: state.usedAddresses,
-      syncWallet: state.syncWallet,
-      disconnect: state.disconnect,
-      connectWallet: state.connectWallet,
-      switching: state.switching,
-      errorSyncing: state.errorSyncing,
-      isPending: state.isPending,
+      utxos: state.utxos,
       willAutoConnect: state.willAutoConnect,
     }),
     [
-      state.isCip45,
       state.activeWallet,
       state.adaBalance.amount,
       state.balance.size,
+      state.collateral,
+      state.connectWallet,
+      state.disconnect,
+      state.errorSyncing,
+      state.feeAddress,
+      state.isCip45,
+      state.isPending,
       state.mainAddress,
-      state.stakeAddress,
       state.network,
-      state.utxos,
-      state.collateral,
       state.observer,
+      state.stakeAddress,
+      state.switching,
+      state.syncWallet,
       state.unusedAddresses,
       state.usedAddresses,
-      state.syncWallet,
-      state.disconnect,
-      state.connectWallet,
-      state.switching,
-      state.isPending,
+      state.utxos,
       state.willAutoConnect,
-      state.errorSyncing,
     ],
   );