@manahippo/aptos-wallet-adapter 0.4.5 → 0.4.7

package/src/WalletAdapters/PetraWallet.ts

@@ -1,6 +1,9 @@
-import { HexEncodedBytes, TransactionPayload } from 'aptos/src/generated';
+import { Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletGetNetworkError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError,
@@ -10,9 +13,11 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
   SignMessagePayload,
   SignMessageResponse,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -23,17 +28,23 @@ interface IApotsErrorResult {
   message: string;
 }
 
+type AddressInfo = { address: string; publicKey: string; authKey?: string };
+
 interface IAptosWallet {
-  connect: () => Promise<{ address: string; publicKey: string }>;
-  account: () => Promise<string>;
+  connect: () => Promise<AddressInfo>;
+  account: () => Promise<AddressInfo>;
   isConnected: () => Promise<boolean>;
   signAndSubmitTransaction(
     transaction: any,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes } | IApotsErrorResult>;
+  ): Promise<{ hash: Types.HexEncodedBytes } | IApotsErrorResult>;
   signTransaction(transaction: any, options?: any): Promise<Uint8Array | IApotsErrorResult>;
   signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
+  network(): Promise<WalletAdapterNetwork>;
+  requestId: Promise<number>;
+  onAccountChange: (listener: (newAddress: AddressInfo) => void) => void;
+  onNetworkChange: (listener: (network: { networkName: string }) => void) => void;
 }
 
 interface AptosWindow extends Window {
@@ -60,7 +71,12 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IAptosWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -74,13 +90,13 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: AptosWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.aptos : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -105,6 +121,14 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -142,6 +166,20 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
         isConnected: true
       };
 
+      try {
+        const name = await provider?.network();
+        const chainId = null;
+        const api = null;
+
+        this._network = name;
+        this._chainId = chainId;
+        this._api = api;
+      } catch (error: any) {
+        const errMsg = error.message;
+        this.emit('error', new WalletGetNetworkError(errMsg));
+        throw error;
+      }
+
       this.emit('connect', this._wallet.publicKey);
     } catch (error: any) {
       this.emit('error', error);
@@ -167,7 +205,7 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
+  async signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.aptos;
@@ -186,9 +224,9 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transaction: TransactionPayload,
+    transaction: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }> {
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.aptos;
@@ -198,7 +236,7 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
       if ((response as IApotsErrorResult).code) {
         throw new Error((response as IApotsErrorResult).message);
       }
-      return response as { hash: HexEncodedBytes };
+      return response as { hash: Types.HexEncodedBytes };
     } catch (error: any) {
       const errMsg = error.message;
       this.emit('error', new WalletSignAndSubmitMessageError(errMsg));
@@ -226,4 +264,46 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleAccountChange = async (newAccount: AddressInfo) => {
+        console.log('account Changed >>>', newAccount);
+        // Petra extension currently didn't return the new Account
+        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));
+      throw error;
+    }
+  }
+
+  async onNetworkChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleNetworkChange = async (newNetwork: { networkName: WalletAdapterNetwork }) => {
+        console.log('network Changed >>>', newNetwork);
+        this._network = newNetwork.networkName;
+        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/PontemWallet.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';
@@ -37,21 +41,24 @@ interface IPontemWallet {
   publicKey(): Promise<MaybeHexString>;
   generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
   signAndSubmit(
-    transaction: TransactionPayload,
+    transaction: Types.TransactionPayload,
     options?: any
   ): Promise<{
     success: boolean;
     result: {
-      hash: HexEncodedBytes;
+      hash: Types.HexEncodedBytes;
     };
   }>;
   isConnected(): Promise<boolean>;
-  signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
+  signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array>;
   signMessage(message: SignMessagePayload): Promise<{
     success: boolean;
     result: SignMessageResponse;
   }>;
   disconnect(): Promise<void>;
+  network(): Promise<NetworkInfo>;
+  onChangeAccount(listener: (address: string) => void): Promise<void>;
+  onChangeNetwork(listener: (network: NetworkInfo) => void): Promise<void>;
 }
 
 interface PontemWindow extends Window {
@@ -78,7 +85,12 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IPontemWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -92,13 +104,13 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: PontemWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.pontem : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -123,6 +135,14 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -166,7 +186,19 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
           publicKey,
           isConnected: true
         };
+
+        try {
+          const networkInfo = await provider?.network();
+          this._network = networkInfo.name;
+          this._chainId = networkInfo.chainId;
+          this._api = networkInfo.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) {
       this.emit('error', new Error('User has rejected the connection'));
@@ -192,7 +224,10 @@ export class PontemWalletAdapter 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.pontem;
@@ -207,9 +242,9 @@ export class PontemWalletAdapter 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.pontem;
@@ -243,4 +278,45 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.pontem;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleAccountChange = async (newAccount: string) => {
+        console.log('account Changed >>>', newAccount);
+        this._wallet = {
+          ...this._wallet,
+          address: newAccount || this._wallet?.address
+        };
+        this.emit('accountChange', newAccount);
+      };
+      await provider?.onChangeAccount(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.pontem;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const handleNetworkChange = async (network: NetworkInfo) => {
+        console.log('network Changed >>>', network);
+        this._network = network.name;
+        this._api = network.api;
+        this._chainId = network.chainId;
+        this.emit('networkChange', this._network);
+      };
+      await provider?.onChangeNetwork(handleNetworkChange);
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }

package/src/WalletAdapters/RiseWallet.ts

@@ -1,6 +1,8 @@
-import { HexEncodedBytes, TransactionPayload } from 'aptos/src/generated';
+import { MaybeHexString, Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignMessageError,
@@ -9,13 +11,14 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
   SignMessagePayload,
   SignMessageResponse,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
-import { MaybeHexString } from 'aptos';
 
 interface RiseAccount {
   address: MaybeHexString;
@@ -28,7 +31,7 @@ interface IRiseWallet {
   connect: () => Promise<{ address: string }>;
   account(): Promise<RiseAccount>;
   isConnected: () => Promise<boolean>;
-  signAndSubmitTransaction(transaction: any): Promise<{ hash: HexEncodedBytes }>;
+  signAndSubmitTransaction(transaction: any): Promise<{ hash: Types.HexEncodedBytes }>;
   signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
   signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
@@ -57,7 +60,12 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: IRiseWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -71,13 +79,13 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: RiseWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.rise : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -102,6 +110,14 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -175,7 +191,7 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
+  async signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
@@ -195,8 +211,8 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transaction: TransactionPayload
-  ): Promise<{ hash: HexEncodedBytes }> {
+    transaction: Types.TransactionPayload
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
@@ -235,4 +251,30 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.rise;
+      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.rise;
+      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/SpikaWallet.ts

@@ -1,6 +1,8 @@
-import { HexEncodedBytes, TransactionPayload } from 'aptos/src/generated';
+import { Types } from 'aptos';
 import {
+  WalletAccountChangeError,
   WalletDisconnectionError,
+  WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletSignAndSubmitMessageError,
@@ -10,7 +12,9 @@ import {
 import {
   AccountKeys,
   BaseWalletAdapter,
+  NetworkInfo,
   scopePollingDetectionStrategy,
+  WalletAdapterNetwork,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -19,7 +23,10 @@ interface ISpikaWallet {
   connect: () => Promise<{ publicKey: string; account: string; authKey: string }>;
   account: () => Promise<string>;
   isConnected: () => Promise<boolean>;
-  signAndSubmitTransaction(transaction: any, options?: any): Promise<{ hash: HexEncodedBytes }>;
+  signAndSubmitTransaction(
+    transaction: any,
+    options?: any
+  ): Promise<{ hash: Types.HexEncodedBytes }>;
   signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
   signMessage(message: string): Promise<string>;
   disconnect(): Promise<void>;
@@ -48,7 +55,12 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
 
   protected _provider: ISpikaWallet | undefined;
 
-  // protected _network: WalletAdapterNetwork;
+  protected _network: WalletAdapterNetwork;
+
+  protected _chainId: string;
+
+  protected _api: string;
+
   protected _timeout: number;
 
   protected _readyState: WalletReadyState =
@@ -62,13 +74,13 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
 
   constructor({
     // provider,
-    // network = WalletAdapterNetwork.Mainnet,
+    // network = WalletAdapterNetwork.Testnet,
     timeout = 10000
   }: SpikaWalletAdapterConfig = {}) {
     super();
 
     this._provider = typeof window !== 'undefined' ? window.spika : undefined;
-    // this._network = network;
+    this._network = undefined;
     this._timeout = timeout;
     this._connecting = false;
     this._wallet = null;
@@ -93,6 +105,14 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
     };
   }
 
+  get network(): NetworkInfo {
+    return {
+      name: this._network,
+      api: this._api,
+      chainId: this._chainId
+    };
+  }
+
   get connecting(): boolean {
     return this._connecting;
   }
@@ -166,7 +186,7 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
     this.emit('disconnect');
   }
 
-  async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
+  async signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.spika;
@@ -186,9 +206,9 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
   }
 
   async signAndSubmitTransaction(
-    transaction: TransactionPayload,
+    transaction: Types.TransactionPayload,
     options?: any
-  ): Promise<{ hash: HexEncodedBytes }> {
+  ): Promise<{ hash: Types.HexEncodedBytes }> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.spika;
@@ -224,4 +244,30 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
       throw error;
     }
   }
+
+  async onAccountChange(): Promise<void> {
+    try {
+      const wallet = this._wallet;
+      const provider = this._provider || window.spika;
+      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.spika;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      //To be implemented
+    } catch (error: any) {
+      const errMsg = error.message;
+      this.emit('error', new WalletNetworkChangeError(errMsg));
+      throw error;
+    }
+  }
 }