@manahippo/aptos-wallet-adapter 0.4.5 → 0.4.7

package/src/WalletAdapters/HippoWallet.ts

@@ -1,12 +1,20 @@
-import { MaybeHexString } from 'aptos';
-import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
+import { MaybeHexString, Types } from 'aptos';
 import { WEBWALLET_URL } from '../config/aptosConstants';
 import {
+  WalletAccountChangeError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError
 } from '../WalletProviders/errors';
-import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
+import {
+  AccountKeys,
+  BaseWalletAdapter,
+  NetworkInfo,
+  WalletAdapterNetwork,
+  WalletName,
+  WalletReadyState
+} from './BaseAdapter';
 
 export const HippoWalletName = 'Hippo Web' as WalletName<'Hippo Web'>;
 
@@ -25,7 +33,12 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: string | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState = WalletReadyState.Installed;
@@ -36,13 +49,13 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider = WEBWALLET_URL,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: HippoWalletAdapterConfig = {}) {
     super();
 
     this._provider = WEBWALLET_URL || 'https://hippo-wallet-test.web.app';
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -57,6 +70,14 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -137,7 +158,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
+  async signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array> {
     try {
       const request = new URLSearchParams({
         request: JSON.stringify({
@@ -165,8 +186,8 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transaction: TransactionPayload
-  ): Promise<{ hash: HexEncodedBytes }> {
+    transaction: Types.TransactionPayload
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const request = new URLSearchParams({
         request: JSON.stringify({
@@ -185,7 +206,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
         this.once('success', resolve);
         this.once('error', reject);
       });
-      return promise as { hash: HexEncodedBytes };
+      return promise as { hash: Types.HexEncodedBytes };
     } catch (error: any) {
       this.emit('error', error);
       throw error;
@@ -218,6 +239,26 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
     }
   }
 
+  async onAccountChange(): Promise<void> {
+    try {
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletAccountChangeError(errMsg));
+      throw error;
+    }
+  }
+
+  async onNetworkChange(): Promise<void> {
+    try {
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
+
   private _beforeUnload = (): void => {
     void this.disconnect();
   };

package/src/WalletAdapters/HyperPayWallet.ts

@@ -1,7 +1,8 @@
-import { MaybeHexString } from 'aptos';
-import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
+import { MaybeHexString, Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError,
@@ -11,7 +12,9 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -34,8 +37,8 @@ interface IHyperPayWallet {
   account(): Promise<HyperPayAccount>;
   isConnected(): Promise<boolean>;
   generateTransaction(sender: MaybeHexString, payload: any, options?: any): Promise<any>;
-  signAndSubmitTransaction(transaction: TransactionPayload): Promise<HexEncodedBytes>;
-  signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
+  signAndSubmitTransaction(transaction: Types.TransactionPayload): Promise<Types.HexEncodedBytes>;
+  signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array>;
   signMessage(message: string): Promise<{ signature: string }>;
   disconnect(): Promise<void>;
 }
@@ -64,7 +67,12 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IHyperPayWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -109,6 +117,14 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -176,7 +192,10 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transactionPyld: TransactionPayload, options?: any): Promise<Uint8Array> {
+  async signTransaction(
+    transactionPyld: Types.TransactionPayload,
+    options?: any
+  ): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.hyperpay;
@@ -196,9 +215,9 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transactionPyld: TransactionPayload,
+    transactionPyld: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }> {
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.hyperpay;
@@ -234,4 +253,30 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.hyperpay;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } 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.hyperpay;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }

package/src/WalletAdapters/MartianWallet.ts

@@ -1,7 +1,9 @@
-import { MaybeHexString } from 'aptos';
-import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
+import { MaybeHexString, Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletGetNetworkError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError,
@@ -11,9 +13,11 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
   SignMessagePayload,
   SignMessageResponse,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -36,10 +40,14 @@ interface IMartianWallet {
   account(): Promise<MartianAccount>;
   isConnected(): Promise<boolean>;
   generateTransaction(sender: MaybeHexString, payload: any, options?: any): Promise<any>;
-  signAndSubmitTransaction(transaction: TransactionPayload): Promise<HexEncodedBytes>;
-  signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
+  signAndSubmitTransaction(transaction: Types.TransactionPayload): Promise<Types.HexEncodedBytes>;
+  signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array>;
   signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
+  getChainId(): Promise<{ chainId: number }>;
+  network(): Promise<WalletAdapterNetwork>;
+  onAccountChange: (listenr: (newAddress: string) => void) => void;
+  onNetworkChange: (listenr: (network: string) => void) => void;
 }
 
 interface MartianWindow extends Window {
@@ -66,7 +74,12 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IMartianWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -80,13 +93,13 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: MartianWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.martian : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -111,6 +124,14 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -152,6 +173,20 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
           ...walletAccount,
           isConnected: true
         };
+
+        try {
+          const name = await provider?.network();
+          const { chainId } = await provider?.getChainId();
+          const api = null;
+
+          this._network = name;
+          this._chainId = chainId.toString();
+          this._api = api;
+        } catch (error: any) {
+          const errMsg = error.message;
+          this.emit('error', new WalletGetNetworkError(errMsg));
+          throw error;
+        }
       }
       this.emit('connect', this._wallet?.address || '');
     } catch (error: any) {
@@ -178,7 +213,10 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transactionPyld: TransactionPayload, options?: any): Promise<Uint8Array> {
+  async signTransaction(
+    transactionPyld: Types.TransactionPayload,
+    options?: any
+  ): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.martian;
@@ -198,9 +236,9 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transactionPyld: TransactionPayload,
+    transactionPyld: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }> {
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.martian;
@@ -239,4 +277,42 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.martian;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      await provider?.onAccountChange((newAccount: string) => {
+        console.log('account Changed >>>', newAccount);
+        this._wallet = {
+          ...this._wallet,
+          address: newAccount
+        };
+        this.emit('accountChange', newAccount);
+      });
+    } 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.martian;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleNetworkChange = async (newNetwork: WalletAdapterNetwork) => {
+        console.log('network Changed >>>', newNetwork);
+        this._network = newNetwork;
+        this.emit('networkChange', this._network);
+      };
+      await provider?.onNetworkChange(handleNetworkChange);
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }

package/src/WalletAdapters/NightlyWallet.ts

@@ -2,9 +2,10 @@ export const NightlyWallet = () => {};
 
 import { PendingTransaction, TransactionPayload } from 'aptos/src/generated';
 import * as SHA3 from 'js-sha3';
-import { aptosClient } from '../config/aptosConstants';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignMessageError,
@@ -13,7 +14,9 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -57,7 +60,10 @@ interface AptosNightly {
   constructor(eventMap: Map<string, (data: any) => any>);
   connect(onDisconnect?: () => void, eagerConnect?: boolean): Promise<AptosPublicKey>;
   disconnect(): Promise<void>;
-  signTransaction: (transaction: TransactionPayload) => Promise<Uint8Array>;
+  signTransaction: (
+    transaction: TransactionPayload,
+    submit: boolean
+  ) => Promise<Uint8Array | PendingTransaction>;
   signAllTransactions: (transaction: TransactionPayload[]) => Promise<Uint8Array[]>;
   signMessage(msg: string): Promise<Uint8Array>;
 }
@@ -88,7 +94,12 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: AptosNightly | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -107,13 +118,13 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: NightlyWalletAdapterConfig = {}) {
     super();
 
     this._provider = window.nightly?.aptos;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -138,6 +149,14 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -205,9 +224,9 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
 
       try {
         const provider = this._provider || window.nightly?.aptos;
-        const response = await provider?.signTransaction(payload);
+        const response = await provider?.signTransaction(payload, false);
         if (response) {
-          return response;
+          return response as Uint8Array;
         } else {
           throw new Error('Transaction failed');
         }
@@ -249,10 +268,9 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
 
       try {
         const provider = this._provider || window.nightly?.aptos;
-        const response = await provider?.signTransaction(tx);
-        const result = await aptosClient.submitSignedBCSTransaction(response);
+        const response = await provider?.signTransaction(tx, true);
         if (response) {
-          return result;
+          return response as PendingTransaction;
         } else {
           throw new Error('Transaction failed');
         }
@@ -283,4 +301,30 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.nightly.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } 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.nightly.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }