@manahippo/aptos-wallet-adapter 0.4.3 → 0.4.5

package/src/WalletAdapters/NightlyWallet.ts

@@ -1,261 +1,286 @@
 export const NightlyWallet = () => {};
-// import { TxnBuilderTypes, BCS } from 'aptos';
-// import {
-//   PendingTransaction,
-//   ScriptFunctionPayload,
-//   SubmitTransactionRequest,
-//   TransactionPayload
-// } from 'aptos/dist/api/data-contracts';
-// import {
-//   ScriptFunction,
-//   StructTag,
-//   TransactionPayloadScriptFunction,
-//   TypeTagStruct
-// } from 'aptos/dist/transaction_builder/aptos_types';
-// import { bcsSerializeUint64, bcsToBytes, Seq } from 'aptos/dist/transaction_builder/bcs';
-// import { aptosClient } from '../config/aptosConstants';
-// import {
-//   WalletDisconnectionError,
-//   WalletNotConnectedError,
-//   WalletNotReadyError,
-//   WalletSignTransactionError
-// } from '../WalletProviders/errors';
-// import {
-//   AccountKeys,
-//   Address,
-//   AuthKey,
-//   BaseWalletAdapter,
-//   PublicKey,
-//   scopePollingDetectionStrategy,
-//   WalletName,
-//   WalletReadyState
-// } from './BaseAdapter';
-
-// interface INightlyWallet {
-//   requestId: number;
-//   connect: (onDisconnect?: () => void, eager?: boolean) => Promise<any>;
-//   account: () => Promise<string>;
-//   isConnected: () => Promise<boolean>;
-//   signAndSubmitTransaction(transaction: any): Promise<void>;
-//   signTransaction(transaction: any): Promise<any>;
-//   disconnect(): Promise<void>;
-// }
-
-// interface NightlyWindow extends Window {
-//   nightly?: {
-//     aptos: INightlyWallet;
-//   };
-// }
-
-// declare const window: NightlyWindow;
-
-// export const NightlyWalletName = 'Nightly Wallet' as WalletName<'Nightly Wallet'>;
-
-// export interface NightlyWalletAdapterConfig {
-//   provider?: INightlyWallet;
-//   // network?: WalletAdapterNetwork;
-//   timeout?: number;
-// }
-
-// export class NightlyWalletAdapter extends BaseWalletAdapter {
-//   name = NightlyWalletName;
-
-//   url =
-//     'https://chrome.google.com/webstore/detail/nightly/injggoambcadlfkkjcgdfbejanmgfgfm/related?hl=en&authuser=0';
-
-//   icon =
-//     'https://lh3.googleusercontent.com/Ha38j09tA-70EiZ17pculpj1KUKDP07ytX4DJx_fumDfod_X2nRTiUg2Y9tDwRBs5jDj-gu52hwaPYVPgq1xAuFA1Q=w128-h128-e365-rj-sc0x00ffffff';
-
-//   protected _provider: INightlyWallet | undefined;
-
-//   // protected _network: WalletAdapterNetwork;
-//   protected _timeout: number;
-
-//   protected _readyState: WalletReadyState =
-//     typeof window === 'undefined' || typeof document === 'undefined'
-//       ? WalletReadyState.Unsupported
-//       : WalletReadyState.NotDetected;
-
-//   protected _connecting: boolean;
-
-//   protected _wallet: {
-//     publicKey?: string;
-//     address?: string;
-//     authKey?: string;
-//     isConnected: boolean;
-//   } | null;
-
-//   constructor({
-//     // provider,
-//     // network = WalletAdapterNetwork.Mainnet,
-//     timeout = 10000
-//   }: NightlyWalletAdapterConfig = {}) {
-//     super();
-
-//     this._provider = window.nightly?.aptos;
-//     // this._network = network;
-//     this._timeout = timeout;
-//     this._connecting = false;
-//     this._wallet = null;
-
-//     if (this._readyState !== WalletReadyState.Unsupported) {
-//       scopePollingDetectionStrategy(() => {
-//         if (window.nightly?.aptos) {
-//           this._readyState = WalletReadyState.Installed;
-//           this.emit('readyStateChange', this._readyState);
-//           return true;
-//         }
-//         return false;
-//       });
-//     }
-//   }
-
-//   get publicAccount(): AccountKeys {
-//     return {
-//       publicKey: this._wallet?.publicKey || null,
-//       address: this._wallet?.address || null,
-//       authKey: this._wallet?.authKey || null
-//     };
-//   }
-
-//   get connecting(): boolean {
-//     return this._connecting;
-//   }
-
-//   get connected(): boolean {
-//     return !!this._wallet?.isConnected;
-//   }
-
-//   get readyState(): WalletReadyState {
-//     return this._readyState;
-//   }
-
-//   async connect(): Promise<void> {
-//     try {
-//       if (this.connected || this.connecting) return;
-//       if (
-//         !(
-//           this._readyState === WalletReadyState.Loadable ||
-//           this._readyState === WalletReadyState.Installed
-//         )
-//       )
-//         throw new WalletNotReadyError();
-//       this._connecting = true;
-
-//       const provider = this._provider || window.nightly?.aptos;
-//       const publicKey = await provider?.connect(() => {
-//         console.log('Trigger disconnect Aptos');
-//       });
-//       this._wallet = {
-//         publicKey: publicKey?.asString(),
-//         address: publicKey?.address(),
-//         isConnected: true
-//       };
-
-//       this.emit('connect', this._wallet.publicKey || '');
-//     } catch (error: any) {
-//       this.emit('error', error);
-//       throw error;
-//     } finally {
-//       this._connecting = false;
-//     }
-//   }
-
-//   async disconnect(): Promise<void> {
-//     const wallet = this._wallet;
-//     if (wallet) {
-//       this._wallet = null;
-
-//       try {
-//         const provider = this._provider || window.nightly?.aptos;
-//         await provider?.disconnect();
-//       } catch (error: any) {
-//         this.emit('error', new WalletDisconnectionError(error?.message, error));
-//       }
-//     }
-
-//     this.emit('disconnect');
-//   }
-
-//   async signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest> {
-//     try {
-//       const wallet = this._wallet;
-//       if (!wallet) throw new WalletNotConnectedError();
-
-//       try {
-//         const provider = this._provider || window.nightly?.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);
-//       }
-//     } catch (error: any) {
-//       this.emit('error', error);
-//       throw error;
-//     }
-//   }
-
-//   async signAndSubmitTransaction(tempTransaction: TransactionPayload): Promise<PendingTransaction> {
-//     try {
-//       const wallet = this._wallet;
-//       if (!wallet) throw new WalletNotConnectedError();
-
-//       try {
-//         const provider = this._provider || window.nightly?.aptos;
-//         const client = aptosClient;
-//         const [{ sequence_number: sequnceNumber }, chainId] = await Promise.all([
-//           client.getAccount(wallet.address || ''),
-//           client.getChainId()
-//         ]);
-//         const transaction = tempTransaction as ScriptFunctionPayload;
-//         const [txAddress, module, funcName] = transaction.function.split('::');
-//         const token = new TypeTagStruct(StructTag.fromString(transaction.type_arguments[0]));
-//         const argts = transaction.arguments.map((arg) => {
-//           if (typeof arg === 'string') {
-//             return bcsSerializeUint64(parseInt(arg));
-//           } else if (typeof arg === 'boolean') {
-//             const serializer = new BCS.Serializer();
-//             serializer.serializeBool(arg);
-//             return serializer.getBytes();
-//           } else if (typeof arg === 'number') {
-//             return bcsSerializeUint64(arg);
-//           } else {
-//             return arg;
-//           }
-//         });
-//         console.log('txnpayload>>', transaction.arguments, argts);
-//         const txnPayload = new TransactionPayloadScriptFunction(
-//           ScriptFunction.natural(`${txAddress}::${module}`, funcName, [token], [...argts])
-//         );
-
-//         const rawTxn = new TxnBuilderTypes.RawTransaction(
-//           TxnBuilderTypes.AccountAddress.fromHex(wallet.address || ''),
-//           BigInt(sequnceNumber),
-//           txnPayload,
-//           BigInt(1000),
-//           BigInt(1),
-//           BigInt(Math.floor(Date.now() / 1000) + 10),
-//           new TxnBuilderTypes.ChainId(chainId)
-//         );
-//         const bcsTxn = await provider?.signTransaction(rawTxn);
-//         const response = await aptosClient.submitSignedBCSTransaction(bcsTxn);
-//         if (response) {
-//           console.log('tx response>>>', 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);
-//       }
-//     } catch (error: any) {
-//       this.emit('error', error);
-//       throw error;
-//     }
-//   }
-// }
+
+import { PendingTransaction, TransactionPayload } from 'aptos/src/generated';
+import * as SHA3 from 'js-sha3';
+import { aptosClient } from '../config/aptosConstants';
+import {
+  WalletDisconnectionError,
+  WalletNotConnectedError,
+  WalletNotReadyError,
+  WalletSignMessageError,
+  WalletSignTransactionError
+} from '../WalletProviders/errors';
+import {
+  AccountKeys,
+  BaseWalletAdapter,
+  scopePollingDetectionStrategy,
+  WalletName,
+  WalletReadyState
+} from './BaseAdapter';
+
+export class AptosPublicKey {
+  private readonly hexString: string;
+
+  static default() {
+    return new AptosPublicKey('0'.repeat(64));
+  }
+
+  address() {
+    const hash = SHA3.sha3_256.create();
+    hash.update(Buffer.from(this.asPureHex(), 'hex'));
+    hash.update('\x00');
+    return '0x' + hash.hex();
+  }
+
+  asUint8Array() {
+    return new Uint8Array(Buffer.from(this.asPureHex(), 'hex'));
+  }
+
+  asString() {
+    return this.hexString;
+  }
+
+  asPureHex() {
+    return this.hexString.substr(2);
+  }
+
+  constructor(hexString: string) {
+    if (hexString.startsWith('0x')) {
+      this.hexString = hexString;
+    } else {
+      this.hexString = `0x${hexString}`;
+    }
+  }
+}
+interface AptosNightly {
+  publicKey: AptosPublicKey;
+  constructor(eventMap: Map<string, (data: any) => any>);
+  connect(onDisconnect?: () => void, eagerConnect?: boolean): Promise<AptosPublicKey>;
+  disconnect(): Promise<void>;
+  signTransaction: (transaction: TransactionPayload) => Promise<Uint8Array>;
+  signAllTransactions: (transaction: TransactionPayload[]) => Promise<Uint8Array[]>;
+  signMessage(msg: string): Promise<Uint8Array>;
+}
+interface NightlyWindow extends Window {
+  nightly?: {
+    aptos: AptosNightly;
+  };
+}
+
+declare const window: NightlyWindow;
+
+export const NightlyWalletName = 'Nightly' as WalletName<'Nightly'>;
+
+export interface NightlyWalletAdapterConfig {
+  provider?: AptosNightly;
+  // network?: WalletAdapterNetwork;
+  timeout?: number;
+}
+
+export class NightlyWalletAdapter extends BaseWalletAdapter {
+  name = NightlyWalletName;
+
+  url =
+    'https://chrome.google.com/webstore/detail/nightly/fiikommddbeccaoicoejoniammnalkfa/related?hl=en&authuser=0';
+
+  icon =
+    'https://lh3.googleusercontent.com/_feXM9qulMM5w9BYMLzMpZrxW2WlBmdyg3SbETIoRsHdAD9PANnLCEPabC7lzEK0N8fOyyvFkY3746jk8l73zUErxhU=w128-h128-e365-rj-sc0x00ffffff';
+
+  protected _provider: AptosNightly | undefined;
+
+  // protected _network: WalletAdapterNetwork;
+  protected _timeout: number;
+
+  protected _readyState: WalletReadyState =
+    typeof window === 'undefined' || typeof document === 'undefined'
+      ? WalletReadyState.Unsupported
+      : WalletReadyState.NotDetected;
+
+  protected _connecting: boolean;
+
+  protected _wallet: {
+    publicKey?: string;
+    address?: string;
+    authKey?: string;
+    isConnected: boolean;
+  } | null;
+
+  constructor({
+    // provider,
+    // network = WalletAdapterNetwork.Mainnet,
+    timeout = 10000
+  }: NightlyWalletAdapterConfig = {}) {
+    super();
+
+    this._provider = window.nightly?.aptos;
+    // this._network = network;
+    this._timeout = timeout;
+    this._connecting = false;
+    this._wallet = null;
+
+    if (this._readyState !== WalletReadyState.Unsupported) {
+      scopePollingDetectionStrategy(() => {
+        if (window.nightly?.aptos) {
+          this._readyState = WalletReadyState.Installed;
+          this.emit('readyStateChange', this._readyState);
+          return true;
+        }
+        return false;
+      });
+    }
+  }
+
+  get publicAccount(): AccountKeys {
+    return {
+      publicKey: this._wallet?.publicKey || null,
+      address: this._wallet?.address || null,
+      authKey: this._wallet?.authKey || null
+    };
+  }
+
+  get connecting(): boolean {
+    return this._connecting;
+  }
+
+  get connected(): boolean {
+    return !!this._wallet?.isConnected;
+  }
+
+  get readyState(): WalletReadyState {
+    return this._readyState;
+  }
+
+  async connect(): Promise<void> {
+    try {
+      if (this.connected || this.connecting) return;
+      if (
+        !(
+          this._readyState === WalletReadyState.Loadable ||
+          this._readyState === WalletReadyState.Installed
+        )
+      )
+        throw new WalletNotReadyError();
+      this._connecting = true;
+
+      const provider = this._provider || window.nightly?.aptos;
+      const publicKey = await provider?.connect(() => {
+        this._wallet = null;
+        this.emit('disconnect');
+      });
+      this._wallet = {
+        publicKey: publicKey?.asString(),
+        address: publicKey?.address(),
+        isConnected: true
+      };
+
+      this.emit('connect', this._wallet.publicKey || '');
+    } catch (error: any) {
+      this.emit('error', error);
+      throw error;
+    } finally {
+      this._connecting = false;
+    }
+  }
+
+  async disconnect(): Promise<void> {
+    const wallet = this._wallet;
+    if (wallet) {
+      this._wallet = null;
+
+      try {
+        const provider = this._provider || window.nightly?.aptos;
+        await provider?.disconnect();
+      } catch (error: any) {
+        this.emit('error', new WalletDisconnectionError(error?.message, error));
+      }
+    }
+
+    this.emit('disconnect');
+  }
+
+  async signTransaction(payload: TransactionPayload): Promise<Uint8Array> {
+    try {
+      const wallet = this._wallet;
+      if (!wallet) throw new WalletNotConnectedError();
+
+      try {
+        const provider = this._provider || window.nightly?.aptos;
+        const response = await provider?.signTransaction(payload);
+        if (response) {
+          return response;
+        } else {
+          throw new Error('Transaction failed');
+        }
+      } catch (error: any) {
+        throw new WalletSignTransactionError(error?.message, error);
+      }
+    } catch (error: any) {
+      this.emit('error', error);
+      throw error;
+    }
+  }
+
+  async signAllTransaction(payload: TransactionPayload[]): Promise<Uint8Array[]> {
+    try {
+      const wallet = this._wallet;
+      if (!wallet) throw new WalletNotConnectedError();
+
+      try {
+        const provider = this._provider || window.nightly?.aptos;
+        const response = await provider?.signAllTransactions(payload);
+        if (response) {
+          return response;
+        } else {
+          throw new Error('Transaction failed');
+        }
+      } catch (error: any) {
+        throw new WalletSignTransactionError(error?.message, error);
+      }
+    } catch (error: any) {
+      this.emit('error', error);
+      throw error;
+    }
+  }
+
+  async signAndSubmitTransaction(tx: TransactionPayload): Promise<PendingTransaction> {
+    try {
+      const wallet = this._wallet;
+      if (!wallet) throw new WalletNotConnectedError();
+
+      try {
+        const provider = this._provider || window.nightly?.aptos;
+        const response = await provider?.signTransaction(tx);
+        const result = await aptosClient.submitSignedBCSTransaction(response);
+        if (response) {
+          return result;
+        } else {
+          throw new Error('Transaction failed');
+        }
+      } catch (error: any) {
+        const errMsg = error instanceof Error ? error.message : error.response.data.message;
+        throw new WalletSignTransactionError(errMsg);
+      }
+    } 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.nightly.aptos;
+      if (!wallet || !provider) throw new WalletNotConnectedError();
+      const response = await provider?.signMessage(message);
+      if (response) {
+        return Buffer.from(response).toString('hex');
+      } 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/PetraWallet.ts

@@ -53,7 +53,8 @@ export interface AptosWalletAdapterConfig {
 export class AptosWalletAdapter extends BaseWalletAdapter {
   name = AptosWalletName;
 
-  url = 'https://aptos.dev/guides/building-wallet-extension';
+  url =
+    'https://chrome.google.com/webstore/detail/petra-aptos-wallet/ejjladinnckdgjemekebdpeokbikhfci';
 
   icon = 'https://miro.medium.com/fit/c/176/176/1*Gf747eyRywU8Img0tK5wvw.png';
 

package/src/WalletAdapters/PontemWallet.ts

@@ -12,6 +12,8 @@ import {
   AccountKeys,
   BaseWalletAdapter,
   scopePollingDetectionStrategy,
+  SignMessagePayload,
+  SignMessageResponse,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -45,11 +47,9 @@ interface IPontemWallet {
   }>;
   isConnected(): Promise<boolean>;
   signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
-  signMessage(message: string): Promise<{
+  signMessage(message: SignMessagePayload): Promise<{
     success: boolean;
-    result: {
-      hexString: HexEncodedBytes;
-    };
+    result: SignMessageResponse;
   }>;
   disconnect(): Promise<void>;
 }
@@ -221,20 +221,19 @@ export class PontemWalletAdapter extends BaseWalletAdapter {
       }
       return { hash: response.result.hash };
     } catch (error: any) {
-      this.emit('error', new WalletSignAndSubmitMessageError(error.error.message));
+      this.emit('error', new WalletSignAndSubmitMessageError(error.message));
       throw error;
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async signMessage(messagePayload: SignMessagePayload): Promise<SignMessageResponse> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.pontem;
       if (!wallet || !provider) throw new WalletNotConnectedError();
-      const response = await provider?.signMessage(message);
-      console.log('MEMEM>>>', response);
+      const response = await provider?.signMessage(messagePayload);
       if (response.success) {
-        return response.result.hexString;
+        return response.result;
       } else {
         throw new Error('Sign Message failed');
       }

package/src/WalletAdapters/RiseWallet.ts

@@ -10,6 +10,8 @@ import {
   AccountKeys,
   BaseWalletAdapter,
   scopePollingDetectionStrategy,
+  SignMessagePayload,
+  SignMessageResponse,
   WalletName,
   WalletReadyState
 } from './BaseAdapter';
@@ -28,7 +30,7 @@ interface IRiseWallet {
   isConnected: () => Promise<boolean>;
   signAndSubmitTransaction(transaction: any): Promise<{ hash: HexEncodedBytes }>;
   signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
-  signMessage(message: string): Promise<{ signature: string }>;
+  signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
 }
 
@@ -213,20 +215,21 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async signMessage(msgPayload: SignMessagePayload): Promise<SignMessageResponse> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.rise;
       if (!wallet || !provider) throw new WalletNotConnectedError();
-
-      const response = await provider?.signMessage(message);
-      if (response?.signature) {
-        return response.signature;
+      if (typeof msgPayload !== 'object' || !msgPayload.nonce) {
+        throw new WalletSignMessageError('Invalid signMessage Payload');
+      }
+      const response = await provider?.signMessage(msgPayload);
+      if (response) {
+        return response;
       } else {
         throw new Error('Sign Message failed');
       }
     } catch (error: any) {
-      console.log('err', error);
       const errMsg = error.message;
       this.emit('error', new WalletSignMessageError(errMsg));
       throw error;