@manahippo/aptos-wallet-adapter 1.0.2 → 1.0.5

package/src/WalletAdapters/OpenBlockWallet.ts

@@ -0,0 +1,293 @@
+import { Types } from 'aptos';
+import {
+  WalletAccountChangeError,
+  WalletDisconnectionError,
+  WalletNetworkChangeError,
+  WalletNotConnectedError,
+  WalletNotReadyError,
+  WalletSignAndSubmitMessageError,
+  WalletSignMessageError,
+  WalletSignTransactionError
+} from '../WalletProviders/errors';
+
+import {
+  AccountKeys,
+  BaseWalletAdapter,
+  NetworkInfo,
+  scopePollingDetectionStrategy,
+  SignMessagePayload,
+  SignMessageResponse,
+  WalletAdapterNetwork,
+  WalletName,
+  WalletReadyState
+} from './BaseAdapter';
+
+type AddressInfo = { address: string; publicKey: string; authKey?: string };
+
+interface IOpenBlockWallet {
+  connect: () => Promise<AddressInfo>;
+  account: () => Promise<AddressInfo>;
+  network: () => Promise<NetworkInfo>;
+  isConnected: () => Promise<boolean>;
+  signAndSubmitTransaction(transaction: any): Promise<{ hash: string }>;
+  signTransaction(payload: any): Promise<string>;
+  signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
+  disconnect(): Promise<void>;
+  onAccountChange: (listener: (newAddress: AddressInfo) => void) => void;
+  onNetworkChange: (listener: (network: NetworkInfo) => void) => void;
+}
+
+interface OpenBlockWindow extends Window {
+  openblock?: {
+    aptos?: IOpenBlockWallet;
+  };
+}
+
+declare const window: OpenBlockWindow;
+
+export const OpenBlockWalletName = 'OpenBlock' as WalletName<'OpenBlock'>;
+
+export interface OpenBlockWalletAdapterConfig {
+  provider?: IOpenBlockWallet;
+  // network?: WalletAdapterNetwork;
+  timeout?: number;
+}
+
+export class OpenBlockWalletAdapter extends BaseWalletAdapter {
+  name = OpenBlockWalletName;
+
+  url = 'https://openblock.com/';
+
+  icon = 'https://obstatic.243096.com/download/dapp/sdk/images/logo_blue.svg';
+
+  protected _provider: IOpenBlockWallet;
+
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
+  protected _timeout: number;
+
+  protected _readyState: WalletReadyState =
+    typeof window === 'undefined' || typeof document === 'undefined'
+      ? WalletReadyState.Unsupported
+      : WalletReadyState.NotDetected;
+
+  protected _connecting: boolean;
+
+  protected _wallet: any | null;
+
+  constructor({
+    // provider,
+    // network = WalletAdapterNetwork.Testnet,
+    timeout = 10000
+  }: OpenBlockWalletAdapterConfig = {}) {
+    super();
+
+    this._provider = typeof window !== 'undefined' ? window.openblock?.aptos : undefined;
+    this._network = undefined;
+    this._timeout = timeout;
+    this._connecting = false;
+    this._wallet = null;
+
+    if (typeof window !== 'undefined' && this._readyState !== WalletReadyState.Unsupported) {
+      require('@openblockhq/dappsdk');
+      scopePollingDetectionStrategy(() => {
+        if (window.openblock?.aptos) {
+          this._readyState = WalletReadyState.Installed;
+          this.emit('readyStateChange', this._readyState);
+          return true;
+        }
+        return false;
+      });
+    }
+  }
+
+  get publicAccount(): AccountKeys {
+    return {
+      publicKey: this._wallet?.publicKey || null,
+      address: this._wallet?.address || null,
+      authKey: this._wallet?.authKey || null
+    };
+  }
+
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
+  get connecting(): boolean {
+    return this._connecting;
+  }
+
+  get connected(): boolean {
+    return !!this._wallet?.isConnected;
+  }
+
+  get readyState(): WalletReadyState {
+    return this._readyState;
+  }
+
+  async connect(): Promise<void> {
+    try {
+      if (this.connected || this.connecting) return;
+      if (
+        !(
+          this._readyState === WalletReadyState.Loadable ||
+          this._readyState === WalletReadyState.Installed
+        )
+      )
+        throw new WalletNotReadyError();
+      this._connecting = true;
+
+      const provider = this._provider || window?.openblock?.aptos;
+      const isConnected = await this._provider?.isConnected();
+      if (isConnected === true) {
+        await provider?.disconnect();
+      }
+
+      const response = await provider?.connect();
+      if (response.address) {
+        this._wallet = {
+          address: response?.address,
+          publicKey: response?.publicKey,
+          isConnected: true
+        };
+        const network = await provider?.network();
+
+        this._network = network.name;
+        this._chainId = network.chainId;
+        this._api = network.api;
+      } else {
+        throw new Error('failed to connect');
+      }
+      this.emit('connect', this._wallet.publicKey);
+    } catch (error: any) {
+      this.emit('error', error);
+      throw error;
+    } finally {
+      this._connecting = false;
+    }
+  }
+
+  async disconnect(): Promise<void> {
+    const wallet = this._wallet;
+    const provider = this._provider || window?.openblock?.aptos;
+    if (wallet) {
+      this._wallet = null;
+
+      try {
+        await provider?.disconnect();
+      } catch (error: any) {
+        this.emit('error', new WalletDisconnectionError(error?.message, error));
+      }
+    }
+
+    this.emit('disconnect');
+  }
+
+  async signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window?.openblock?.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+
+      const response = await provider.signTransaction(transaction);
+      if (response) {
+        return new TextEncoder().encode(response);
+      }
+      throw new Error('failed to SignTransaction');
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletSignTransactionError(errMsg));
+      throw error;
+    }
+  }
+
+  async signAndSubmitTransaction(
+    transaction: Types.TransactionPayload
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window?.openblock?.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const response = await provider.signAndSubmitTransaction(transaction);
+      if (response) {
+        return response;
+      }
+      throw new Error('Failed to SignAndSubmitTransaction');
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletSignAndSubmitMessageError(errMsg));
+      throw error;
+    }
+  }
+
+  async signMessage(msgPayload: SignMessagePayload): Promise<SignMessageResponse> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window?.openblock?.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      if (typeof msgPayload !== 'object' || !msgPayload.nonce) {
+        throw new WalletSignMessageError('Invalid signMessage Payload');
+      }
+
+      const response = await provider?.signMessage(msgPayload);
+      if (response) {
+        return response;
+      }
+
+      throw new Error('Failed to signMessage');
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletSignMessageError(errMsg));
+      throw error;
+    }
+  }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window?.openblock?.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleAccountChange = async (newAccount: AddressInfo) => {
+        this._wallet = {
+          ...this._wallet,
+          publicKey: newAccount.publicKey || this._wallet?.publicKey,
+          authKey: newAccount.authKey || this._wallet?.authKey,
+          address: newAccount.address || this._wallet?.address
+        };
+        this.emit('accountChange', newAccount.publicKey);
+      };
+      provider?.onAccountChange(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?.openblock?.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleNetworkChange = async (newNetwork: NetworkInfo) => {
+        this._network = newNetwork.name;
+        this._api = newNetwork.api;
+        this._chainId = newNetwork.chainId;
+        this.emit('networkChange', this._network);
+      };
+      provider?.onNetworkChange(handleNetworkChange);
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
+}

package/src/WalletAdapters/PetraWallet.ts

@@ -175,7 +175,7 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
         throw error;
       }
 
-      this.emit('connect', this._wallet.publicKey);
+      this.emit('connect', this._wallet.address);
     } catch (error: any) {
       this.emit('error', error);
       throw error;

package/src/WalletAdapters/PontemWallet.ts

@@ -287,18 +287,21 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
       if (!wallet || !provider) throw new WalletNotConnectedError();
       const handleAccountChange = async (newAccount: string | undefined) => {
         // disconnect wallet if newAccount is undefined
-        if (newAccount === undefined) {
-          if (this.connected) {
-            await provider?.disconnect();
-          }
-          return;
+        if (newAccount) {
+          const newPublicKey = await provider?.publicKey();
+          this._wallet = {
+            ...this._wallet,
+            address: newAccount,
+            publicKey: newPublicKey
+          };
+        } else {
+          const response = await provider?.connect();
+          this._wallet = {
+            ...this._wallet,
+            address: response?.address || this._wallet?.address,
+            publicKey: response?.publicKey || this._wallet?.publicKey
+          };
         }
-        const newPublicKey = await provider?.publicKey();
-        this._wallet = {
-          ...this._wallet,
-          address: newAccount,
-          publicKey: newPublicKey
-        };
         this.emit('accountChange', newAccount);
       };
       await provider?.onAccountChange(handleAccountChange);

package/src/WalletAdapters/SpikaWallet.ts

@@ -51,7 +51,7 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
 
   url = 'https://chrome.google.com/webstore/detail/spika/fadkojdgchhfkdkklllhcphknohbmjmb';
 
-  icon = 'https://spika.app/assets/logo_400_nb.png';
+  icon = 'https://raw.githubusercontent.com/hippospace/aptos-wallet-adapter/main/logos/spika.svg';
 
   protected _provider: ISpikaWallet | undefined;
 

package/src/WalletAdapters/index.ts

@@ -17,3 +17,7 @@ export * from './ONTOWallet';
 export * from './BloctoWallet';
 export * from './Coin98Wallet';
 export * from './SafePalWallet';
+export * from './FoxWallet';
+// export * from './MsafeWallet';
+export * from './OpenBlockWallet';
+export * from './CloverWallet';

package/src/WalletProviders/WalletProvider.tsx

@@ -1,10 +1,14 @@
 import { FC, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
 import { Types } from 'aptos';
 import {
+  WalletConnectionError,
   WalletError,
   WalletNotConnectedError,
   WalletNotReadyError,
-  WalletNotSelectedError
+  WalletNotSelectedError,
+  WalletSignAndSubmitMessageError,
+  WalletSignMessageError,
+  WalletSignTransactionError
 } from './errors';
 import { useLocalStorage } from '../hooks/useLocalStorage';
 import {
@@ -16,6 +20,7 @@ import {
   WalletReadyState
 } from '../WalletAdapters/BaseAdapter';
 import { Wallet, WalletContext } from './useWallet';
+import { timeoutPromise } from '../utilities/util';
 
 export interface WalletProviderProps {
   children: ReactNode;
@@ -39,6 +44,8 @@ const initialState: {
   network: null
 };
 
+const TIMEOUT = 90;
+
 export const WalletProvider: FC<WalletProviderProps> = ({
   children,
   wallets: adapters,
@@ -51,7 +58,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   const readyState = adapter?.readyState || WalletReadyState.Unsupported;
   const [connecting, setConnecting] = useState(false);
   const [disconnecting, setDisconnecting] = useState(false);
-  const isConnecting = useRef(false);
+  // const isConnecting = useRef(false);
   const isDisconnecting = useRef(false);
   const isUnloading = useRef(false);
 
@@ -117,6 +124,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
 
     window.addEventListener('beforeunload', listener);
     return () => window.removeEventListener('beforeunload', listener);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isUnloading, autoConnect]);
 
   // Handle the adapter's connect event
@@ -218,7 +226,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   // Connect the adapter to the wallet
   const connect = useCallback(
     async (walletName?) => {
-      if (isConnecting.current || isDisconnecting.current || connected || !walletName) return;
+      if (isDisconnecting.current || connected || !walletName) return;
       let walletToConnect = initialState;
       if (!adapter || walletName !== adapter?.name) {
         const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === walletName);
@@ -258,18 +266,23 @@ export const WalletProvider: FC<WalletProviderProps> = ({
 
         throw handleError(new WalletNotReadyError('Wallet Not Ready'));
       }
-      isConnecting.current = true;
+      // isConnecting.current = true;
       setConnecting(true);
       try {
-        await walletToConnect.adapter.connect();
+        const timeout = timeoutPromise(TIMEOUT * 1000);
+        await Promise.race([walletToConnect.adapter.connect(), timeout.promise]);
+        clearTimeout(timeout.timeoutId);
       } catch (error: any) {
         // Clear the selected wallet
         setName(null);
-        // Rethrow the error, and handleError will also be called
-        throw error;
+        if (error === 'timeout') {
+          throw handleError(new WalletConnectionError(error));
+        } else {
+          throw error;
+        }
       } finally {
         setConnecting(false);
-        isConnecting.current = false;
+        // isConnecting.current = false;
       }
     },
     [connected, adapter, handleError, wallets, setName, wallet, account, network]
@@ -278,7 +291,6 @@ export const WalletProvider: FC<WalletProviderProps> = ({
   // If autoConnect is enabled, try to connect when the adapter changes and is ready
   useEffect(() => {
     if (
-      isConnecting.current ||
       connected ||
       !autoConnect ||
       !name ||
@@ -287,7 +299,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
     )
       return;
     connect(name);
-  }, [isConnecting, connected, autoConnect, name, connect, adapter, readyState]);
+  }, [connected, autoConnect, name, connect, adapter, readyState]);
 
   // Disconnect the adapter from the wallet
   const disconnect = useCallback(async () => {
@@ -314,7 +326,13 @@ export const WalletProvider: FC<WalletProviderProps> = ({
     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);
+      const timeout = timeoutPromise(TIMEOUT * 1000);
+      const response = await Promise.race([
+        adapter.signAndSubmitTransaction(transaction, option),
+        timeout.promise
+      ]);
+      clearTimeout(timeout.timeoutId);
+      if (!response) throw handleError(new WalletSignAndSubmitMessageError('Timeout'));
       return response;
     },
     [adapter, handleError, connected]
@@ -324,7 +342,14 @@ export const WalletProvider: FC<WalletProviderProps> = ({
     async (transaction: Types.TransactionPayload, option?: any) => {
       if (!adapter) throw handleError(new WalletNotSelectedError());
       if (!connected) throw handleError(new WalletNotConnectedError());
-      return adapter.signTransaction(transaction, option);
+      const timeout = timeoutPromise(TIMEOUT * 1000);
+      const response = await Promise.race([
+        adapter.signTransaction(transaction, option),
+        timeout.promise
+      ]);
+      clearTimeout(timeout.timeoutId);
+      if (!response) throw handleError(new WalletSignTransactionError('Timeout'));
+      return response;
     },
     [adapter, handleError, connected]
   );
@@ -333,7 +358,11 @@ export const WalletProvider: FC<WalletProviderProps> = ({
     async (msgPayload: string | SignMessagePayload | Uint8Array) => {
       if (!adapter) throw handleError(new WalletNotSelectedError());
       if (!connected) throw handleError(new WalletNotConnectedError());
-      return adapter.signMessage(msgPayload);
+      const timeout = timeoutPromise(TIMEOUT * 1000);
+      const response = await Promise.race([adapter.signMessage(msgPayload), timeout.promise]);
+      clearTimeout(timeout.timeoutId);
+      if (!response) throw handleError(new WalletSignMessageError('Timeout'));
+      return response;
     },
     [adapter, handleError, connected]
   );

package/src/utilities/util.ts

@@ -9,3 +9,16 @@ export const payloadV1ToV0 = (payload: Types.TransactionPayload) => {
     arguments: v1.arguments
   };
 };
+
+export const timeoutPromise = (timeout) => {
+  let timeoutId;
+  const promise: Promise<void> = new Promise((resolve, reject) => {
+    timeoutId = setTimeout(async () => {
+      reject('timeout');
+    }, timeout);
+  });
+  return {
+    timeoutId,
+    promise
+  };
+};