@manahippo/aptos-wallet-adapter 0.2.0 → 0.3.1

package/src/WalletAdapters/FewchaWallet.ts

@@ -1,16 +1,13 @@
 import {
-  PendingTransaction,
-  SubmitTransactionRequest,
-  TransactionPayload
-} from 'aptos/dist/api/data-contracts';
-import { aptosClient, WEBWALLET_URL } from '../config/aptosConstants';
-import {
+  WalletConnectionError,
   WalletDisconnectionError,
   WalletNotConnectedError,
   WalletNotReadyError,
+  WalletSignAndSubmitMessageError,
+  WalletSignMessageError,
   WalletSignTransactionError
 } from '../WalletProviders/errors';
-import Web3, { Web3Provider, Web3ProviderType } from '@fewcha/web3';
+import Web3, { Web3ProviderType } from '@fewcha/web3';
 import {
   AccountKeys,
   BaseWalletAdapter,
@@ -18,8 +15,14 @@ import {
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
+import {
+  TransactionPayload,
+  SubmitTransactionRequest,
+  HexEncodedBytes,
+  EntryFunctionPayload
+} from 'aptos/dist/generated';
 
-export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
+export const FewchaWalletName = 'Fewcha' as WalletName<'Fewcha'>;
 
 interface FewchaWindow extends Window {
   fewcha: Web3ProviderType;
@@ -27,8 +30,6 @@ interface FewchaWindow extends Window {
 
 declare const window: FewchaWindow;
 
-const defaultWeb3 = new Web3(new Web3Provider(window.fewcha));
-
 export interface FewchaAdapterConfig {
   provider?: string;
   // network?: WalletAdapterNetwork;
@@ -60,14 +61,13 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
   }: FewchaAdapterConfig = {}) {
     super();
 
-    this._provider = defaultWeb3.action;
     // this._network = network;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
     // this._readyState = WalletReadyState.Installed;
 
-    if (this._readyState !== WalletReadyState.Unsupported) {
+    if (typeof window !== 'undefined' && this._readyState !== WalletReadyState.Unsupported) {
       scopePollingDetectionStrategy(() => {
         if (window.fewcha) {
           this._readyState = WalletReadyState.Installed;
@@ -77,28 +77,6 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
         return false;
       });
     }
-
-    window.addEventListener('aptos#connected', async () => {
-      const publicAccount = await this._provider?.account();
-      const isConnected = await this._provider?.isConnected();
-      if (publicAccount?.data.publicKey && isConnected) {
-        this._wallet = {
-          connected: isConnected,
-          ...publicAccount.data
-        };
-        this.emit('connect', this._wallet.publicKey);
-      }
-    });
-
-    window.addEventListener('aptos#transaction', (e: any) => {
-      if (e?.detail?.tx) {
-        this.emit('success', e?.detail?.tx);
-      }
-    });
-
-    window.addEventListener('aptos#disconnected', () => {
-      this.emit('disconnect');
-    });
   }
 
   get publicAccount(): AccountKeys {
@@ -133,12 +111,32 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
         throw new WalletNotReadyError();
 
       this._connecting = true;
-      const provider = this._provider;
-      const isConnected = await this._provider?.isConnected();
-      if (isConnected) {
-        await provider?.disconnect();
+      const provider = new Web3().action;
+      const isConnected = await provider.isConnected();
+      if (isConnected?.data === true) {
+        await provider.disconnect();
+      }
+      const response = await provider.connect();
+      if (response.status === 401) {
+        throw new WalletConnectionError('User has rejected the connection');
+      } else if (response.status !== 200) {
+        throw new WalletConnectionError('Wallet connect issue');
+      }
+      let accountDetail = { ...response.data };
+
+      if (!accountDetail.publicKey) {
+        const accountResp = await provider.account();
+        if (!accountResp.data.publicKey) {
+          throw new WalletConnectionError('Wallet connect issue', response.data);
+        }
+        accountDetail = { ...accountResp.data };
       }
-      await provider?.connect();
+      this._wallet = {
+        connected: true,
+        ...accountDetail
+      };
+      this._provider = provider;
+      this.emit('connect', this._wallet.publicKey);
     } catch (error: any) {
       this.emit('error', error);
       throw error;
@@ -148,68 +146,86 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
   }
 
   async disconnect(): Promise<void> {
-    const wallet = this._wallet;
-    if (wallet) {
-      this._wallet = null;
-
+    const provider = this._provider;
+    if (provider) {
       try {
-        const provider = this._provider;
-        await provider?.disconnect();
+        const isDisconnected = await provider.disconnect();
+        if (isDisconnected.data === true) {
+          this._provider = undefined;
+          this._wallet = null;
+        } else {
+          throw new Error('Disconnect failed');
+        }
       } catch (error: any) {
         this.emit('error', new WalletDisconnectionError(error?.message, error));
+        throw error;
       }
     }
+    this.emit('disconnect');
   }
 
   async signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest> {
     try {
-      const request = new URLSearchParams({
-        request: JSON.stringify({
-          method: 'signTransaction',
-          payload: transaction
-        }),
-        origin: window.location.origin
-      }).toString();
-      const popup = window.open(
-        `${WEBWALLET_URL}?${request}`,
-        'Transaction Confirmation',
-        'scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=440,height=700'
-      );
-      if (!popup) throw new WalletNotConnectedError();
-      const promise = await new Promise((resolve, reject) => {
-        this.once('success', resolve);
-        this.once('error', reject);
-      });
-      return promise as SubmitTransactionRequest;
+      const wallet = this._wallet;
+      if (!wallet) throw new WalletNotConnectedError();
+
+      const provider = this._provider || window.fewcha;
+      const tx = await provider.generateTransaction(transaction as EntryFunctionPayload);
+      if (!tx) throw new Error('Cannot generate transaction');
+      const response = await provider?.signTransaction(tx.data);
+
+      if (!response) {
+        throw new Error('No response');
+      }
+      const result = { hash: response } as any;
+      return result as SubmitTransactionRequest;
     } catch (error: any) {
-      this.emit('error', error);
+      const errMsg = error instanceof Error ? error.message : error.response.data.message;
+      this.emit('error', new WalletSignTransactionError(errMsg));
       throw error;
     }
   }
 
-  async signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction> {
+  async signAndSubmitTransaction(
+    transaction: TransactionPayload
+  ): Promise<{ hash: HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       if (!wallet) throw new WalletNotConnectedError();
 
-      try {
-        const provider = this._provider;
-        const tx = await aptosClient.generateTransaction(wallet.address, transaction);
-        await provider?.signAndSubmitTransaction(tx);
-
-        const promise = await new Promise((resolve, reject) => {
-          this.once('success', resolve);
-          this.once('error', reject);
-        });
-        return {
-          hash: promise
-        } as PendingTransaction;
-      } catch (error: any) {
-        const errMsg = error instanceof Error ? error.message : error.response.data.message;
-        throw new WalletSignTransactionError(errMsg);
+      const provider = this._provider || window.fewcha;
+      const tx = await provider.generateTransaction(transaction as EntryFunctionPayload);
+      if (!tx) throw new Error('Cannot generate transaction');
+      const response = await provider?.signAndSubmitTransaction(tx.data);
+      if (response.status === 401) {
+        throw new Error('User has rejected the transaction');
+      } else if (response.status !== 200) {
+        throw new Error('Transaction issue');
       }
+      return {
+        hash: response.data
+      };
     } catch (error: any) {
-      this.emit('error', error);
+      const errMsg = error instanceof Error ? error.message : error.response.data.message;
+      this.emit('error', new WalletSignAndSubmitMessageError(errMsg));
+      throw error;
+    }
+  }
+
+  async signMessage(message: string): Promise<string> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.fewcha;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const response = await provider?.signMessage(message);
+      if (response) {
+        return response.data;
+      } else {
+        throw new Error('Sign Message failed');
+      }
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletSignMessageError(errMsg));
       throw error;
     }
   }

package/src/WalletAdapters/HippoExtensionWallet.ts

@@ -1,13 +1,15 @@
 import { MaybeHexString } from 'aptos';
 import {
-  PendingTransaction,
+  TransactionPayload,
   SubmitTransactionRequest,
-  TransactionPayload
-} from 'aptos/dist/api/data-contracts';
+  HexEncodedBytes
+} from 'aptos/dist/generated';
 import {
   WalletDisconnectionError,
   WalletNotConnectedError,
   WalletNotReadyError,
+  WalletSignAndSubmitMessageError,
+  WalletSignMessageError,
   WalletSignTransactionError
 } from '../WalletProviders/errors';
 import {
@@ -28,6 +30,7 @@ interface IHippoWallet {
   isConnected: () => Promise<boolean>;
   signAndSubmitTransaction(transaction: any): Promise<any>;
   signTransaction(transaction: any): Promise<void>;
+  signMessage(message: string): Promise<string>;
   disconnect(): Promise<void>;
 }
 
@@ -37,7 +40,7 @@ interface HippoWindow extends Window {
 
 declare const window: HippoWindow;
 
-export const HippoExtensionWalletName = 'Hippo Wallet' as WalletName<'Hippo Wallet'>;
+export const HippoExtensionWalletName = 'Hippo' as WalletName<'Hippo'>;
 
 export interface HippoExtensionWalletAdapterConfig {
   provider?: IHippoWallet;
@@ -73,13 +76,13 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
   }: HippoExtensionWalletAdapterConfig = {}) {
     super();
 
-    this._provider = window.hippoWallet;
+    this._provider = typeof window !== 'undefined' ? window.hippoWallet : undefined;
     // this._network = network;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
 
-    if (this._readyState !== WalletReadyState.Unsupported) {
+    if (typeof window !== 'undefined' && this._readyState !== WalletReadyState.Unsupported) {
       scopePollingDetectionStrategy(() => {
         if (window.hippoWallet) {
           this._readyState = WalletReadyState.Installed;
@@ -178,7 +181,9 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
     }
   }
 
-  async signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction> {
+  async signAndSubmitTransaction(
+    transaction: TransactionPayload
+  ): Promise<{ hash: HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       if (!wallet) throw new WalletNotConnectedError();
@@ -187,17 +192,35 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
         const provider = this._provider || window.hippoWallet;
         const response = await provider?.signAndSubmitTransaction(transaction);
         if (response) {
-          return response.detail;
+          return response.detail.hash;
         } else {
           throw new Error('Transaction failed');
         }
       } catch (error: any) {
         // console.log('transact err', error, error.message);
-        throw new WalletSignTransactionError(error.message || error);
+        throw new WalletSignAndSubmitMessageError(error.message || error);
       }
     } catch (error: any) {
       this.emit('error', error);
       throw error;
     }
   }
+
+  async signMessage(message: string): Promise<string> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.hippoWallet;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const response = await provider?.signMessage(message);
+      if (response) {
+        return response;
+      } else {
+        throw new Error('Sign Message failed');
+      }
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletSignMessageError(errMsg));
+      throw error;
+    }
+  }
 }

package/src/WalletAdapters/HippoWallet.ts

@@ -1,9 +1,9 @@
 import { MaybeHexString } from 'aptos';
 import {
-  PendingTransaction,
+  TransactionPayload,
   SubmitTransactionRequest,
-  TransactionPayload
-} from 'aptos/dist/api/data-contracts';
+  HexEncodedBytes
+} from 'aptos/dist/generated';
 import { WEBWALLET_URL } from '../config/aptosConstants';
 import {
   WalletNotConnectedError,
@@ -12,7 +12,7 @@ import {
 } from '../WalletProviders/errors';
 import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
 
-export const HippoWalletName = 'Hippo Web Wallet' as WalletName<'Hippo Web Wallet'>;
+export const HippoWalletName = 'Hippo Web' as WalletName<'Hippo Web'>;
 
 export interface HippoWalletAdapterConfig {
   provider?: string;
@@ -102,7 +102,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
         };
         this.emit('connect', this._wallet);
       } else if (e.data.method === 'success') {
-        this.emit('success', e.data.detail);
+        this.emit('success', e.data.detail?.hash);
       } else if (e.data.method === 'fail') {
         this.emit('error', new WalletSignAndSubmitMessageError(e.data.error));
       } else if (e.data.method === 'disconnected') {
@@ -168,7 +168,9 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
     }
   }
 
-  async signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction> {
+  async signAndSubmitTransaction(
+    transaction: TransactionPayload
+  ): Promise<{ hash: HexEncodedBytes }> {
     try {
       const request = new URLSearchParams({
         request: JSON.stringify({
@@ -187,7 +189,33 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
         this.once('success', resolve);
         this.once('error', reject);
       });
-      return promise as PendingTransaction;
+      return promise as { hash: HexEncodedBytes };
+    } catch (error: any) {
+      this.emit('error', error);
+      throw error;
+    }
+  }
+
+  async signMessage(message: string): Promise<string> {
+    try {
+      const request = new URLSearchParams({
+        request: JSON.stringify({
+          method: 'signMessage',
+          payload: message
+        }),
+        origin: window.location.origin
+      }).toString();
+      const popup = window.open(
+        `${WEBWALLET_URL}?${request}`,
+        'Transaction Confirmation',
+        'scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=440,height=700'
+      );
+      if (!popup) throw new WalletNotConnectedError();
+      const promise = await new Promise((resolve, reject) => {
+        this.once('success', resolve);
+        this.once('error', reject);
+      });
+      return promise as string;
     } catch (error: any) {
       this.emit('error', error);
       throw error;

package/src/WalletAdapters/MartianWallet.ts

@@ -1,14 +1,15 @@
 import { MaybeHexString } from 'aptos';
 import {
-  PendingTransaction,
+  TransactionPayload,
   SubmitTransactionRequest,
-  TransactionPayload
-} from 'aptos/dist/api/data-contracts';
-import { aptosClient } from '../config/aptosConstants';
+  HexEncodedBytes
+} from 'aptos/dist/generated';
 import {
   WalletDisconnectionError,
   WalletNotConnectedError,
   WalletNotReadyError,
+  WalletSignAndSubmitMessageError,
+  WalletSignMessageError,
   WalletSignTransactionError
 } from '../WalletProviders/errors';
 import {
@@ -33,12 +34,13 @@ interface MartianAccount {
   isConnected: boolean;
 }
 interface IMartianWallet {
-  connect: (params?: any) => Promise<ConnectMartianAccount>;
+  connect: () => Promise<ConnectMartianAccount>;
   account(): Promise<MartianAccount>;
   isConnected(): Promise<boolean>;
   generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
-  signAndSubmitTransaction(transaction: any): Promise<string>;
-  // signTransaction(transaction: any): Promise<void>;
+  signAndSubmitTransaction(transaction: TransactionPayload): Promise<HexEncodedBytes>;
+  signTransaction(transaction: TransactionPayload): Promise<HexEncodedBytes>;
+  signMessage(message: string): Promise<string>;
   disconnect(): Promise<void>;
 }
 
@@ -48,7 +50,7 @@ interface MartianWindow extends Window {
 
 declare const window: MartianWindow;
 
-export const MartianWalletName = 'MartianWallet' as WalletName<'MartianWallet'>;
+export const MartianWalletName = 'Martian' as WalletName<'Martian'>;
 
 export interface MartianWalletAdapterConfig {
   provider?: IMartianWallet;
@@ -62,7 +64,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
   url = 'https://chrome.google.com/webstore/detail/martian-wallet/efbglgofoippbgcjepnhiblaibcnclgk';
 
   icon =
-    'https://www.gitbook.com/cdn-cgi/image/width=40,height=40,fit=contain,dpr=2,format=auto/https%3A%2F%2F1159842905-files.gitbook.io%2F~%2Ffiles%2Fv0%2Fb%2Fgitbook-x-prod.appspot.com%2Fo%2Fspaces%252FXillBNDwQOz0oPJ4OtRH%252Ficon%252FaBwgf6d32iEu3YE56Jvk%252Flogo128_squ.png%3Falt%3Dmedia%26token%3D0f5bef1f-a4bd-495e-a447-289c235bb76a';
+    'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzUyIiBoZWlnaHQ9IjM1MiIgdmlld0JveD0iMCAwIDM1MiAzNTIiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIzNTIiIGhlaWdodD0iMzUyIiByeD0iODciIGZpbGw9IiMxRjFGMUYiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNjkuNzAxIDg5LjA4NDFDMTU5LjUwOCA4OS44MzA5IDE1MC41NDcgOTIuMDAxNCAxNDEuMDc2IDk2LjAxNjlDMTM5LjQyNCA5Ni43MTc0IDEzMy43MDIgOTkuNjAzNyAxMzIuMTE2IDEwMC41MzdDMTI4LjEzMSAxMDIuODgxIDEyMy4wNDMgMTA2LjQ5NiAxMTkuNTg2IDEwOS40NEMxMTYuOTc1IDExMS42NjUgMTExLjIxNiAxMTcuNDUyIDEwOS4yMDIgMTE5Ljg3NkMxMDUuMDg1IDEyNC44MzIgMTAxLjA4OCAxMzAuODg2IDk4LjQzODQgMTM2LjE3OUM5Ny45OTQyIDEzNy4wNjYgOTcuNTYzNSAxMzcuODE3IDk3LjQ4MTMgMTM3Ljg0OEM5Ny4zOTkzIDEzNy44OCA5Ny4zMzIgMTM3Ljk5NSA5Ny4zMzIgMTM4LjEwNUM5Ny4zMzIgMTM4LjIxNCA5Ni43Njg1IDEzOS42MDggOTYuMDc5NiAxNDEuMkM5NC42OTc1IDE0NC4zOTYgOTIuOTE3NiAxNDkuNDk2IDkxLjk5MjUgMTUyLjkwOUM4OS42MjY3IDE2MS42NCA4OC41NDA3IDE3Mi40OTUgODkuMTgxMSAxODEuMDExQzkwLjM4ODggMTk3LjA3MSA5NS4xODY2IDIxMS4xMiAxMDMuODUzIDIyMy45NzVDMTEwLjE0NyAyMzMuMzExIDExOC4zMzYgMjQxLjQxMyAxMjcuOTk1IDI0Ny44NjFDMTM4LjkzNiAyNTUuMTYzIDE1MS45NzEgMjU5LjkxIDE2NS41MzIgMjYxLjUyOUMxNjkuMjQ3IDI2MS45NzIgMTc3LjczMSAyNjIuMTQ2IDE4MS43NjIgMjYxLjg2MUMxOTguMDkzIDI2MC43MDYgMjEzLjYxNiAyNTQuOTk0IDIyNi43OCAyNDUuMjk3QzI0NC4wODIgMjMyLjU1MiAyNTYuMDc2IDIxMy43OTcgMjYwLjMzMiAxOTIuODM0QzI2MS42MDEgMTg2LjU4MiAyNjIuMDA2IDE4Mi4zNTUgMjYyIDE3NS40MDdDMjYxLjk5NiAxNzAuMzM3IDI2MS45NDYgMTY5LjI5NSAyNjEuNTQxIDE2NS44MjlDMjU5LjcwNSAxNTAuMTQyIDI1NC4wNTkgMTM1Ljg4OCAyNDQuNzgzIDEyMy41MjdDMjM4LjkwMyAxMTUuNjg5IDIzMC45OTIgMTA4LjI0OCAyMjMuMDk4IDEwMy4xMjlDMjE4LjQ4NSAxMDAuMTM2IDIxNi4xNzggOTguODU1NSAyMTEuNjYxIDk2Ljc3NzRDMjAyLjMzOCA5Mi40ODc5IDE5Mi4zNzYgODkuOTA5MSAxODIuMTg3IDg5LjE0NzlDMTgwLjA0MiA4OC45ODc2IDE3MS42MDYgODguOTQ0NSAxNjkuNzAxIDg5LjA4NDFaTTE4My4wMjUgMTAzLjY1N0MxODkuNTAzIDEwNC4zNDggMTk2LjI4NCAxMDYuMDM0IDIwMi4zNiAxMDguNDY0TDIwNC4zNTYgMTA5LjI2MkwyMDQuMzU2IDExMC44MjJDMjA0LjM1NyAxMTYuODk2IDIwMC4zNDQgMTIyLjMwNyAxOTQuMzMzIDEyNC4zMzRMMTkyLjcyIDEyNC44NzhMMTczLjUyMyAxMjQuOTg3QzE1NS4yODkgMTI1LjA5IDE1MS45OTQgMTI1LjE3NSAxNDcuNjE2IDEyNS42NTdDMTM3LjY3NiAxMjYuNzUyIDEyOS44NzIgMTI4LjI2NSAxMjEuMzAyIDEzMC43NjFDMTIwLjA1IDEzMS4xMjUgMTE4LjkxNyAxMzEuNDI0IDExOC43ODUgMTMxLjQyNEMxMTguNDY0IDEzMS40MjQgMTE4LjkwOSAxMzAuNzkxIDEyMC43NTIgMTI4LjYyMkMxMjQuNDgzIDEyNC4yMzMgMTMwLjczMiAxMTguNTk4IDEzNC43MDYgMTE2LjA0MUMxMzUuMTI2IDExNS43NyAxMzUuNTA4IDExNS41MDkgMTM1LjU1NSAxMTUuNDZDMTM1LjYwMiAxMTUuNDExIDEzNi4yNTEgMTE0Ljk3OSAxMzYuOTk5IDExNC41MDFDMTQyLjI2MyAxMTEuMTMxIDE0OC4wMzYgMTA4LjQ0MSAxNTQuMDcyIDEwNi41NDNDMTU5LjY1OCAxMDQuNzg3IDE2NC44MTQgMTAzLjg3MiAxNzIuMTY0IDEwMy4zMzFDMTczLjg3NCAxMDMuMjA2IDE4MC43MjMgMTAzLjQxMSAxODMuMDI1IDEwMy42NTdaTTIxOS4xMzMgMTE4LjAyMkMyMjIuNzUxIDEyMC43NzkgMjI5LjQ5OSAxMjcuMTM2IDIyOS40OTkgMTI3Ljc4N0MyMjkuNDk5IDEyOC42MDYgMjI2Ljc1IDEzMy40OTMgMjI0Ljc4NCAxMzYuMTY4QzIxOC4wMzIgMTQ1LjM1NSAyMDcuOTIxIDE1MS41NTYgMTk2Ljc5NyAxNTMuMzMyQzE5My45NDUgMTUzLjc4OCAxOTEuOTk0IDE1My44MzUgMTc1LjczMiAxNTMuODQ1QzE1NS4zOTYgMTUzLjg1NyAxNTIuNTc3IDE1My45NjYgMTQ1LjA2OCAxNTUuMDI4QzEzMS4xNjkgMTU2Ljk5NCAxMTguMDA0IDE2MS4zODUgMTA1Ljc3IDE2OC4xMzdDMTA0Ljc1NyAxNjguNjk1IDEwMy44ODUgMTY5LjEwOCAxMDMuODMxIDE2OS4wNTRDMTAzLjY1IDE2OC44NzMgMTA0LjMxMyAxNjMuOTY5IDEwNC44OTUgMTYxLjE4MkMxMDUuNTE0IDE1OC4yMTggMTA2LjU0MiAxNTQuNDE0IDEwNy4zMTEgMTUyLjI0N0wxMDcuNzg2IDE1MC45MDlMMTA5LjQ4MSAxNTAuMTU2QzEyMC45OTQgMTQ1LjA0MiAxMzQuODA4IDE0MS4zODIgMTQ3LjQ0NyAxNDAuMDk3QzE1NC4yNTggMTM5LjQwNSAxNTUuMTY2IDEzOS4zNzggMTczLjk0OCAxMzkuMzA0QzE4NC45MTIgMTM5LjI2MSAxOTMuMTE2IDEzOS4xNiAxOTMuOTMgMTM5LjA2QzE5NS4yOCAxMzguODkyIDE5Ny44NDYgMTM4LjI4NyAxOTkuNDEgMTM3Ljc2NkMxOTkuODQxIDEzNy42MjIgMjAxLjE4OCAxMzcuMDI1IDIwMi40MDMgMTM2LjQzOUMyMDkuNTU2IDEzMi45ODcgMjE0LjkxIDEyNi43OTggMjE3LjM1OCAxMTkuMTU0QzIxNy43OTIgMTE3Ljc5OCAyMTguMDU3IDExNy4yMDQgMjE4LjE4NCAxMTcuM0MyMTguMjg3IDExNy4zNzggMjE4LjcxNCAxMTcuNzAzIDIxOS4xMzMgMTE4LjAyMlpNMjM5LjM5OSAxNDEuODI1QzI0MC42NzggMTQ0LjAyMyAyNDIuODA1IDE0OS4xNjMgMjQ0LjA5MSAxNTMuMTZDMjQ1LjE0MSAxNTYuNDI2IDI0NS4yMTggMTU2LjgxOCAyNDQuODk5IDE1Ny4zMDVDMjQ0LjQ1MyAxNTcuOTg1IDIzOC45OTEgMTYzLjUxMSAyMzcuMzc3IDE2NC45MTZDMjI5LjUxNCAxNzEuNzU2IDIyMC4yNTIgMTc2Ljg4MiAyMTAuNTc1IDE3OS43NUMyMDUuNzczIDE4MS4xNzMgMjAxLjM0NCAxODIuMDAxIDE5NS42MjMgMTgyLjU0NkMxOTQuNjk4IDE4Mi42MzQgMTg1Ljk0NSAxODIuNzE2IDE3Ni4xNzIgMTgyLjcyOUMxNTUuMDkgMTgyLjc1NSAxNTMuODA5IDE4Mi44MTEgMTQ2LjU5NyAxODQuMDAxQzEzMy44MDkgMTg2LjExMiAxMjAuNjg1IDE5MS43MDYgMTEwLjA5NCAxOTkuNTZDMTA5LjIwNSAyMDAuMjE5IDEwOC4zNjggMjAwLjc2NyAxMDguMjM1IDIwMC43NzdDMTA3Ljk1NCAyMDAuNzk4IDEwNy4zODIgMTk5LjIxOCAxMDYuMjQ0IDE5NS4yNzZDMTA1LjQyOSAxOTIuNDUyIDEwNC4yNDggMTg2LjgxNCAxMDQuMzMxIDE4Ni4xNEMxMDQuMzcxIDE4NS44MTkgMTA0Ljg5NyAxODUuNDAxIDEwNi43NiAxODQuMjExQzExNy42NTkgMTc3LjI0NiAxMjkuNDk5IDE3Mi40ODcgMTQxLjkyNSAxNzAuMDc1QzE0NS4zODMgMTY5LjQwNCAxNDUuOTMxIDE2OS4zMjIgMTQ5Ljk5NSAxNjguODY1QzE1NSAxNjguMzAyIDE1Ni42NjQgMTY4LjI2MSAxNzcuMDA2IDE2OC4yMDVDMTk1LjY3MiAxNjguMTUzIDE5NS44ODMgMTY4LjE0NCAyMDAuODc0IDE2Ny4xNzRDMjA4LjYzNiAxNjUuNjY3IDIxNi4yMDcgMTYyLjQ3MyAyMjIuNjI4IDE1Ny45OThDMjI4LjUzMyAxNTMuODgyIDIzNC40MDMgMTQ3Ljg5MiAyMzcuOTcgMTQyLjM0QzIzOC40MDMgMTQxLjY2NiAyMzguODA3IDE0MS4xMTIgMjM4Ljg2OCAxNDEuMTA5QzIzOC45MjkgMTQxLjEwNiAyMzkuMTY4IDE0MS40MjggMjM5LjM5OSAxNDEuODI1Wk0yNDcuNjc1IDE3Ni44MDhDMjQ3LjY3MiAxODEuNTQ5IDI0Ni43NTUgMTg4LjE3NyAyNDUuMzU5IDE5My41MzNDMjQ0Ljk1NyAxOTUuMDc3IDI0NC44NDcgMTk1LjMwOCAyNDQuMzggMTk1LjU5QzI0NC4wOSAxOTUuNzY2IDI0My4zMTggMTk2LjIzOCAyNDIuNjY0IDE5Ni42NDFDMjMwLjUzNCAyMDQuMTA4IDIxNi40MTUgMjA5LjEzNyAyMDMuMTIxIDIxMC43MjVDMjAxLjUxMSAyMTAuOTE3IDE5OS41NDQgMjExLjE2MyAxOTguNzUgMjExLjI3MUMxOTcuNzcgMjExLjQwNCAxOTAuNzU0IDIxMS41MDcgMTc2LjkyMSAyMTEuNTkxQzE2NS43MDkgMjExLjY1OCAxNTYuMzA2IDIxMS43NTYgMTU2LjAyNSAyMTEuODA3QzE1NS43NDUgMjExLjg1OSAxNTQuNzkgMjExLjk4OSAxNTMuOTAyIDIxMi4wOTdDMTQzLjc3MiAyMTMuMzI1IDEzMy4yMDggMjE3Ljg1OSAxMjUuMTU2IDIyNC40MzRDMTI0LjQzNiAyMjUuMDIyIDEyMy43NzIgMjI1LjUwMyAxMjMuNjggMjI1LjUwM0MxMjMuMTkxIDIyNS41MDMgMTE4LjA5MiAyMTkuMjc5IDExNS44OSAyMTUuOTk0QzExNC45NDQgMjE0LjU4MiAxMTQuNzM2IDIxNC4xNjEgMTE0Ljg5IDIxMy45NzJDMTE1LjIyNyAyMTMuNTU4IDExOS40MjggMjEwLjM5MSAxMjEuMiAyMDkuMjE1QzEyNy40NDEgMjA1LjA3NCAxMzQuMTA1IDIwMS45NjQgMTQwLjk5MSAxOTkuOThDMTQ1LjAwMyAxOTguODI0IDE0Ny45NDkgMTk4LjIyNyAxNTMuMDM3IDE5Ny41NDJDMTU1LjMzMiAxOTcuMjMzIDE1OC42NjcgMTk3LjE3NSAxODAuMTQ4IDE5Ny4wNzJDMTk1Ljg1OCAxOTYuOTk2IDE5Ny4xMiAxOTYuOTQ2IDIwMi4zMTggMTk2LjE5N0MyMTQuNzAxIDE5NC40MTIgMjI2LjYyNyAxODkuODU3IDIzNy4zOTggMTgyLjc5N0MyMzkuNTQ4IDE4MS4zODggMjQzLjcxMiAxNzguMjU2IDI0NS43MjIgMTc2LjUzNUMyNDYuNjU2IDE3NS43MzUgMjQ3LjQ3OCAxNzUuMDc4IDI0Ny41NDggMTc1LjA3NEMyNDcuNjE4IDE3NS4wNyAyNDcuNjc1IDE3NS44NSAyNDcuNjc1IDE3Ni44MDhaTTIzNC40MjUgMjE3LjEyOUMyMzQuNDI1IDIxNy4yOTQgMjMyLjIxOCAyMjAuMTc1IDIzMC42MTYgMjIyLjEwMkMyMjguODg1IDIyNC4xODUgMjIzLjkyOSAyMjkuMTM0IDIyMS44NjYgMjMwLjg0MUMyMTAuMzQ3IDI0MC4zNzEgMTk3LjE0MSAyNDUuOTA2IDE4Mi4yNzIgMjQ3LjQzNUMxNzkuMjIyIDI0Ny43NDggMTcxLjA4OSAyNDcuNjk4IDE2OC4xMDQgMjQ3LjM0NkMxNjAuNTU1IDI0Ni40NTggMTUzLjk3MiAyNDQuNzYzIDE0Ny40NDcgMjQyLjAyOEMxNDUuOTEzIDI0MS4zODUgMTQxLjgxNCAyMzkuMzc5IDE0MC41MDMgMjM4LjYyOUMxMzcuODA3IDIzNy4wODkgMTM0Ljg3MyAyMzUuMjExIDEzNC44NzggMjM1LjAzMUMxMzQuODg4IDIzNC42ODQgMTM5LjY4MSAyMzEuNjU0IDE0Mi4xOTUgMjMwLjQwN0MxNDYuMDU3IDIyOC40OSAxNDkuNDU3IDIyNy4zOTcgMTU0LjM5IDIyNi40ODdDMTU2LjMxMiAyMjYuMTMyIDE1Ni45MTEgMjI2LjExOSAxNzYuNDExIDIyNi4wMDFDMTg3LjQzNiAyMjUuOTM0IDE5Ni44MDEgMjI1LjgzNSAxOTcuMjIxIDIyNS43OEMxOTcuNjQyIDIyNS43MjUgMTk5LjAxOCAyMjUuNTk3IDIwMC4yNzkgMjI1LjQ5NEMyMDUuMTI2IDIyNS4xIDIxMS44NDMgMjIzLjk3NiAyMTYuOTU5IDIyMi43MDRDMjE5LjYzOSAyMjIuMDM4IDIyNC4xNTggMjIwLjc5NCAyMjQuNjU3IDIyMC41ODZDMjI0Ljg0NCAyMjAuNTA4IDIyNi4wMjkgMjIwLjA5MiAyMjcuMjkgMjE5LjY2MkMyMjguNTUxIDIxOS4yMzEgMjMwLjYxNSAyMTguNDY2IDIzMS44NzcgMjE3Ljk2MUMyMzQuMzIzIDIxNi45ODIgMjM0LjQyNSAyMTYuOTQ5IDIzNC40MjUgMjE3LjEyOVoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=';
 
   protected _provider: IMartianWallet | undefined;
 
@@ -85,15 +87,15 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
   }: MartianWalletAdapterConfig = {}) {
     super();
 
-    this._provider = window.martian;
+    this._provider = typeof window !== 'undefined' ? window.martian : undefined;
     // this._network = network;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
 
-    if (this._readyState !== WalletReadyState.Unsupported) {
+    if (typeof window !== 'undefined' && this._readyState !== WalletReadyState.Unsupported) {
       scopePollingDetectionStrategy(() => {
-        if (window.martian) {
+        if (this._provider) {
           this._readyState = WalletReadyState.Installed;
           this.emit('readyStateChange', this._readyState);
           return true;
@@ -125,9 +127,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
 
   async connect(): Promise<void> {
     try {
-      // console.log(1, window.martian);
       if (this.connected || this.connecting) return;
-      // console.log(2);
       if (
         !(
           this._readyState === WalletReadyState.Loadable ||
@@ -135,14 +135,14 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
         )
       )
         throw new WalletNotReadyError();
-      // console.log(3);
       this._connecting = true;
 
-      const provider = window.martian;
-      await provider?.disconnect();
-      // console.log(4);
+      const provider = this._provider || window.martian;
+      const isConnected = await provider?.isConnected();
+      if (isConnected) {
+        await provider?.disconnect();
+      }
       const response = await provider?.connect();
-      // console.log(5, response);
 
       if (!response) {
         throw new WalletNotConnectedError('No connect response');
@@ -154,16 +154,12 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
           ...walletAccount,
           isConnected: true
         };
-        // console.log(6, this._wallet);
       }
-      // console.log(9, this._wallet?.address);
       this.emit('connect', this._wallet?.address || '');
     } catch (error: any) {
-      // console.log(10, error);
-      this.emit('error', error);
+      this.emit('error', new Error(error));
       throw error;
     } finally {
-      // console.log(11);
       this._connecting = false;
     }
   }
@@ -187,39 +183,58 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
   async signTransaction(transactionPyld: TransactionPayload): Promise<SubmitTransactionRequest> {
     try {
       const wallet = this._wallet;
-      const provider = this._provider;
-      if (!wallet) throw new WalletNotConnectedError();
-      const tx = await aptosClient.generateTransaction(wallet.address || '', transactionPyld);
-      const response = await provider?.signAndSubmitTransaction(tx);
+      const provider = this._provider || window.martian;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const tx = await provider.generateTransaction(wallet.address || '', transactionPyld);
+      if (!tx) throw new Error('Cannot generate transaction');
+      const response = await provider?.signTransaction(tx);
 
       if (!response) {
-        throw new WalletSignTransactionError('No response');
+        throw new Error('No response');
       }
-      return {
-        hash: response
-      } as PendingTransaction;
+      const result = { hash: response } as any;
+      return result as SubmitTransactionRequest;
     } catch (error: any) {
-      this.emit('error', error);
+      this.emit('error', new WalletSignTransactionError(error));
       throw error;
     }
   }
 
-  async signAndSubmitTransaction(transactionPyld: TransactionPayload): Promise<PendingTransaction> {
+  async signAndSubmitTransaction(
+    transactionPyld: TransactionPayload
+  ): Promise<{ hash: HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
-      const provider = this._provider;
-      if (!wallet) throw new WalletNotConnectedError();
-      const tx = await provider?.generateTransaction(wallet.address || '', transactionPyld);
+      const provider = this._provider || window.martian;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const tx = await provider.generateTransaction(wallet.address || '', transactionPyld);
+      if (!tx) throw new Error('Cannot generate transaction');
       const response = await provider?.signAndSubmitTransaction(tx);
 
       if (!response) {
-        throw new WalletSignTransactionError('No response');
+        throw new Error('No response');
+      }
+      return { hash: response };
+    } catch (error: any) {
+      this.emit('error', new WalletSignAndSubmitMessageError(error));
+      throw error;
+    }
+  }
+
+  async signMessage(message: string): Promise<string> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.martian;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const response = await provider?.signMessage(message);
+      if (response) {
+        return response;
+      } else {
+        throw new Error('Sign Message failed');
       }
-      return {
-        hash: response
-      } as PendingTransaction;
     } catch (error: any) {
-      this.emit('error', error);
+      const errMsg = error.message;
+      this.emit('error', new WalletSignMessageError(errMsg));
       throw error;
     }
   }