@aptos-labs/wallet-adapter-react 1.4.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @aptos-labs/wallet-adapter-react
 
+## 2.0.0
+
+### Major Changes
+
+- 31e0084: Support TypeScript SDK V2. Fully compatible with existing SDK V1 and Wallet Adapter V1
+  but with a full SDK V2 support for the dapp.
+
+  - Add support for SDK V2 input types
+  - `signAndSubmitTransaction()` accept only SDK V2 transaction input type
+  - Implement a `submitTransaction()` function for multi signers transactions
+  - `signTransaction()` to support both SDK V1 and V2 versions
+  - Convert wallet `SignedTransaction` response from `signTransaction()` to TS SDK V2 `AccountAuthenticator`
+  - Demo app to demonstrate different trnsaction flows - single signer, sponsor and multi agent transactions
+  - Reject promise on core and/or provider errors instead of just returning `false`
+  - Use `@aptos-labs/ts-sdk@experimental` version `0.0.7`
+
+### Patch Changes
+
+- Updated dependencies [31e0084]
+  - @aptos-labs/wallet-adapter-core@3.0.0
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AccountInfo, NetworkInfo, WalletName, WalletInfo, Wallet, Types, TransactionOptions, TxnBuilderTypes, SignMessagePayload, SignMessageResponse, InputGenerateTransactionData } from '@aptos-labs/wallet-adapter-core';
+import { AccountInfo, NetworkInfo, WalletName, WalletInfo, Wallet, InputGenerateTransactionData, InputGenerateTransactionOptions, AnyRawTransaction, Types, AccountAuthenticator, InputSubmitTransactionData, PendingTransactionResponse, SignMessagePayload, SignMessageResponse } from '@aptos-labs/wallet-adapter-core';
 export { NetworkName, Wallet, WalletName, WalletReadyState, isInAppBrowser, isMobile, isRedirectable } from '@aptos-labs/wallet-adapter-core';
 import { ReactNode, FC } from 'react';
 
@@ -11,13 +11,11 @@ interface WalletContextState {
     disconnect(): void;
     wallet: WalletInfo | null;
     wallets: ReadonlyArray<Wallet>;
-    signAndSubmitTransaction<T extends Types.TransactionPayload>(transaction: T, options?: TransactionOptions): Promise<any>;
-    signAndSubmitBCSTransaction<T extends TxnBuilderTypes.TransactionPayload>(transaction: T, options?: TransactionOptions): Promise<any>;
-    signTransaction<T extends Types.TransactionPayload>(transaction: T, options?: TransactionOptions): Promise<any>;
-    signMessage(message: SignMessagePayload): Promise<SignMessageResponse | null>;
+    signAndSubmitTransaction(transaction: InputGenerateTransactionData, options?: InputGenerateTransactionOptions): Promise<any>;
+    signTransaction(transactionOrPayload: AnyRawTransaction | Types.TransactionPayload, asFeePayer?: boolean, options?: InputGenerateTransactionOptions): Promise<AccountAuthenticator>;
+    submitTransaction(transaction: InputSubmitTransactionData): Promise<PendingTransactionResponse>;
+    signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
     signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;
-    submitTransaction(transaction: InputGenerateTransactionData): Promise<any>;
-    signMultiAgentTransaction(transaction: TxnBuilderTypes.MultiAgentRawTransaction | TxnBuilderTypes.FeePayerRawTransaction): Promise<any>;
 }
 declare function useWallet(): WalletContextState;
 

package/dist/index.js

@@ -33,11 +33,11 @@ module.exports = __toCommonJS(src_exports);
 // src/useWallet.tsx
 var import_wallet_adapter_core = require("@aptos-labs/wallet-adapter-core");
 var import_react = require("react");
-var DEFAULT_COUNTEXT = {
+var DEFAULT_CONTEXT = {
   connected: false
 };
 var WalletContext = (0, import_react.createContext)(
-  DEFAULT_COUNTEXT
+  DEFAULT_CONTEXT
 );
 function useWallet() {
   const context = (0, import_react.useContext)(WalletContext);
@@ -77,8 +77,7 @@ var AptosWalletAdapterProvider = ({
       console.log("connect error", error);
       if (onError)
         onError(error);
-      else
-        throw error;
+      return Promise.reject(error);
     } finally {
       setIsLoading(false);
     }
@@ -86,37 +85,19 @@ var AptosWalletAdapterProvider = ({
   const disconnect = async () => {
     try {
       await walletCore.disconnect();
-    } catch (e) {
-      console.log("disconnect error", e);
-      if (onError)
-        onError(e);
-    }
-  };
-  const signAndSubmitTransaction = async (transaction, options) => {
-    try {
-      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-    }
-  };
-  const signAndSubmitBCSTransaction = async (transaction, options) => {
-    try {
-      return await walletCore.signAndSubmitBCSTransaction(transaction, options);
-    } catch (error) {
-      throw error;
+      return Promise.reject(error);
     }
   };
-  const signTransaction = async (transaction, options) => {
+  const signTransaction = async (transaction, asFeePayer, options) => {
     try {
-      return await walletCore.signTransaction(transaction, options);
+      return await walletCore.signTransaction(transaction, asFeePayer, options);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
+      return Promise.reject(error);
     }
   };
   const signMessage = async (message) => {
@@ -125,9 +106,7 @@ var AptosWalletAdapterProvider = ({
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return null;
+      return Promise.reject(error);
     }
   };
   const signMessageAndVerify = async (message) => {
@@ -136,31 +115,25 @@ var AptosWalletAdapterProvider = ({
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
-  const signMultiAgentTransaction = async (transaction) => {
+  const submitTransaction = async (transaction) => {
     try {
-      return await walletCore.signMultiAgentTransaction(transaction);
+      return await walletCore.submitTransaction(transaction);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
-  const submitTransaction = async (transaction) => {
+  const signAndSubmitTransaction = async (transaction, options) => {
     try {
-      return await walletCore.submitTransaction(transaction);
+      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
   (0, import_react2.useEffect)(() => {
@@ -253,13 +226,11 @@ var AptosWalletAdapterProvider = ({
       wallet,
       wallets,
       signAndSubmitTransaction,
-      signAndSubmitBCSTransaction,
       signTransaction,
       signMessage,
       signMessageAndVerify,
-      signMultiAgentTransaction,
-      submitTransaction,
-      isLoading
+      isLoading,
+      submitTransaction
     },
     children
   });

package/dist/index.mjs

@@ -7,11 +7,11 @@ import {
   isMobile
 } from "@aptos-labs/wallet-adapter-core";
 import { createContext, useContext } from "react";
-var DEFAULT_COUNTEXT = {
+var DEFAULT_CONTEXT = {
   connected: false
 };
 var WalletContext = createContext(
-  DEFAULT_COUNTEXT
+  DEFAULT_CONTEXT
 );
 function useWallet() {
   const context = useContext(WalletContext);
@@ -56,8 +56,7 @@ var AptosWalletAdapterProvider = ({
       console.log("connect error", error);
       if (onError)
         onError(error);
-      else
-        throw error;
+      return Promise.reject(error);
     } finally {
       setIsLoading(false);
     }
@@ -65,37 +64,19 @@ var AptosWalletAdapterProvider = ({
   const disconnect = async () => {
     try {
       await walletCore.disconnect();
-    } catch (e) {
-      console.log("disconnect error", e);
-      if (onError)
-        onError(e);
-    }
-  };
-  const signAndSubmitTransaction = async (transaction, options) => {
-    try {
-      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-    }
-  };
-  const signAndSubmitBCSTransaction = async (transaction, options) => {
-    try {
-      return await walletCore.signAndSubmitBCSTransaction(transaction, options);
-    } catch (error) {
-      throw error;
+      return Promise.reject(error);
     }
   };
-  const signTransaction = async (transaction, options) => {
+  const signTransaction = async (transaction, asFeePayer, options) => {
     try {
-      return await walletCore.signTransaction(transaction, options);
+      return await walletCore.signTransaction(transaction, asFeePayer, options);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
+      return Promise.reject(error);
     }
   };
   const signMessage = async (message) => {
@@ -104,9 +85,7 @@ var AptosWalletAdapterProvider = ({
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return null;
+      return Promise.reject(error);
     }
   };
   const signMessageAndVerify = async (message) => {
@@ -115,31 +94,25 @@ var AptosWalletAdapterProvider = ({
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
-  const signMultiAgentTransaction = async (transaction) => {
+  const submitTransaction = async (transaction) => {
     try {
-      return await walletCore.signMultiAgentTransaction(transaction);
+      return await walletCore.submitTransaction(transaction);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
-  const submitTransaction = async (transaction) => {
+  const signAndSubmitTransaction = async (transaction, options) => {
     try {
-      return await walletCore.submitTransaction(transaction);
+      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error) {
       if (onError)
         onError(error);
-      else
-        throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
   useEffect(() => {
@@ -232,13 +205,11 @@ var AptosWalletAdapterProvider = ({
       wallet,
       wallets,
       signAndSubmitTransaction,
-      signAndSubmitBCSTransaction,
       signTransaction,
       signMessage,
       signMessageAndVerify,
-      signMultiAgentTransaction,
-      submitTransaction,
-      isLoading
+      isLoading,
+      submitTransaction
     },
     children
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-react",
-  "version": "1.4.0",
+  "version": "2.0.0",
   "description": "Aptos Wallet Adapter React Provider",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -37,7 +37,7 @@
     "@aptos-labs/wallet-adapter-tsconfig": "0.0.0"
   },
   "dependencies": {
-    "@aptos-labs/wallet-adapter-core": "2.6.0"
+    "@aptos-labs/wallet-adapter-core": "3.0.0"
   },
   "peerDependencies": {
     "react": "^18"

package/src/WalletProvider.tsx

@@ -13,11 +13,15 @@ import type {
   SignMessagePayload,
   Wallet,
   WalletInfo,
+  InputGenerateTransactionOptions,
+  AnyRawTransaction,
+  InputGenerateTransactionData,
+  InputSubmitTransactionData,
+  AccountAuthenticator,
+  PendingTransactionResponse,
+  SignMessageResponse,
   WalletName,
-  TransactionOptions,
-  TxnBuilderTypes,
   Types,
-  InputGenerateTransactionData,
 } from "@aptos-labs/wallet-adapter-core";
 import { WalletCore } from "@aptos-labs/wallet-adapter-core";
 
@@ -65,7 +69,7 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
     } catch (error: any) {
       console.log("connect error", error);
       if (onError) onError(error);
-      else throw error;
+      return Promise.reject(error);
     } finally {
       setIsLoading(false);
     }
@@ -74,90 +78,69 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
   const disconnect = async () => {
     try {
       await walletCore.disconnect();
-    } catch (e) {
-      console.log("disconnect error", e);
-      if (onError) onError(e);
-    }
-  };
-
-  const signAndSubmitTransaction = async (
-    transaction: Types.TransactionPayload,
-    options?: TransactionOptions
-  ) => {
-    try {
-      return await walletCore.signAndSubmitTransaction(transaction, options);
-    } catch (error: any) {
+    } catch (error) {
       if (onError) onError(error);
-      else throw error;
-    }
-  };
-
-  const signAndSubmitBCSTransaction = async (
-    transaction: TxnBuilderTypes.TransactionPayload,
-    options?: TransactionOptions
-  ) => {
-    try {
-      return await walletCore.signAndSubmitBCSTransaction(transaction, options);
-    } catch (error: any) {
-      throw error;
+      return Promise.reject(error);
     }
   };
 
   const signTransaction = async (
-    transaction: Types.TransactionPayload,
-    options?: TransactionOptions
-  ) => {
+    transaction: AnyRawTransaction | Types.TransactionPayload,
+    asFeePayer?: boolean,
+    options?: InputGenerateTransactionOptions
+  ): Promise<AccountAuthenticator> => {
     try {
-      return await walletCore.signTransaction(transaction, options);
+      return await walletCore.signTransaction(transaction, asFeePayer, options);
     } catch (error: any) {
       if (onError) onError(error);
-      else throw error;
+      return Promise.reject(error);
     }
   };
 
-  const signMessage = async (message: SignMessagePayload) => {
+  const signMessage = async (
+    message: SignMessagePayload
+  ): Promise<SignMessageResponse> => {
     try {
       return await walletCore.signMessage(message);
     } catch (error: any) {
       if (onError) onError(error);
-      else throw error;
-      return null;
+      return Promise.reject(error);
     }
   };
 
-  const signMessageAndVerify = async (message: SignMessagePayload) => {
+  const signMessageAndVerify = async (
+    message: SignMessagePayload
+  ): Promise<boolean> => {
     try {
       return await walletCore.signMessageAndVerify(message);
     } catch (error: any) {
       if (onError) onError(error);
-      else throw error;
-      return false;
+      return Promise.reject(error);
     }
   };
 
-  const signMultiAgentTransaction = async (
-      transaction: TxnBuilderTypes.MultiAgentRawTransaction | TxnBuilderTypes.FeePayerRawTransaction,
-  ) => {
+  const submitTransaction = async (
+    transaction: InputSubmitTransactionData
+  ): Promise<PendingTransactionResponse> => {
     try {
-      return await walletCore.signMultiAgentTransaction(transaction);
+      return await walletCore.submitTransaction(transaction);
     } catch (error: any) {
       if (onError) onError(error);
-      else throw error;
-      return false;
+      return Promise.reject(error);
     }
-  }
+  };
 
-  const submitTransaction = async (
-      transaction: InputGenerateTransactionData,
+  const signAndSubmitTransaction = async (
+    transaction: InputGenerateTransactionData,
+    options?: InputGenerateTransactionOptions
   ) => {
     try {
-      return await walletCore.submitTransaction(transaction);
+      return await walletCore.signAndSubmitTransaction(transaction, options);
     } catch (error: any) {
       if (onError) onError(error);
-      else throw error;
-      return false;
+      return Promise.reject(error);
     }
-  }
+  };
 
   useEffect(() => {
     if (autoConnect) {
@@ -261,13 +244,11 @@ export const AptosWalletAdapterProvider: FC<AptosWalletProviderProps> = ({
         wallet,
         wallets,
         signAndSubmitTransaction,
-        signAndSubmitBCSTransaction,
         signTransaction,
         signMessage,
         signMessageAndVerify,
-        signMultiAgentTransaction,
-        submitTransaction,
         isLoading,
+        submitTransaction,
       }}
     >
       {children}

package/src/index.tsx

@@ -7,5 +7,5 @@ export {
   isMobile,
   isRedirectable,
 } from "./useWallet";
-export type { WalletName, Wallet } from "./useWallet";
+export type { Wallet, WalletName } from "./useWallet";
 export * from "./WalletProvider";

package/src/useWallet.tsx

@@ -2,7 +2,6 @@ import {
   AccountInfo,
   NetworkInfo,
   WalletInfo,
-  WalletName,
   SignMessagePayload,
   SignMessageResponse,
   Wallet,
@@ -11,20 +10,24 @@ import {
   isInAppBrowser,
   isRedirectable,
   isMobile,
-  TransactionOptions,
-  TxnBuilderTypes,
-  Types,
+  InputGenerateTransactionOptions,
   InputGenerateTransactionData,
+  AnyRawTransaction,
+  InputSubmitTransactionData,
+  PendingTransactionResponse,
+  AccountAuthenticator,
+  Types,
+  WalletName,
 } from "@aptos-labs/wallet-adapter-core";
 import { createContext, useContext } from "react";
 
-export type { WalletName, Wallet };
+export type { Wallet, WalletName };
 export {
   WalletReadyState,
-  NetworkName,
   isInAppBrowser,
   isRedirectable,
   isMobile,
+  NetworkName,
 };
 
 export interface WalletContextState {
@@ -36,32 +39,28 @@ export interface WalletContextState {
   disconnect(): void;
   wallet: WalletInfo | null;
   wallets: ReadonlyArray<Wallet>;
-  signAndSubmitTransaction<T extends Types.TransactionPayload>(
-    transaction: T,
-    options?: TransactionOptions
-  ): Promise<any>;
-  signAndSubmitBCSTransaction<T extends TxnBuilderTypes.TransactionPayload>(
-    transaction: T,
-    options?: TransactionOptions
+  signAndSubmitTransaction(
+    transaction: InputGenerateTransactionData,
+    options?: InputGenerateTransactionOptions
   ): Promise<any>;
-  signTransaction<T extends Types.TransactionPayload>(
-    transaction: T,
-    options?: TransactionOptions
-  ): Promise<any>;
-  signMessage(message: SignMessagePayload): Promise<SignMessageResponse | null>;
+  signTransaction(
+    transactionOrPayload: AnyRawTransaction | Types.TransactionPayload,
+    asFeePayer?: boolean,
+    options?: InputGenerateTransactionOptions
+  ): Promise<AccountAuthenticator>;
+  submitTransaction(
+    transaction: InputSubmitTransactionData
+  ): Promise<PendingTransactionResponse>;
+  signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;
-  submitTransaction(transaction: InputGenerateTransactionData): Promise<any>;
-  signMultiAgentTransaction(
-      transaction: TxnBuilderTypes.MultiAgentRawTransaction | TxnBuilderTypes.FeePayerRawTransaction,
-  ): Promise<any>;
 }
 
-const DEFAULT_COUNTEXT = {
+const DEFAULT_CONTEXT = {
   connected: false,
 };
 
 export const WalletContext = createContext<WalletContextState>(
-  DEFAULT_COUNTEXT as WalletContextState
+  DEFAULT_CONTEXT as WalletContextState
 );
 
 export function useWallet(): WalletContextState {