@sundaeswap/wallet-lite 0.0.94 → 0.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -66,6 +66,7 @@
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.5.2",
     "@types/libsodium-wrappers-sumo": "^0.7.8",
+    "@tanstack/react-query": "^5.51.11",
     "@types/lodash": "^4.17.4",
     "@types/node": "^20.14.2",
     "@types/node-fetch": "^2.6.11",

package/src/@types/observer.ts

@@ -18,6 +18,9 @@ export interface IWindowCip30Extension {
   icon: string;
   isEnabled: () => Promise<boolean>;
   name: string;
+  experimental?: {
+    feeAddress?: string;
+  };
 }
 
 /**
@@ -102,4 +105,5 @@ export interface IWalletObserverSync<
   collateral?: Error | TransactionUnspentOutput[];
   network: Error | number;
   feeAddress?: Error | string;
+  changeAddress?: Error | string;
 }

package/src/classes/WalletObserver.class.ts

@@ -150,6 +150,7 @@ export class WalletObserver<
         newOutputs,
         newCollateral,
         newFeeAddress,
+        newChangeAddress,
       ] = await Promise.all([
         this.getNetwork(),
         this.getUsedAddresses(),
@@ -157,6 +158,7 @@ export class WalletObserver<
         this.getUtxos(),
         this.getCollateral(),
         this.getFeeAddress(),
+        this.getChangeAddress(),
       ]);
 
       const result: IWalletObserverSync<AssetMetadata> = {
@@ -167,6 +169,7 @@ export class WalletObserver<
         collateral: newCollateral,
         network: newNetwork,
         feeAddress: newFeeAddress,
+        changeAddress: newChangeAddress,
       };
 
       const end = performance.now();
@@ -414,6 +417,41 @@ export class WalletObserver<
     this.dispatch(EWalletObserverEvents.DISCONNECT);
   };
 
+  /**
+   * Gets a the change address.
+   *
+   * @returns {Promise<string | Error>} The change address, or an error.
+   */
+  getChangeAddress = async (): Promise<string | Error> => {
+    if (!this.api) {
+      throw new Error(
+        "Attempted to query change address without an API instance.",
+      );
+    }
+
+    const start = performance.now();
+
+    const [{ Cardano }, typedHex] = await Promise.all([
+      getCardanoCore(),
+      getCardanoUtil(),
+    ]);
+
+    let cbor: string;
+    try {
+      cbor = await this.api.getChangeAddress();
+    } catch (e) {
+      return e as Error;
+    }
+
+    const data = Cardano.Address.fromBytes(typedHex(cbor)).toBech32();
+
+    const end = performance.now();
+    if (this._options.debug) {
+      console.log(`getChangeAddress: ${end - start}ms`);
+    }
+    return data;
+  };
+
   /**
    * Retrieves the balance of the wallet, including metadata for each asset.
    *
@@ -635,7 +673,8 @@ export class WalletObserver<
 
     const start = performance.now();
     try {
-      const address = this.api.experimental?.feeAddress;
+      const address =
+        window.cardano?.[this.activeWallet!]?.experimental?.feeAddress;
       const end = performance.now();
 
       if (this._options.debug) {

package/src/react-components/WalletObserverProvider/WalletObserverProvider.tsx

@@ -39,6 +39,7 @@ const WalletObserverProvider: FC<
   const derivedState = useDerivedState(observerRef.current, {
     usedAddresses: state.usedAddresses,
     unusedAddresses: state.unusedAddresses,
+    changeAddress: state.changeAddress,
   });
 
   // Memoize the context value

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

@@ -7,32 +7,30 @@ export const useDerivedState = (
   observer: WalletObserver,
   state: Pick<
     ReturnType<typeof useWalletObserverState>,
-    "usedAddresses" | "unusedAddresses"
+    "usedAddresses" | "unusedAddresses" | "changeAddress"
   >,
 ) => {
   const [stakeAddress, setStakeAddress] = useState<string>();
+  const address =
+    state.changeAddress || state.usedAddresses[0] || state.unusedAddresses[0];
 
   useEffect(() => {
-    if (!state.usedAddresses[0] && !state.unusedAddresses[0]) {
+    if (!address) {
       return;
     }
 
     observer.getUtils().then((utils) => {
-      setStakeAddress(
-        utils.getBech32StakingAddress(
-          state.usedAddresses[0] || state.unusedAddresses[0],
-        ),
-      );
+      setStakeAddress(utils.getBech32StakingAddress(address));
     });
-  }, [state.usedAddresses[0] || state.unusedAddresses[0]]);
+  }, [address]);
 
   const memoizedDerivedState = useMemo(() => {
-    let mainAddress = state.usedAddresses[0] || state.unusedAddresses[0];
     const persistentCache = window.localStorage.getItem(
       WalletObserver.PERSISTENCE_CACHE_KEY,
     );
     const usePersistence = observer.getOptions().persistence;
 
+    let mainAddress = address;
     if (usePersistence && persistentCache && !mainAddress) {
       const cache = JSON.parse(persistentCache) as IWalletObserverSeed;
       mainAddress = cache.mainAddress;
@@ -42,12 +40,7 @@ export const useDerivedState = (
       stakeAddress,
       mainAddress,
     };
-  }, [
-    observer,
-    state.usedAddresses[0],
-    state.unusedAddresses[0],
-    stakeAddress,
-  ]);
+  }, [observer, address, stakeAddress]);
 
   return memoizedDerivedState;
 };

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

@@ -31,6 +31,7 @@ export const useWalletObserverState = <
   const [network, setNetwork] = useState<number | undefined>();
   const [usedAddresses, setUsedAddresses] = useState<string[]>([]);
   const [unusedAddresses, setUnusedAddresses] = useState<string[]>([]);
+  const [changeAddress, setChangeAddress] = useState<string | undefined>();
   const [feeAddress, setFeeAddress] = useState<string | undefined>();
   const [utxos, setUtxos] = useState<TransactionUnspentOutput[]>();
   const [collateral, setCollateral] = useState<TransactionUnspentOutput[]>();
@@ -54,6 +55,7 @@ export const useWalletObserverState = <
     setBalance(new WalletBalanceMap(observer));
     setUsedAddresses([]);
     setUnusedAddresses([]);
+    setChangeAddress(undefined);
     setActiveWallet(undefined);
     setNetwork(undefined);
     setUtxos(undefined);
@@ -176,6 +178,13 @@ export const useWalletObserverState = <
               prevValue === newFeeAddress ? prevValue : newFeeAddress,
             );
           }
+
+          const newChangeAddress = freshData.changeAddress;
+          if (!(newChangeAddress instanceof Error)) {
+            setChangeAddress((prevValue) =>
+              prevValue === newChangeAddress ? prevValue : newChangeAddress,
+            );
+          }
         });
       } catch (e) {
         setErrorSyncing(true);
@@ -212,6 +221,7 @@ export const useWalletObserverState = <
     isPending,
     isReadOnlyMode,
     network,
+    changeAddress,
     setActiveWallet,
     setAdaBalance,
     setBalance,
@@ -224,6 +234,7 @@ export const useWalletObserverState = <
     setUnusedAddresses,
     setUsedAddresses,
     setUtxos,
+    setChangeAddress,
     switching,
     syncWallet,
     unusedAddresses,

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

@@ -95,4 +95,5 @@ export type TUseWalletObserverState<
   | "setCollateral"
   | "setFeeAddress"
   | "setIsReadOnlyMode"
+  | "setChangeAddress"
 >;

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

@@ -36,6 +36,7 @@ export const useWalletObserver = <
       isPending: state.isPending,
       isReadOnlyMode: state.isReadOnlyMode,
       mainAddress: state.mainAddress,
+      changeAddress: state.changeAddress,
       network: state.network,
       observer: state.observer,
       stakeAddress: state.stakeAddress,
@@ -47,6 +48,7 @@ export const useWalletObserver = <
       willAutoConnect: state.willAutoConnect,
     }),
     [
+      state.changeAddress,
       state.activeWallet,
       state.adaBalance.amount,
       state.balance.size,