@manahippo/aptos-wallet-adapter 0.4.5 → 0.4.7

package/src/WalletProviders/WalletProvider.tsx

@@ -1,5 +1,5 @@
 import { FC, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
-import { TransactionPayload } from 'aptos/src/generated';
+import { Types } from 'aptos';
 import {
   WalletError,
   WalletNotConnectedError,
@@ -9,6 +9,7 @@ import {
 import { useLocalStorage } from '../hooks/useLocalStorage';
 import {
   AccountKeys,
+  NetworkInfo,
   SignMessagePayload,
   WalletAdapter,
   WalletName,
@@ -29,11 +30,13 @@ const initialState: {
   adapter: WalletAdapter | null;
   account: AccountKeys | null;
   connected: boolean;
+  network: NetworkInfo | null;
 } = {
   wallet: null,
   adapter: null,
   account: null,
-  connected: false
+  connected: false,
+  network: null
 };
 
 export const WalletProvider: FC<WalletProviderProps> = ({
@@ -44,7 +47,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   localStorageKey = 'walletName'
 }) => {
   const [name, setName] = useLocalStorage<WalletName | null>(localStorageKey, null);
-  const [{ wallet, adapter, account, connected }, setState] = useState(initialState);
+  const [{ wallet, adapter, account, connected, network }, setState] = useState(initialState);
   const readyState = adapter?.readyState || WalletReadyState.Unsupported;
   const [connecting, setConnecting] = useState(false);
   const [disconnecting, setDisconnecting] = useState(false);
@@ -110,7 +113,8 @@ export const WalletProvider: FC<WalletProviderProps> = ({
         wallet: selectedWallet,
         adapter: selectedWallet.adapter,
         connected: selectedWallet.adapter.connected,
-        account: selectedWallet.adapter.publicAccount
+        account: selectedWallet.adapter.publicAccount,
+        network: selectedWallet.adapter.network
       });
     } else {
       setState(initialState);
@@ -137,6 +141,31 @@ export const WalletProvider: FC<WalletProviderProps> = ({
       return {
         ...state,
         connected: adapter.connected,
+        account: adapter.publicAccount,
+        network: adapter.network
+      };
+    });
+  }, [adapter]);
+
+  // Handle the adapter's network event
+  const handleNetworkChange = useCallback(() => {
+    if (!adapter) return;
+    console.log('adapter: handleNetworkChange', adapter.network);
+    setState((state) => {
+      return {
+        ...state,
+        network: adapter.network
+      };
+    });
+  }, [adapter]);
+
+  // Handle the adapter's account event
+  const handleAccountChange = useCallback(() => {
+    if (!adapter) return;
+    console.log('adapter: handleAccountChange', adapter.publicAccount);
+    setState((state) => {
+      return {
+        ...state,
         account: adapter.publicAccount
       };
     });
@@ -158,19 +187,38 @@ export const WalletProvider: FC<WalletProviderProps> = ({
     [isUnloading, onError]
   );
 
+  // Listen on the adapter's network/account changes
+  useEffect(() => {
+    if (adapter && connected) {
+      adapter.onAccountChange();
+      adapter.onNetworkChange();
+    }
+  }, [adapter, connected]);
+
   // Setup and teardown event listeners when the adapter changes
   useEffect(() => {
     if (adapter) {
       adapter.on('connect', handleConnect);
+      adapter.on('networkChange', handleNetworkChange);
+      adapter.on('accountChange', handleAccountChange);
       adapter.on('disconnect', handleDisconnect);
       adapter.on('error', handleError);
       return () => {
         adapter.off('connect', handleConnect);
+        adapter.off('networkChange', handleNetworkChange);
+        adapter.off('accountChange', handleAccountChange);
         adapter.off('disconnect', handleDisconnect);
         adapter.off('error', handleError);
       };
     }
-  }, [adapter, handleConnect, handleDisconnect, handleError]);
+  }, [
+    adapter,
+    handleAccountChange,
+    handleConnect,
+    handleDisconnect,
+    handleError,
+    handleNetworkChange
+  ]);
 
   // When the adapter changes, disconnect the old one
   useEffect(() => {
@@ -265,7 +313,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
 
   // Send a transaction using the provided connection
   const signAndSubmitTransaction = useCallback(
-    async (transaction: TransactionPayload, option?: any) => {
+    async (transaction: Types.TransactionPayload, option?: any) => {
       if (!adapter) throw handleError(new WalletNotSelectedError());
       if (!connected) throw handleError(new WalletNotConnectedError());
       const response = await adapter.signAndSubmitTransaction(transaction, option);
@@ -275,7 +323,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   );
 
   const signTransaction = useCallback(
-    async (transaction: TransactionPayload, option?: any) => {
+    async (transaction: Types.TransactionPayload, option?: any) => {
       if (!adapter) throw handleError(new WalletNotSelectedError());
       if (!connected) throw handleError(new WalletNotConnectedError());
       return adapter.signTransaction(transaction, option);
@@ -307,7 +355,8 @@ export const WalletProvider: FC<WalletProviderProps> = ({
         disconnect,
         signAndSubmitTransaction,
         signTransaction,
-        signMessage
+        signMessage,
+        network
       }}>
       {children}
     </WalletContext.Provider>

package/src/WalletProviders/errors.ts

@@ -39,6 +39,17 @@ export class WalletDisconnectionError extends WalletError {
 export class WalletAccountError extends WalletError {
   name = 'WalletAccountError';
 }
+export class WalletGetNetworkError extends WalletError {
+  name = 'WalletGetNetworkError';
+}
+
+export class WalletAccountChangeError extends WalletError {
+  name = 'WalletAccountChangeError';
+}
+
+export class WalletNetworkChangeError extends WalletError {
+  name = 'WalletNetworkChangeError';
+}
 
 export class WalletPublicKeyError extends WalletError {
   name = 'WalletPublicKeyError';

package/src/WalletProviders/useWallet.ts

@@ -1,7 +1,8 @@
-import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
+import { Types } from 'aptos';
 import { createContext, useContext } from 'react';
 import {
   AccountKeys,
+  NetworkInfo,
   SignMessagePayload,
   SignMessageResponse,
   WalletAdapter,
@@ -22,14 +23,15 @@ export interface WalletContextState {
   connecting: boolean;
   connected: boolean;
   disconnecting: boolean;
+  network: NetworkInfo;
   select(walletName: WalletName): void;
   connect(): Promise<void>;
   disconnect(): Promise<void>;
   signAndSubmitTransaction(
-    transaction: TransactionPayload,
+    transaction: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }>;
-  signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
+  ): Promise<{ hash: Types.HexEncodedBytes }>;
+  signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array>;
   signMessage(
     message: string | SignMessagePayload | Uint8Array
   ): Promise<SignMessageResponse | string>;

package/src/utilities/util.ts

@@ -1,7 +1,7 @@
-import { TransactionPayload, TransactionPayload_EntryFunctionPayload } from 'aptos/src/generated';
+import { Types } from 'aptos';
 
-export const payloadV1ToV0 = (payload: TransactionPayload) => {
-  const v1 = payload as TransactionPayload_EntryFunctionPayload;
+export const payloadV1ToV0 = (payload: Types.TransactionPayload) => {
+  const v1 = payload as Types.TransactionPayload_EntryFunctionPayload;
   return {
     type: 'script_function_payload',
     function: v1.function,