@manahippo/aptos-wallet-adapter 1.0.3 → 1.0.6

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/RiseWallet.ts

@@ -28,8 +28,10 @@ interface RiseAccount {
   isConnected: boolean;
 }
 
+type AddressInfo = { address: string; publicKey: string; authKey?: string };
+
 interface IRiseWallet {
-  connect: () => Promise<{ address: string }>;
+  connect: () => Promise<AddressInfo>;
   account(): Promise<RiseAccount>;
   isConnected: () => Promise<boolean>;
   signAndSubmitTransaction(transaction: any): Promise<{ hash: Types.HexEncodedBytes }>;
@@ -37,6 +39,10 @@ interface IRiseWallet {
   signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
   network(): Promise<NetworkInfo>;
+  on(event: string, listener: () => any): void;
+  off(event: string, listener: () => any): void;
+  onAccountChange: (listener: (newAddress: AddressInfo) => void) => void;
+  onNetworkChange: (listener: (network: NetworkInfo) => void) => void;
 }
 
 interface RiseWindow extends Window {
@@ -156,22 +162,20 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
         throw new WalletNotConnectedError('User has rejected the request');
       }
 
-      // TODO - remove this check in the future
-      //  provider.network is still not live and we want smooth transition
-      if (provider?.network) {
-        try {
-          const { chainId, api, name } = await provider.network();
-
-          this._network = name;
-          this._chainId = chainId;
-          this._api = api;
-        } catch (error: any) {
-          const errMsg = error.message;
-          this.emit('error', new WalletGetNetworkError(errMsg));
-          throw error;
-        }
+      try {
+        const { chainId, api, name } = await provider.network();
+
+        this._network = name;
+        this._chainId = chainId;
+        this._api = api;
+      } catch (error: any) {
+        const errMsg = error.message;
+        this.emit('error', new WalletGetNetworkError(errMsg));
+        throw error;
       }
 
+      provider?.on('disconnect', this.handleDisconnect);
+
       const account = await provider?.account();
       if (account) {
         const { publicKey, address, authKey } = account;
@@ -200,6 +204,7 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
 
       try {
         const provider = this._provider || window.rise;
+        provider?.off('disconnect', this.handleDisconnect);
         await provider?.disconnect();
       } catch (error: any) {
         this.emit('error', new WalletDisconnectionError(error?.message, error));
@@ -275,7 +280,18 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
       if (!wallet || !provider) throw new WalletNotConnectedError();
-      //To be implemented
+      const handleAccountChange = async (newAccount?: AddressInfo) => {
+        if (newAccount?.publicKey) {
+          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);
+        }
+      };
+      await provider?.onAccountChange?.(handleAccountChange);
     } catch (error: any) {
       const errMsg = error.message;
       this.emit('error', new WalletAccountChangeError(errMsg));
@@ -288,11 +304,30 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
       if (!wallet || !provider) throw new WalletNotConnectedError();
-      //To be implemented
+      const handleNetworkChange = async (newNetwork: NetworkInfo) => {
+        const { chainId, api, name } = newNetwork;
+        this._network = name;
+        this._chainId = chainId;
+        this._api = api;
+        this.emit('networkChange', this._network);
+      };
+      await provider?.onNetworkChange?.(handleNetworkChange);
     } catch (error: any) {
       const errMsg = error.message;
       this.emit('error', new WalletNetworkChangeError(errMsg));
       throw error;
     }
   }
+
+  private handleDisconnect = () => {
+    try {
+      const provider = this._provider || window.rise;
+
+      provider?.off('disconnect', this.handleDisconnect);
+
+      this._wallet = null;
+    } finally {
+      this.emit('disconnect');
+    }
+  };
 }