@manahippo/aptos-wallet-adapter 0.4.5 → 0.4.6

package/src/WalletAdapters/PontemWallet.ts

@@ -1,7 +1,9 @@
-import { MaybeHexString } from 'aptos';
-import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
+import { MaybeHexString, Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletGetNetworkError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError,
@@ -11,9 +13,11 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
   SignMessagePayload,
   SignMessageResponse,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -37,21 +41,24 @@ interface IPontemWallet {
   publicKey(): Promise<MaybeHexString>;
   generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
   signAndSubmit(
-    transaction: TransactionPayload,
+    transaction: Types.TransactionPayload,
     options?: any
   ): Promise<{
     success: boolean;
     result: {
-      hash: HexEncodedBytes;
+      hash: Types.HexEncodedBytes;
     };
   }>;
   isConnected(): Promise<boolean>;
-  signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
+  signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array>;
   signMessage(message: SignMessagePayload): Promise<{
     success: boolean;
     result: SignMessageResponse;
   }>;
   disconnect(): Promise<void>;
+  network(): Promise<NetworkInfo>;
+  onChangeAccount(listener: (address: string) => void): Promise<void>;
+  onChangeNetwork(listener: (network: NetworkInfo) => void): Promise<void>;
 }
 
 interface PontemWindow extends Window {
@@ -78,7 +85,12 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IPontemWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -92,13 +104,13 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: PontemWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.pontem : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -123,6 +135,14 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -166,7 +186,19 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
           publicKey,
           isConnected: true
         };
+
+        try {
+          const networkInfo = await provider?.network();
+          this._network = networkInfo.name;
+          this._chainId = networkInfo.chainId;
+          this._api = networkInfo.api;
+        } catch (error: any) {
+          const errMsg = error.message;
+          this.emit('error', new WalletGetNetworkError(errMsg));
+          throw error;
+        }
       }
+
       this.emit('connect', this._wallet?.address || '');
     } catch (error: any) {
       this.emit('error', new Error('User has rejected the connection'));
@@ -192,7 +224,10 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transactionPyld: TransactionPayload, options?: any): Promise<Uint8Array> {
+  async signTransaction(
+    transactionPyld: Types.TransactionPayload,
+    options?: any
+  ): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.pontem;
@@ -207,9 +242,9 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transactionPyld: TransactionPayload,
+    transactionPyld: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }> {
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.pontem;
@@ -243,4 +278,45 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.pontem;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleAccountChange = async (newAccount: string) => {
+        console.log('account Changed >>>', newAccount);
+        this._wallet = {
+          ...this._wallet,
+          address: newAccount || this._wallet?.address
+        };
+        this.emit('accountChange', newAccount);
+      };
+      await provider?.onChangeAccount(handleAccountChange);
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletAccountChangeError(errMsg));
+      throw error;
+    }
+  }
+
+  async onNetworkChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.pontem;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleNetworkChange = async (network: NetworkInfo) => {
+        console.log('network Changed >>>', network);
+        this._network = network.name;
+        this._api = network.api;
+        this._chainId = network.chainId;
+        this.emit('networkChange', this._network);
+      };
+      await provider?.onChangeNetwork(handleNetworkChange);
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }

package/src/WalletAdapters/RiseWallet.ts

@@ -1,6 +1,8 @@
-import { HexEncodedBytes, TransactionPayload } from 'aptos/src/generated';
+import { MaybeHexString, Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignMessageError,
@@ -9,13 +11,14 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
   SignMessagePayload,
   SignMessageResponse,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
-import { MaybeHexString } from 'aptos';
 
 interface RiseAccount {
   address: MaybeHexString;
@@ -28,7 +31,7 @@ interface IRiseWallet {
   connect: () => Promise<{ address: string }>;
   account(): Promise<RiseAccount>;
   isConnected: () => Promise<boolean>;
-  signAndSubmitTransaction(transaction: any): Promise<{ hash: HexEncodedBytes }>;
+  signAndSubmitTransaction(transaction: any): Promise<{ hash: Types.HexEncodedBytes }>;
   signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
   signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
@@ -57,7 +60,12 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IRiseWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -71,13 +79,13 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: RiseWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.rise : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -102,6 +110,14 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -175,7 +191,7 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
+  async signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
@@ -195,8 +211,8 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transaction: TransactionPayload
-  ): Promise<{ hash: HexEncodedBytes }> {
+    transaction: Types.TransactionPayload
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
@@ -235,4 +251,30 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.rise;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletAccountChangeError(errMsg));
+      throw error;
+    }
+  }
+
+  async onNetworkChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.rise;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }

package/src/WalletAdapters/SpikaWallet.ts

@@ -1,6 +1,8 @@
-import { HexEncodedBytes, TransactionPayload } from 'aptos/src/generated';
+import { Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError,
@@ -10,7 +12,9 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -19,7 +23,10 @@ interface ISpikaWallet {
   connect: () => Promise<{ publicKey: string; account: string; authKey: string }>;
   account: () => Promise<string>;
   isConnected: () => Promise<boolean>;
-  signAndSubmitTransaction(transaction: any, options?: any): Promise<{ hash: HexEncodedBytes }>;
+  signAndSubmitTransaction(
+    transaction: any,
+    options?: any
+  ): Promise<{ hash: Types.HexEncodedBytes }>;
   signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
   signMessage(message: string): Promise<string>;
   disconnect(): Promise<void>;
@@ -48,7 +55,12 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: ISpikaWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -62,13 +74,13 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: SpikaWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.spika : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -93,6 +105,14 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -166,7 +186,7 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
+  async signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.spika;
@@ -186,9 +206,9 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transaction: TransactionPayload,
+    transaction: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }> {
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.spika;
@@ -224,4 +244,30 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.spika;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletAccountChangeError(errMsg));
+      throw error;
+    }
+  }
+
+  async onNetworkChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.spika;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }

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,