@manahippo/aptos-wallet-adapter 0.1.15 → 0.1.18

package/src/WalletAdapters/FewchaWallet.ts

@@ -3,7 +3,7 @@ import {
   SubmitTransactionRequest,
   TransactionPayload
 } from 'aptos/dist/api/data-contracts';
-import { aptosClient, WEBWALLET_URL } from '../config/aptosConstants';
+import { WEBWALLET_URL } from '../config/aptosConstants';
 import {
   WalletDisconnectionError,
   WalletNotConnectedError,
@@ -14,7 +14,6 @@ import Web3, { Web3Provider, Web3ProviderType } from '@fewcha/web3';
 import {
   AccountKeys,
   BaseWalletAdapter,
-  PublicKey,
   scopePollingDetectionStrategy,
   WalletName,
   WalletReadyState
@@ -22,8 +21,13 @@ import {
 
 export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
 
-const defaultNodeURL = 'https://fullnode.devnet.aptoslabs.com';
-const defaultWeb3 = new Web3(new Web3Provider(defaultNodeURL));
+interface FewchaWindow extends Window {
+  fewcha: Web3ProviderType;
+}
+
+declare const window: FewchaWindow;
+
+const defaultWeb3 = new Web3(new Web3Provider(window.fewcha));
 
 export interface FewchaAdapterConfig {
   provider?: string;
@@ -65,12 +69,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
 
     if (this._readyState !== WalletReadyState.Unsupported) {
       scopePollingDetectionStrategy(() => {
-        const wallet = (window as any).fewcha;
-
-        if (wallet) {
-          const provider = new Web3Provider(wallet);
-          const web3 = new Web3(provider);
-          this._provider = web3.action;
+        if (window.fewcha) {
           this._readyState = WalletReadyState.Installed;
           this.emit('readyStateChange', this._readyState);
           return true;
@@ -80,9 +79,8 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
     }
 
     window.addEventListener('aptos#connected', async () => {
-      const publicAccount = await this._provider?.account();
+      const publicAccount: any = await this._provider?.account();
       const isConnected = await this._provider?.isConnected();
-      console.log('loginnnn>>', publicAccount, publicAccount?.publicKey);
       if (publicAccount?.publicKey && isConnected) {
         this._wallet = {
           connected: isConnected,
@@ -92,8 +90,10 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
       }
     });
 
-    window.addEventListener('aptos#transaction', (e) => {
-      this.emit('success', e);
+    window.addEventListener('aptos#transaction', (e: any) => {
+      if (e?.detail?.tx) {
+        this.emit('success', e?.detail?.tx);
+      }
     });
 
     window.addEventListener('aptos#disconnected', () => {
@@ -105,7 +105,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
     return {
       publicKey: this._wallet?.publicKey || null,
       address: this._wallet?.address || null,
-      authKey: this._wallet?.authcKey || null
+      authKey: this._wallet?.authKey || null
     };
   }
 
@@ -134,6 +134,10 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
 
       this._connecting = true;
       const provider = this._provider;
+      const isConnected = await this._provider?.isConnected();
+      if (isConnected) {
+        await provider?.disconnect();
+      }
       await provider?.connect();
     } catch (error: any) {
       this.emit('error', error);
@@ -190,14 +194,18 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
 
       try {
         const provider = this._provider;
-        const tx = await aptosClient.generateTransaction(wallet.address, transaction);
-        await provider?.signAndSubmitTransaction(tx);
+        const tx = await provider?.generateTransaction(transaction);
+        if (tx) {
+          await provider?.signAndSubmitTransaction(tx.data);
+        }
 
         const promise = await new Promise((resolve, reject) => {
           this.once('success', resolve);
           this.once('error', reject);
         });
-        return promise as PendingTransaction;
+        return {
+          hash: promise
+        } as PendingTransaction;
       } catch (error: any) {
         const errMsg = error instanceof Error ? error.message : error.response.data.message;
         throw new WalletSignTransactionError(errMsg);

package/src/WalletAdapters/HippoExtensionWallet.ts

@@ -1,3 +1,4 @@
+import { MaybeHexString } from 'aptos';
 import {
   PendingTransaction,
   SubmitTransactionRequest,
@@ -12,14 +13,17 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
-  PublicKey,
   scopePollingDetectionStrategy,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
 
 interface IHippoWallet {
-  connect: () => Promise<{ address: string }>;
+  connect: () => Promise<{
+    address: MaybeHexString;
+    publicKey: MaybeHexString;
+    authKey: MaybeHexString;
+  }>;
   account: () => Promise<string>;
   isConnected: () => Promise<boolean>;
   signAndSubmitTransaction(transaction: any): Promise<any>;
@@ -33,8 +37,7 @@ interface HippoWindow extends Window {
 
 declare const window: HippoWindow;
 
-export const HippoExtensionWalletName =
-  'Hippo Wallet' as WalletName<'Hippo Wallet'>;
+export const HippoExtensionWalletName = 'Hippo Wallet' as WalletName<'Hippo Wallet'>;
 
 export interface HippoExtensionWalletAdapterConfig {
   provider?: IHippoWallet;
@@ -45,7 +48,7 @@ export interface HippoExtensionWalletAdapterConfig {
 export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
   name = HippoExtensionWalletName;
 
-  url = 'https://hippo-wallet-test.web.app';
+  url = 'https://github.com/hippospace/hippo-wallet';
 
   icon = 'https://ui-test1-22e7c.web.app/static/media/hippo_logo.ecded6bf411652de9b7f.png';
 
@@ -92,7 +95,7 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
     return {
       publicKey: this._wallet?.publicKey || null,
       address: this._wallet?.address || null,
-      authKey: this._wallet?.authcKey || null
+      authKey: this._wallet?.authKey || null
     };
   }
 
@@ -124,7 +127,7 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
       const response = await provider?.connect();
 
       this._wallet = {
-        publicKey: response?.address,
+        ...response,
         isConnected: true
       };
 

package/src/WalletAdapters/HippoWallet.ts

@@ -10,13 +10,7 @@ import {
   WalletNotReadyError,
   WalletSignAndSubmitMessageError
 } from '../WalletProviders/errors';
-import {
-  AccountKeys,
-  BaseWalletAdapter,
-  PublicKey,
-  WalletName,
-  WalletReadyState
-} from './BaseAdapter';
+import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
 
 export const HippoWalletName = 'Hippo Web Wallet' as WalletName<'Hippo Web Wallet'>;
 
@@ -63,7 +57,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
     return {
       publicKey: this._wallet?.publicKey || null,
       address: this._wallet?.address || null,
-      authKey: this._wallet?.authcKey || null
+      authKey: this._wallet?.authKey || null
     };
   }
 
@@ -154,7 +148,8 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
           method: 'signTransaction',
           payload: transaction
         }),
-        origin: window.location.origin
+        origin: window.location.origin,
+        isPopUp: 'true'
       }).toString();
       const popup = window.open(
         `${WEBWALLET_URL}?${request}`,

package/src/WalletAdapters/MartianWallet.ts

@@ -1,11 +1,10 @@
 import { MaybeHexString } from 'aptos';
 import {
   PendingTransaction,
-  ScriptFunctionPayload,
   SubmitTransactionRequest,
   TransactionPayload
 } from 'aptos/dist/api/data-contracts';
-import { aptosClient } from '../config/aptosConstants';
+// import { aptosClient } from '../config/aptosConstants';
 import {
   WalletDisconnectionError,
   WalletNotConnectedError,
@@ -15,7 +14,6 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
-  PublicKey,
   scopePollingDetectionStrategy,
   WalletName,
   WalletReadyState
@@ -31,13 +29,14 @@ interface ConnectMartianAccount {
 interface MartianAccount {
   address: MaybeHexString;
   publicKey: MaybeHexString;
-  authcKey: MaybeHexString;
+  authKey: MaybeHexString;
   isConnected: boolean;
 }
 interface IMartianWallet {
   connect: (params?: any) => 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>;
   disconnect(): Promise<void>;
@@ -108,7 +107,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
     return {
       publicKey: this._wallet?.publicKey || null,
       address: this._wallet?.address || null,
-      authKey: this._wallet?.authcKey || null
+      authKey: this._wallet?.authKey || null
     };
   }
 
@@ -140,7 +139,9 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
       this._connecting = true;
 
       const provider = window.martian;
-      // console.log(4);
+      const isConnected = await provider?.isConnected();
+      if (isConnected) await provider?.disconnect();
+      // console.log(4, isConnected);
       const response = await provider?.connect();
       // console.log(5, response);
 
@@ -149,6 +150,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
       }
 
       const walletAccount = await provider?.account();
+      // console.log(6, walletAccount);
       if (walletAccount) {
         this._wallet = {
           ...walletAccount,
@@ -189,7 +191,8 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
       const wallet = this._wallet;
       const provider = this._provider;
       if (!wallet) throw new WalletNotConnectedError();
-      const tx = await aptosClient.generateTransaction(wallet.address || '', transactionPyld);
+      const tx = await provider?.generateTransaction(wallet.address || '', transactionPyld);
+      if (!tx) throw new WalletSignTransactionError('No transaction');
       const response = await provider?.signAndSubmitTransaction(tx);
 
       if (!response) {
@@ -209,7 +212,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
       const wallet = this._wallet;
       const provider = this._provider;
       if (!wallet) throw new WalletNotConnectedError();
-      const tx = await aptosClient.generateTransaction(wallet.address || '', transactionPyld);
+      const tx = await provider?.generateTransaction(wallet.address || '', transactionPyld);
       const response = await provider?.signAndSubmitTransaction(tx);
 
       if (!response) {

package/src/WalletAdapters/MultiMaskWallet.ts

@@ -96,7 +96,7 @@ export class MultiMaskWalletAdapter extends BaseWalletAdapter {
     return {
       publicKey: this._wallet?.publicKey || null,
       address: this._wallet?.address || null,
-      authKey: this._wallet?.authcKey || null
+      authKey: this._wallet?.authKey || null
     };
   }