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

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @aptos-labs/wallet-adapter-react
 
+## 2.1.0
+
+### Minor Changes
+
+- aa3d15a: Make sender optional when sign and submit single signer transaction
+
+### Patch Changes
+
+- Updated dependencies [6257015]
+- Updated dependencies [aa3d15a]
+  - @aptos-labs/wallet-adapter-core@3.1.0
+
+## 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/README.md

@@ -1,3 +1,5 @@
+> **_NOTE:_** This documentation is for Wallet Adapter `v2.0.0` and up that is fully comatible with the Aptos TypeScript SDK V2. For Wallet Adapter `v^1.*.*` refer to [this guide](./READMEV1.md)
+
 # Wallet Adapter React Provider
 
 A react provider wrapper for the Aptos Wallet Adapter
@@ -26,6 +28,7 @@ signMessage
 signTransaction
 signMessageAndVerify
 signAndSubmitBCSTransaction
+submitTransaction
 ```
 
 ### Usage
@@ -113,6 +116,13 @@ You can find it [here](../wallet-adapter-ant-design/) with instructions on how t
 
 #### Examples
 
+##### Initialize Aptos
+
+```js
+const aptosConfig = new AptosConfig({ network: Network.TESTNET });
+const aptos = new Aptos(aptosConfig);
+```
+
 ##### connect(walletName)
 
 ```js
@@ -132,61 +142,51 @@ const onConnect = async (walletName) => {
 ##### signAndSubmitTransaction(payload)
 
 ```js
-  const onSignAndSubmitTransaction = async () => {
-    const payload: Types.TransactionPayload = {
-      type: "entry_function_payload",
+const onSignAndSubmitTransaction = async () => {
+  const response = await signAndSubmitTransaction({
+    sender: account.address,
+    data: {
       function: "0x1::coin::transfer",
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [account?.address, 1], // 1 is in Octas
-    };
-    const response = await signAndSubmitTransaction(payload);
-    // if you want to wait for transaction
-    try {
-      await aptosClient.waitForTransaction(response?.hash || "");
-    } catch (error) {
-      console.error(error);
-    }
-  };
+      typeArguments: ["0x1::aptos_coin::AptosCoin"],
+      functionArguments: [account.address, 1],
+    },
+  });
+  // if you want to wait for transaction
+  try {
+    await aptos.waitForTransaction({ transactionHash: response.hash });
+  } catch (error) {
+    console.error(error);
+  }
+};
 
 <button onClick={onSignAndSubmitTransaction}>
   Sign and submit transaction
-</button>
+</button>;
 ```
 
 ##### signAndSubmitBCSTransaction(payload)
 
 ```js
-   const onSignAndSubmitBCSTransaction = async () => {
-    const token = new TxnBuilderTypes.TypeTagStruct(
-      TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin")
-    );
-    const entryFunctionBCSPayload =
-      new TxnBuilderTypes.TransactionPayloadEntryFunction(
-        TxnBuilderTypes.EntryFunction.natural(
-          "0x1::coin",
-          "transfer",
-          [token],
-          [
-            BCS.bcsToBytes(
-              TxnBuilderTypes.AccountAddress.fromHex(account!.address)
-            ),
-            BCS.bcsSerializeUint64(2),
-          ]
-        )
-      );
-
-    const response = await signAndSubmitBCSTransaction(entryFunctionBCSPayload);
-    // if you want to wait for transaction
-    try {
-      await aptosClient.waitForTransaction(response?.hash || "");
-    } catch (error) {
-      console.error(error);
-    }
-  };
+const onSignAndSubmitBCSTransaction = async () => {
+  const response = await signAndSubmitTransaction({
+    sender: account.address,
+    data: {
+      function: "0x1::coin::transfer",
+      typeArguments: [parseTypeTag(APTOS_COIN)],
+      functionArguments: [AccountAddress.from(account.address), new U64(1)],
+    },
+  });
+  // if you want to wait for transaction
+  try {
+    await aptos.waitForTransaction({ transactionHash: response.hash });
+  } catch (error) {
+    console.error(error);
+  }
+};
 
 <button onClick={onSignAndSubmitTransaction}>
   Sign and submit BCS transaction
-</button>
+</button>;
 ```
 
 ##### signMessage(payload)
@@ -235,19 +235,17 @@ const onSignMessage = async () => {
 ##### signTransaction(payload)
 
 ```js
-  const onSignTransaction = async () => {
-    const payload: Types.TransactionPayload = {
-      type: "entry_function_payload",
-      function: "0x1::coin::transfer",
-      type_arguments: ["0x1::aptos_coin::AptosCoin"],
-      arguments: [account?.address, 1], // 1 is in Octas
-    };
-    const response = await signTransaction(payload);
+const onSignTransaction = async () => {
+  const payload = {
+    type: "entry_function_payload",
+    function: "0x1::coin::transfer",
+    type_arguments: ["0x1::aptos_coin::AptosCoin"],
+    arguments: [account?.address, 1], // 1 is in Octas
   };
+  const response = await signTransaction(payload);
+};
 
-<button onClick={onSignTransaction}>
-  Sign transaction
-</button>
+<button onClick={onSignTransaction}>Sign transaction</button>;
 ```
 
 ##### signMessageAndVerify(payload)

package/READMEV1.md

@@ -0,0 +1,267 @@
+> **_NOTE:_** This documentation is for Wallet Adapter `v^1.*.*`
+
+# Wallet Adapter React Provider
+
+A react provider wrapper for the Aptos Wallet Adapter
+
+Dapps that want to use the adapter should install this package and other supported wallet packages.
+
+### Support
+
+The react provider supports all [wallet standard](https://aptos.dev/guides/wallet-standard) functions and feature functions
+
+##### Standard functions
+
+```
+connect
+disconnect
+connected
+account
+network
+signAndSubmitTransaction
+signMessage
+```
+
+##### Feature functions - functions that may not be supported by all wallets
+
+```
+signTransaction
+signMessageAndVerify
+signAndSubmitBCSTransaction
+```
+
+### Usage
+
+#### Install Dependencies
+
+Install wallet dependencies you want to include in your app.
+To do that, you can look at our [supported wallets list](https://github.com/aptos-labs/aptos-wallet-adapter#supported-wallet-packages). Each wallet is a link to npm package where you can install it from.
+
+Next, install the `@aptos-labs/wallet-adapter-react`
+
+```
+pnpm i @aptos-labs/wallet-adapter-react
+```
+
+using npm
+
+```
+npm i @aptos-labs/wallet-adapter-react
+```
+
+#### Import dependencies
+
+On the `App.jsx` file,
+
+Import the installed wallets.
+
+```js
+import { SomeAptosWallet } from "some-aptos-wallet-package";
+```
+
+Import the `AptosWalletAdapterProvider`.
+
+```js
+import { AptosWalletAdapterProvider } from "@aptos-labs/wallet-adapter-react";
+```
+
+Wrap your app with the Provider, pass it the `plugins (wallets)` you want to have on your app as an array and a `autoConnect` option (set to false by default)
+
+```js
+const wallets = [new AptosWallet()];
+
+<AptosWalletAdapterProvider
+  plugins={wallets}
+  autoConnect={true}
+  onError={(error) => {
+    console.log("error", error);
+  }}
+>
+  <App />
+</AptosWalletAdapterProvider>;
+```
+
+#### Use Wallet
+
+On any page you want to use the wallet props, import `useWallet` from `@aptos-labs/wallet-adapter-react`
+
+```js
+import { useWallet } from "@aptos-labs/wallet-adapter-react";
+```
+
+Then you can use the exported properties
+
+```js
+const {
+  connect,
+  account,
+  network,
+  connected,
+  disconnect,
+  wallet,
+  wallets,
+  signAndSubmitTransaction,
+  signAndSubmitBCSTransaction,
+  signTransaction,
+  signMessage,
+  signMessageAndVerify,
+} = useWallet();
+```
+
+### Use a UI package (recommended)
+
+As part of the wallet adapter repo we provide a wallet connect UI package that provides a wallet connect button and a wallet select modal.
+You can find it [here](../wallet-adapter-ant-design/) with instructions on how to use it.
+
+#### Examples
+
+##### connect(walletName)
+
+```js
+const onConnect = async (walletName) => {
+  await connect(walletName);
+};
+
+<button onClick={() => onConnect(wallet.name)}>{wallet.name}</button>;
+```
+
+##### disconnect()
+
+```js
+<button onClick={disconnect}>Disconnect</button>
+```
+
+##### signAndSubmitTransaction(payload)
+
+```js
+  const onSignAndSubmitTransaction = async () => {
+    const payload: Types.TransactionPayload = {
+      type: "entry_function_payload",
+      function: "0x1::coin::transfer",
+      type_arguments: ["0x1::aptos_coin::AptosCoin"],
+      arguments: [account?.address, 1], // 1 is in Octas
+    };
+    const response = await signAndSubmitTransaction(payload);
+    // if you want to wait for transaction
+    try {
+      await aptosClient.waitForTransaction(response?.hash || "");
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+<button onClick={onSignAndSubmitTransaction}>
+  Sign and submit transaction
+</button>
+```
+
+##### signAndSubmitBCSTransaction(payload)
+
+```js
+   const onSignAndSubmitBCSTransaction = async () => {
+    const token = new TxnBuilderTypes.TypeTagStruct(
+      TxnBuilderTypes.StructTag.fromString("0x1::aptos_coin::AptosCoin")
+    );
+    const entryFunctionBCSPayload =
+      new TxnBuilderTypes.TransactionPayloadEntryFunction(
+        TxnBuilderTypes.EntryFunction.natural(
+          "0x1::coin",
+          "transfer",
+          [token],
+          [
+            BCS.bcsToBytes(
+              TxnBuilderTypes.AccountAddress.fromHex(account!.address)
+            ),
+            BCS.bcsSerializeUint64(2),
+          ]
+        )
+      );
+
+    const response = await signAndSubmitBCSTransaction(entryFunctionBCSPayload);
+    // if you want to wait for transaction
+    try {
+      await aptosClient.waitForTransaction(response?.hash || "");
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+<button onClick={onSignAndSubmitTransaction}>
+  Sign and submit BCS transaction
+</button>
+```
+
+##### signMessage(payload)
+
+```js
+const onSignMessage = async () => {
+  const payload = {
+    message: "Hello from Aptos Wallet Adapter",
+    nonce: "random_string",
+  };
+  const response = await signMessage(payload);
+};
+
+<button onClick={onSignMessage}>Sign message</button>;
+```
+
+##### Account
+
+```js
+<div>{account?.address}</div>
+<div>{account?.publicKey}</div>
+```
+
+##### Network
+
+```js
+<div>{network?.name}</div>
+```
+
+##### Wallet
+
+```js
+<div>{wallet?.name}</div>
+<div>{wallet?.icon}</div>
+<div>{wallet?.url}</div>
+```
+
+##### Wallets
+
+```js
+{
+  wallets.map((wallet) => <p>{wallet.name}</p>);
+}
+```
+
+##### signTransaction(payload)
+
+```js
+  const onSignTransaction = async () => {
+    const payload: Types.TransactionPayload = {
+      type: "entry_function_payload",
+      function: "0x1::coin::transfer",
+      type_arguments: ["0x1::aptos_coin::AptosCoin"],
+      arguments: [account?.address, 1], // 1 is in Octas
+    };
+    const response = await signTransaction(payload);
+  };
+
+<button onClick={onSignTransaction}>
+  Sign transaction
+</button>
+```
+
+##### signMessageAndVerify(payload)
+
+```js
+const onSignMessageAndVerify = async () => {
+  const payload = {
+    message: "Hello from Aptos Wallet Adapter",
+    nonce: "random_string",
+  };
+  const response = await signMessageAndVerify(payload);
+};
+
+<button onClick={onSignMessageAndVerify}>Sign message and verify</button>;
+```

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, InputTransactionData, 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: InputTransactionData, 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.1.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.1.0"
   },
   "peerDependencies": {
     "react": "^18"

package/src/WalletProvider.tsx

@@ -13,11 +13,15 @@ import type {
   SignMessagePayload,
   Wallet,
   WalletInfo,
+  InputGenerateTransactionOptions,
+  AnyRawTransaction,
+  InputSubmitTransactionData,
+  AccountAuthenticator,
+  PendingTransactionResponse,
+  SignMessageResponse,
   WalletName,
-  TransactionOptions,
-  TxnBuilderTypes,
   Types,
-  InputGenerateTransactionData,
+  InputTransactionData,
 } 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: InputTransactionData,
+    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,
+  InputGenerateTransactionOptions,
+  AnyRawTransaction,
+  InputTransactionData,
+  InputSubmitTransactionData,
+  PendingTransactionResponse,
+  AccountAuthenticator,
   Types,
-  InputGenerateTransactionData,
+  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
+  signAndSubmitTransaction(
+    transaction: InputTransactionData,
+    options?: InputGenerateTransactionOptions
   ): 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>;
+  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 {