@manahippo/aptos-wallet-adapter 0.2.1 → 0.3.0

package/src/WalletAdapters/AptosWallet.ts

@@ -1,8 +1,8 @@
 import {
-  PendingTransaction,
+  HexEncodedBytes,
   SubmitTransactionRequest,
   TransactionPayload
-} from 'aptos/dist/api/data-contracts';
+} from 'aptos/dist/generated';
 import {
   WalletDisconnectionError,
   WalletNotConnectedError,
@@ -18,12 +18,11 @@ import {
 } from './BaseAdapter';
 
 interface IAptosWallet {
-  requestId: number;
   connect: () => Promise<{ address: string }>;
   account: () => Promise<string>;
   isConnected: () => Promise<boolean>;
-  signAndSubmitTransaction(transaction: any): Promise<void>;
-  signTransaction(transaction: any): Promise<void>;
+  signAndSubmitTransaction(transaction: any): Promise<{ hash: HexEncodedBytes }>;
+  signTransaction(transaction: any): Promise<SubmitTransactionRequest>;
   disconnect(): Promise<void>;
 }
 
@@ -69,13 +68,13 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
   }: AptosWalletAdapterConfig = {}) {
     super();
 
-    this._provider = window.aptos;
+    this._provider = typeof window !== 'undefined' ? window.aptos : 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.aptos) {
           this._readyState = WalletReadyState.Installed;
@@ -120,8 +119,12 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
       this._connecting = true;
 
       const provider = this._provider || window.aptos;
-      const response = await provider?.connect();
+      const isConnected = await this._provider?.isConnected();
+      if (isConnected === true) {
+        await provider?.disconnect();
+      }
 
+      const response = await provider?.connect();
       this._wallet = {
         publicKey: response?.address,
         isConnected: true
@@ -155,44 +158,39 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
   async signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest> {
     try {
       const wallet = this._wallet;
-      if (!wallet) throw new WalletNotConnectedError();
+      const provider = this._provider || window.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
 
-      try {
-        const provider = this._provider || window.aptos;
-        const response = await provider?.signTransaction(transaction);
-        if (response) {
-          return response;
-        } else {
-          throw new Error('Transaction failed');
-        }
-      } catch (error: any) {
-        throw new WalletSignTransactionError(error?.message, error);
+      const response = await provider?.signTransaction(transaction);
+      if (response) {
+        return response;
+      } else {
+        throw new Error('Sign Transaction failed');
       }
     } catch (error: any) {
-      this.emit('error', error);
+      const errMsg = error.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();
+      const provider = this._provider || window.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
 
-      try {
-        const provider = this._provider || window.aptos;
-        const response = await provider?.signAndSubmitTransaction(transaction);
-        if (response) {
-          return response;
-        } else {
-          throw new Error('Transaction failed');
-        }
-      } catch (error: any) {
-        const errMsg = error instanceof Error ? error.message : error.response.data.message;
-        throw new WalletSignTransactionError(errMsg);
+      const response = await provider?.signAndSubmitTransaction(transaction);
+      if (response) {
+        return response;
+      } else {
+        throw new Error('Transaction failed');
       }
     } catch (error: any) {
-      this.emit('error', error);
+      const errMsg = error.message;
+      this.emit('error', new WalletSignTransactionError(errMsg));
       throw error;
     }
   }

package/src/WalletAdapters/BaseAdapter.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 EventEmitter from 'eventemitter3';
 
 declare global {
@@ -64,26 +64,13 @@ export interface WalletAdapterProps<Name extends string = string> {
   publicAccount: AccountKeys;
   connect(): Promise<void>;
   disconnect(): Promise<void>;
-  signAndSubmitTransaction(
-    transaction: TransactionPayload
-    // connection: Connection,
-    // options?: SendTransactionOptions
-  ): Promise<PendingTransaction>;
-  signTransaction(
-    transaction: TransactionPayload
-    // connection: Connection,
-    // options?: SendTransactionOptions
-  ): Promise<SubmitTransactionRequest>;
+  signAndSubmitTransaction(transaction: TransactionPayload): Promise<{ hash: HexEncodedBytes }>;
+  signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
 }
 
 export type WalletAdapter<Name extends string = string> = WalletAdapterProps<Name> &
   EventEmitter<WalletAdapterEvents>;
 
-export interface SignerWalletAdapterProps {
-  // signTransaction(transaction: Transaction): Promise<Transaction>;
-  // signAllTransactions(transaction: Transaction[]): Promise<Transaction[]>;
-}
-
 export abstract class BaseWalletAdapter
   extends EventEmitter<WalletAdapterEvents>
   implements WalletAdapter
@@ -106,7 +93,9 @@ export abstract class BaseWalletAdapter
 
   abstract connect(): Promise<void>;
   abstract disconnect(): Promise<void>;
-  abstract signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
+  abstract signAndSubmitTransaction(
+    transaction: TransactionPayload
+  ): Promise<{ hash: HexEncodedBytes }>;
 
   abstract signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
 }

package/src/WalletAdapters/FewchaWallet.ts

@@ -1,10 +1,5 @@
 import {
-  PendingTransaction,
-  SubmitTransactionRequest,
-  TransactionPayload
-} from 'aptos/dist/api/data-contracts';
-import { aptosClient, WEBWALLET_URL } from '../config/aptosConstants';
-import {
+  WalletConnectionError,
   WalletDisconnectionError,
   WalletNotConnectedError,
   WalletNotReadyError,
@@ -18,6 +13,11 @@ import {
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
+import {
+  TransactionPayload,
+  SubmitTransactionRequest,
+  HexEncodedBytes
+} from 'aptos/dist/generated';
 
 export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
 
@@ -27,8 +27,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 +58,15 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
   }: FewchaAdapterConfig = {}) {
     super();
 
-    this._provider = defaultWeb3.action;
+    this._provider =
+      typeof window !== 'undefined' ? new Web3(new Web3Provider(window.fewcha)).action : undefined;
     // 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 +76,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 +110,31 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
         throw new WalletNotReadyError();
 
       this._connecting = true;
-      const provider = this._provider;
+      const provider = this._provider || window.fewcha;
       const isConnected = await this._provider?.isConnected();
-      if (isConnected) {
+      if (isConnected?.data === true) {
         await provider?.disconnect();
       }
-      await provider?.connect();
+      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 };
+      }
+      this._wallet = {
+        connected: true,
+        ...accountDetail
+      };
+      this.emit('connect', this._wallet.publicKey);
     } catch (error: any) {
       this.emit('error', error);
       throw error;
@@ -153,8 +149,13 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
       this._wallet = null;
 
       try {
-        const provider = this._provider;
-        await provider?.disconnect();
+        const provider = this._provider || window.fewcha;
+        const isDisconnected = await provider?.disconnect();
+        if (isDisconnected.data === true) {
+          this.emit('disconnect');
+        } else {
+          throw new Error('Disconnect failed');
+        }
       } catch (error: any) {
         this.emit('error', new WalletDisconnectionError(error?.message, error));
       }
@@ -163,53 +164,48 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
 
   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);
+      if (!tx) throw new WalletSignTransactionError('Cannot generate transaction');
+      const response = await provider?.signTransaction(tx.data);
+
+      if (!response) {
+        throw new WalletSignTransactionError('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);
+      if (!tx) throw new WalletSignTransactionError('Cannot generate transaction');
+      const response = await provider?.signAndSubmitTransaction(tx.data);
+      if (response.status === 401) {
+        throw new WalletSignTransactionError('User has rejected the transaction');
+      } else if (response.status !== 200) {
+        throw new WalletSignTransactionError('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 WalletSignTransactionError(errMsg));
       throw error;
     }
   }

package/src/WalletAdapters/HippoExtensionWallet.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 {
   WalletDisconnectionError,
   WalletNotConnectedError,
@@ -73,13 +73,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 +178,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,7 +189,7 @@ 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');
         }

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,
@@ -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,7 @@ 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;

package/src/WalletAdapters/MartianWallet.ts

@@ -1,10 +1,9 @@
 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,
@@ -33,12 +32,12 @@ 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>;
   disconnect(): Promise<void>;
 }
 
@@ -85,15 +84,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 +124,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 +132,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 +151,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 +180,40 @@ 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 WalletSignTransactionError('Cannot generate transaction');
+      const response = await provider?.signTransaction(tx);
 
       if (!response) {
         throw new WalletSignTransactionError('No response');
       }
-      return {
-        hash: response
-      } as PendingTransaction;
+      const result = { hash: response } as any;
+      return result as SubmitTransactionRequest;
     } catch (error: any) {
       this.emit('error', 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 WalletSignTransactionError('Cannot generate transaction');
       const response = await provider?.signAndSubmitTransaction(tx);
 
       if (!response) {
         throw new WalletSignTransactionError('No response');
       }
-      return {
-        hash: response
-      } as PendingTransaction;
+      return { hash: response };
     } catch (error: any) {
-      this.emit('error', error);
+      this.emit('error', new Error(error));
       throw error;
     }
   }